From b12d72c68f2d580f014a764de8655f799f1a5957 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 9 Jul 2015 11:44:27 -0400
Subject: [PATCH 001/362] fix monitor popup size

---
 web/skins/classic/js/flat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js
index 4e43ce170..7a6947d60 100644
--- a/web/skins/classic/js/flat.js
+++ b/web/skins/classic/js/flat.js
@@ -48,7 +48,7 @@ var popupSizes = {
     'log':          { 'width': 1080, 'height': 720 },
     'login':        { 'width': 720, 'height': 480 },
     'logout':       { 'width': 260, 'height': 100 },
-    'monitor':      { 'width': 450, 'height': 440 },
+    'monitor':      { 'width': 550, 'height': 630 },
     'monitorpreset':{ 'width': 440, 'height': 200 },
     'monitorprobe': { 'width': 500, 'height': 240 },
     'monitorselect':{ 'width': 160, 'height': 200 },

From 69e1fd8b182f0ffc1b3af8d049ac50738b216758 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 9 Jul 2015 11:45:19 -0400
Subject: [PATCH 002/362] add code to convert the human readable config entry
 ZM_SERVER_NAME into ZM_SERVER_ID

---
 web/includes/config.php.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index fbcb0e7b3..7fdba34a7 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -166,4 +166,15 @@ function loadConfig( $defineConsts=true )
     //print_r( $configCats );
 }
 
+// For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
+if ( ! defined(ZM_SERVER_ID) and defined(ZM_SERVER) ) {
+    $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
+    if ( ! $server_id ) {
+        Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
+    } else {
+        define( ZM_SERVER_ID, $server_id );
+    }
+}
+
+
 ?>

From 7fa2d51277d5ff7582161e9cf3f7b5ff5a951575 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 09:42:29 -0400
Subject: [PATCH 003/362] snapshot releases

---
 distros/ubuntu1504/changelog | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/distros/ubuntu1504/changelog b/distros/ubuntu1504/changelog
index 2dfc8b63c..e53dd0203 100644
--- a/distros/ubuntu1504/changelog
+++ b/distros/ubuntu1504/changelog
@@ -1,3 +1,21 @@
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015070402) vivid; urgency=medium
+
+  * Correct PRIMARY KEY update code on States table
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Tue, 07 Jul 2015 15:40:21 -0400
+
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015070401) vivid; urgency=medium
+
+  * Bump actual version # so that db upgrade scripts run
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Tue, 07 Jul 2015 12:44:55 -0400
+
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015070301) vivid; urgency=medium
+
+  * initial merge of api.  Various other small fixes/improvements.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 06 Jul 2015 15:59:08 -0400
+
 zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium
 
   * maybe fix for RTSP Basic Auth

From e318c3bf3746e7cca71a8ed8decd6e95cb63864c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 16:12:35 -0400
Subject: [PATCH 004/362] Add ServerId as a filter option

---
 scripts/zmfilter.pl.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 54f372262..4280f4e48 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -349,6 +349,10 @@ sub getFilters
                         my ( $temp_attr_name ) = $filter_expr->{terms}[$i]->{attr} =~ /^Monitor(.+)$/;
                         $db_filter->{Sql} .= "M.".$temp_attr_name;
                     }
+					elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' )
+					{
+						$db_filter->{Sql} .= "M.ServerId";
+					}
                     elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' )
                     {
                         $db_filter->{Sql} .= "E.StartTime";
@@ -392,6 +396,13 @@ sub getFilters
                         {
                             $value = "'$temp_value'";
                         }
+						elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' ) {
+							if ( $temp_value eq 'ZM_SERVER_ID' ) {
+								$value = "'$Config{ZM_SERVER_ID}'";
+							} else {
+								$value = "'$temp_value'";
+							}
+						}
                         elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name'
                                 || $filter_expr->{terms}[$i]->{attr} eq 'Cause'
                                 || $filter_expr->{terms}[$i]->{attr} eq 'Notes'

From 51af432468c278a667652352a3ad57fa76e08b23 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 16:18:05 -0400
Subject: [PATCH 005/362] Only load monitors for our server if ZM_SERVER_ID is
 specified

---
 scripts/zmpkg.pl.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 46ea825c4..c5a1d489d 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -119,10 +119,10 @@ my $retval = 0;
 if ( $command eq "state" )
 {
     Info( "Updating DB: $state->{Name}\n" );
-    my $sql = "select * from Monitors order by Id asc";
+	my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=? ORDER BY Id ASC' : 'SELECT * FROM Monitors ORDER BY Id ASC';
     my $sth = $dbh->prepare_cached( $sql )
         or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute()
+    my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID}: () )
         or Fatal( "Can't execute: ".$sth->errstr() );
     while( my $monitor = $sth->fetchrow_hashref() )
     {
@@ -228,10 +228,10 @@ if ( $command =~ /^(?:start|restart)$/ )
         zmMemTidy();
         runCommand( "zmdc.pl startup" );
 
-        my $sql = "select * from Monitors";
+		my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
         my $sth = $dbh->prepare_cached( $sql )
             or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute()
+        my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
             or Fatal( "Can't execute: ".$sth->errstr() );
         while( my $monitor = $sth->fetchrow_hashref() )
         {

From b8888b9d5536b51e66331ec49c60ce1d6b40ad74 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 16:22:43 -0400
Subject: [PATCH 006/362] Only load triggers for our Server if ZM_SERVER_ID is
 set

---
 scripts/zmtrigger.pl.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index e43b00bbb..0dc18562d 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -358,11 +358,12 @@ sub loadMonitors
     my %new_monitors = ();
 
     my $sql = "SELECT * FROM Monitors
-               WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )"
+               WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )".
+			   ( $Config{ZM_SERVER_ID} ? 'AND ServerId=?' : '' )
     ;
     my $sth = $dbh->prepare_cached( $sql )
         or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute()
+    my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
         or Fatal( "Can't execute: ".$sth->errstr() );
     while( my $monitor = $sth->fetchrow_hashref() )
     {

From ca9a391d6216cc17b48298af7d1d78b661357a11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 16:24:01 -0400
Subject: [PATCH 007/362] Only load the monitors for our server

---
 scripts/zmwatch.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 01d15e815..3e97733a1 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -74,14 +74,14 @@ sleep( START_DELAY );
 
 my $dbh = zmDbConnect();
 
-my $sql = "select * from Monitors";
+my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
 my $sth = $dbh->prepare_cached( $sql )
     or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
 
 while( 1 )
 {
     my $now = time();
-    my $res = $sth->execute()
+    my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
         or Fatal( "Can't execute: ".$sth->errstr() );
     while( my $monitor = $sth->fetchrow_hashref() )
     {

From 34813685742ed08aa918ac1f42363ba0985d470e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 15 Jul 2015 16:44:16 -0400
Subject: [PATCH 008/362] given SERVER_NAME populate SERVER_ID and vice versa

---
 src/zm_config.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index a25f7a39a..27a8365e4 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -91,17 +91,82 @@ void zmLoadConfig()
             staticConfig.DB_PASS = std::string(val_ptr);
 		else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 )
             staticConfig.PATH_WEB = std::string(val_ptr);
+		else if ( strcasecmp( name_ptr, "ZM_SERVER_HOST" ) == 0 )
+			staticConfig.SERVER_NAME = std::string(val_ptr);
+		else if ( strcasecmp( name_ptr, "ZM_SERVER_NAME" ) == 0 )
+			staticConfig.SERVER_NAME = std::string(val_ptr);
+		else if ( strcasecmp( name_ptr, "ZM_SERVER_ID" ) == 0 )
+			staticConfig.SERVER_ID = atoi(val_ptr);
 		else
 		{
 			// We ignore this now as there may be more parameters than the
 			// c/c++ binaries are bothered about
 			// Warning( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG );
 		}
-	}
-	fclose( cfg);
+	} // end foreach line of the config
+	fclose( cfg );
 	zmDbConnect();
 	config.Load();
 	config.Assign();
+
+	// Populate the server config entries
+	if ( ! staticConfig.SERVER_ID ) {
+		if ( staticConfig.SERVER_NAME && ! staticConfig.SERVER_NAME.empty() ) {
+
+			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME );
+			if ( mysql_query( &dbconn, sql.c_str() ) )
+			{
+				Error( "Can't run query: %s", mysql_error( &dbconn ) );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+			}
+			MYSQL_RES *result = mysql_store_result( &dbconn );
+			if ( !result )
+			{
+				Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+			}
+			int n_rows = mysql_num_rows( result );
+			if ( n_rows != 1 )
+			{
+				Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+			}
+
+			if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
+			{
+				staticConfig.SERVER_ID = atoi(dbrow[0]);
+			}
+			mysql_free_result( result );
+
+		} // end if has SERVER_NAME
+	} else if ( ! staticConfig.SERVER_NAME ) {
+		std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
+		if ( mysql_query( &dbconn, sql.c_str() ) )
+		{
+			Error( "Can't run query: %s", mysql_error( &dbconn ) );
+			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
+		}
+		
+		MYSQL_RES *result = mysql_store_result( &dbconn );
+		if ( !result )
+		{
+			Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
+		}
+		int n_rows = mysql_num_rows( result );
+		if ( n_rows != 1 )
+		{
+			Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
+			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
+		}
+
+		if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
+		{
+			staticConfig.SERVER_NAME = std::string(dbrow[0]);
+		}
+		mysql_free_result( result );
+	
+	}	
 }
 
 StaticConfig staticConfig;

From 50b333fb28321fca9e2cba017294f5380622b25c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 16 Jul 2015 10:04:56 -0400
Subject: [PATCH 009/362] Add SERVER_NAME and SERVER_ID loading to config

---
 src/zm_config.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 27a8365e4..f8ae0c271 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "zm_utils.h"
+
 void zmLoadConfig()
 {
 	FILE *cfg;
@@ -111,25 +113,25 @@ void zmLoadConfig()
 
 	// Populate the server config entries
 	if ( ! staticConfig.SERVER_ID ) {
-		if ( staticConfig.SERVER_NAME && ! staticConfig.SERVER_NAME.empty() ) {
+		if ( ! staticConfig.SERVER_NAME.empty() ) {
 
-			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME );
+			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
 			if ( mysql_query( &dbconn, sql.c_str() ) )
 			{
 				Error( "Can't run query: %s", mysql_error( &dbconn ) );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
 			}
 			MYSQL_RES *result = mysql_store_result( &dbconn );
 			if ( !result )
 			{
 				Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
 			}
 			int n_rows = mysql_num_rows( result );
 			if ( n_rows != 1 )
 			{
 				Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME );
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
 			}
 
 			if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
@@ -139,7 +141,7 @@ void zmLoadConfig()
 			mysql_free_result( result );
 
 		} // end if has SERVER_NAME
-	} else if ( ! staticConfig.SERVER_NAME ) {
+	} else if ( staticConfig.SERVER_NAME.empty() ) {
 		std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
 		if ( mysql_query( &dbconn, sql.c_str() ) )
 		{

From 4ed248e5a5d00fad62fb43ead3e297a9c0bd165c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 16 Jul 2015 10:05:21 -0400
Subject: [PATCH 010/362] Add SERVER_NAME and SERVER_ID loading to config

---
 src/zm_config.h.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/zm_config.h.in b/src/zm_config.h.in
index 1df1edf16..83aa19210 100644
--- a/src/zm_config.h.in
+++ b/src/zm_config.h.in
@@ -65,6 +65,8 @@ struct StaticConfig
     std::string DB_USER;
     std::string DB_PASS;
     std::string PATH_WEB;
+	std::string SERVER_NAME;
+	unsigned int SERVER_ID;
 };
 
 extern StaticConfig staticConfig;

From 60410c98d6c20988a012da7f68995be7889f3b2c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 16 Jul 2015 16:44:09 -0400
Subject: [PATCH 011/362] use new db functions in zm_config.cpp

---
 src/zm_config.cpp | 25 ++++---------------------
 src/zm_db.cpp     |  3 ++-
 src/zm_db.h       |  2 +-
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index f8ae0c271..e9c54b943 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -115,30 +115,13 @@ void zmLoadConfig()
 	if ( ! staticConfig.SERVER_ID ) {
 		if ( ! staticConfig.SERVER_NAME.empty() ) {
 
+			
 			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
-			if ( mysql_query( &dbconn, sql.c_str() ) )
-			{
-				Error( "Can't run query: %s", mysql_error( &dbconn ) );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
-			}
-			MYSQL_RES *result = mysql_store_result( &dbconn );
-			if ( !result )
-			{
-				Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
-			}
-			int n_rows = mysql_num_rows( result );
-			if ( n_rows != 1 )
-			{
-				Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
-			}
-
-			if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
-			{
+			if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
 				staticConfig.SERVER_ID = atoi(dbrow[0]);
+			} else {
+				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
 			}
-			mysql_free_result( result );
 
 		} // end if has SERVER_NAME
 	} else if ( staticConfig.SERVER_NAME.empty() ) {
diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index 0065488f5..a342ca14b 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -95,7 +95,7 @@ MYSQL_RES * zmDbFetch( const char * query ) {
 	return result;
 } // end MYSQL_RES * zmDbFetch( const char * query );
 
-MYSQL_ROW zmDBFetchOne( const char *query ) {
+MYSQL_ROW zmDbFetchOne( const char *query ) {
 	MYSQL_RES *result = zmDbFetch( query );
 	int n_rows = mysql_num_rows( result );
 	if ( n_rows != 1 ) {
@@ -104,6 +104,7 @@ MYSQL_ROW zmDBFetchOne( const char *query ) {
 	}
 
 	MYSQL_ROW dbrow = mysql_fetch_row( result );
+	mysql_free_result( result );
 	if ( ! dbrow ) {
 		Error("Error getting row from query %s. Error is %s", query, mysql_error( &dbconn ) );
 		return NULL;
diff --git a/src/zm_db.h b/src/zm_db.h
index de1a81340..6ec1b5e4e 100644
--- a/src/zm_db.h
+++ b/src/zm_db.h
@@ -33,7 +33,7 @@ void zmDbConnect();
 void zmDbClose();
 
 MYSQL_RES * zmDbFetch( const char *query );
-MYSQL_ROW zmDBFetchOne( const char *query );
+MYSQL_ROW zmDbFetchOne( const char *query );
 
 #ifdef __cplusplus 
 } /* extern "C" */

From 633a6e2df9fbdfee6768c53784df441b7191a080 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 16 Jul 2015 16:53:30 -0400
Subject: [PATCH 012/362] use zmDbFetchOne more

---
 src/zm_config.cpp | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index e9c54b943..5521b5a14 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -115,7 +115,6 @@ void zmLoadConfig()
 	if ( ! staticConfig.SERVER_ID ) {
 		if ( ! staticConfig.SERVER_NAME.empty() ) {
 
-			
 			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
 			if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
 				staticConfig.SERVER_ID = atoi(dbrow[0]);
@@ -126,30 +125,12 @@ void zmLoadConfig()
 		} // end if has SERVER_NAME
 	} else if ( staticConfig.SERVER_NAME.empty() ) {
 		std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
-		if ( mysql_query( &dbconn, sql.c_str() ) )
-		{
-			Error( "Can't run query: %s", mysql_error( &dbconn ) );
-			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
-		}
 		
-		MYSQL_RES *result = mysql_store_result( &dbconn );
-		if ( !result )
-		{
-			Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
-		}
-		int n_rows = mysql_num_rows( result );
-		if ( n_rows != 1 )
-		{
-			Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
-			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
-		}
-
-		if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
-		{
+		if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
 			staticConfig.SERVER_NAME = std::string(dbrow[0]);
+		} else {
+			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
 		}
-		mysql_free_result( result );
 	
 	}	
 }

From 441a82e611e73c4e5da899093a0fee1e85772550 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 17 Jul 2015 10:12:44 -0400
Subject: [PATCH 013/362] fixup loading SERVER_ID from SERVER_NAME

---
 web/includes/config.php.in | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 7fdba34a7..efe9d2bce 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -167,13 +167,22 @@ function loadConfig( $defineConsts=true )
 }
 
 // For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
-if ( ! defined(ZM_SERVER_ID) and defined(ZM_SERVER) ) {
-    $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
-    if ( ! $server_id ) {
-        Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
-    } else {
-        define( ZM_SERVER_ID, $server_id );
-    }
+if ( ! defined('ZM_SERVER_ID') ) {
+	if ( defined('ZM_SERVER_NAME') ) {
+		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
+		if ( ! $server_id ) {
+			Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
+		} else {
+			define( 'ZM_SERVER_ID', $server_id );
+		}
+	} else if ( defined('ZM_SERVER_HOST') ) {
+		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
+		if ( ! $server_id ) {
+			Error("ZM_SERVER_HOST set in config, but not found in Servers table.");
+		} else {
+			define( 'ZM_SERVER_ID', $server_id );
+		}
+	}
 }
 
 

From dfd3d2c4cde6a2867b4b53983811d9d7d5d424ba Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 20 Jul 2015 16:28:21 -0400
Subject: [PATCH 014/362] use std::string to build sql for loading monitors. 
 ALso use new ZmDbFetch functions

---
 src/zm_monitor.cpp | 660 ++++++++++++++++++++++-----------------------
 src/zm_monitor.h   |   5 +-
 2 files changed, 321 insertions(+), 344 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 906ca68f6..e233b0790 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -263,6 +263,7 @@ bool Monitor::MonitorLink::hasAlarmed()
 Monitor::Monitor(
     int p_id,
     const char *p_name,
+	const unsigned int p_server_id,
     int p_function,
     bool p_enabled,
     const char *p_linked_monitors,
@@ -292,6 +293,7 @@ Monitor::Monitor(
     int p_n_zones,
     Zone *p_zones[]
 ) : id( p_id ),
+	server_id( p_server_id ),
     function( (Function)p_function ),
     enabled( p_enabled ),
     width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
@@ -1860,25 +1862,22 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
 #if ZM_HAS_V4L
 int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    if ( !device[0] )
-    {
-        strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Function != 'None' and Type = 'Local' order by Device, Channel", sizeof(sql) );
-    }
-    else
-    {
-        snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Function != 'None' and Type = 'Local' and Device = '%s' order by Channel", device );
-    }
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+	std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Function != 'None' and Type = 'Local'";
+;
+    if ( device[0] ) {
+		sql += " AND Device='";
+		sql += device;
+		sql += "'";
+	}
+	if ( staticConfig.SERVER_ID ) {
+		sql += " AND ServerId='";
+		sql += staticConfig.SERVER_ID;
+		sql += "'";
+	}
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    MYSQL_RES *result = zmDbFetch( sql.c_str() );
+    if ( !result ) {
+        Error( "Can't load local monitors: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
     }
     int n_monitors = mysql_num_rows( result );
@@ -1891,6 +1890,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
+		unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -1988,6 +1988,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
         monitors[i] = new Monitor(
             id,
             name,
+			server_id,
             function,
             enabled,
             linked_monitors,
@@ -2036,24 +2037,19 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 
 int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    if ( !protocol )
-    {
-        strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Remote'", sizeof(sql) );
-    }
-    else
-    {
-        snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Remote' and Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
-    }
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
+    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Remote'";
+    if ( staticConfig.SERVER_ID ) {
+        sql += " AND ServerId='";
+        sql += staticConfig.SERVER_ID;
+        sql += "'";
     }
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
+    if ( protocol ) {
+        sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
+    }
+
+    MYSQL_RES *result = zmDbFetch( sql.c_str() );
+    if ( !result ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
     }
@@ -2067,6 +2063,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 
         int id = atoi(dbrow[col]); col++;
         std::string name = dbrow[col]; col++;
+		unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2161,6 +2158,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
         monitors[i] = new Monitor(
             id,
             name.c_str(),
+			server_id,
             function,
             enabled,
             linked_monitors,
@@ -2209,22 +2207,18 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 
 int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    if ( !file[0] )
-    {
-        strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'File'", sizeof(sql) );
+        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'File'";
+    if ( file[0] ) {
+		sql += " AND Path='";
+		sql += file;
+		sql += "'";
     }
-    else
-    {
-        snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'File' and Path = '%s'", file );
+    if ( staticConfig.SERVER_ID ) {
+        sql += " AND ServerId='";
+        sql += staticConfig.SERVER_ID;
+        sql += "'";
     }
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    MYSQL_RES *result = mysql_store_result( &dbconn );
+    MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result )
     {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
@@ -2240,6 +2234,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
+		unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2298,6 +2293,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
         monitors[i] = new Monitor(
             id,
             name,
+			server_id,
             function,
             enabled,
             linked_monitors,
@@ -2346,27 +2342,23 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 #if HAVE_LIBAVFORMAT
 int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    if ( !file[0] )
-    {
-        strncpy( sql, "select Id, Name, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Ffmpeg'", sizeof(sql) );
+        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Ffmpeg'";
+    if ( file[0] ) {
+		sql += " AND Path = '";
+		sql += file;
+		sql += "'";
     }
-    else
-    {
-        snprintf( sql, sizeof(sql), "select Id, Name, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion from Monitors where Function != 'None' and Type = 'Ffmpeg' and Path = '%s'", file );
+    if ( staticConfig.SERVER_ID ) {
+        sql += " AND ServerId='";
+        sql += staticConfig.SERVER_ID;
+        sql += "'";
     }
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    MYSQL_RES *result = zmDbFetch( sql.c_str() );
+    if ( ! result ) {
+        Error( "Cannot load FfmpegMonitors" );
         exit( mysql_errno( &dbconn ) );
     }
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
     int n_monitors = mysql_num_rows( result );
     Debug( 1, "Got %d monitors", n_monitors );
     delete[] monitors;
@@ -2377,6 +2369,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
+		unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2439,6 +2432,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
         monitors[i] = new Monitor(
             id,
             name,
+			server_id,
             function,
             enabled,
             linked_monitors,
@@ -2485,321 +2479,303 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 }
 #endif // HAVE_LIBAVFORMAT
 
-Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose )
+Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    snprintf( sql, sizeof(sql), "select Id, Name, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = %d", id );
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+    std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = %d", p_id );
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
+	MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
+    if ( ! dbrow ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
     }
-    int n_monitors = mysql_num_rows( result );
-    Debug( 1, "Got %d monitors", n_monitors );
     Monitor *monitor = 0;
-    for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-    {
-        int col = 0;
+	unsigned int col = 0;
 
-        int id = atoi(dbrow[col]); col++;
-        std::string name = dbrow[col]; col++;
-        std::string type = dbrow[col]; col++;
-        int function = atoi(dbrow[col]); col++;
-        int enabled = atoi(dbrow[col]); col++;
-        std::string linked_monitors = dbrow[col]; col++;
+	unsigned int id = atoi(dbrow[col]); col++;
+	std::string name = dbrow[col]; col++;
+	unsigned int server_id = atoi(dbrow[col]); col++;
+	std::string type = dbrow[col]; col++;
+	int function = atoi(dbrow[col]); col++;
+	int enabled = atoi(dbrow[col]); col++;
+	std::string linked_monitors = dbrow[col]; col++;
 
-        std::string device = dbrow[col]; col++;
-        int channel = atoi(dbrow[col]); col++;
-        int format = atoi(dbrow[col]); col++;
+	std::string device = dbrow[col]; col++;
+	int channel = atoi(dbrow[col]); col++;
+	int format = atoi(dbrow[col]); col++;
 
-        bool v4l_multi_buffer;
-        if ( dbrow[col] ) {
-            if (*dbrow[col] == '0' ) {
-                v4l_multi_buffer = false;
-            } else if ( *dbrow[col] == '1' ) {
-                v4l_multi_buffer = true;
-            }
-        } else {
-            v4l_multi_buffer = config.v4l_multi_buffer;
-        }
-        col++;
+	bool v4l_multi_buffer;
+	if ( dbrow[col] ) {
+		if (*dbrow[col] == '0' ) {
+			v4l_multi_buffer = false;
+		} else if ( *dbrow[col] == '1' ) {
+			v4l_multi_buffer = true;
+		}
+	} else {
+		v4l_multi_buffer = config.v4l_multi_buffer;
+	}
+	col++;
 
-        int v4l_captures_per_frame = 0;
-        if ( dbrow[col] ) {
-             v4l_captures_per_frame = atoi(dbrow[col]);
-        } else {
-            v4l_captures_per_frame = config.captures_per_frame;
-        }
+	int v4l_captures_per_frame = 0;
+	if ( dbrow[col] ) {
+		 v4l_captures_per_frame = atoi(dbrow[col]);
+	} else {
+		v4l_captures_per_frame = config.captures_per_frame;
+	}
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-        col++;
+	col++;
 
-        std::string protocol = dbrow[col]; col++;
-        std::string method = dbrow[col]; col++;
-        std::string host = dbrow[col]; col++;
-        std::string port = dbrow[col]; col++;
-        std::string path = dbrow[col]; col++;
-        std::string options = dbrow[col]; col++;
-        std::string user = dbrow[col]; col++;
-        std::string pass = dbrow[col]; col++;
+	std::string protocol = dbrow[col]; col++;
+	std::string method = dbrow[col]; col++;
+	std::string host = dbrow[col]; col++;
+	std::string port = dbrow[col]; col++;
+	std::string path = dbrow[col]; col++;
+	std::string options = dbrow[col]; col++;
+	std::string user = dbrow[col]; col++;
+	std::string pass = dbrow[col]; col++;
 
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        int palette = atoi(dbrow[col]); col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
+	int width = atoi(dbrow[col]); col++;
+	int height = atoi(dbrow[col]); col++;
+	int colours = atoi(dbrow[col]); col++;
+	int palette = atoi(dbrow[col]); col++;
+	Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+	unsigned int deinterlacing = atoi(dbrow[col]); col++;
+	int brightness = atoi(dbrow[col]); col++;
+	int contrast = atoi(dbrow[col]); col++;
+	int hue = atoi(dbrow[col]); col++;
+	int colour = atoi(dbrow[col]); col++;
 
-        std::string event_prefix = dbrow[col]; col++;
-        std::string label_format = dbrow[col]; col++;
+	std::string event_prefix = dbrow[col]; col++;
+	std::string label_format = dbrow[col]; col++;
 
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
+	int label_x = atoi(dbrow[col]); col++;
+	int label_y = atoi(dbrow[col]); col++;
 
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
+	int image_buffer_count = atoi(dbrow[col]); col++;
+	int warmup_count = atoi(dbrow[col]); col++;
+	int pre_event_count = atoi(dbrow[col]); col++;
+	int post_event_count = atoi(dbrow[col]); col++;
+	int stream_replay_buffer = atoi(dbrow[col]); col++;
+	int alarm_frame_count = atoi(dbrow[col]); col++;
+	int section_length = atoi(dbrow[col]); col++;
+	int frame_skip = atoi(dbrow[col]); col++;
+	int motion_frame_skip = atoi(dbrow[col]); col++;
+	int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+	int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+	int fps_report_interval = atoi(dbrow[col]); col++;
+	int ref_blend_perc = atoi(dbrow[col]); col++;
+	int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+	int track_motion = atoi(dbrow[col]); col++;
 
-        int signal_check_colour;
-        if ( dbrow[col][0] == '#' )
-            signal_check_colour = strtol(dbrow[col]+1,0,16);
-        else
-            signal_check_colour = strtol(dbrow[col],0,16);
+	int signal_check_colour;
+	if ( dbrow[col][0] == '#' )
+		signal_check_colour = strtol(dbrow[col]+1,0,16);
+	else
+		signal_check_colour = strtol(dbrow[col],0,16);
 
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
+	int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
+	int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
 
-        int extras = (deinterlacing>>24)&0xff;
+	int extras = (deinterlacing>>24)&0xff;
 
-        Camera *camera = 0;
-        if ( type == "Local" )
-        {
+	Camera *camera = 0;
+	if ( type == "Local" )
+	{
 #if ZM_HAS_V4L
-            camera = new LocalCamera(
-                id,
-                device.c_str(),
-                channel,
-                format,
-				v4l_multi_buffer,
-				v4l_captures_per_frame,
-                method,
-                cam_width,
-                cam_height,
-                colours,
-                palette,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE,
-                extras
-            );
+		camera = new LocalCamera(
+			id,
+			device.c_str(),
+			channel,
+			format,
+			v4l_multi_buffer,
+			v4l_captures_per_frame,
+			method,
+			cam_width,
+			cam_height,
+			colours,
+			palette,
+			brightness,
+			contrast,
+			hue,
+			colour,
+			purpose==CAPTURE,
+			extras
+		);
 #else // ZM_HAS_V4L
-            Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
+		Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
 #endif // ZM_HAS_V4L
-        }
-        else if ( type == "Remote" )
-        {
-            if ( protocol == "http" )
-            {
-                camera = new RemoteCameraHttp(
-                    id,
-                    method.c_str(),
-                    host.c_str(),
-                    port.c_str(),
-                    path.c_str(),
-                    cam_width,
-                    cam_height,
-                    colours,
-                    brightness,
-                    contrast,
-                    hue,
-                    colour,
-                    purpose==CAPTURE
-                );
-            }
-            else if ( protocol == "rtsp" )
-            {
+	}
+	else if ( type == "Remote" )
+	{
+		if ( protocol == "http" )
+		{
+			camera = new RemoteCameraHttp(
+				id,
+				method.c_str(),
+				host.c_str(),
+				port.c_str(),
+				path.c_str(),
+				cam_width,
+				cam_height,
+				colours,
+				brightness,
+				contrast,
+				hue,
+				colour,
+				purpose==CAPTURE
+			);
+		}
+		else if ( protocol == "rtsp" )
+		{
 #if HAVE_LIBAVFORMAT
-                camera = new RemoteCameraRtsp(
-                    id,
-                    method.c_str(),
-                    host.c_str(),
-                    port.c_str(),
-                    path.c_str(),
-                    cam_width,
-                    cam_height,
-                    colours,
-                    brightness,
-                    contrast,
-                    hue,
-                    colour,
-                    purpose==CAPTURE
-                );
+			camera = new RemoteCameraRtsp(
+				id,
+				method.c_str(),
+				host.c_str(),
+				port.c_str(),
+				path.c_str(),
+				cam_width,
+				cam_height,
+				colours,
+				brightness,
+				contrast,
+				hue,
+				colour,
+				purpose==CAPTURE
+			);
 #else // HAVE_LIBAVFORMAT
-                Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
+			Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
 #endif // HAVE_LIBAVFORMAT
-            }
-            else
-            {
-                Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
-            }
-        }
-        else if ( type == "File" )
-        {
-            camera = new FileCamera(
-                id,
-                path.c_str(),
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
-        }
-        else if ( type == "Ffmpeg" )
-        {
+		}
+		else
+		{
+			Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
+		}
+	}
+	else if ( type == "File" )
+	{
+		camera = new FileCamera(
+			id,
+			path.c_str(),
+			cam_width,
+			cam_height,
+			colours,
+			brightness,
+			contrast,
+			hue,
+			colour,
+			purpose==CAPTURE
+		);
+	}
+	else if ( type == "Ffmpeg" )
+	{
 #if HAVE_LIBAVFORMAT
-            camera = new FfmpegCamera(
-                id,
-                path.c_str(),
-                method,
-                options,
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
+		camera = new FfmpegCamera(
+			id,
+			path.c_str(),
+			method,
+			options,
+			cam_width,
+			cam_height,
+			colours,
+			brightness,
+			contrast,
+			hue,
+			colour,
+			purpose==CAPTURE
+		);
 #else // HAVE_LIBAVFORMAT
-            Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
+		Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
 #endif // HAVE_LIBAVFORMAT
-        }
-        else if (type == "Libvlc")
-        {
+	}
+	else if (type == "Libvlc")
+	{
 #if HAVE_LIBVLC
-            camera = new LibvlcCamera(
-                id,
-                path.c_str(),
-                method,
-                options,
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
+		camera = new LibvlcCamera(
+			id,
+			path.c_str(),
+			method,
+			options,
+			cam_width,
+			cam_height,
+			colours,
+			brightness,
+			contrast,
+			hue,
+			colour,
+			purpose==CAPTURE
+		);
 #else // HAVE_LIBVLC
-            Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
+		Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
 #endif // HAVE_LIBVLC
-        }
-        else if ( type == "cURL" )
-        {
+	}
+	else if ( type == "cURL" )
+	{
 #if HAVE_LIBCURL
-            camera = new cURLCamera(
-                id,
-                path.c_str(),
-                user.c_str(),
-                pass.c_str(),
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
+		camera = new cURLCamera(
+			id,
+			path.c_str(),
+			user.c_str(),
+			pass.c_str(),
+			cam_width,
+			cam_height,
+			colours,
+			brightness,
+			contrast,
+			hue,
+			colour,
+			purpose==CAPTURE
+		);
 #else // HAVE_LIBCURL
-            Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
+		Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
 #endif // HAVE_LIBCURL
-        }
-        else
-        {
-            Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
-        }
-        monitor = new Monitor(
-            id,
-            name.c_str(),
-            function,
-            enabled,
-            linked_monitors.c_str(),
-            camera,
-            orientation,
-            deinterlacing,
-            event_prefix.c_str(),
-            label_format.c_str(),
-            Coord( label_x, label_y ),
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            signal_check_colour,
-            purpose,
-            0,
-            0
+	}
+	else
+	{
+		Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
+	}
+	monitor = new Monitor(
+		id,
+		name.c_str(),
+		server_id,
+		function,
+		enabled,
+		linked_monitors.c_str(),
+		camera,
+		orientation,
+		deinterlacing,
+		event_prefix.c_str(),
+		label_format.c_str(),
+		Coord( label_x, label_y ),
+		image_buffer_count,
+		warmup_count,
+		pre_event_count,
+		post_event_count,
+		stream_replay_buffer,
+		alarm_frame_count,
+		section_length,
+		frame_skip,
+		motion_frame_skip,
+		capture_delay,
+		alarm_capture_delay,
+		fps_report_interval,
+		ref_blend_perc,
+		alarm_ref_blend_perc,
+		track_motion,
+		signal_check_colour,
+		purpose,
+		0,
+		0
 
-        );
-
-        int n_zones = 0;
-        if ( load_zones )
-        {
-            Zone **zones = 0;
-            n_zones = Zone::Load( monitor, zones );
-            monitor->AddZones( n_zones, zones );
-        }
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
+	);
 
+	int n_zones = 0;
+	if ( load_zones )
+	{
+		Zone **zones = 0;
+		n_zones = Zone::Load( monitor, zones );
+		monitor->AddZones( n_zones, zones );
+	}
+	Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
     return( monitor );
 }
 
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index b8326a1c4..8cf5ece36 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -211,6 +211,7 @@ protected:
 	// These are read from the DB and thereafter remain unchanged
 	unsigned int	id;
 	char			name[64];
+	unsigned int	server_id;
 	Function		function;			    // What the monitor is doing
 	bool			enabled;			    // Whether the monitor is enabled or asleep
 	unsigned int    width;				    // Normally the same as the camera, but not if partly rotated
@@ -298,7 +299,7 @@ protected:
 public:
 // OurCheckAlarms seems to be unused. Check it on zm_monitor.cpp for more info.
 //bool OurCheckAlarms( Zone *zone, const Image *pImage );
-	Monitor( int p_id, const char *p_name, int p_function, bool p_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, unsigned int p_deinterlacing, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord, int p_image_buffer_count, int p_warmup_count, int p_pre_event_count, int p_post_event_count, int p_stream_replay_buffer, int p_alarm_frame_count, int p_section_length, int p_frame_skip, int p_motion_frame_skip, int p_capture_delay, int p_alarm_capture_delay, int p_fps_report_interval, int p_ref_blend_perc, int p_alarm_ref_blend_perc, bool p_track_motion, Rgb p_signal_check_colour, Purpose p_purpose, int p_n_zones=0, Zone *p_zones[]=0 );
+	Monitor( int p_id, const char *p_name, unsigned int p_server_id, int p_function, bool p_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, unsigned int p_deinterlacing, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord, int p_image_buffer_count, int p_warmup_count, int p_pre_event_count, int p_post_event_count, int p_stream_replay_buffer, int p_alarm_frame_count, int p_section_length, int p_frame_skip, int p_motion_frame_skip, int p_capture_delay, int p_alarm_capture_delay, int p_fps_report_interval, int p_ref_blend_perc, int p_alarm_ref_blend_perc, bool p_track_motion, Rgb p_signal_check_colour, Purpose p_purpose, int p_n_zones=0, Zone *p_zones[]=0 );
 	~Monitor();
 
 	void AddZones( int p_n_zones, Zone *p_zones[] );
@@ -413,7 +414,7 @@ public:
 #if HAVE_LIBAVFORMAT
 	static int LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose );
 #endif // HAVE_LIBAVFORMAT
-	static Monitor *Load( int id, bool load_zones, Purpose purpose );
+	static Monitor *Load( unsigned int id, bool load_zones, Purpose purpose );
     //void writeStreamImage( Image *image, struct timeval *timestamp, int scale, int mag, int x, int y );
 	//void StreamImages( int scale=100, int maxfps=10, time_t ttl=0, int msq_id=0 );
 	//void StreamImagesRaw( int scale=100, int maxfps=10, time_t ttl=0 );

From 84ed491765a89ff7de47e993f33a9d5a2dff455c Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Wed, 22 Jul 2015 13:51:31 -0400
Subject: [PATCH 015/362] Initial Montage Review for people to take a look at

---
 web/skins/classic/views/console.php       |   6 +-
 web/skins/classic/views/montagereview.php | 688 ++++++++++++++++++++++
 2 files changed, 693 insertions(+), 1 deletion(-)
 create mode 100644 web/skins/classic/views/montagereview.php

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 5930ebe95..f7724d6e7 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -210,7 +210,11 @@ if ( canView( 'Stream' ) && $cycleCount > 1 )
 {
     $cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
 ?>
-      <div id="cycleMontage"><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?>&nbsp;/&nbsp;<?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></div>
+      <div id="cycleMontage">
+           <?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?>&nbsp;/&nbsp;
+           <?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?>&nbsp;/&nbsp;
+           <?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montagereview', translate('Montage Review'), $running ) ?>
+      </div>
 <?php
 }
 else
diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
new file mode 100644
index 000000000..917e162c2
--- /dev/null
+++ b/web/skins/classic/views/montagereview.php
@@ -0,0 +1,688 @@
+<?php
+//
+// ZoneMinder web montagereview view file, $Date$, $Revision$
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+// ---------------------
+
+// Montage Review -- show all (visible) monitors, and allow to review time ranges easily for all monitors.
+//
+// This is similar to the timeline view, but is NOT linked to events directly, and shows all monitors
+// It also will do a pseudo play function (one second or more at a time, not less than 1 second resolution)
+//
+
+// This is very much a preliminary version, very lightly tested, mostly on Firefox, but should work on IE and Chrome (at least)
+// It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
+// change the playback slider to 0 and then it does not try to play at the same time it is scrubbing.
+
+if ( !canView( 'Events' ) )
+{
+    $view = "error";
+    return;
+}
+
+$monitorsSql = "select *  from Monitors ";
+
+// Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
+// if the bulk record has not been written - to get more current reduce bulk frame sizes
+
+$eventsSql = "
+    select E.Id,E.Name,E.StartTime,max(F.TimeStamp) as CalcEndTime,E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+    from Events as E
+    inner join Monitors as M on (E.MonitorId = M.Id)
+    inner join Frames F on F.EventId=E.Id
+    where not isnull(E.Frames) and not isnull(StartTime) ";
+
+$frameSql = "
+    select E.Id as EventId, E.MonitorId, F.TimeStamp, max(F.Score) as Score
+    from Events as E
+    inner join Frames as F on (F.EventId = E.Id)
+    where not isnull(StartTime) and F.Score>0 ";
+
+// This program only calls itself with the time range involved -- it does all monitors (the user can see) all the time
+
+if ( !empty($user['MonitorIds']) )
+{
+    $monFilterSql = ' AND M.Id IN ('.$user['MonitorIds'].')';
+
+    $eventsSql   .= $monFilterSql;
+    $monitorsSQL .= $monFilterSql;
+    $frameSql    .= $monFilterSql;
+}
+
+// Parse input parameters -- note for future, validate/clean up better in case we don't get called from self.
+
+if ( isset($_REQUEST['minTime']) )
+    $minTime = validHtmlStr($_REQUEST['minTime']);
+
+if ( isset($_REQUEST['maxTime']) )
+    $maxTime = validHtmlStr($_REQUEST['maxTime']);
+
+if ( isset($_REQUEST['scale']) )
+    $defaultScale=validHtmlStr($_REQUEST['scale']);
+else
+    $defaultScale=0.3;
+
+if (isset($_REQUEST['speed']) )
+    $defaultSpeed=validHtmlStr($_REQUEST['speed']);
+else
+    $defaultSpeed=1;
+
+if (isset($_REQUEST['current']) )
+    $defaultCurrentTime=validHtmlStr($_REQUEST['current']);
+
+$archive=1;
+if (isset($_REQUEST['archive']) )
+    $archive=validHtmlStr($_REQUEST['archive']);
+
+if ($archive==0)
+{
+    $eventsSql .= " and E.Archived=0 ";
+}    $frameSql .= " and E.Archived=0 ";
+
+$eventsSql .= "group by E.Id,E.Name,E.StartTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId ";
+
+if( isset($minTime) && isset($maxTime) )
+{
+    $eventsSql .= "having CalcEndTime > '" . $minTime . "' and StartTime < '" . $maxTime . "'";
+    $frameSql .= "
+        and TimeStamp > '" . $minTime . "' and TimeStamp < '" . $maxTime . "'";
+}
+$frameSql .= "group by E.Id, E.MonitorId, F.TimeStamp order by E.MonitorId, F.TimeStamp asc";
+
+xhtmlHeaders(__FILE__, translate('montagereview') );
+?>
+<style>
+input[type=range]::-ms-tooltip {
+    display: none;
+}
+
+</style>
+</head>
+<body>
+  <div id="page">
+    <div id="header">
+      <div id="headerButtons">
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
+      </div>
+      <h2><?php echo translate('Montage Review') ?></h2>
+    </div>
+
+    <div style='display: inline-flex; border: 1px solid black;'>
+        <label style='margin:5px;' for=scaleslider>Scale</label>
+        <input id=scaleslider type=range min=0.10 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)'/>
+        <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo $defaultScale?>x</output>
+    </div>
+    <div style='display: inline-flex; border: 1px solid black;'>
+        <label style='margin:5px;' for=speedslider>Speed</label>
+        <input id=speedslider type=range min=0 max=50 value=<?php echo $defaultSpeed ?> step=1 wdth=20% onchange='changespeed(this.value)'/>
+        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $defaultSpeed ?>x</output>
+    </div>
+    <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
+        <button type='button' id=panleft   onclick='panleft() '>&lt;&nbsp;Pan&nbsp;Left</button>
+        <button type='button' id=zoomin    onclick='zoomin()  '>Zoom&nbsp;In&nbsp;+</button>
+        <button type='button' id=zoomout   onclick='zoomout() '>Zoom&nbsp;Out&nbsp;-</button>
+        <button type='button' id=lasthour  onclick='lasthour()'>LastHour</button>
+        <button type='button' id=allof     onclick='allof()   '>All</button>
+        <button type='button' id=allnon    onclick='allnon()  '>All&nbsp;Non-Archive</button>
+        <button type='button' id=panright  onclick='panright()'>Pan&nbsp;Right&nbsp;&gt;</button>
+    </div>
+
+    <div id=timelinediv style='position:relative; width:93%;'>
+        <canvas id=timeline style='border:1px solid;' onmousemove='mmove(event)' ontouchmove='tmove(event)' onmousedown='mdown(event)' onmouseup='mup(event)' onmouseout='mout(event)' ></canvas>
+        <output id=scrubleft for=scrub></output>
+        <output id=scrubright for=scrub></output>
+        <output id=scruboutput for=scrub></output>
+    </div>
+
+</script>
+<?php
+
+// This loads all monitors the user can see -- we will prune this list later based on what we find
+
+$monitors = array();
+$monitorsSql .= " order by Sequence asc ";
+$index=0;
+foreach( dbFetchAll( $monitorsSql ) as $row )
+{
+    $monitors[$index] = $row;
+    $index = $index + 1;
+}
+
+// This builds the list of events that are eligible from this range
+
+echo "<script>\n";
+echo "var eventMonitorId = [];\n";
+echo "var eventId = [];\n";
+echo "var eventStartTimeSecs = [];\n";
+echo "var eventEndTimeSecs = [];\n";
+echo "var eventPath = [];\n";
+echo "var eventFrames = [];\n";   // this is going to presume all frames equal durationlength
+
+// Because we might not have time as the criteria, figure out the min/max time when we run the query
+
+$minTimeSecs = strtotime("2036-01-01 01:01:01");
+$maxTimeSecs = strtotime("1950-01-01 01:01:01");
+
+$index=0;
+$anyAlarms=false;
+$eventsMonitorsFound = array();     // this will just flag which ones found
+
+foreach( dbFetchAll( $eventsSql ) as $event )
+{
+    if( $minTimeSecs > strtotime($event['StartTime']))   $minTimeSecs=strtotime($event['StartTime']);
+    if( $maxTimeSecs < strtotime($event['CalcEndTime'])) $maxTimeSecs=strtotime($event['CalcEndTime']);
+    echo "eventMonitorId[$index]=" . $event['MonitorId'] . "; eventId[$index]=" . $event['Id'] . "; ";
+    echo "eventStartTimeSecs[$index]=" . strtotime($event['StartTime']) . "; eventEndTimeSecs[$index]=" . strtotime($event['CalcEndTime']) . "; ";
+    echo "eventFrames[$index]=" . $event['Frames'] . "; ";
+
+    if ( ZM_USE_DEEP_STORAGE )
+        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . strftime("%y/%m/%d/%H/%M/%S", strtotime($event['StartTime'])) . "/\";" ;
+    else
+        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . $event['Id'] . "/\";" ;
+    $eventsMonitorsFound[$event['MonitorId']] = true;
+    $index=$index+1;
+    if($event['MaxScore']>0)
+        $anyAlarms=true;
+    echo "\n";
+}
+
+if($index == 0)  // if there is no data set the min/max to the passed in values
+{
+    if(isset($minTime) && isset($maxTime))
+    {
+        $minTimeSecs = strtotime($minTime);
+        $maxTimeSecs = strtotime($maxTime);
+    }
+    else // this is the case of no passed in times AND no data -- just set something arbitrary
+    {
+        $minTimeSecs=strtotime('1950-06-01 01:01:01');  // random time so there's something to display
+        $maxTimeSecs=strtotime('2020-06-02 02:02:02');
+    }
+}
+
+// We only reset the calling time if there was no calling time
+if(!isset($minTime) || !isset($maxTime))
+{
+    $maxTime = strftime($maxTimeSecs);
+    $minTime = strftime($minTimeSecs);
+}
+else
+{
+    $minTimeSecs = strtotime($minTime);
+    $maxTimeSecs = strtotime($maxTime);
+}
+
+// If we had any alarms in those events, this builds the list of all alarm frames (thought for later - should these be ranges, so as to minimize list if very long?)
+
+echo "var frameMonitorId = [];\n";
+echo "var frameTimeStampSecs = [];\n";
+echo "var frameScore = [];\n";
+$maxScore=0;
+$index=0;
+
+if($anyAlarms)
+    foreach( dbFetchAll ($frameSql) as $frame )
+    {
+        echo "  frameMonitorId[$index]=" . $frame['MonitorId'] . ";";
+        echo "  frameTimeStampSecs[$index]=" . strtotime($frame['TimeStamp']) . ";";
+        echo "  frameScore[$index]=" . $frame['Score'] . ";\n";
+        if($maxScore <= $frame['Score'])
+            $maxScore=$frame['Score'];
+        $index += 1;
+    }
+
+// This is where we have to display the canvases -- AFTER determining which monitors we use (above in events) and BEFORE we loop through them to cache the objects
+// This splits up the javascript and html a bit, but it's a lot simpler than trying in php to cache one while completing the other
+
+// Monitor images - these had to be loaded after the monitors used were determined (after loading events)
+
+echo "</script>\n";
+
+foreach ($monitors as $m)
+{
+    if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
+    {
+          echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:2px solid " . $m['WebColour'] . "' onclick='showOneEvent(" . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
+    }
+}
+echo "<script>\n";
+
+echo "var maxScore=$maxScore;\n";  // used to skip frame load if we find no alarms.
+echo "var monitorName = [];\n";
+echo "var monitorLoading = [];\n";
+echo "var monitorImageObject = [];\n";
+echo "var monitorLoadingStageURL = [];\n";
+echo "var monitorColour = [];\n";
+echo "var monitorWidth = [];\n";
+echo "var monitorHeight = [];\n";
+echo "var monitorIndex = [];\n";
+echo "var monitorCanvasObj = [];\n"; // stash location of these here so we don't have to search
+echo "var monitorCanvasCtx = [];\n";
+
+// This builds the list of monitors.
+
+$numMonitors=0;  // this array is indexed by the monitor ID for faster access later, so it may be sparse
+foreach ($monitors as $m)
+{
+    if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
+    {
+        echo "  monitorLoading["         . $m['Id'] . "]=false;  ";
+        echo "  monitorImageObject["     . $m['Id'] . "]=null;  ";
+        echo "  monitorLoadingStageURL[" . $m['Id'] . "] = ''; ";
+        echo "  monitorColour["          . $m['Id'] . "]=\"" . $m['WebColour'] . "\"; ";
+        echo "  monitorWidth["           . $m['Id'] . "]=" . $m['Width'] . "; ";
+        echo "  monitorHeight["          . $m['Id'] . "]=" . $m['Height'] . ";";
+        echo "  monitorIndex["           . $m['Id'] . "]=" . $numMonitors . ";";
+        echo "  monitorName["            . $m['Id'] . "]=\"" . $m['Name'] . "\"; ";
+        echo "  monitorCanvasObj["       . $m['Id'] . "]=document.getElementById('Monitor" . $m['Id'] . "');";
+        echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d');\n";
+        $numMonitors += 1;
+    }
+}
+
+echo "var numMonitors = $numMonitors;\n";
+echo "var minTimeSecs="     . $minTimeSecs . ";\n";
+echo "var maxTimeSecs="     . $maxTimeSecs . ";\n";
+echo "var rangeTimeSecs="   . ( $maxTimeSecs - $minTimeSecs + 1) . ";\n";
+if(isset($defaultCurrentTime))
+    echo "var currentTimeSecs=" . strtotime($defaultCurrentTime) . ";\n";
+else
+    echo "var currentTimeSecs=" . $minTimeSecs . ";\n";
+
+?>
+
+var scrubAsObject=document.getElementById('scrub');
+var cWidth;   // save canvas width
+var cHeight;  // save canvas height
+var canvas=document.getElementById("timeline");  // global canvas definition so we don't have to keep looking it up
+var ctx=canvas.getContext('2d');
+var underSlider;    // use this to hold what is hidden by the slider
+var underSliderX;   // Where the above was taken from (left side, Y is zero)
+
+
+function outputUpdate(val)
+{
+    drawSliderOnGraph(val);
+    for(var i=0; i<monitorIndex.length; i++)
+    {
+        if(monitorName[i]>"")
+            loadImage2Monitor(i,SetImageSource(i,val));
+    }
+    var currentTimeMS = new Date(val*1000);
+    currentTimeSecs=val;
+}
+
+function SetImageSource(monId,val)
+{
+    var zeropad = <?php echo  sprintf("\"%0" . ZM_EVENT_IMAGE_DIGITS . "d\"",0); ?>;
+    for(var i=0; i<eventPath.length; i++)  // Search for a match
+    {
+        if(eventMonitorId[i]==monId && val >= eventStartTimeSecs[i] && val <= eventEndTimeSecs[i])
+        {
+            frame=parseInt((val - eventStartTimeSecs[i])/(eventEndTimeSecs[i]-eventStartTimeSecs[i])*eventFrames[i])+1;
+            img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+            i=eventPath.length+1;  // force loop exit
+            return img;
+        }
+    }
+    return "graphics/transparent.gif";
+}
+
+function imagedone(monId,success)
+{
+    monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
+    if(success)
+        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);   // we ignore errors and just clear the image and keep going
+    monitorImageObject[monId]=null;
+    monitorLoading[monId]=false;
+    if(monitorLoadingStageURL[monId]=="") return;
+    loadImage2Monitor(monId,monitorLoadingStageURL[monId]);
+    monitorLoadingStageURL[monId]="";
+    return;
+}
+
+function loadImage2Monitor(monId,url)
+{
+    if(monitorLoading[monId])
+       monitorLoadingStageURL[monId]=url;   // we don't care if we are overriting, it means it didn't change fast enough
+    else
+      {
+        monitorImageObject[monId]=undefined;
+        monitorImageObject[monId]=new Image();
+        monitorImageObject[monId].onload  = function() {imagedone(monId,true )};
+        monitorImageObject[monId].onerror = function() {imagedone(monId,false)};
+        monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
+        monitorLoading[monId]=true;
+      }
+}
+
+function changescale(newscale)
+{
+    for(var i=0; i<monitorIndex.length; i++)
+    {
+        if(monitorName[i]>"")
+          {
+            monitorCanvasObj[i].width=monitorWidth[i]*newscale;
+            monitorCanvasObj[i].height=monitorHeight[i]*newscale;
+          }
+    }
+    document.getElementById('scaleslideroutput').value = newscale.toString() + " x";
+    return;
+}
+var playSecsperSec = 1;
+var TimerInterval = 1000;    // We never show subsecond frame rates, but if playing faster we play up to 1 per 250ms
+var AdvanceByTime = setInterval(TimerFire,TimerInterval);
+
+function changespeed(val)
+{
+    playSecsperSec=parseInt(val);
+    var t;
+    if(val==0) t=0;
+    if(val==1) t=1000;  // The speed this can support is likely pretty browser/os dependant
+    if(val==2) t=500;
+    if(val==3) t=330;
+    if(val>3)  t=250;
+    if(t!=TimerInterval)
+    {
+        if(AdvanceByTime!=0) clearInterval(AdvanceByTime);
+        TimerInterval=t;
+        if(t>0) AdvanceByTime=setInterval(TimerFire,TimerInterval)
+        else AdvanceByTime=0;
+    }
+    document.getElementById('speedslideroutput').innerHTML = val.toString() + " x";
+}
+
+function TimerFire()
+{
+    if (currentTimeSecs + playSecsperSec >= maxTimeSecs) return;
+    outputUpdate(currentTimeSecs + playSecsperSec);
+}
+
+function drawSliderOnGraph(val)
+{
+    var sliderWidth=10;
+    var sliderLineWidth=1;
+    var sliderHeight=cHeight;
+
+    // Set some sizes
+
+    labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * 0.6 / (numMonitors+1)) ) );
+    labbottom=parseInt(cHeight * 0.2 / (numMonitors+1)).toString() + "px";  // This is positioning same as row labels below, but from bottom so 1-position
+    labfont=labelpx + "px Georgia";  // set this like below row labels
+
+    if(numMonitors>0) // if we have no data to display don't do the slider itself 
+    {
+        var sliderX=parseInt( (val - minTimeSecs) / rangeTimeSecs * cWidth - sliderWidth/2);  // position left side of slider
+        if(sliderX < 0) sliderX=0;
+        if(sliderX+sliderWidth > cWidth) sliderX=cWidth-sliderWidth-1;
+
+        // If we have data already saved first restore it from LAST time
+
+        if(typeof underSlider !== 'undefined')
+        {
+            ctx.putImageData(underSlider,underSliderX, 0, 0, 0, sliderWidth, sliderHeight);
+            underSlider=undefined;
+        }
+        // Now save where we are putting it THIS time
+        underSlider=ctx.getImageData(sliderX, 0, sliderWidth, sliderHeight);
+        // And add in the slider'
+        ctx.lineWidth=sliderLineWidth;
+        ctx.strokeStyle='black';
+        // looks like strokes are on the outside (or could be) so shrink it by the line width so we replace all the pixels
+        ctx.strokeRect(sliderX+sliderLineWidth,sliderLineWidth,sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
+        underSliderX=sliderX;
+
+        var o = document.getElementById('scruboutput');
+        o.innerHTML=secs2dbstr(currentTimeSecs);
+        o.style.position="absolute";
+        o.style.bottom=labbottom;
+        o.style.font=labfont;
+        // try to get length and then when we get too close to the right switch to the left
+        var len = o.offsetWidth;
+        if(sliderX > cWidth/2)
+            x=sliderX - len - 10;
+        else
+            x=sliderX + 10;
+        o.style.left=x.toString() + "px";
+    }
+
+    // This displays (or not) the left/right limits depending on how close the slider is.
+    // Because these change widths if the slider is too close, use the slider width as an estimate for the left/right label length (i.e. don't recalculate len from above)
+    // If this starts to collide increase some of the extra space
+
+    var o = document.getElementById('scrubleft');
+    o.innerHTML=secs2dbstr(minTimeSecs);
+    o.style.position="absolute";
+    o.style.bottom=labbottom;
+    o.style.font=labfont;
+    o.style.left="3px";
+    if(numMonitors==0)  // we need a len calculation if we skipped the slider
+        len = o.offsetWidth;
+    // If the slider will overlay part of this suppress (this is the left side)
+    if(len + 5 > sliderX)
+        o.style.display="none";
+    else
+        o.style.display="inline";
+
+    var o = document.getElementById('scrubright');
+    o.innerHTML=secs2dbstr(maxTimeSecs);
+    o.style.position="absolute";
+    o.style.bottom=labbottom;
+    o.style.font=labfont;
+    // If the slider will overlay part of this suppress (this is the right side)
+    o.style.left=(cWidth - len - 5).toString() + "px";
+    if(sliderX > cWidth - len - 10)
+        o.style.display="none";
+    else
+        o.style.display="inline";
+}
+
+function drawGraph()
+{
+    var divWidth=document.getElementById("timelinediv").clientWidth
+    canvas.width = cWidth = divWidth;   // Let it float and determine width (it should be sized a bit smaller percentage of window)
+    canvas.height=cHeight = parseInt(window.innerHeight * 0.10);
+    if(eventId.length==0)
+    {
+        ctx.font="40px Georgia";
+        ctx.fillStyle="Black";
+        ctx.globalAlpha=1;
+        var t="No data found in range - choose differently";
+        var l=ctx.measureText(t).width;
+        ctx.fillText(t,(cWidth - l)/2, cHeight-10);
+        underSlider=undefined;
+        return;
+    }
+    var rowHeight=parseInt(cHeight / (numMonitors + 1) );  // Leave room for a scale of some sort
+
+    // first fill in the bars for the events (not alarms)
+
+    for(var i=0; i<eventId.length; i++)  // Display all we loaded
+    {
+        var x1=parseInt( (eventStartTimeSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
+        var x2=parseInt( (eventEndTimeSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round high end up to be sure consecutive ones connect
+        ctx.fillStyle=monitorColour[eventMonitorId[i]];
+        ctx.globalAlpha = 0.2;    // light color for background
+        ctx.clearRect(x1,monitorIndex[eventMonitorId[i]]*rowHeight,x2-x1,rowHeight);  // Erase any overlap so it doesn't look artificially darker
+        ctx.fillRect (x1,monitorIndex[eventMonitorId[i]]*rowHeight,x2-x1,rowHeight);
+    }
+    for(var i=0; (i<frameScore.length) && (maxScore>0); i++)  // Now put in scored frames (if any)
+    {
+        var x1=parseInt( (frameTimeStampSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
+        var x2=parseInt( (frameTimeStampSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round up
+        if(x2-x1 < 2) x2=x1+2;    // So it is visible make them all at least this number of seconds wide
+        ctx.fillStyle=monitorColour[frameMonitorId[i]];
+        ctx.globalAlpha = 0.4 + 0.6 * (1 - frameScore[i]/maxScore);    // Background is scaled but even lowest is twice as dark as the background
+        ctx.fillRect(x1,monitorIndex[frameMonitorId[i]]*rowHeight,x2-x1,rowHeight);
+    }
+    for(var i=0; i<monitorName.length; i++)  // Note that this may be a sparse array
+    {
+        if(monitorName[i]>"")
+        {
+            ctx.font= parseInt(rowHeight * 0.6).toString() + "px Georgia";
+            ctx.fillStyle="Black";
+            ctx.globalAlpha=1;
+            ctx.fillText(monitorName[i], 0, (monitorIndex[i] + 0.8) * rowHeight);
+        }
+    }
+    underSlider=undefined;   // flag we don't have a slider cached
+    return;
+}
+
+/// Found this here: http://stackoverflow.com/questions/55677/how-do-i-get-the-coordinates-of-a-mouse-click-on-a-canvas-element
+function relMouseCoords(event){
+    var totalOffsetX = 0;
+    var totalOffsetY = 0;
+    var canvasX = 0;
+    var canvasY = 0;
+    var currentElement = this;
+
+    do{
+        totalOffsetX += currentElement.offsetLeft - currentElement.scrollLeft;
+        totalOffsetY += currentElement.offsetTop - currentElement.scrollTop;
+    }
+    while(currentElement = currentElement.offsetParent)
+
+    canvasX = event.pageX - totalOffsetX;
+    canvasY = event.pageY - totalOffsetY;
+
+    return {x:canvasX, y:canvasY}
+}
+HTMLCanvasElement.prototype.relMouseCoords = relMouseCoords;
+
+// These are the functions for mouse movement in the timeline.  Note that touch is treated as a mouse move with mouse down
+
+var mouseisdown=false;
+function mdown(event) {mouseisdown=true; mmove(event)}
+function mup(event) {mouseisdown=false;}
+function mout(event) {mouseisdown=false;} // if we go outside treat it as release
+function tmove(event) {mouseisdown=true; mmove(event);}
+
+function mmove(event)
+{
+    if(mouseisdown) // only do anything if the mouse is depressed while on the sheet
+    {
+        var sec = minTimeSecs + rangeTimeSecs / event.target.width * event.target.relMouseCoords(event).x;
+        outputUpdate(sec);
+    }
+}
+
+function secs2dbstr (s)
+{
+    var st = (new Date(s * 1000)).format("%Y-%m-%d %H:%M:%S");
+    return st;
+}
+
+//vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+// The sceond below are to reload this program with new parameters 
+
+function clicknav(minSecs,maxSecs,arch)  // we use the current time if we can
+{
+    var now = new Date() / 1000;
+    var minStr="";
+    var maxStr="";
+    var currentStr="";
+    var archiveStr="";
+    if(minSecs>0)
+    {
+        if(maxSecs > now)
+            maxSecs = parseInt(now);
+        maxStr="&maxTime=" + secs2dbstr(maxSecs);
+    }
+    if(maxSecs>0)
+        minStr="&minTime=" + secs2dbstr(minSecs);
+    if(arch==0)
+        archiveStr="&archive=0";
+    if(minSecs && maxSecs)
+    {
+        if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
+        currentStr="&current=" + secs2dbstr(currentTimeSecs);
+    }
+    var uri = "?view=" + currentView + minStr + maxStr + currentStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
+    window.location=uri;
+}
+
+function lasthour()
+{
+    var now = new Date() / 1000;
+    clicknav(now - 3600 + 1, now,1);
+}
+
+function zoomin()
+{
+    rangeTimeSecs = parseInt(rangeTimeSecs / 2);
+    minTimeSecs = parseInt(currentTimeSecs - rangeTimeSecs/2);  // this is the slider current time, we center on that
+    maxTimeSecs = parseInt(currentTimeSecs + rangeTimeSecs/2);
+    clicknav(minTimeSecs,maxTimeSecs,1);
+}
+
+function zoomout()
+{
+    rangeTimeSecs = parseInt(rangeTimeSecs * 2);
+    minTimeSecs = parseInt(currentTimeSecs - rangeTimeSecs/2);  // this is the slider current time, we center on that
+    maxTimeSecs = parseInt(currentTimeSecs + rangeTimeSecs/2);
+    clicknav(minTimeSecs,maxTimeSecs,1);
+}
+function panleft()
+{
+    minTimeSecs = parseInt(minTimeSecs - rangeTimeSecs/2);
+    maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
+    clicknav(minTimeSecs,maxTimeSecs,1);
+}
+function panright()
+{
+    minTimeSecs = parseInt(minTimeSecs + rangeTimeSecs/2);
+    maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
+    clicknav(minTimeSecs,maxTimeSecs,1);
+}
+function allof()
+{
+    clicknav(0,0,1);
+}
+function allnon()
+{
+    clicknav(0,0,0);
+}
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ End of handlers for reloading this program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+function showOneEvent(monId)  // link out to the normal view of one event's data
+{
+    // We know the monitor, need to determine the event based on current time
+    for(var i=0; i<eventId.length; i++)  // Display all we loaded
+    {
+        if(eventMonitorId[i]==monId && currentTimeSecs >= eventStartTimeSecs[i] && currentTimeSecs <= eventEndTimeSecs[i])
+        {
+            var url = '?view=event&eid=' + eventId[i] + '&fid=' + parseInt(Math.max(1, Math.min(eventFrames[i], eventFrames[i] * (currentTimeSecs - eventStartTimeSecs[i]) / (eventEndTimeSecs[i] - eventStartTimeSecs[i] + 1) ) ));
+            createPopup(url, 'zmEvent', 'event', monitorWidth[eventMonitorId[i]], monitorHeight[eventMonitorId[i]]);
+        }
+    }
+
+}
+
+
+// Do this on load implicitly
+drawGraph();
+window.addEventListener("resize",drawGraph);
+
+</script>
+
+</div>
+</body>
+</html>
+
+

From b88403cd416cbbd20dbee93efc3f763baa96841c Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 23 Jul 2015 15:01:53 -0400
Subject: [PATCH 016/362] Minor corrections based on feedback to date

---
 src/zm_event.cpp                          |  56 ++++++++++-----
 src/zm_event.h                            |   6 ++
 src/zm_image.cpp                          |  42 ++++++++++-
 src/zm_image.h                            |   7 +-
 web/api/app/Config/core.php               |   4 +-
 web/graphics/NoDataImage.gif              | Bin 0 -> 7002 bytes
 web/skins/classic/views/montagereview.php |  81 +++++++++++++++-------
 7 files changed, 149 insertions(+), 47 deletions(-)
 create mode 100644 web/graphics/NoDataImage.gif

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3e723fa48..b173d9e0c 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -67,6 +67,14 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
     if ( !initialised )
         Initialise();
 
+// >>> Real time image extrat settings <<< these need to go in conf options 
+
+    UpldCount=0;
+    strcpy(UpldPath,"/home/ferguson/ToUpload");
+    UpldWriteEvery=600;
+    UpldWriteEveryAlarm=2;
+
+
     std::string notes;
     createNotes( notes );
 
@@ -349,28 +357,42 @@ bool Event::SendFrameImage( const Image *image, bool alarm_frame )
 
 bool Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 {
-    if ( config.timestamp_on_capture )
+    bool toUpld=false;
+    char UpldFile[PATH_MAX];
+    char UpldFileRename[PATH_MAX];
+    if( ( UpldCount++ % (alarm_frame ? UpldWriteEveryAlarm : UpldWriteEvery) ) == 0)  // notice this grabs frame #1 so it gets the first of every event (zero count = frame 1)
     {
-        if ( !config.opt_frame_server || !SendFrameImage( image, alarm_frame) )
-        {
-            if ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) )
-                image->WriteJpeg( event_file, config.jpeg_alarm_file_quality );
-            else
-                image->WriteJpeg( event_file );
-        }
+        toUpld=true;
+        char tmbuf[64], buf[64];
+        strftime(tmbuf, sizeof tmbuf, "%Y-%m-%d-%H-%M-%S", localtime(&(timestamp.tv_sec)));
+        snprintf(buf, sizeof buf, "%s-%06d", tmbuf,(int)(timestamp.tv_usec));
+        snprintf(UpldFile,       sizeof(UpldFile),"%s/%s-%06d_%s_%s.jpg_saving",UpldPath, tmbuf,(int)(timestamp.tv_usec),this->monitor->Name(),alarm_frame?"Alarm":"Periodic");
+        snprintf(UpldFileRename, sizeof(UpldFile),"%s/%s-%06d_%s_%s.jpg",       UpldPath, tmbuf,(int)(timestamp.tv_usec),this->monitor->Name(),alarm_frame?"Alarm":"Periodic");
+    }
+
+    Image* ImgToWrite;
+    Image ts_image( *image );
+
+    if ( config.timestamp_on_capture )  // stash the image we plan to use in another pointer regardless if timestamped.
+    {
+        monitor->TimestampImage( &ts_image, &timestamp );
+        ImgToWrite=&ts_image;
     }
     else
+        ImgToWrite=image;
+
+    if ( !config.opt_frame_server || !SendFrameImage( ImgToWrite, alarm_frame) )
     {
-        Image ts_image( *image );
-        monitor->TimestampImage( &ts_image, &timestamp );
-        if ( !config.opt_frame_server || !SendFrameImage( &ts_image, alarm_frame) )
-        {
-            if ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) )
-                ts_image.WriteJpeg( event_file, config.jpeg_alarm_file_quality );
-            else
-                ts_image.WriteJpeg( event_file );
+        int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use
+        ImgToWrite->WriteJpeg( event_file, thisquality, timestamp );
+        if(toUpld)
+        {   // Because these are for real-time use and may be grabbed as they are being written, write under one name then rename
+            ImgToWrite->WriteJpeg(UpldFile, thisquality, timestamp);
+            if(rename(UpldFile, UpldFileRename)!=0)
+                Error ("Failure to rename real time capture file %s to %s, ignored",UpldFile, UpldFileRename);
         }
     }
+
     return( true );
 }
 
@@ -885,7 +907,7 @@ void EventStream::processCommand( const CmdMsg *msg )
             }
 
 	    // If we are in single event mode and at the last frame, replay the current event
-	    if ( (mode == MODE_SINGLE) && (curr_frame_id == event_data->frame_count) )
+	    if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) )
 		curr_frame_id = 1;
 
             replay_rate = ZM_RATE_BASE;
diff --git a/src/zm_event.h b/src/zm_event.h
index f50a5bf06..412baa0bb 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -59,6 +59,12 @@ protected:
 protected:
 	static int		sd;
 
+private:
+        int  UpldCount;
+        char UpldPath[PATH_MAX];
+        int UpldWriteEvery;
+        int UpldWriteEveryAlarm;
+
 public:
     typedef std::set<std::string> StringSet;
     typedef std::map<std::string,StringSet> StringSetMap;
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 8f91ab28b..c1e91a00d 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -787,7 +787,22 @@ bool Image::ReadJpeg( const char *filename, unsigned int p_colours, unsigned int
 	return( true );
 }
 
-bool Image::WriteJpeg( const char *filename, int quality_override ) const
+// Multiple calling formats to permit inclusion (or not) of both quality_override and timestamp (exif), with suitable defaults.
+
+bool Image::WriteJpeg( const char *filename, int quality_override) const
+{
+    return Image::WriteJpeg(filename, quality_override, (timeval){0,0});
+}
+bool Image::WriteJpeg( const char *filename) const
+{
+    return Image::WriteJpeg(filename, 0, (timeval){0,0});
+}
+bool Image::WriteJpeg( const char *filename, struct timeval timestamp ) const
+{
+    return Image::WriteJpeg(filename,0,timestamp);
+}
+
+bool Image::WriteJpeg( const char *filename, int quality_override, struct timeval timestamp  ) const
 {
 	if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
 	{
@@ -795,7 +810,6 @@ bool Image::WriteJpeg( const char *filename, int quality_override ) const
 		temp_image.Colourise( ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
 		return( temp_image.WriteJpeg( filename, quality_override ) );
 	}
-
 	int quality = quality_override?quality_override:config.jpeg_file_quality;
 
 	struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
@@ -887,6 +901,30 @@ bool Image::WriteJpeg( const char *filename, int quality_override ) const
 		jpeg_write_marker( cinfo, JPEG_COM, (const JOCTET *)text, strlen(text) );
 	}
 
+        if(timestamp.tv_sec)
+        {
+            #define EXIFTIMES_MS_OFFSET 0x36   // three decimal digits for milliseconds
+            #define EXIFTIMES_MS_LEN    0x03
+            #define EXIFTIMES_OFFSET    0x3E   // 19 characters format '2015:07:21 13:14:45' not including quotes
+            #define EXIFTIMES_LEN       0x13   // = 19
+            #define EXIF_CODE           0xE1
+
+            char timebuf[64], msbuf[64];
+            strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime(&(timestamp.tv_sec)));
+            snprintf(msbuf, sizeof msbuf, "%06d",(int)(timestamp.tv_usec));  // we only use milliseconds because that's all defined in exif, but this is the whole microseconds because we have it
+            unsigned char exiftimes[82] = {
+                 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
+                 0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                 0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
+                 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                 0xff, 0x00 };
+            memcpy(&exiftimes[EXIFTIMES_OFFSET],   timebuf,EXIFTIMES_LEN);
+            memcpy(&exiftimes[EXIFTIMES_MS_OFFSET],msbuf  ,EXIFTIMES_MS_LEN); // first character after the decimal point
+            jpeg_write_marker (cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes) );
+
+        }
+
 	JSAMPROW row_pointer;	/* pointer to a single row */
 	int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
 	while ( cinfo->next_scanline < cinfo->image_height )
diff --git a/src/zm_image.h b/src/zm_image.h
index 46c7a031b..a48fafacc 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -204,7 +204,12 @@ public:
 	bool WriteRaw( const char *filename ) const;
 
 	bool ReadJpeg( const char *filename, unsigned int p_colours, unsigned int p_subpixelorder);
-	bool WriteJpeg( const char *filename, int quality_override=0 ) const;
+
+	bool WriteJpeg ( const char *filename) const;
+        bool WriteJpeg ( const char *filename, int quality_override ) const;
+        bool WriteJpeg ( const char *filename, struct timeval timestamp ) const;
+        bool WriteJpeg ( const char *filename, int quality_override, struct timeval timestamp ) const;
+
 	bool DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder);
 	bool EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override=0 ) const;
 
diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 436cf8d60..59d72162c 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -222,12 +222,12 @@
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', 'Q0MjGG2xRQEhJVQR85WhFJKI7f2St8RYMlVR7GNQ');
+	Configure::write('Security.salt', 'olX2TOlboOnC474y3Tk4W4JOyuirw1EaadeHCcr4');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '02670120062639232092038865362');
+	Configure::write('Security.cipherSeed', '84684583012508019120061282965');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).
diff --git a/web/graphics/NoDataImage.gif b/web/graphics/NoDataImage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ff97eb1a96f13e5caaba7a7707bea402a1be4e5a
GIT binary patch
literal 7002
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

literal 0
HcmV?d00001

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 917e162c2..d243c3949 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -28,14 +28,34 @@
 // This is very much a preliminary version, very lightly tested, mostly on Firefox, but should work on IE and Chrome (at least)
 // It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
 // change the playback slider to 0 and then it does not try to play at the same time it is scrubbing.
-
+//
+// Jul 23 2015 update:
+//          - Correct problem propagating selected playback speed
+//          - Change from blank monitor to specific message about no data in times with no recording
+//          - Enlarge and better center fonts on labels for lines.
+//          - Add support for monitor groups in selecting criteria from console
+//          - Fix some no-update conditions when playback was off but scale changed or refreshed.
+//          - Added translate call around buttons so as to facilitate possible translations later
+//          - Removed range from/to labels on very small graphs to keep from overlapping slider
+//          - Changed initial (from other page) position of slider to be in the middle to be more obvious
+//
 if ( !canView( 'Events' ) )
 {
     $view = "error";
     return;
 }
 
-$monitorsSql = "select *  from Monitors ";
+if ( !empty($_REQUEST['group']) )
+{
+    $group = $_REQUEST['group'];
+    $row = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_REQUEST['group']) );
+    $monitorsSql = "select * from Monitors where Function != 'None' and find_in_set( Id, '".$row['MonitorIds']."' ) ";
+}
+else
+{
+    $monitorsSql = "select *  from Monitors ";
+    $group = "";
+}
 
 // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
 // if the bulk record has not been written - to get more current reduce bulk frame sizes
@@ -123,23 +143,23 @@ input[type=range]::-ms-tooltip {
     </div>
 
     <div style='display: inline-flex; border: 1px solid black;'>
-        <label style='margin:5px;' for=scaleslider>Scale</label>
+        <label style='margin:5px;' for=scaleslider><?php echo translate('Scale') ?></label>
         <input id=scaleslider type=range min=0.10 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)'/>
         <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo $defaultScale?>x</output>
     </div>
     <div style='display: inline-flex; border: 1px solid black;'>
-        <label style='margin:5px;' for=speedslider>Speed</label>
+        <label style='margin:5px;' for=speedslider><?php echo translate('Speed') ?></label>
         <input id=speedslider type=range min=0 max=50 value=<?php echo $defaultSpeed ?> step=1 wdth=20% onchange='changespeed(this.value)'/>
         <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $defaultSpeed ?>x</output>
     </div>
     <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
-        <button type='button' id=panleft   onclick='panleft() '>&lt;&nbsp;Pan&nbsp;Left</button>
-        <button type='button' id=zoomin    onclick='zoomin()  '>Zoom&nbsp;In&nbsp;+</button>
-        <button type='button' id=zoomout   onclick='zoomout() '>Zoom&nbsp;Out&nbsp;-</button>
-        <button type='button' id=lasthour  onclick='lasthour()'>LastHour</button>
-        <button type='button' id=allof     onclick='allof()   '>All</button>
-        <button type='button' id=allnon    onclick='allnon()  '>All&nbsp;Non-Archive</button>
-        <button type='button' id=panright  onclick='panright()'>Pan&nbsp;Right&nbsp;&gt;</button>
+        <button type='button' id=panleft   onclick='panleft() '>&lt;&nbsp;<?php echo translate('Pan&nbsp;Left') ?></button>
+        <button type='button' id=zoomin    onclick='zoomin()  '><?php echo translate('Zoom&nbsp;In&nbsp;+') ?></button>
+        <button type='button' id=zoomout   onclick='zoomout() '><?php echo translate('Zoom&nbsp;Out&nbsp;-') ?></button>
+        <button type='button' id=lasthour  onclick='lasthour()'><?php echo translate('Last Hour') ?></button>
+        <button type='button' id=allof     onclick='allof()   '><?php echo translate('All') ?></button>
+        <button type='button' id=allnon    onclick='allnon()  '><?php echo translate('All&nbsp;Non-Archive') ?></button>
+        <button type='button' id=panright  onclick='panright()'><?php echo translate('Pan&nbsp;Right&nbsp;&gt;') ?></button>
     </div>
 
     <div id=timelinediv style='position:relative; width:93%;'>
@@ -166,6 +186,7 @@ foreach( dbFetchAll( $monitorsSql ) as $row )
 // This builds the list of events that are eligible from this range
 
 echo "<script>\n";
+echo "var timeLabelsFractOfRow = 0.9;\n";
 echo "var eventMonitorId = [];\n";
 echo "var eventId = [];\n";
 echo "var eventStartTimeSecs = [];\n";
@@ -302,7 +323,7 @@ echo "var rangeTimeSecs="   . ( $maxTimeSecs - $minTimeSecs + 1) . ";\n";
 if(isset($defaultCurrentTime))
     echo "var currentTimeSecs=" . strtotime($defaultCurrentTime) . ";\n";
 else
-    echo "var currentTimeSecs=" . $minTimeSecs . ";\n";
+    echo "var currentTimeSecs=" . ($minTimeSecs + $maxTimeSecs)/2 . ";\n";
 
 ?>
 
@@ -340,19 +361,24 @@ function SetImageSource(monId,val)
             return img;
         }
     }
-    return "graphics/transparent.gif";
+    return "graphics/NoDataImage.gif";
 }
 
 function imagedone(monId,success)
 {
     monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
     if(success)
-        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);   // we ignore errors and just clear the image and keep going
+        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height); 
     monitorImageObject[monId]=null;
     monitorLoading[monId]=false;
-    if(monitorLoadingStageURL[monId]=="") return;
-    loadImage2Monitor(monId,monitorLoadingStageURL[monId]);
-    monitorLoadingStageURL[monId]="";
+    if(!success) // if we had a failrue queue up the no-data image
+        loadImage2Monitor(monId,"graphics/NoDataImage.gif");  // leave the staged URL if there is one, just ignore it here.
+    else
+    {
+        if(monitorLoadingStageURL[monId]=="") return;
+        loadImage2Monitor(monId,monitorLoadingStageURL[monId]);
+        monitorLoadingStageURL[monId]="";
+    }
     return;
 }
 
@@ -382,6 +408,7 @@ function changescale(newscale)
           }
     }
     document.getElementById('scaleslideroutput').value = newscale.toString() + " x";
+    outputUpdate(currentTimeSecs);
     return;
 }
 var playSecsperSec = 1;
@@ -421,7 +448,7 @@ function drawSliderOnGraph(val)
 
     // Set some sizes
 
-    labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * 0.6 / (numMonitors+1)) ) );
+    labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * timeLabelsFractOfRow / (numMonitors+1)) ) );
     labbottom=parseInt(cHeight * 0.2 / (numMonitors+1)).toString() + "px";  // This is positioning same as row labels below, but from bottom so 1-position
     labfont=labelpx + "px Georgia";  // set this like below row labels
 
@@ -470,11 +497,11 @@ function drawSliderOnGraph(val)
     o.style.position="absolute";
     o.style.bottom=labbottom;
     o.style.font=labfont;
-    o.style.left="3px";
+    o.style.left="5px";
     if(numMonitors==0)  // we need a len calculation if we skipped the slider
         len = o.offsetWidth;
     // If the slider will overlay part of this suppress (this is the left side)
-    if(len + 5 > sliderX)
+    if(len + 10 > sliderX || cWidth < len * 5 )  // that last check is for very narrow browsers
         o.style.display="none";
     else
         o.style.display="inline";
@@ -485,8 +512,8 @@ function drawSliderOnGraph(val)
     o.style.bottom=labbottom;
     o.style.font=labfont;
     // If the slider will overlay part of this suppress (this is the right side)
-    o.style.left=(cWidth - len - 5).toString() + "px";
-    if(sliderX > cWidth - len - 10)
+    o.style.left=(cWidth - len - 15).toString() + "px";
+    if(sliderX > cWidth - len - 20 || cWidth < len * 5 )
         o.style.display="none";
     else
         o.style.display="inline";
@@ -534,13 +561,14 @@ function drawGraph()
     {
         if(monitorName[i]>"")
         {
-            ctx.font= parseInt(rowHeight * 0.6).toString() + "px Georgia";
+            ctx.font= parseInt(rowHeight * timeLabelsFractOfRow).toString() + "px Georgia";
             ctx.fillStyle="Black";
             ctx.globalAlpha=1;
-            ctx.fillText(monitorName[i], 0, (monitorIndex[i] + 0.8) * rowHeight);
+            ctx.fillText(monitorName[i], 0, (monitorIndex[i] + 1 - (1 - timeLabelsFractOfRow)/2 ) * rowHeight );  // This should roughly center font in row
         }
     }
     underSlider=undefined;   // flag we don't have a slider cached
+    drawSliderOnGraph(currentTimeSecs);
     return;
 }
 
@@ -613,7 +641,8 @@ function clicknav(minSecs,maxSecs,arch)  // we use the current time if we can
         if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
         currentStr="&current=" + secs2dbstr(currentTimeSecs);
     }
-    var uri = "?view=" + currentView + minStr + maxStr + currentStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
+    var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; fi; ?>;
+    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
     window.location=uri;
 }
 
@@ -677,6 +706,8 @@ function showOneEvent(monId)  // link out to the normal view of one event's data
 
 // Do this on load implicitly
 drawGraph();
+changespeed(<?php echo $defaultSpeed ?>);  // This makes sure we start at the requested rate
+outputUpdate(currentTimeSecs);
 window.addEventListener("resize",drawGraph);
 
 </script>

From 3544fbd0a8ed6b7c14ed2e214aa15262674fcaf0 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 23 Jul 2015 15:15:57 -0400
Subject: [PATCH 017/362] Remove unexpected files that were added

---
 src/zm_event.cpp | 62 ++++++++++++++++--------------------------------
 src/zm_event.h   |  6 -----
 src/zm_image.cpp | 42 ++------------------------------
 src/zm_image.h   |  7 +-----
 4 files changed, 23 insertions(+), 94 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index b173d9e0c..3e723fa48 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -67,14 +67,6 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
     if ( !initialised )
         Initialise();
 
-// >>> Real time image extrat settings <<< these need to go in conf options 
-
-    UpldCount=0;
-    strcpy(UpldPath,"/home/ferguson/ToUpload");
-    UpldWriteEvery=600;
-    UpldWriteEveryAlarm=2;
-
-
     std::string notes;
     createNotes( notes );
 
@@ -357,42 +349,28 @@ bool Event::SendFrameImage( const Image *image, bool alarm_frame )
 
 bool Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 {
-    bool toUpld=false;
-    char UpldFile[PATH_MAX];
-    char UpldFileRename[PATH_MAX];
-    if( ( UpldCount++ % (alarm_frame ? UpldWriteEveryAlarm : UpldWriteEvery) ) == 0)  // notice this grabs frame #1 so it gets the first of every event (zero count = frame 1)
+    if ( config.timestamp_on_capture )
     {
-        toUpld=true;
-        char tmbuf[64], buf[64];
-        strftime(tmbuf, sizeof tmbuf, "%Y-%m-%d-%H-%M-%S", localtime(&(timestamp.tv_sec)));
-        snprintf(buf, sizeof buf, "%s-%06d", tmbuf,(int)(timestamp.tv_usec));
-        snprintf(UpldFile,       sizeof(UpldFile),"%s/%s-%06d_%s_%s.jpg_saving",UpldPath, tmbuf,(int)(timestamp.tv_usec),this->monitor->Name(),alarm_frame?"Alarm":"Periodic");
-        snprintf(UpldFileRename, sizeof(UpldFile),"%s/%s-%06d_%s_%s.jpg",       UpldPath, tmbuf,(int)(timestamp.tv_usec),this->monitor->Name(),alarm_frame?"Alarm":"Periodic");
-    }
-
-    Image* ImgToWrite;
-    Image ts_image( *image );
-
-    if ( config.timestamp_on_capture )  // stash the image we plan to use in another pointer regardless if timestamped.
-    {
-        monitor->TimestampImage( &ts_image, &timestamp );
-        ImgToWrite=&ts_image;
-    }
-    else
-        ImgToWrite=image;
-
-    if ( !config.opt_frame_server || !SendFrameImage( ImgToWrite, alarm_frame) )
-    {
-        int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use
-        ImgToWrite->WriteJpeg( event_file, thisquality, timestamp );
-        if(toUpld)
-        {   // Because these are for real-time use and may be grabbed as they are being written, write under one name then rename
-            ImgToWrite->WriteJpeg(UpldFile, thisquality, timestamp);
-            if(rename(UpldFile, UpldFileRename)!=0)
-                Error ("Failure to rename real time capture file %s to %s, ignored",UpldFile, UpldFileRename);
+        if ( !config.opt_frame_server || !SendFrameImage( image, alarm_frame) )
+        {
+            if ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) )
+                image->WriteJpeg( event_file, config.jpeg_alarm_file_quality );
+            else
+                image->WriteJpeg( event_file );
+        }
+    }
+    else
+    {
+        Image ts_image( *image );
+        monitor->TimestampImage( &ts_image, &timestamp );
+        if ( !config.opt_frame_server || !SendFrameImage( &ts_image, alarm_frame) )
+        {
+            if ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) )
+                ts_image.WriteJpeg( event_file, config.jpeg_alarm_file_quality );
+            else
+                ts_image.WriteJpeg( event_file );
         }
     }
-
     return( true );
 }
 
@@ -907,7 +885,7 @@ void EventStream::processCommand( const CmdMsg *msg )
             }
 
 	    // If we are in single event mode and at the last frame, replay the current event
-	    if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) )
+	    if ( (mode == MODE_SINGLE) && (curr_frame_id == event_data->frame_count) )
 		curr_frame_id = 1;
 
             replay_rate = ZM_RATE_BASE;
diff --git a/src/zm_event.h b/src/zm_event.h
index 412baa0bb..f50a5bf06 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -59,12 +59,6 @@ protected:
 protected:
 	static int		sd;
 
-private:
-        int  UpldCount;
-        char UpldPath[PATH_MAX];
-        int UpldWriteEvery;
-        int UpldWriteEveryAlarm;
-
 public:
     typedef std::set<std::string> StringSet;
     typedef std::map<std::string,StringSet> StringSetMap;
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index c1e91a00d..8f91ab28b 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -787,22 +787,7 @@ bool Image::ReadJpeg( const char *filename, unsigned int p_colours, unsigned int
 	return( true );
 }
 
-// Multiple calling formats to permit inclusion (or not) of both quality_override and timestamp (exif), with suitable defaults.
-
-bool Image::WriteJpeg( const char *filename, int quality_override) const
-{
-    return Image::WriteJpeg(filename, quality_override, (timeval){0,0});
-}
-bool Image::WriteJpeg( const char *filename) const
-{
-    return Image::WriteJpeg(filename, 0, (timeval){0,0});
-}
-bool Image::WriteJpeg( const char *filename, struct timeval timestamp ) const
-{
-    return Image::WriteJpeg(filename,0,timestamp);
-}
-
-bool Image::WriteJpeg( const char *filename, int quality_override, struct timeval timestamp  ) const
+bool Image::WriteJpeg( const char *filename, int quality_override ) const
 {
 	if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
 	{
@@ -810,6 +795,7 @@ bool Image::WriteJpeg( const char *filename, int quality_override, struct timeva
 		temp_image.Colourise( ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
 		return( temp_image.WriteJpeg( filename, quality_override ) );
 	}
+
 	int quality = quality_override?quality_override:config.jpeg_file_quality;
 
 	struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
@@ -901,30 +887,6 @@ bool Image::WriteJpeg( const char *filename, int quality_override, struct timeva
 		jpeg_write_marker( cinfo, JPEG_COM, (const JOCTET *)text, strlen(text) );
 	}
 
-        if(timestamp.tv_sec)
-        {
-            #define EXIFTIMES_MS_OFFSET 0x36   // three decimal digits for milliseconds
-            #define EXIFTIMES_MS_LEN    0x03
-            #define EXIFTIMES_OFFSET    0x3E   // 19 characters format '2015:07:21 13:14:45' not including quotes
-            #define EXIFTIMES_LEN       0x13   // = 19
-            #define EXIF_CODE           0xE1
-
-            char timebuf[64], msbuf[64];
-            strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime(&(timestamp.tv_sec)));
-            snprintf(msbuf, sizeof msbuf, "%06d",(int)(timestamp.tv_usec));  // we only use milliseconds because that's all defined in exif, but this is the whole microseconds because we have it
-            unsigned char exiftimes[82] = {
-                 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
-                 0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
-                 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                 0xff, 0x00 };
-            memcpy(&exiftimes[EXIFTIMES_OFFSET],   timebuf,EXIFTIMES_LEN);
-            memcpy(&exiftimes[EXIFTIMES_MS_OFFSET],msbuf  ,EXIFTIMES_MS_LEN); // first character after the decimal point
-            jpeg_write_marker (cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes) );
-
-        }
-
 	JSAMPROW row_pointer;	/* pointer to a single row */
 	int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
 	while ( cinfo->next_scanline < cinfo->image_height )
diff --git a/src/zm_image.h b/src/zm_image.h
index a48fafacc..46c7a031b 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -204,12 +204,7 @@ public:
 	bool WriteRaw( const char *filename ) const;
 
 	bool ReadJpeg( const char *filename, unsigned int p_colours, unsigned int p_subpixelorder);
-
-	bool WriteJpeg ( const char *filename) const;
-        bool WriteJpeg ( const char *filename, int quality_override ) const;
-        bool WriteJpeg ( const char *filename, struct timeval timestamp ) const;
-        bool WriteJpeg ( const char *filename, int quality_override, struct timeval timestamp ) const;
-
+	bool WriteJpeg( const char *filename, int quality_override=0 ) const;
 	bool DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder);
 	bool EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override=0 ) const;
 

From 9e81eaa0f9fe35ffc89ea0cbbb0751f92c23e304 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 23 Jul 2015 15:19:40 -0400
Subject: [PATCH 018/362] Remove unexpected files that were added - 3

---
 web/api/app/Config/core.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 59d72162c..93dcff772 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -222,12 +222,12 @@
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', 'olX2TOlboOnC474y3Tk4W4JOyuirw1EaadeHCcr4');
+	Configure::write('Security.salt', '02670120062639232092038865362');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '84684583012508019120061282965');
+	Configure::write('Security.cipherSeed', '02670120062639232092038865362');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).

From e967e3de6efacb4e8ec84abba87c2aac349198c7 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 23 Jul 2015 15:20:40 -0400
Subject: [PATCH 019/362] Remove unexpected files that were added - 4

---
 web/api/app/Config/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 93dcff772..436cf8d60 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -222,7 +222,7 @@
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', '02670120062639232092038865362');
+	Configure::write('Security.salt', 'Q0MjGG2xRQEhJVQR85WhFJKI7f2St8RYMlVR7GNQ');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.

From a091ad16f30ed2401c65d620d45abc0d4705aba1 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 23 Jul 2015 15:36:21 -0400
Subject: [PATCH 020/362] Final cleanup before pull request

---
 web/skins/classic/views/montagereview.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index d243c3949..210ccc668 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -21,11 +21,10 @@
 
 // Montage Review -- show all (visible) monitors, and allow to review time ranges easily for all monitors.
 //
-// This is similar to the timeline view, but is NOT linked to events directly, and shows all monitors
+// This is similar to the timeline view, but is NOT linked to events directly, and shows all monitors' images.
 // It also will do a pseudo play function (one second or more at a time, not less than 1 second resolution)
 //
 
-// This is very much a preliminary version, very lightly tested, mostly on Firefox, but should work on IE and Chrome (at least)
 // It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
 // change the playback slider to 0 and then it does not try to play at the same time it is scrubbing.
 //
@@ -58,7 +57,7 @@ else
 }
 
 // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
-// if the bulk record has not been written - to get more current reduce bulk frame sizes
+// if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large)
 
 $eventsSql = "
     select E.Id,E.Name,E.StartTime,max(F.TimeStamp) as CalcEndTime,E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
@@ -73,7 +72,7 @@ $frameSql = "
     inner join Frames as F on (F.EventId = E.Id)
     where not isnull(StartTime) and F.Score>0 ";
 
-// This program only calls itself with the time range involved -- it does all monitors (the user can see) all the time
+// This program only calls itself with the time range involved -- it does all monitors (the user can see, in the called group) all the time
 
 if ( !empty($user['MonitorIds']) )
 {
@@ -248,7 +247,8 @@ else
     $maxTimeSecs = strtotime($maxTime);
 }
 
-// If we had any alarms in those events, this builds the list of all alarm frames (thought for later - should these be ranges, so as to minimize list if very long?)
+// If we had any alarms in those events, this builds the list of all alarm frames 
+// thought for later in case people have a LOT of alarms - change these to ranges, built as it loads, so as to minimize list length
 
 echo "var frameMonitorId = [];\n";
 echo "var frameTimeStampSecs = [];\n";

From 3e85d57710440729a830b20cc9fd663aaa0a2cd5 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 30 Jul 2015 12:06:52 -0400
Subject: [PATCH 021/362] New version with added live view

---
 web/skins/classic/views/montagereview.php | 356 +++++++++++++++-------
 1 file changed, 251 insertions(+), 105 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 210ccc668..92c15e43c 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -17,12 +17,13 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
+
 // ---------------------
 
 // Montage Review -- show all (visible) monitors, and allow to review time ranges easily for all monitors.
 //
 // This is similar to the timeline view, but is NOT linked to events directly, and shows all monitors' images.
-// It also will do a pseudo play function (one second or more at a time, not less than 1 second resolution)
+// It also will do a pseudo play function from history, as well as a live display of images.
 //
 
 // It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
@@ -38,6 +39,13 @@
 //          - Removed range from/to labels on very small graphs to keep from overlapping slider
 //          - Changed initial (from other page) position of slider to be in the middle to be more obvious
 //
+// Jul 29 2015 update
+//          - Add live mode shots from cameras via single frame pull mode
+//          - Added dynamic refresh rate based on how fast we can upload images
+//          - Closed some gaps in playback frames due to time rounding in retrieval.
+//          - Consolidated frame in-memory records to contiguous time rather than individual frame-seconds (still requires a good deal of browser memory)
+//          - Took out a lot of the integral second rounding so that it works better at subsequent replay speeds
+//
 if ( !canView( 'Events' ) )
 {
     $view = "error";
@@ -60,14 +68,15 @@ else
 // if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large)
 
 $eventsSql = "
-    select E.Id,E.Name,E.StartTime,max(F.TimeStamp) as CalcEndTime,E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
     from Events as E
     inner join Monitors as M on (E.MonitorId = M.Id)
     inner join Frames F on F.EventId=E.Id
     where not isnull(E.Frames) and not isnull(StartTime) ";
 
+// Note that the delta value seems more accurate than the time stamp for some reason.
 $frameSql = "
-    select E.Id as EventId, E.MonitorId, F.TimeStamp, max(F.Score) as Score
+    select E.Id as EventId, E.MonitorId, UNIX_TIMESTAMP(DATE_ADD(E.StartTime, Interval Delta Second)) as TimeStampSecs, max(F.Score) as Score
     from Events as E
     inner join Frames as F on (F.EventId = E.Id)
     where not isnull(StartTime) and F.Score>0 ";
@@ -84,6 +93,7 @@ if ( !empty($user['MonitorIds']) )
 }
 
 // Parse input parameters -- note for future, validate/clean up better in case we don't get called from self.
+// Live overrides all the min/max stuff but it is still processed
 
 if ( isset($_REQUEST['minTime']) )
     $minTime = validHtmlStr($_REQUEST['minTime']);
@@ -104,6 +114,10 @@ else
 if (isset($_REQUEST['current']) )
     $defaultCurrentTime=validHtmlStr($_REQUEST['current']);
 
+$initialModeIsLive=0;
+if(isset($_REQUEST['live']) )
+    $initialModeIsLive=1;
+
 $archive=1;
 if (isset($_REQUEST['archive']) )
     $archive=validHtmlStr($_REQUEST['archive']);
@@ -117,9 +131,10 @@ $eventsSql .= "group by E.Id,E.Name,E.StartTime,E.Length,E.Frames,E.MaxScore,E.C
 
 if( isset($minTime) && isset($maxTime) )
 {
-    $eventsSql .= "having CalcEndTime > '" . $minTime . "' and StartTime < '" . $maxTime . "'";
-    $frameSql .= "
-        and TimeStamp > '" . $minTime . "' and TimeStamp < '" . $maxTime . "'";
+    $minTimeSecs = strtotime($minTime);
+    $maxTimeSecs = strtotime($maxTime);
+    $eventsSql .= "having CalcEndTimeSecs > '" . $minTimeSecs . "' and StartTimeSecs < '" . $maxTimeSecs . "'";
+    $frameSql .= "and TimeStamp > '" . $minTime . "' and TimeStamp < '" . $maxTime . "'";
 }
 $frameSql .= "group by E.Id, E.MonitorId, F.TimeStamp order by E.MonitorId, F.TimeStamp asc";
 
@@ -146,19 +161,20 @@ input[type=range]::-ms-tooltip {
         <input id=scaleslider type=range min=0.10 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)'/>
         <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo $defaultScale?>x</output>
     </div>
-    <div style='display: inline-flex; border: 1px solid black;'>
+    <div id='SpeedDiv' style='display: inline-flex; border: 1px solid black;'>
         <label style='margin:5px;' for=speedslider><?php echo translate('Speed') ?></label>
         <input id=speedslider type=range min=0 max=50 value=<?php echo $defaultSpeed ?> step=1 wdth=20% onchange='changespeed(this.value)'/>
-        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $defaultSpeed ?>x</output>
+        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $defaultSpeed ?> fps</output>
     </div>
     <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
-        <button type='button' id=panleft   onclick='panleft() '>&lt;&nbsp;<?php echo translate('Pan&nbsp;Left') ?></button>
-        <button type='button' id=zoomin    onclick='zoomin()  '><?php echo translate('Zoom&nbsp;In&nbsp;+') ?></button>
-        <button type='button' id=zoomout   onclick='zoomout() '><?php echo translate('Zoom&nbsp;Out&nbsp;-') ?></button>
-        <button type='button' id=lasthour  onclick='lasthour()'><?php echo translate('Last Hour') ?></button>
-        <button type='button' id=allof     onclick='allof()   '><?php echo translate('All') ?></button>
-        <button type='button' id=allnon    onclick='allnon()  '><?php echo translate('All&nbsp;Non-Archive') ?></button>
-        <button type='button' id=panright  onclick='panright()'><?php echo translate('Pan&nbsp;Right&nbsp;&gt;') ?></button>
+        <button type='button' id=panleft   onclick='panleft()  '>&lt;&nbsp;<?php echo translate('Pan&nbsp;Left') ?></button>
+        <button type='button' id=zoomin    onclick='zoomin()   '><?php echo translate('Zoom&nbsp;In&nbsp;+') ?></button>
+        <button type='button' id=zoomout   onclick='zoomout()  '><?php echo translate('Zoom&nbsp;Out&nbsp;-') ?></button>
+        <button type='button' id=lasthour  onclick='lasthour() '><?php echo translate('Last Hour') ?></button>
+        <button type='button' id=allof     onclick='allof()    '><?php echo translate('All Events') ?></button>
+        <button type='button' id=allnon    onclick='allnon()   '><?php echo translate('All&nbsp;Non-Archive') ?></button>
+        <button type='button' id=panright  onclick='panright() '><?php echo translate('Pan&nbsp;Right&nbsp;&gt;') ?></button>
+        <button type='button' id=live      onclick='liveview(1)'><?php echo translate('Live Feed') ?></button>
     </div>
 
     <div id=timelinediv style='position:relative; width:93%;'>
@@ -168,9 +184,34 @@ input[type=range]::-ms-tooltip {
         <output id=scruboutput for=scrub></output>
     </div>
 
-</script>
+
+
+<script>
+var currentScale=<?php echo $defaultScale?>;
+var liveMode=<?php echo $initialModeIsLive?>;
+var currentSpeed=<?php echo $defaultSpeed?>;  // slider scale, which is only for replay and relative to real time
+var currentDisplayInterval=1000; // will be set based on performance, this is the display interval in milliseconds for history, and fps for live, and dynamically determined (in ms)
+var playSecsperInterval;         // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval;
+var timerInterval;               // milliseconds between interrupts
+var timerObj;               // object to hold timer interval;
+var freeTimeLastIntervals=[];    // Percentage of current interval used in loading most recent image
+var imageLoadTimesEvaluated=0;   // running count
+var imageLoadTimesNeeded=15;     // and how many we need
+var timeLabelsFractOfRow = 0.9;
+var eventMonitorId = [];
+var eventId = [];
+var eventStartTimeSecs = [];
+var eventEndTimeSecs = [];
+var eventPath = [];
+var eventFrames = [];            // this is going to presume all frames equal durationlength
+
 <?php
 
+// Because we might not have time as the criteria, figure out the min/max time when we run the query
+
+$minTimeSecs = strtotime("2036-01-01 01:01:01");
+$maxTimeSecs = strtotime("1950-01-01 01:01:01");
+
 // This loads all monitors the user can see -- we will prune this list later based on what we find
 
 $monitors = array();
@@ -181,37 +222,22 @@ foreach( dbFetchAll( $monitorsSql ) as $row )
     $monitors[$index] = $row;
     $index = $index + 1;
 }
-
 // This builds the list of events that are eligible from this range
 
-echo "<script>\n";
-echo "var timeLabelsFractOfRow = 0.9;\n";
-echo "var eventMonitorId = [];\n";
-echo "var eventId = [];\n";
-echo "var eventStartTimeSecs = [];\n";
-echo "var eventEndTimeSecs = [];\n";
-echo "var eventPath = [];\n";
-echo "var eventFrames = [];\n";   // this is going to presume all frames equal durationlength
-
-// Because we might not have time as the criteria, figure out the min/max time when we run the query
-
-$minTimeSecs = strtotime("2036-01-01 01:01:01");
-$maxTimeSecs = strtotime("1950-01-01 01:01:01");
-
 $index=0;
 $anyAlarms=false;
 $eventsMonitorsFound = array();     // this will just flag which ones found
 
 foreach( dbFetchAll( $eventsSql ) as $event )
 {
-    if( $minTimeSecs > strtotime($event['StartTime']))   $minTimeSecs=strtotime($event['StartTime']);
-    if( $maxTimeSecs < strtotime($event['CalcEndTime'])) $maxTimeSecs=strtotime($event['CalcEndTime']);
+    if( $minTimeSecs > $event['StartTimeSecs'])   $minTimeSecs=$event['StartTimeSecs'];
+    if( $maxTimeSecs < $event['CalcEndTimeSecs']) $maxTimeSecs=$event['CalcEndTimeSecs'];
     echo "eventMonitorId[$index]=" . $event['MonitorId'] . "; eventId[$index]=" . $event['Id'] . "; ";
-    echo "eventStartTimeSecs[$index]=" . strtotime($event['StartTime']) . "; eventEndTimeSecs[$index]=" . strtotime($event['CalcEndTime']) . "; ";
+    echo "eventStartTimeSecs[$index]=" . $event['StartTimeSecs'] . "; eventEndTimeSecs[$index]=" . $event['CalcEndTimeSecs'] . "; ";
     echo "eventFrames[$index]=" . $event['Frames'] . "; ";
 
     if ( ZM_USE_DEEP_STORAGE )
-        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . strftime("%y/%m/%d/%H/%M/%S", strtotime($event['StartTime'])) . "/\";" ;
+        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . strftime("%y/%m/%d/%H/%M/%S", $event['StartTimeSecs']) . "/\";" ;
     else
         echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . $event['Id'] . "/\";" ;
     $eventsMonitorsFound[$event['MonitorId']] = true;
@@ -251,20 +277,50 @@ else
 // thought for later in case people have a LOT of alarms - change these to ranges, built as it loads, so as to minimize list length
 
 echo "var frameMonitorId = [];\n";
-echo "var frameTimeStampSecs = [];\n";
+echo "var frameTimeStampFromSecs = [];\n";
+echo "var frameTimeStampToSecs = [];\n";
 echo "var frameScore = [];\n";
 $maxScore=0;
 $index=0;
+$mId=-1;
+$fromSecs=-1;
+$toSecs=-1;
+$maxScore=-1;
 
 if($anyAlarms)
     foreach( dbFetchAll ($frameSql) as $frame )
     {
-        echo "  frameMonitorId[$index]=" . $frame['MonitorId'] . ";";
-        echo "  frameTimeStampSecs[$index]=" . strtotime($frame['TimeStamp']) . ";";
-        echo "  frameScore[$index]=" . $frame['Score'] . ";\n";
-        if($maxScore <= $frame['Score'])
+        if($mId<0)
+        {
+            $mId=$frame['MonitorId'];
+            $fromSecs=$frame['TimeStampSecs'];
+            $toSecs=$frame['TimeStampSecs'];
             $maxScore=$frame['Score'];
-        $index += 1;
+        }
+        else if ($mId != $frame['MonitorId'] || $frame['TimeStampSecs'] - $toSecs > 1) // dump this one start a new
+        {
+            $index++;
+            echo "  frameMonitorId[$index]=" . $mId . ";";
+            echo "  frameTimeStampFromSecs[$index]=" . $fromSecs . ";";
+            echo "  frameTimeStampToSecs[$index]=" . $toSecs . ";";
+            echo "  frameScore[$index]=" . $maxScore . ";\n";
+            $mId=$frame['MonitorId'];
+            $fromSecs=$frame['TimeStampSecs'];
+            $toSecs=$frame['TimeStampSecs'];
+            $maxScore=$frame['Score'];
+        }
+        else  // just add this one on
+        {
+            $toSecs=$frame['TimeStampSecs']; 
+            if($maxScore < $frame['Score']) $maxScore=$frame['Score'];
+        }
+    }
+    if($mId>0)
+    {
+            echo "  frameMonitorId[$index]=" . $mId . ";";
+            echo "  frameTimeStampFromSecs[$index]=" . $fromSecs . ";";
+            echo "  frameTimeStampToSecs[$index]=" . $toSecs . ";";
+            echo "  frameScore[$index]=" . $maxScore . ";\n";
     }
 
 // This is where we have to display the canvases -- AFTER determining which monitors we use (above in events) and BEFORE we loop through them to cache the objects
@@ -278,7 +334,7 @@ foreach ($monitors as $m)
 {
     if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
     {
-          echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:2px solid " . $m['WebColour'] . "' onclick='showOneEvent(" . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
+          echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:3px solid " . $m['WebColour'] . "' onclick='showOneEvent(" . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
     }
 }
 echo "<script>\n";
@@ -288,6 +344,8 @@ echo "var monitorName = [];\n";
 echo "var monitorLoading = [];\n";
 echo "var monitorImageObject = [];\n";
 echo "var monitorLoadingStageURL = [];\n";
+echo "var monitorLoadStartTimems = [];\n";
+echo "var monitorLoadEndTimems = [];\n";
 echo "var monitorColour = [];\n";
 echo "var monitorWidth = [];\n";
 echo "var monitorHeight = [];\n";
@@ -350,25 +408,70 @@ function outputUpdate(val)
 
 function SetImageSource(monId,val)
 {
-    var zeropad = <?php echo  sprintf("\"%0" . ZM_EVENT_IMAGE_DIGITS . "d\"",0); ?>;
-    for(var i=0; i<eventPath.length; i++)  // Search for a match
+    if(liveMode==1)
     {
-        if(eventMonitorId[i]==monId && val >= eventStartTimeSecs[i] && val <= eventEndTimeSecs[i])
-        {
-            frame=parseInt((val - eventStartTimeSecs[i])/(eventEndTimeSecs[i]-eventStartTimeSecs[i])*eventFrames[i])+1;
-            img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
-            i=eventPath.length+1;  // force loop exit
-            return img;
-        }
+        return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + (currentScale*100).toString() + "&cachekill=" + Math.random().toString();
+    }
+    else
+    {
+        var zeropad = <?php echo  sprintf("\"%0" . ZM_EVENT_IMAGE_DIGITS . "d\"",0); ?>;
+        for(var i=0; i<eventPath.length; i++)  // Search for a match
+        {
+            if(eventMonitorId[i]==monId && val >= eventStartTimeSecs[i] && val <= eventEndTimeSecs[i])
+            {
+                frame=parseInt((val - eventStartTimeSecs[i])/(eventEndTimeSecs[i]-eventStartTimeSecs[i])*eventFrames[i])+1;
+                img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+                i=eventPath.length+1;  // force loop exit
+               return img;
+            }
+        }
+        return "graphics/NoDataImage.gif";
     }
-    return "graphics/NoDataImage.gif";
 }
 
-function imagedone(monId,success)
+function evaluateLoadTimes()
+{   // Only consider it a completed event if we load ALL monitors, then zero all and start again
+    var start=0;
+    var end=0;
+    for(var i=0; i<monitorIndex.length; i++)
+        if( monitorName[i]>"")
+        {
+            if( monitorLoadEndTimems[i]==0) return;   // if we have a monitor with no time yet just wait
+            if( start == 0 || start > monitorLoadStartTimems[i] ) start = monitorLoadStartTimems[i];
+            if( end   == 0 || end   < monitorLoadEndTimems[i]   ) end   = monitorLoadEndTimems[i];
+        }
+    if(start==0 || end==0) return; // we really should not get here
+    for(var i=0; i<monitorIndex.length; i++)
+        if(monitorName[i]>"")
+        {
+            monitorLoadStartTimems[i]=0;
+            monitorLoadEndTimems[i]=0;
+        }
+    freeTimeLastIntervals[imageLoadTimesEvaluated++] = 1 - ((end - start)/currentDisplayInterval);
+    if( imageLoadTimesEvaluated < imageLoadTimesNeeded ) return;
+    var avgFrac=0;
+    for(var i=0; i<imageLoadTimesEvaluated; i++)
+        avgFrac += freeTimeLastIntervals[i];
+    avgFrac = avgFrac / imageLoadTimesEvaluated;
+    // The larger this is(positive) the faster we can go
+    if      (avgFrac >= 0.8) currentDisplayInterval = (currentDisplayInterval * 0.5).toFixed(1);  // we can go much faster
+    else if (avgFrac >= 0.5) currentDisplayInterval = (currentDisplayInterval * 0.8).toFixed(1);
+    else if (avgFrac >= 0.3) currentDisplayInterval = (currentDisplayInterval);  // this is a rough target 
+    else if (avgFrac >= 0.1) currentDisplayInterval = (currentDisplayInterval * 1.3).toFixed(1);
+    else currentDisplayInterval = (currentDisplayInterval * 2.0).toFixed(1);
+    imageLoadTimesEvaluated=0;
+    changespeed(currentSpeed);
+}
+
+function imagedone(obj, monId, success)
 {
     monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
     if(success)
+    {
         monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height); 
+        monitorLoadEndTimems[monId] = new Date().getTime(); // elapsed time to load
+        evaluateLoadTimes();
+    }
     monitorImageObject[monId]=null;
     monitorLoading[monId]=false;
     if(!success) // if we had a failrue queue up the no-data image
@@ -385,16 +488,21 @@ function imagedone(monId,success)
 function loadImage2Monitor(monId,url)
 {
     if(monitorLoading[monId])
+    {
        monitorLoadingStageURL[monId]=url;   // we don't care if we are overriting, it means it didn't change fast enough
+    }
     else
-      {
-        monitorImageObject[monId]=undefined;
+    {
+        var skipthis=0;
+        if( typeof monitorImageObject[monId] !== "undefined" && monitorImageObject[monId] != null && monitorImageObject[monId].src == url ) return;   // do nothing if it's the same
+//        monitorImageObject[monId]=undefined;
         monitorImageObject[monId]=new Image();
-        monitorImageObject[monId].onload  = function() {imagedone(monId,true )};
-        monitorImageObject[monId].onerror = function() {imagedone(monId,false)};
+        monitorImageObject[monId].onload  = function() {imagedone(this, monId,true )};
+        monitorImageObject[monId].onerror = function() {imagedone(this, monId,false)};
         monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
-        monitorLoading[monId]=true;
-      }
+        monitorLoading[monId]=true; 
+        monitorLoadStartTimems[monId]=new Date().getTime();
+    }
 }
 
 function changescale(newscale)
@@ -409,35 +517,38 @@ function changescale(newscale)
     }
     document.getElementById('scaleslideroutput').value = newscale.toString() + " x";
     outputUpdate(currentTimeSecs);
+    currentScale=newscale;
     return;
 }
-var playSecsperSec = 1;
-var TimerInterval = 1000;    // We never show subsecond frame rates, but if playing faster we play up to 1 per 250ms
-var AdvanceByTime = setInterval(TimerFire,TimerInterval);
 
-function changespeed(val)
+function changespeed(val) // Allow float time so we can do fractions (note this just changes playback rate not display interval
 {
-    playSecsperSec=parseInt(val);
     var t;
-    if(val==0) t=0;
-    if(val==1) t=1000;  // The speed this can support is likely pretty browser/os dependant
-    if(val==2) t=500;
-    if(val==3) t=330;
-    if(val>3)  t=250;
-    if(t!=TimerInterval)
-    {
-        if(AdvanceByTime!=0) clearInterval(AdvanceByTime);
-        TimerInterval=t;
-        if(t>0) AdvanceByTime=setInterval(TimerFire,TimerInterval)
-        else AdvanceByTime=0;
-    }
-    document.getElementById('speedslideroutput').innerHTML = val.toString() + " x";
+    if(liveMode==1) return;  // we shouldn't actually get here but just in case
+    currentSpeed=parseFloat(val);
+    if( timerInterval != currentDisplayInterval && timerInterval == 0)  TimerFire(); // if the timer isn't firing we need to trigger it to update
+    playSecsperInterval = currentSpeed * currentDisplayInterval / 1000;
+    document.getElementById('speedslideroutput').innerHTML = currentSpeed.toString() + " x";
 }
 
 function TimerFire()
 {
-    if (currentTimeSecs + playSecsperSec >= maxTimeSecs) return;
-    outputUpdate(currentTimeSecs + playSecsperSec);
+    // See if we need to reschedule
+    if(currentDisplayInterval != timerInterval) // zero just turn off interrupts
+    {
+        clearInterval(timerObj);
+        timerInterval=currentDisplayInterval;
+        if(currentDisplayInterval>0) timerObj=setInterval(TimerFire,timerInterval);
+    }
+
+    if (liveMode) outputUpdate(currentTimeSecs); // In live mode we basically do nothing but redisplay
+    else if (currentTimeSecs + playSecsperInterval >= maxTimeSecs) // beyond the end just stop
+    {
+        changespeed(0);
+        outputUpdate(currentTimeSecs);
+    }
+    else outputUpdate(currentTimeSecs + playSecsperInterval);
+    return;
 }
 
 function drawSliderOnGraph(val)
@@ -446,6 +557,10 @@ function drawSliderOnGraph(val)
     var sliderLineWidth=1;
     var sliderHeight=cHeight;
 
+    if(liveMode==1)
+    {
+        val=Math.floor( Date.now() / 1000);
+    }
     // Set some sizes
 
     labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * timeLabelsFractOfRow / (numMonitors+1)) ) );
@@ -465,17 +580,28 @@ function drawSliderOnGraph(val)
             ctx.putImageData(underSlider,underSliderX, 0, 0, 0, sliderWidth, sliderHeight);
             underSlider=undefined;
         }
-        // Now save where we are putting it THIS time
-        underSlider=ctx.getImageData(sliderX, 0, sliderWidth, sliderHeight);
-        // And add in the slider'
-        ctx.lineWidth=sliderLineWidth;
-        ctx.strokeStyle='black';
-        // looks like strokes are on the outside (or could be) so shrink it by the line width so we replace all the pixels
-        ctx.strokeRect(sliderX+sliderLineWidth,sliderLineWidth,sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
-        underSliderX=sliderX;
-
+        if(liveMode==0)  // we get rid of the slider if we switch to live (since it may not be in the "right" place)
+        {
+            // Now save where we are putting it THIS time
+            underSlider=ctx.getImageData(sliderX, 0, sliderWidth, sliderHeight);
+            // And add in the slider'
+            ctx.lineWidth=sliderLineWidth;
+            ctx.strokeStyle='black';
+            // looks like strokes are on the outside (or could be) so shrink it by the line width so we replace all the pixels
+            ctx.strokeRect(sliderX+sliderLineWidth,sliderLineWidth,sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
+            underSliderX=sliderX;
+        }
         var o = document.getElementById('scruboutput');
-        o.innerHTML=secs2dbstr(currentTimeSecs);
+        if(liveMode==1)
+        {
+            o.innerHTML="Live Feed @ " + (1000 / currentDisplayInterval).toFixed(1) + " fps";
+            o.style.color="red";
+        }
+        else
+        {
+            o.innerHTML=secs2dbstr(val);
+            o.style.color="blue";
+        }
         o.style.position="absolute";
         o.style.bottom=labbottom;
         o.style.font=labfont;
@@ -501,7 +627,7 @@ function drawSliderOnGraph(val)
     if(numMonitors==0)  // we need a len calculation if we skipped the slider
         len = o.offsetWidth;
     // If the slider will overlay part of this suppress (this is the left side)
-    if(len + 10 > sliderX || cWidth < len * 5 )  // that last check is for very narrow browsers
+    if(len + 10 > sliderX || cWidth < len * 4 )  // that last check is for very narrow browsers
         o.style.display="none";
     else
         o.style.display="inline";
@@ -513,7 +639,7 @@ function drawSliderOnGraph(val)
     o.style.font=labfont;
     // If the slider will overlay part of this suppress (this is the right side)
     o.style.left=(cWidth - len - 15).toString() + "px";
-    if(sliderX > cWidth - len - 20 || cWidth < len * 5 )
+    if(sliderX > cWidth - len - 20 || cWidth < len * 4 )
         o.style.display="none";
     else
         o.style.display="inline";
@@ -550,8 +676,8 @@ function drawGraph()
     }
     for(var i=0; (i<frameScore.length) && (maxScore>0); i++)  // Now put in scored frames (if any)
     {
-        var x1=parseInt( (frameTimeStampSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
-        var x2=parseInt( (frameTimeStampSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round up
+        var x1=parseInt( (frameTimeStampFromSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
+        var x2=parseInt( (frameTimeStampToSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round up
         if(x2-x1 < 2) x2=x1+2;    // So it is visible make them all at least this number of seconds wide
         ctx.fillStyle=monitorColour[frameMonitorId[i]];
         ctx.globalAlpha = 0.4 + 0.6 * (1 - frameScore[i]/maxScore);    // Background is scaled but even lowest is twice as dark as the background
@@ -606,6 +732,7 @@ function mmove(event)
     if(mouseisdown) // only do anything if the mouse is depressed while on the sheet
     {
         var sec = minTimeSecs + rangeTimeSecs / event.target.width * event.target.relMouseCoords(event).x;
+        if(liveMode==1) liveview(0);  // If we were in live mode turn it off
         outputUpdate(sec);
     }
 }
@@ -616,10 +743,24 @@ function secs2dbstr (s)
     return st;
 }
 
-//vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-// The sceond below are to reload this program with new parameters 
+function liveview(which)
+{
+    liveMode=which;
+    if(which==1)
+    {
+        document.getElementById("SpeedDiv").style.display="none";
 
-function clicknav(minSecs,maxSecs,arch)  // we use the current time if we can
+    }
+    else  // switch out of liveview mode
+    {
+        document.getElementById("SpeedDiv").style.display="inline-flex";
+    }
+}
+
+//vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+// The sceond below are to reload this program with new parameters
+
+function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we can
 {
     var now = new Date() / 1000;
     var minStr="";
@@ -641,15 +782,18 @@ function clicknav(minSecs,maxSecs,arch)  // we use the current time if we can
         if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
         currentStr="&current=" + secs2dbstr(currentTimeSecs);
     }
+    var liveStr="";
+    if(live==1)
+        liveStr="&live";
     var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; fi; ?>;
-    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
+    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + liveStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
     window.location=uri;
 }
 
 function lasthour()
 {
     var now = new Date() / 1000;
-    clicknav(now - 3600 + 1, now,1);
+    clicknav(now - 3600 + 1, now,1,0);
 }
 
 function zoomin()
@@ -657,7 +801,7 @@ function zoomin()
     rangeTimeSecs = parseInt(rangeTimeSecs / 2);
     minTimeSecs = parseInt(currentTimeSecs - rangeTimeSecs/2);  // this is the slider current time, we center on that
     maxTimeSecs = parseInt(currentTimeSecs + rangeTimeSecs/2);
-    clicknav(minTimeSecs,maxTimeSecs,1);
+    clicknav(minTimeSecs,maxTimeSecs,1,0);
 }
 
 function zoomout()
@@ -665,27 +809,27 @@ function zoomout()
     rangeTimeSecs = parseInt(rangeTimeSecs * 2);
     minTimeSecs = parseInt(currentTimeSecs - rangeTimeSecs/2);  // this is the slider current time, we center on that
     maxTimeSecs = parseInt(currentTimeSecs + rangeTimeSecs/2);
-    clicknav(minTimeSecs,maxTimeSecs,1);
+    clicknav(minTimeSecs,maxTimeSecs,1,0);
 }
 function panleft()
 {
     minTimeSecs = parseInt(minTimeSecs - rangeTimeSecs/2);
     maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
-    clicknav(minTimeSecs,maxTimeSecs,1);
+    clicknav(minTimeSecs,maxTimeSecs,1,0);
 }
 function panright()
 {
     minTimeSecs = parseInt(minTimeSecs + rangeTimeSecs/2);
     maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
-    clicknav(minTimeSecs,maxTimeSecs,1);
+    clicknav(minTimeSecs,maxTimeSecs,1,0);
 }
 function allof()
 {
-    clicknav(0,0,1);
+    clicknav(0,0,1,0);
 }
 function allnon()
 {
-    clicknav(0,0,0);
+    clicknav(0,0,0,0);
 }
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ End of handlers for reloading this program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -705,8 +849,10 @@ function showOneEvent(monId)  // link out to the normal view of one event's data
 
 
 // Do this on load implicitly
+liveview(<?php echo $initialModeIsLive?>);
 drawGraph();
-changespeed(<?php echo $defaultSpeed ?>);  // This makes sure we start at the requested rate
+timerObj=setInterval(TimerFire,timerInterval=currentDisplayInterval); //start the timer
+changespeed(<?php echo $defaultSpeed ?>);
 outputUpdate(currentTimeSecs);
 window.addEventListener("resize",drawGraph);
 

From 4354cbeecbe9bfa8051ad907b5efb04d834fa050 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 30 Jul 2015 19:01:27 -0400
Subject: [PATCH 022/362] More minor changes, last in prelude of next version

---
 web/skins/classic/views/montagereview.php | 114 ++++++++++++++++------
 1 file changed, 85 insertions(+), 29 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 92c15e43c..b3b310ebd 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -46,6 +46,13 @@
 //          - Consolidated frame in-memory records to contiguous time rather than individual frame-seconds (still requires a good deal of browser memory)
 //          - Took out a lot of the integral second rounding so that it works better at subsequent replay speeds
 //
+// Jul 30 2015 update
+//          - Smoother adjustment of frame rate, fixed upper/lower limits (caching can cause runaway) (and a display, probably temporary, at the bottom)
+//          - Change to using index.php?view= instead of direct access so image access is authenticated
+//          - Add fractional speed for replay, and non-linear speed slider, and update current setting as slider moves (not when done)
+//          - Experimenting with a black background for monitors (this should be replaced with proper CSS later)
+//
+
 if ( !canView( 'Events' ) )
 {
     $view = "error";
@@ -66,9 +73,10 @@ else
 
 // Note that this finds incomplete events as well, and any frame records written, but still cannot "see" to the end frame
 // if the bulk record has not been written - to be able to include more current frames reduce bulk frame sizes (event size can be large)
+// Note we round up just a bit on the end time as otherwise you get gaps, like 59.78 to 00 in the next second, which can give blank frames when moved through slowly.
 
 $eventsSql = "
-    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta+0.5 Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
     from Events as E
     inner join Monitors as M on (E.MonitorId = M.Id)
     inner join Frames F on F.EventId=E.Id
@@ -106,18 +114,33 @@ if ( isset($_REQUEST['scale']) )
 else
     $defaultScale=0.3;
 
+$speeds=[0, 0.1, 0.25, 0.5, 0.75, 1.0, 1.5, 2, 3, 5, 10, 20, 50];
+
 if (isset($_REQUEST['speed']) )
     $defaultSpeed=validHtmlStr($_REQUEST['speed']);
 else
     $defaultSpeed=1;
 
+$speedIndex=5; // default to 1x
+for ($i=0; $i<count($speeds); $i++)
+    if($speeds[$i]==$defaultSpeed)
+    {
+        $speedIndex=$i;
+        break;
+    }
+
 if (isset($_REQUEST['current']) )
     $defaultCurrentTime=validHtmlStr($_REQUEST['current']);
 
+
 $initialModeIsLive=0;
 if(isset($_REQUEST['live']) )
     $initialModeIsLive=1;
 
+$initialDisplayInterval=1000;
+if(isset($_REQUEST['displayinterval']))
+    $initialDisplayInterval=validHtmlStr($_REQUEST['displayinterval']);
+
 $archive=1;
 if (isset($_REQUEST['archive']) )
     $archive=validHtmlStr($_REQUEST['archive']);
@@ -157,14 +180,14 @@ input[type=range]::-ms-tooltip {
     </div>
 
     <div style='display: inline-flex; border: 1px solid black;'>
-        <label style='margin:5px;' for=scaleslider><?php echo translate('Scale') ?></label>
-        <input id=scaleslider type=range min=0.10 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)'/>
-        <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo $defaultScale?>x</output>
+        <label style='margin:5px;' for=scaleslider><?php echo translate('Scale')?></label>
+        <input id=scaleslider type=range min=0.1 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)' oninput='inputscale(this.value)'/>
+        <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo number_format((float)$defaultScale,2,'.','')?> x</output>
     </div>
     <div id='SpeedDiv' style='display: inline-flex; border: 1px solid black;'>
         <label style='margin:5px;' for=speedslider><?php echo translate('Speed') ?></label>
-        <input id=speedslider type=range min=0 max=50 value=<?php echo $defaultSpeed ?> step=1 wdth=20% onchange='changespeed(this.value)'/>
-        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $defaultSpeed ?> fps</output>
+        <input id=speedslider type=range min=0 max=<?php echo count($speeds)?> value=<?php echo $speedIndex ?> step=1 wdth=20% onchange='changespeed(this.value)' oninput='inputspeed(this.value)'/>
+        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $speeds[$speedIndex] ?> fps</output>
     </div>
     <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
         <button type='button' id=panleft   onclick='panleft()  '>&lt;&nbsp;<?php echo translate('Pan&nbsp;Left') ?></button>
@@ -189,8 +212,9 @@ input[type=range]::-ms-tooltip {
 <script>
 var currentScale=<?php echo $defaultScale?>;
 var liveMode=<?php echo $initialModeIsLive?>;
-var currentSpeed=<?php echo $defaultSpeed?>;  // slider scale, which is only for replay and relative to real time
-var currentDisplayInterval=1000; // will be set based on performance, this is the display interval in milliseconds for history, and fps for live, and dynamically determined (in ms)
+var currentSpeed=<?php echo $speeds[$speedIndex]?>;  // slider scale, which is only for replay and relative to real time
+var speedIndex=<?php echo $speedIndex?>;
+var currentDisplayInterval=<?php echo $initialDisplayInterval?>;  // will be set based on performance, this is the display interval in milliseconds for history, and fps for live, and dynamically determined (in ms)
 var playSecsperInterval;         // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval;
 var timerInterval;               // milliseconds between interrupts
 var timerObj;               // object to hold timer interval;
@@ -273,8 +297,7 @@ else
     $maxTimeSecs = strtotime($maxTime);
 }
 
-// If we had any alarms in those events, this builds the list of all alarm frames 
-// thought for later in case people have a LOT of alarms - change these to ranges, built as it loads, so as to minimize list length
+// If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments
 
 echo "var frameMonitorId = [];\n";
 echo "var frameTimeStampFromSecs = [];\n";
@@ -329,7 +352,7 @@ if($anyAlarms)
 // Monitor images - these had to be loaded after the monitors used were determined (after loading events)
 
 echo "</script>\n";
-
+echo "<div id='monitors' style='background-color:black;' width='100%' height='100%'>\n";
 foreach ($monitors as $m)
 {
     if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
@@ -337,6 +360,8 @@ foreach ($monitors as $m)
           echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:3px solid " . $m['WebColour'] . "' onclick='showOneEvent(" . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
     }
 }
+echo "</div>\n";
+echo "<p id='fps'>evaluating fps</p>\n";
 echo "<script>\n";
 
 echo "var maxScore=$maxScore;\n";  // used to skip frame load if we find no alarms.
@@ -368,6 +393,8 @@ foreach ($monitors as $m)
         echo "  monitorHeight["          . $m['Id'] . "]=" . $m['Height'] . ";";
         echo "  monitorIndex["           . $m['Id'] . "]=" . $numMonitors . ";";
         echo "  monitorName["            . $m['Id'] . "]=\"" . $m['Name'] . "\"; ";
+        echo "  monitorLoadStartTimems[" . $m['Id'] . "]=0; ";
+        echo "  monitorLoadEndTimems["   . $m['Id'] . "]=0; ";
         echo "  monitorCanvasObj["       . $m['Id'] . "]=document.getElementById('Monitor" . $m['Id'] . "');";
         echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d');\n";
         $numMonitors += 1;
@@ -383,6 +410,12 @@ if(isset($defaultCurrentTime))
 else
     echo "var currentTimeSecs=" . ($minTimeSecs + $maxTimeSecs)/2 . ";\n";
 
+echo "var speeds=[";
+for ($i=0; $i<count($speeds); $i++)
+    echo (($i>0)?", ":"") . $speeds[$i];
+echo "];\n";
+
+
 ?>
 
 var scrubAsObject=document.getElementById('scrub');
@@ -420,7 +453,8 @@ function SetImageSource(monId,val)
             if(eventMonitorId[i]==monId && val >= eventStartTimeSecs[i] && val <= eventEndTimeSecs[i])
             {
                 frame=parseInt((val - eventStartTimeSecs[i])/(eventEndTimeSecs[i]-eventStartTimeSecs[i])*eventFrames[i])+1;
-                img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+//                img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+                  img = "index.php?view=image&path=" + eventPath[i].substring(6) + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
                 i=eventPath.length+1;  // force loop exit
                return img;
             }
@@ -433,6 +467,7 @@ function evaluateLoadTimes()
 {   // Only consider it a completed event if we load ALL monitors, then zero all and start again
     var start=0;
     var end=0;
+    if(liveMode!=1 && currentSpeed==0) return;  // don't evaluate when we are not moving as we can do nothing really fast.
     for(var i=0; i<monitorIndex.length; i++)
         if( monitorName[i]>"")
         {
@@ -454,21 +489,30 @@ function evaluateLoadTimes()
         avgFrac += freeTimeLastIntervals[i];
     avgFrac = avgFrac / imageLoadTimesEvaluated;
     // The larger this is(positive) the faster we can go
-    if      (avgFrac >= 0.8) currentDisplayInterval = (currentDisplayInterval * 0.5).toFixed(1);  // we can go much faster
-    else if (avgFrac >= 0.5) currentDisplayInterval = (currentDisplayInterval * 0.8).toFixed(1);
-    else if (avgFrac >= 0.3) currentDisplayInterval = (currentDisplayInterval);  // this is a rough target 
-    else if (avgFrac >= 0.1) currentDisplayInterval = (currentDisplayInterval * 1.3).toFixed(1);
-    else currentDisplayInterval = (currentDisplayInterval * 2.0).toFixed(1);
+    if      (avgFrac >= 0.9)  currentDisplayInterval = (currentDisplayInterval * 0.50).toFixed(1);  // we can go much faster
+    else if (avgFrac >= 0.8)  currentDisplayInterval = (currentDisplayInterval * 0.55).toFixed(1);
+    else if (avgFrac >= 0.7)  currentDisplayInterval = (currentDisplayInterval * 0.60).toFixed(1);
+    else if (avgFrac >= 0.6)  currentDisplayInterval = (currentDisplayInterval * 0.65).toFixed(1);
+    else if (avgFrac >= 0.5)  currentDisplayInterval = (currentDisplayInterval * 0.70).toFixed(1);
+    else if (avgFrac >= 0.4)  currentDisplayInterval = (currentDisplayInterval * 0.80).toFixed(1);
+    else if (avgFrac >= 0.35) currentDisplayInterval = (currentDisplayInterval * 0.90).toFixed(1);
+    else if (avgFrac >= 0.3)  currentDisplayInterval = (currentDisplayInterval * 1.00).toFixed(1);
+    else if (avgFrac >= 0.25) currentDisplayInterval = (currentDisplayInterval * 1.20).toFixed(1);
+    else if (avgFrac >= 0.2)  currentDisplayInterval = (currentDisplayInterval * 1.50).toFixed(1);
+    else if (avgFrac >= 0.1)  currentDisplayInterval = (currentDisplayInterval * 2.00).toFixed(1);
+    else currentDisplayInterval                      = (currentDisplayInterval * 2.50).toFixed(1);
+    currentDisplayInterval=Math.min(Math.max(currentDisplayInterval, 30),10000);   // limit this from about 30fps to .1 fps
     imageLoadTimesEvaluated=0;
-    changespeed(currentSpeed);
+    changespeed(speedIndex);
+    document.getElementById("fps").innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
 }
 
 function imagedone(obj, monId, success)
 {
-    monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
+// don't need?     monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
     if(success)
     {
-        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height); 
+        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);
         monitorLoadEndTimems[monId] = new Date().getTime(); // elapsed time to load
         evaluateLoadTimes();
     }
@@ -487,7 +531,7 @@ function imagedone(obj, monId, success)
 
 function loadImage2Monitor(monId,url)
 {
-    if(monitorLoading[monId])
+    if(monitorLoading[monId] && monitorImageObject[monId].src != url )  // never queue the same image twice (if it's loading it has to be defined, right?
     {
        monitorLoadingStageURL[monId]=url;   // we don't care if we are overriting, it means it didn't change fast enough
     }
@@ -500,12 +544,18 @@ function loadImage2Monitor(monId,url)
         monitorImageObject[monId].onload  = function() {imagedone(this, monId,true )};
         monitorImageObject[monId].onerror = function() {imagedone(this, monId,false)};
         monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
-        monitorLoading[monId]=true; 
+        monitorLoading[monId]=true;
         monitorLoadStartTimems[monId]=new Date().getTime();
     }
 }
 
-function changescale(newscale)
+function inputscale(newscale) // updates slider only
+{
+    document.getElementById('scaleslideroutput').value = parseFloat(newscale).toFixed(2).toString() + " x";
+    return;
+}
+
+function changescale(newscale) // makes actual change
 {
     for(var i=0; i<monitorIndex.length; i++)
     {
@@ -515,20 +565,25 @@ function changescale(newscale)
             monitorCanvasObj[i].height=monitorHeight[i]*newscale;
           }
     }
-    document.getElementById('scaleslideroutput').value = newscale.toString() + " x";
+    document.getElementById('scaleslideroutput').value = parseFloat(newscale).toFixed(2).toString() + " x";
     outputUpdate(currentTimeSecs);
     currentScale=newscale;
     return;
 }
+function inputspeed(val) // updates slider only
+{
+    document.getElementById('speedslideroutput').innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
+}
 
-function changespeed(val) // Allow float time so we can do fractions (note this just changes playback rate not display interval
+function changespeed(val)   // Note parameter is the index not the speed
 {
     var t;
     if(liveMode==1) return;  // we shouldn't actually get here but just in case
-    currentSpeed=parseFloat(val);
+    currentSpeed=parseFloat(speeds[val]);
+    speedIndex=val;
     if( timerInterval != currentDisplayInterval && timerInterval == 0)  TimerFire(); // if the timer isn't firing we need to trigger it to update
     playSecsperInterval = currentSpeed * currentDisplayInterval / 1000;
-    document.getElementById('speedslideroutput').innerHTML = currentSpeed.toString() + " x";
+    document.getElementById('speedslideroutput').innerHTML = currentSpeed.toFixed(2).toString() + " x";
 }
 
 function TimerFire()
@@ -777,6 +832,7 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
         minStr="&minTime=" + secs2dbstr(minSecs);
     if(arch==0)
         archiveStr="&archive=0";
+    var intervalStr="&displayinterval=" + currentDisplayInterval.toString();
     if(minSecs && maxSecs)
     {
         if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
@@ -786,7 +842,7 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
     if(live==1)
         liveStr="&live";
     var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; fi; ?>;
-    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + liveStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + document.getElementById("speedslider").value + "&archive=" + arch;
+    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + intervalStr + liveStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + speeds[document.getElementById("speedslider").value] + "&archive=" + arch;
     window.location=uri;
 }
 
@@ -852,7 +908,7 @@ function showOneEvent(monId)  // link out to the normal view of one event's data
 liveview(<?php echo $initialModeIsLive?>);
 drawGraph();
 timerObj=setInterval(TimerFire,timerInterval=currentDisplayInterval); //start the timer
-changespeed(<?php echo $defaultSpeed ?>);
+changespeed(<?php echo $speedIndex ?>);
 outputUpdate(currentTimeSecs);
 window.addEventListener("resize",drawGraph);
 

From 42f77377f2c2ecf9b37efd1ee18e81cd0dc06fac Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Sun, 2 Aug 2015 16:15:18 -0400
Subject: [PATCH 023/362] Add a fit feature to fit all monitos on screen

---
 web/skins/classic/views/montagereview.php | 617 ++++++++++++++--------
 1 file changed, 404 insertions(+), 213 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index b3b310ebd..eb9760c02 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -52,7 +52,11 @@
 //          - Add fractional speed for replay, and non-linear speed slider, and update current setting as slider moves (not when done)
 //          - Experimenting with a black background for monitors (this should be replaced with proper CSS later)
 //
-
+// Aug 02, 2015 update
+//          - Add max fit, make it default
+//          - Remove timeline in live mode, and restore when switched back (live button becomes toggle)
+//          - Add +/- zooms to individual monitors so you can adjust size, persist across reload buttons (only)
+//
 if ( !canView( 'Events' ) )
 {
     $view = "error";
@@ -84,7 +88,7 @@ $eventsSql = "
 
 // Note that the delta value seems more accurate than the time stamp for some reason.
 $frameSql = "
-    select E.Id as EventId, E.MonitorId, UNIX_TIMESTAMP(DATE_ADD(E.StartTime, Interval Delta Second)) as TimeStampSecs, max(F.Score) as Score
+    select E.Id as eId, E.MonitorId, UNIX_TIMESTAMP(DATE_ADD(E.StartTime, Interval Delta Second)) as TimeStampSecs, max(F.Score) as Score
     from Events as E
     inner join Frames as F on (F.EventId = E.Id)
     where not isnull(StartTime) and F.Score>0 ";
@@ -112,7 +116,7 @@ if ( isset($_REQUEST['maxTime']) )
 if ( isset($_REQUEST['scale']) )
     $defaultScale=validHtmlStr($_REQUEST['scale']);
 else
-    $defaultScale=0.3;
+    $defaultScale=1.1; // fit
 
 $speeds=[0, 0.1, 0.25, 0.5, 0.75, 1.0, 1.5, 2, 3, 5, 10, 20, 50];
 
@@ -148,7 +152,8 @@ if (isset($_REQUEST['archive']) )
 if ($archive==0)
 {
     $eventsSql .= " and E.Archived=0 ";
-}    $frameSql .= " and E.Archived=0 ";
+    $frameSql .= " and E.Archived=0 ";
+}
 
 $eventsSql .= "group by E.Id,E.Name,E.StartTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId ";
 
@@ -161,15 +166,28 @@ if( isset($minTime) && isset($maxTime) )
 }
 $frameSql .= "group by E.Id, E.MonitorId, F.TimeStamp order by E.MonitorId, F.TimeStamp asc";
 
+// This loads all monitors the user can see - even if we don't have data for one we still show all for switch to live.
+
+$monitors = array();
+$monitorsSql .= " order by Sequence asc ";
+$index=0;
+foreach( dbFetchAll( $monitorsSql ) as $row )
+{
+    $monitors[$index] = $row;
+    $index = $index + 1;
+}
+
+// These are zoom ranges per visible monitor
+
+
+
 xhtmlHeaders(__FILE__, translate('montagereview') );
 ?>
 <style>
 input[type=range]::-ms-tooltip {
     display: none;
 }
-
 </style>
-</head>
 <body>
   <div id="page">
     <div id="header">
@@ -181,35 +199,47 @@ input[type=range]::-ms-tooltip {
 
     <div style='display: inline-flex; border: 1px solid black;'>
         <label style='margin:5px;' for=scaleslider><?php echo translate('Scale')?></label>
-        <input id=scaleslider type=range min=0.1 max=1.00 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='changescale(this.value)' oninput='inputscale(this.value)'/>
-        <output style='margin:5px;' id=scaleslideroutput from=scaleslider><?php echo number_format((float)$defaultScale,2,'.','')?> x</output>
+        <input id=scaleslider type=range min=0.1 max=1.10 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='setScale(this.value)' oninput='showScale(this.value)'/>
+        <span style='margin:5px;' id=scaleslideroutput><?php echo number_format((float)$defaultScale,2,'.','')?> x</span>
     </div>
     <div id='SpeedDiv' style='display: inline-flex; border: 1px solid black;'>
         <label style='margin:5px;' for=speedslider><?php echo translate('Speed') ?></label>
-        <input id=speedslider type=range min=0 max=<?php echo count($speeds)?> value=<?php echo $speedIndex ?> step=1 wdth=20% onchange='changespeed(this.value)' oninput='inputspeed(this.value)'/>
-        <output style='margin:5px;' id=speedslideroutput from=speedslider><?php echo $speeds[$speedIndex] ?> fps</output>
+        <input id=speedslider type=range min=0 max=<?php echo count($speeds)-1?> value=<?php echo $speedIndex ?> step=1 wdth=20% onchange='setSpeed(this.value)' oninput='showSpeed(this.value)'/>
+        <span style='margin:5px;' id=speedslideroutput><?php echo $speeds[$speedIndex] ?> fps</span>
     </div>
     <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
-        <button type='button' id=panleft   onclick='panleft()  '>&lt;&nbsp;<?php echo translate('Pan&nbsp;Left') ?></button>
-        <button type='button' id=zoomin    onclick='zoomin()   '><?php echo translate('Zoom&nbsp;In&nbsp;+') ?></button>
-        <button type='button' id=zoomout   onclick='zoomout()  '><?php echo translate('Zoom&nbsp;Out&nbsp;-') ?></button>
-        <button type='button' id=lasthour  onclick='lasthour() '><?php echo translate('Last Hour') ?></button>
-        <button type='button' id=allof     onclick='allof()    '><?php echo translate('All Events') ?></button>
-        <button type='button' id=allnon    onclick='allnon()   '><?php echo translate('All&nbsp;Non-Archive') ?></button>
-        <button type='button' id=panright  onclick='panright() '><?php echo translate('Pan&nbsp;Right&nbsp;&gt;') ?></button>
-        <button type='button' id=live      onclick='liveview(1)'><?php echo translate('Live Feed') ?></button>
+        <button type='button' id=panleft   onclick='panleft()          '>&lt; <?php echo translate('Pan Left') ?></button>
+        <button type='button' id=zoomin    onclick='zoomin()           '><?php echo translate('Zoom In +') ?></button>
+        <button type='button' id=zoomout   onclick='zoomout()          '><?php echo translate('Zoom Out -') ?></button>
+        <button type='button' id=lasthour  onclick='lasthour()         '><?php echo translate('Last Hour') ?></button>
+        <button type='button' id=allof     onclick='allof()            '><?php echo translate('All Events') ?></button>
+        <button type='button' id=allnon    onclick='allnon()           '><?php echo translate('All Non-Archive') ?></button>
+        <button type='button' id=live      onclick='liveSet(1-liveMode)'><?php echo translate('Live Feed') ?></button>
+        <button type='button' id=panright  onclick='panright()         '><?php echo translate('Pan Right &gt;') ?></button>
     </div>
 
     <div id=timelinediv style='position:relative; width:93%;'>
         <canvas id=timeline style='border:1px solid;' onmousemove='mmove(event)' ontouchmove='tmove(event)' onmousedown='mdown(event)' onmouseup='mup(event)' onmouseout='mout(event)' ></canvas>
-        <output id=scrubleft for=scrub></output>
-        <output id=scrubright for=scrub></output>
-        <output id=scruboutput for=scrub></output>
+        <span id=scrubleft ></span>
+        <span id=scrubright ></span>
+        <span id=scruboutput ></span>
     </div>
+<?php
+// Monitor images - these had to be loaded after the monitors used were determined (after loading events)
 
+echo "<div id='monitors' style='position:relative; background-color:black;' width='100%' height='100%'>\n";
+foreach ($monitors as $m)
+{
+    {
+          echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:3px solid " . $m['WebColour'] . "' onclick='clickMonitor(event," . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
+    }
+}
+echo "</div>\n";
+echo "<p id='fps'>evaluating fps</p>\n";
+echo "<script>\n";
 
+?>
 
-<script>
 var currentScale=<?php echo $defaultScale?>;
 var liveMode=<?php echo $initialModeIsLive?>;
 var currentSpeed=<?php echo $speeds[$speedIndex]?>;  // slider scale, which is only for replay and relative to real time
@@ -222,11 +252,11 @@ var freeTimeLastIntervals=[];    // Percentage of current interval used in loadi
 var imageLoadTimesEvaluated=0;   // running count
 var imageLoadTimesNeeded=15;     // and how many we need
 var timeLabelsFractOfRow = 0.9;
-var eventMonitorId = [];
-var eventId = [];
-var eventStartTimeSecs = [];
-var eventEndTimeSecs = [];
-var eventPath = [];
+var eMonId = [];
+var eId = [];
+var eStartSecs = [];
+var eEndSecs = [];
+var ePath = [];
 var eventFrames = [];            // this is going to presume all frames equal durationlength
 
 <?php
@@ -236,35 +266,23 @@ var eventFrames = [];            // this is going to presume all frames equal du
 $minTimeSecs = strtotime("2036-01-01 01:01:01");
 $maxTimeSecs = strtotime("1950-01-01 01:01:01");
 
-// This loads all monitors the user can see -- we will prune this list later based on what we find
-
-$monitors = array();
-$monitorsSql .= " order by Sequence asc ";
-$index=0;
-foreach( dbFetchAll( $monitorsSql ) as $row )
-{
-    $monitors[$index] = $row;
-    $index = $index + 1;
-}
 // This builds the list of events that are eligible from this range
 
 $index=0;
 $anyAlarms=false;
-$eventsMonitorsFound = array();     // this will just flag which ones found
 
 foreach( dbFetchAll( $eventsSql ) as $event )
 {
     if( $minTimeSecs > $event['StartTimeSecs'])   $minTimeSecs=$event['StartTimeSecs'];
     if( $maxTimeSecs < $event['CalcEndTimeSecs']) $maxTimeSecs=$event['CalcEndTimeSecs'];
-    echo "eventMonitorId[$index]=" . $event['MonitorId'] . "; eventId[$index]=" . $event['Id'] . "; ";
-    echo "eventStartTimeSecs[$index]=" . $event['StartTimeSecs'] . "; eventEndTimeSecs[$index]=" . $event['CalcEndTimeSecs'] . "; ";
+    echo "eMonId[$index]=" . $event['MonitorId'] . "; eId[$index]=" . $event['Id'] . "; ";
+    echo "eStartSecs[$index]=" . $event['StartTimeSecs'] . "; eEndSecs[$index]=" . $event['CalcEndTimeSecs'] . "; ";
     echo "eventFrames[$index]=" . $event['Frames'] . "; ";
 
     if ( ZM_USE_DEEP_STORAGE )
-        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . strftime("%y/%m/%d/%H/%M/%S", $event['StartTimeSecs']) . "/\";" ;
+        echo "ePath[$index] = \"events/" . $event['MonitorId'] . "/" . strftime("%y/%m/%d/%H/%M/%S", $event['StartTimeSecs']) . "/\";" ;
     else
-        echo "eventPath[$index] = \"events/" . $event['MonitorId'] . "/" . $event['Id'] . "/\";" ;
-    $eventsMonitorsFound[$event['MonitorId']] = true;
+        echo "ePath[$index] = \"events/" . $event['MonitorId'] . "/" . $event['Id'] . "/\";" ;
     $index=$index+1;
     if($event['MaxScore']>0)
         $anyAlarms=true;
@@ -299,10 +317,10 @@ else
 
 // If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments
 
-echo "var frameMonitorId = [];\n";
-echo "var frameTimeStampFromSecs = [];\n";
-echo "var frameTimeStampToSecs = [];\n";
-echo "var frameScore = [];\n";
+echo "var fMonId = [];\n";
+echo "var fTimeFromSecs = [];\n";
+echo "var fTimeToSecs = [];\n";
+echo "var fScore = [];\n";
 $maxScore=0;
 $index=0;
 $mId=-1;
@@ -323,10 +341,10 @@ if($anyAlarms)
         else if ($mId != $frame['MonitorId'] || $frame['TimeStampSecs'] - $toSecs > 1) // dump this one start a new
         {
             $index++;
-            echo "  frameMonitorId[$index]=" . $mId . ";";
-            echo "  frameTimeStampFromSecs[$index]=" . $fromSecs . ";";
-            echo "  frameTimeStampToSecs[$index]=" . $toSecs . ";";
-            echo "  frameScore[$index]=" . $maxScore . ";\n";
+            echo "  fMonId[$index]=" . $mId . ";";
+            echo "  fTimeFromSecs[$index]=" . $fromSecs . ";";
+            echo "  fTimeToSecs[$index]=" . $toSecs . ";";
+            echo "  fScore[$index]=" . $maxScore . ";\n";
             $mId=$frame['MonitorId'];
             $fromSecs=$frame['TimeStampSecs'];
             $toSecs=$frame['TimeStampSecs'];
@@ -334,36 +352,18 @@ if($anyAlarms)
         }
         else  // just add this one on
         {
-            $toSecs=$frame['TimeStampSecs']; 
+            $toSecs=$frame['TimeStampSecs'];
             if($maxScore < $frame['Score']) $maxScore=$frame['Score'];
         }
     }
     if($mId>0)
     {
-            echo "  frameMonitorId[$index]=" . $mId . ";";
-            echo "  frameTimeStampFromSecs[$index]=" . $fromSecs . ";";
-            echo "  frameTimeStampToSecs[$index]=" . $toSecs . ";";
-            echo "  frameScore[$index]=" . $maxScore . ";\n";
+            echo "  fMonId[$index]=" . $mId . ";";
+            echo "  fTimeFromSecs[$index]=" . $fromSecs . ";";
+            echo "  fTimeToSecs[$index]=" . $toSecs . ";";
+            echo "  fScore[$index]=" . $maxScore . ";\n";
     }
 
-// This is where we have to display the canvases -- AFTER determining which monitors we use (above in events) and BEFORE we loop through them to cache the objects
-// This splits up the javascript and html a bit, but it's a lot simpler than trying in php to cache one while completing the other
-
-// Monitor images - these had to be loaded after the monitors used were determined (after loading events)
-
-echo "</script>\n";
-echo "<div id='monitors' style='background-color:black;' width='100%' height='100%'>\n";
-foreach ($monitors as $m)
-{
-    if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
-    {
-          echo "<canvas width='" . $m['Width'] * $defaultScale . "px' height='"  . $m['Height'] * $defaultScale . "px' id='Monitor" . $m['Id'] . "' style='border:3px solid " . $m['WebColour'] . "' onclick='showOneEvent(" . $m['Id'] . ")'>No Canvas Support!!</canvas>\n";
-    }
-}
-echo "</div>\n";
-echo "<p id='fps'>evaluating fps</p>\n";
-echo "<script>\n";
-
 echo "var maxScore=$maxScore;\n";  // used to skip frame load if we find no alarms.
 echo "var monitorName = [];\n";
 echo "var monitorLoading = [];\n";
@@ -375,32 +375,47 @@ echo "var monitorColour = [];\n";
 echo "var monitorWidth = [];\n";
 echo "var monitorHeight = [];\n";
 echo "var monitorIndex = [];\n";
+echo "var monitorNormalizeScale = [];\n";
+echo "var monitorZoomScale = [];\n";
 echo "var monitorCanvasObj = [];\n"; // stash location of these here so we don't have to search
 echo "var monitorCanvasCtx = [];\n";
+echo "var monitorPtr = []; // monitorName[monitorPtr[0]] is first monitor\n";
 
-// This builds the list of monitors.
 
 $numMonitors=0;  // this array is indexed by the monitor ID for faster access later, so it may be sparse
+$avgArea=floatval(0);  // Calculations the normalizing scale
+
 foreach ($monitors as $m)
 {
-    if(!empty($eventsMonitorsFound[$m['Id']]))  // only save the monitor if it's part of these events
-    {
-        echo "  monitorLoading["         . $m['Id'] . "]=false;  ";
-        echo "  monitorImageObject["     . $m['Id'] . "]=null;  ";
-        echo "  monitorLoadingStageURL[" . $m['Id'] . "] = ''; ";
-        echo "  monitorColour["          . $m['Id'] . "]=\"" . $m['WebColour'] . "\"; ";
-        echo "  monitorWidth["           . $m['Id'] . "]=" . $m['Width'] . "; ";
-        echo "  monitorHeight["          . $m['Id'] . "]=" . $m['Height'] . ";";
-        echo "  monitorIndex["           . $m['Id'] . "]=" . $numMonitors . ";";
-        echo "  monitorName["            . $m['Id'] . "]=\"" . $m['Name'] . "\"; ";
-        echo "  monitorLoadStartTimems[" . $m['Id'] . "]=0; ";
-        echo "  monitorLoadEndTimems["   . $m['Id'] . "]=0; ";
-        echo "  monitorCanvasObj["       . $m['Id'] . "]=document.getElementById('Monitor" . $m['Id'] . "');";
-        echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d');\n";
-        $numMonitors += 1;
-    }
+    $avgArea = $avgArea + floatval($m['Width'] * $m['Height']);
+    $numMonitors++;
 }
 
+if($numMonitors>0) $avgArea= $avgArea / $numMonitors;
+
+$numMonitors=0;
+foreach ($monitors as $m)
+{
+    echo "  monitorLoading["         . $m['Id'] . "]=false;  ";
+    echo "  monitorImageObject["     . $m['Id'] . "]=null;  ";
+    echo "  monitorLoadingStageURL[" . $m['Id'] . "] = ''; ";
+    echo "  monitorColour["          . $m['Id'] . "]=\"" . $m['WebColour'] . "\"; ";
+    echo "  monitorWidth["           . $m['Id'] . "]=" . $m['Width'] . "; ";
+    echo "  monitorHeight["          . $m['Id'] . "]=" . $m['Height'] . "; ";
+    echo "  monitorIndex["           . $m['Id'] . "]=" . $numMonitors . "; ";
+    echo "  monitorName["            . $m['Id'] . "]=\"" . $m['Name'] . "\"; ";
+    echo "  monitorLoadStartTimems[" . $m['Id'] . "]=0; ";
+    echo "  monitorLoadEndTimems["   . $m['Id'] . "]=0; ";
+    echo "  monitorCanvasObj["       . $m['Id'] . "]=document.getElementById('Monitor" . $m['Id'] . "'); ";
+    echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d'); ";
+    echo "  monitorNormalizeScale["  . $m['Id'] . "]=" . ( $m['Width'] * $m['Height'] / $avgArea ) . "; ";
+    $zoomScale=1.0;
+    if(isset($_REQUEST[ 'z' . $m[Id] ]) )
+        $zoomScale = floatval( validHtmlStr($_REQUEST[ 'z' . $m['Id'] ]) );
+    echo "  monitorZoomScale["       . $m['Id'] . "]=" . $zoomScale . ";";
+    echo "  monitorPtr["         . $numMonitors . "]=" . $m['Id'] . ";\n";
+    $numMonitors += 1;
+}
 echo "var numMonitors = $numMonitors;\n";
 echo "var minTimeSecs="     . $minTimeSecs . ";\n";
 echo "var maxTimeSecs="     . $maxTimeSecs . ";\n";
@@ -414,8 +429,6 @@ echo "var speeds=[";
 for ($i=0; $i<count($speeds); $i++)
     echo (($i>0)?", ":"") . $speeds[$i];
 echo "];\n";
-
-
 ?>
 
 var scrubAsObject=document.getElementById('scrub');
@@ -426,43 +439,6 @@ var ctx=canvas.getContext('2d');
 var underSlider;    // use this to hold what is hidden by the slider
 var underSliderX;   // Where the above was taken from (left side, Y is zero)
 
-
-function outputUpdate(val)
-{
-    drawSliderOnGraph(val);
-    for(var i=0; i<monitorIndex.length; i++)
-    {
-        if(monitorName[i]>"")
-            loadImage2Monitor(i,SetImageSource(i,val));
-    }
-    var currentTimeMS = new Date(val*1000);
-    currentTimeSecs=val;
-}
-
-function SetImageSource(monId,val)
-{
-    if(liveMode==1)
-    {
-        return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + (currentScale*100).toString() + "&cachekill=" + Math.random().toString();
-    }
-    else
-    {
-        var zeropad = <?php echo  sprintf("\"%0" . ZM_EVENT_IMAGE_DIGITS . "d\"",0); ?>;
-        for(var i=0; i<eventPath.length; i++)  // Search for a match
-        {
-            if(eventMonitorId[i]==monId && val >= eventStartTimeSecs[i] && val <= eventEndTimeSecs[i])
-            {
-                frame=parseInt((val - eventStartTimeSecs[i])/(eventEndTimeSecs[i]-eventStartTimeSecs[i])*eventFrames[i])+1;
-//                img = eventPath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
-                  img = "index.php?view=image&path=" + eventPath[i].substring(6) + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
-                i=eventPath.length+1;  // force loop exit
-               return img;
-            }
-        }
-        return "graphics/NoDataImage.gif";
-    }
-}
-
 function evaluateLoadTimes()
 {   // Only consider it a completed event if we load ALL monitors, then zero all and start again
     var start=0;
@@ -476,11 +452,10 @@ function evaluateLoadTimes()
             if( end   == 0 || end   < monitorLoadEndTimems[i]   ) end   = monitorLoadEndTimems[i];
         }
     if(start==0 || end==0) return; // we really should not get here
-    for(var i=0; i<monitorIndex.length; i++)
-        if(monitorName[i]>"")
+    for(var i=0; i<numMonitors; i++)
         {
-            monitorLoadStartTimems[i]=0;
-            monitorLoadEndTimems[i]=0;
+            monitorLoadStartTimems[monitorPtr[i]]=0;
+            monitorLoadEndTimems[monitorPtr[i]]=0;
         }
     freeTimeLastIntervals[imageLoadTimesEvaluated++] = 1 - ((end - start)/currentDisplayInterval);
     if( imageLoadTimesEvaluated < imageLoadTimesNeeded ) return;
@@ -503,20 +478,60 @@ function evaluateLoadTimes()
     else currentDisplayInterval                      = (currentDisplayInterval * 2.50).toFixed(1);
     currentDisplayInterval=Math.min(Math.max(currentDisplayInterval, 30),10000);   // limit this from about 30fps to .1 fps
     imageLoadTimesEvaluated=0;
-    changespeed(speedIndex);
-    document.getElementById("fps").innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
+    setSpeed(speedIndex);
+    $(fps).innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
+}
+
+function outputUpdate(val)
+{
+    drawSliderOnGraph(val);
+    for(var i=0; i<numMonitors; i++)
+    {
+            loadImage2Monitor(monitorPtr[i],SetImageSource(monitorPtr[i],val));
+    }
+    var currentTimeMS = new Date(val*1000);
+    currentTimeSecs=val;
+}
+
+function SetImageSource(monId,val)
+{
+    if(liveMode==1)
+    {
+        var effectiveScale = monitorCanvasObj[monId].width / monitorWidth[monId];
+        return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + "&cachekill=" + Math.random().toString();
+    }
+    else
+    {
+        var zeropad = <?php echo  sprintf("\"%0" . ZM_EVENT_IMAGE_DIGITS . "d\"",0); ?>;
+        for(var i=0; i<ePath.length; i++)  // Search for a match
+        {
+            if(eMonId[i]==monId && val >= eStartSecs[i] && val <= eEndSecs[i])
+            {
+                var frame=parseInt((val - eStartSecs[i])/(eEndSecs[i]-eStartSecs[i])*eventFrames[i])+1;
+//                img = ePath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+                  img = "index.php?view=image&path=" + ePath[i].substring(6) + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+               return img;
+            }
+        }
+        return "graphics/NoDataImage.gif";
+    }
 }
 
 function imagedone(obj, monId, success)
 {
-// don't need?     monitorCanvasCtx[monId].clearRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);  // just in case image is no good
     if(success)
     {
-        monitorCanvasCtx[monId].drawImage(monitorImageObject[monId],0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);
+        monitorCanvasCtx[monId].drawImage( monitorImageObject[monId], 0, 0, monitorCanvasObj[monId].width, monitorCanvasObj[monId].height);
+        var iconSize=(Math.max(monitorCanvasObj[monId].width,monitorCanvasObj[monId].height) * 0.10);
+        monitorCanvasCtx[monId].font = "600 " + iconSize.toString() + "px Arial";
+        monitorCanvasCtx[monId].fillStyle="white";
+        monitorCanvasCtx[monId].globalCompositeOperation="difference";
+        monitorCanvasCtx[monId].fillText("+",iconSize*0.2, iconSize*1.2);
+        monitorCanvasCtx[monId].fillText("-",monitorCanvasObj[monId].width - iconSize*1.2, iconSize*1.2);
+        monitorCanvasCtx[monId].globalCompositeOperation="source-over";
         monitorLoadEndTimems[monId] = new Date().getTime(); // elapsed time to load
         evaluateLoadTimes();
     }
-    monitorImageObject[monId]=null;
     monitorLoading[monId]=false;
     if(!success) // if we had a failrue queue up the no-data image
         loadImage2Monitor(monId,"graphics/NoDataImage.gif");  // leave the staged URL if there is one, just ignore it here.
@@ -539,67 +554,84 @@ function loadImage2Monitor(monId,url)
     {
         var skipthis=0;
         if( typeof monitorImageObject[monId] !== "undefined" && monitorImageObject[monId] != null && monitorImageObject[monId].src == url ) return;   // do nothing if it's the same
-//        monitorImageObject[monId]=undefined;
-        monitorImageObject[monId]=new Image();
-        monitorImageObject[monId].onload  = function() {imagedone(this, monId,true )};
-        monitorImageObject[monId].onerror = function() {imagedone(this, monId,false)};
-        monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
+        if( monitorImageObject[monId] == null )
+        {
+            monitorImageObject[monId]=new Image();
+            monitorImageObject[monId].onload  = function() {imagedone(this, monId,true )};
+            monitorImageObject[monId].onerror = function() {imagedone(this, monId,false)};
+        }
         monitorLoading[monId]=true;
         monitorLoadStartTimems[monId]=new Date().getTime();
+        monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
     }
 }
 
-function inputscale(newscale) // updates slider only
+function showScale(newscale) // updates slider only
 {
-    document.getElementById('scaleslideroutput').value = parseFloat(newscale).toFixed(2).toString() + " x";
+    if(newscale == parseFloat($(scaleslider).max))
+        $(scaleslideroutput).innerHTML="Fit";
+    else
+        $(scaleslideroutput).innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
     return;
 }
 
-function changescale(newscale) // makes actual change
+function setScale(newscale) // makes actual change
 {
-    for(var i=0; i<monitorIndex.length; i++)
+    var ret=1;
+    showScale(newscale);
+    if(newscale == parseFloat($(scaleslider).max))
     {
-        if(monitorName[i]>"")
-          {
-            monitorCanvasObj[i].width=monitorWidth[i]*newscale;
-            monitorCanvasObj[i].height=monitorHeight[i]*newscale;
-          }
+        var vh=window.innerHeight;
+        var vw=window.innerWidth;
+        var pos=$(monitors).getPosition();
+        var mh=(vh - pos.y - $(fps).getSize().y);
+        $(monitors).setStyle('height',mh.toString() + "px");  // leave a small gap at bottom
+        ret=maxfit2($(monitors).getSize().x,$(monitors).getSize().y);   /// if we fail to fix we want to bubble up the failure so we can react
+    }
+    else
+    {
+        for(var i=0; i<numMonitors; i++)
+        {
+            monitorCanvasObj[monitorPtr[i]].width=monitorWidth[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
+            monitorCanvasObj[monitorPtr[i]].height=monitorHeight[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
+            monitorCanvasObj[monitorPtr[i]].style.position="";
+        }
+        $(monitors).setStyle('height',"auto");
     }
-    document.getElementById('scaleslideroutput').value = parseFloat(newscale).toFixed(2).toString() + " x";
     outputUpdate(currentTimeSecs);
     currentScale=newscale;
-    return;
+    return ret;
 }
-function inputspeed(val) // updates slider only
+function showSpeed(val) // updates slider only
 {
-    document.getElementById('speedslideroutput').innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
+    $(speedslideroutput).innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
 }
 
-function changespeed(val)   // Note parameter is the index not the speed
+function setSpeed(val)   // Note parameter is the index not the speed
 {
     var t;
     if(liveMode==1) return;  // we shouldn't actually get here but just in case
     currentSpeed=parseFloat(speeds[val]);
     speedIndex=val;
-    if( timerInterval != currentDisplayInterval && timerInterval == 0)  TimerFire(); // if the timer isn't firing we need to trigger it to update
     playSecsperInterval = currentSpeed * currentDisplayInterval / 1000;
-    document.getElementById('speedslideroutput').innerHTML = currentSpeed.toFixed(2).toString() + " x";
+    showSpeed(val);
+    if( timerInterval != currentDisplayInterval || currentSpeed == 0 )  timerFire(); // if the timer isn't firing we need to trigger it to update
 }
 
-function TimerFire()
+function timerFire()
 {
     // See if we need to reschedule
-    if(currentDisplayInterval != timerInterval) // zero just turn off interrupts
+    if(currentDisplayInterval != timerInterval || currentSpeed == 0) // zero just turn off interrupts
     {
         clearInterval(timerObj);
         timerInterval=currentDisplayInterval;
-        if(currentDisplayInterval>0) timerObj=setInterval(TimerFire,timerInterval);
+        if(currentSpeed>0 || liveMode!=0) timerObj=setInterval(timerFire,timerInterval);  // don't fire out of live mode if speed is zero
     }
 
     if (liveMode) outputUpdate(currentTimeSecs); // In live mode we basically do nothing but redisplay
     else if (currentTimeSecs + playSecsperInterval >= maxTimeSecs) // beyond the end just stop
     {
-        changespeed(0);
+        setSpeed(0);
         outputUpdate(currentTimeSecs);
     }
     else outputUpdate(currentTimeSecs + playSecsperInterval);
@@ -618,9 +650,9 @@ function drawSliderOnGraph(val)
     }
     // Set some sizes
 
-    labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * timeLabelsFractOfRow / (numMonitors+1)) ) );
-    labbottom=parseInt(cHeight * 0.2 / (numMonitors+1)).toString() + "px";  // This is positioning same as row labels below, but from bottom so 1-position
-    labfont=labelpx + "px Georgia";  // set this like below row labels
+    var labelpx = Math.max( 6, Math.min( 20, parseInt(cHeight * timeLabelsFractOfRow / (numMonitors+1)) ) );
+    var labbottom=parseInt(cHeight * 0.2 / (numMonitors+1)).toString() + "px";  // This is positioning same as row labels below, but from bottom so 1-position
+    var labfont=labelpx + "px Georgia";  // set this like below row labels
 
     if(numMonitors>0) // if we have no data to display don't do the slider itself 
     {
@@ -646,7 +678,7 @@ function drawSliderOnGraph(val)
             ctx.strokeRect(sliderX+sliderLineWidth,sliderLineWidth,sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
             underSliderX=sliderX;
         }
-        var o = document.getElementById('scruboutput');
+        var o = $(scruboutput);
         if(liveMode==1)
         {
             o.innerHTML="Live Feed @ " + (1000 / currentDisplayInterval).toFixed(1) + " fps";
@@ -662,6 +694,7 @@ function drawSliderOnGraph(val)
         o.style.font=labfont;
         // try to get length and then when we get too close to the right switch to the left
         var len = o.offsetWidth;
+        var x;
         if(sliderX > cWidth/2)
             x=sliderX - len - 10;
         else
@@ -673,7 +706,7 @@ function drawSliderOnGraph(val)
     // Because these change widths if the slider is too close, use the slider width as an estimate for the left/right label length (i.e. don't recalculate len from above)
     // If this starts to collide increase some of the extra space
 
-    var o = document.getElementById('scrubleft');
+    var o = $(scrubleft);
     o.innerHTML=secs2dbstr(minTimeSecs);
     o.style.position="absolute";
     o.style.bottom=labbottom;
@@ -687,7 +720,7 @@ function drawSliderOnGraph(val)
     else
         o.style.display="inline";
 
-    var o = document.getElementById('scrubright');
+    var o = $(scrubright);
     o.innerHTML=secs2dbstr(maxTimeSecs);
     o.style.position="absolute";
     o.style.bottom=labbottom;
@@ -702,10 +735,10 @@ function drawSliderOnGraph(val)
 
 function drawGraph()
 {
-    var divWidth=document.getElementById("timelinediv").clientWidth
+    var divWidth=$(timelinediv).clientWidth
     canvas.width = cWidth = divWidth;   // Let it float and determine width (it should be sized a bit smaller percentage of window)
     canvas.height=cHeight = parseInt(window.innerHeight * 0.10);
-    if(eventId.length==0)
+    if(eId.length==0)
     {
         ctx.font="40px Georgia";
         ctx.fillStyle="Black";
@@ -720,33 +753,30 @@ function drawGraph()
 
     // first fill in the bars for the events (not alarms)
 
-    for(var i=0; i<eventId.length; i++)  // Display all we loaded
+    for(var i=0; i<eId.length; i++)  // Display all we loaded
     {
-        var x1=parseInt( (eventStartTimeSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
-        var x2=parseInt( (eventEndTimeSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round high end up to be sure consecutive ones connect
-        ctx.fillStyle=monitorColour[eventMonitorId[i]];
+        var x1=parseInt( (eStartSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
+        var x2=parseInt( (eEndSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round high end up to be sure consecutive ones connect
+        ctx.fillStyle=monitorColour[eMonId[i]];
         ctx.globalAlpha = 0.2;    // light color for background
-        ctx.clearRect(x1,monitorIndex[eventMonitorId[i]]*rowHeight,x2-x1,rowHeight);  // Erase any overlap so it doesn't look artificially darker
-        ctx.fillRect (x1,monitorIndex[eventMonitorId[i]]*rowHeight,x2-x1,rowHeight);
+        ctx.clearRect(x1,monitorIndex[eMonId[i]]*rowHeight,x2-x1,rowHeight);  // Erase any overlap so it doesn't look artificially darker
+        ctx.fillRect (x1,monitorIndex[eMonId[i]]*rowHeight,x2-x1,rowHeight);
     }
-    for(var i=0; (i<frameScore.length) && (maxScore>0); i++)  // Now put in scored frames (if any)
+    for(var i=0; (i<fScore.length) && (maxScore>0); i++)  // Now put in scored frames (if any)
     {
-        var x1=parseInt( (frameTimeStampFromSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
-        var x2=parseInt( (frameTimeStampToSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round up
+        var x1=parseInt( (fTimeFromSecs[i] - minTimeSecs) / rangeTimeSecs * cWidth) ;        // round low end down
+        var x2=parseInt( (fTimeToSecs[i]   - minTimeSecs) / rangeTimeSecs * cWidth + 0.5 ) ; // round up
         if(x2-x1 < 2) x2=x1+2;    // So it is visible make them all at least this number of seconds wide
-        ctx.fillStyle=monitorColour[frameMonitorId[i]];
-        ctx.globalAlpha = 0.4 + 0.6 * (1 - frameScore[i]/maxScore);    // Background is scaled but even lowest is twice as dark as the background
-        ctx.fillRect(x1,monitorIndex[frameMonitorId[i]]*rowHeight,x2-x1,rowHeight);
+        ctx.fillStyle=monitorColour[fMonId[i]];
+        ctx.globalAlpha = 0.4 + 0.6 * (1 - fScore[i]/maxScore);    // Background is scaled but even lowest is twice as dark as the background
+        ctx.fillRect(x1,monitorIndex[fMonId[i]]*rowHeight,x2-x1,rowHeight);
     }
-    for(var i=0; i<monitorName.length; i++)  // Note that this may be a sparse array
+    for(var i=0; i<numMonitors; i++)  // Note that this may be a sparse array
     {
-        if(monitorName[i]>"")
-        {
-            ctx.font= parseInt(rowHeight * timeLabelsFractOfRow).toString() + "px Georgia";
-            ctx.fillStyle="Black";
-            ctx.globalAlpha=1;
-            ctx.fillText(monitorName[i], 0, (monitorIndex[i] + 1 - (1 - timeLabelsFractOfRow)/2 ) * rowHeight );  // This should roughly center font in row
-        }
+        ctx.font= parseInt(rowHeight * timeLabelsFractOfRow).toString() + "px Georgia";
+        ctx.fillStyle="Black";
+        ctx.globalAlpha=1;
+        ctx.fillText(monitorName[monitorPtr[i]], 0, (i + 1 - (1 - timeLabelsFractOfRow)/2 ) * rowHeight );  // This should roughly center font in row
     }
     underSlider=undefined;   // flag we don't have a slider cached
     drawSliderOnGraph(currentTimeSecs);
@@ -787,7 +817,6 @@ function mmove(event)
     if(mouseisdown) // only do anything if the mouse is depressed while on the sheet
     {
         var sec = minTimeSecs + rangeTimeSecs / event.target.width * event.target.relMouseCoords(event).x;
-        if(liveMode==1) liveview(0);  // If we were in live mode turn it off
         outputUpdate(sec);
     }
 }
@@ -798,18 +827,29 @@ function secs2dbstr (s)
     return st;
 }
 
-function liveview(which)
+function liveSet(value)
 {
-    liveMode=which;
-    if(which==1)
+    liveMode=value;
+    if(liveMode==1) // if we are not in live view switch to
     {
-        document.getElementById("SpeedDiv").style.display="none";
+        $(SpeedDiv).style.display="none";
+        $(timelinediv).style.display="none";
+        $(live).innerHTML="History";
 
     }
     else  // switch out of liveview mode
     {
-        document.getElementById("SpeedDiv").style.display="inline-flex";
+        $(SpeedDiv).style.display="inline-flex";
+        $(timelinediv).style.display=null;
+        $(live).innerHTML="Live";
     }
+    redrawScreen();
+    timerFire();  // force a fire in case it's not timing
+}
+function redrawScreen()
+{
+    drawGraph();
+    return setScale(currentScale);  // this might be bubbling up an error
 }
 
 //vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
@@ -841,8 +881,13 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
     var liveStr="";
     if(live==1)
         liveStr="&live";
-    var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; fi; ?>;
-    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + intervalStr + liveStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + speeds[document.getElementById("speedslider").value] + "&archive=" + arch;
+    var zoomStr="";
+    for(var i=0; i<numMonitors; i++)
+        if(monitorZoomScale[monitorPtr[i]] < 0.99 || monitorZoomScale[monitorPtr[i]] > 1.01)  // allow for some up/down changes and just treat as 1 of almost 1
+            zoomStr += "&z" + monitorPtr[i].toString() + "=" + monitorZoomScale[monitorPtr[i]].toFixed(2);
+
+    var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; ?>;
+    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + intervalStr + liveStr + zoomStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + speeds[document.getElementById("speedslider").value] + "&archive=" + arch;
     window.location=uri;
 }
 
@@ -887,35 +932,181 @@ function allnon()
 {
     clicknav(0,0,0,0);
 }
+/// >>>>>>>>>>>>>>>>> handles packing different size/aspect monitors on screen    <<<<<<<<<<<<<<<<<<<<<<<<
+
+function compSize(a, b) // sort array by some size parameter  - height seems to work best.  A semi-greedy algorithm
+{
+    if      ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] >  monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b] ) return -1;
+    else if ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] == monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b])  return 0;
+    else return 1;
+}
+
+
+function maxfit2(divW, divH)
+{
+    var bestFitX=[];   // how we arranged the so-far best match
+    var bestFitX2=[];
+    var bestFitY=[];
+    var bestFitY2=[];
+    var bestFitScale;
+
+    var minScale=0.05;
+    var maxScale=5.00;
+    var bestFitArea=0;
+
+    var borders=-1;
+
+    monitorPtr.sort(compSize);
+
+    while(1)
+    {
+        if( maxScale - minScale < 0.01 ) break;
+        var thisScale = (maxScale + minScale) / 2;
+        var allFit=1;
+        var thisArea=0;
+        var thisX=[];  // top left
+        var thisY=[];
+        var thisX2=[];  // bottom right
+        var thisY2=[];
+
+        for(var m=0; m<numMonitors; m++)
+        {
+                // this loop places each monitor (if it can)
+
+                function doesItFit(x,y,w,h,d)
+                {  // does block (w,h) fit at position (x,y) relative to edge and other nodes already done (0..d)
+                   if(x+w>=divW) return 0;
+                   if(y+h>=divH) return 0;
+                   for(var i=0; i<=d; i++)
+                       if( !( thisX[i]>x+w-1 || thisX2[i] < x || thisY[i] > y+h-1 || thisY2[i] < y ) ) return 0;
+                   return 1; // it's OK
+                }
+
+                if(borders<=0) borders=$("Monitor"+monitorPtr[m]).getStyle("border").toInt() * 2;   // assume fixed size border, and added to both sides and top/bottom
+                // try fitting over first, then down.  Each new one must land at either upper right or lower left corner of last (try in that order)
+                // Pick the one with the smallest Y, then smallest X if Y equal
+                var fitX = 999999999;
+                var fitY = 999999999;
+                for( adjacent=0; adjacent<m; adjacent++)
+                {
+                    // try top right of adjacent
+                    if( doesItFit(thisX2[adjacent]+1, thisY[adjacent], monitorWidth[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, monitorHeight[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, m-1) == 1 )
+                    {
+                        if(thisY[adjacent]<fitY || ( thisY[adjacent]==fitY && thisX2[adjacent]+1 < fitX ))
+                        {
+                            fitX=thisX2[adjacent]+1;
+                            fitY=thisY[adjacent];
+                        }
+                    }
+                    // try bottom left
+                    if ( doesItFit(thisX[adjacent], thisY2[adjacent]+1, monitorWidth[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, monitorHeight[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, m-1) == 1 )
+                    {
+                        if(thisY2[adjacent]+1<fitY || ( thisY2[adjacent]+1 == fitY && thisX[adjacent]<fitX ))
+                        {
+                            fitX=thisX[adjacent];
+                            fitY=thisY2[adjacent]+1;
+                        }
+                    }
+                 }
+                 if(m==0) // note for teh very first one there were no adjacents so the above loop didn't run
+                 {
+                     if( doesItFit(0,0,monitorWidth[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, monitorHeight[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders, -1) == 1 )
+                     {
+                        fitX=0;
+                        fitY=0;
+                     }
+                 }
+                 if(fitX==999999999)
+                 {
+                     allFit=0;
+                     break; // break out of monitor loop flagging we didn't fit
+                 }
+                 thisX[m] =fitX;
+                 thisX2[m]=fitX + monitorWidth[monitorPtr[m]]  * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders;
+                 thisY[m] =fitY;
+                 thisY2[m]=fitY + monitorHeight[monitorPtr[m]] * thisScale * monitorNormalizeScale[monitorPtr[m]] * monitorZoomScale[monitorPtr[m]] + borders;
+                 thisArea += (thisX2[m] - thisX[m])*(thisY2[m] - thisY[m]);
+        }
+        if(allFit==1)
+        {
+            minScale=thisScale;
+            if(bestFitArea<thisArea)
+            {
+                bestFitArea=thisArea;
+                bestFitX=thisX;
+                bestFitY=thisY;
+                bestFitX2=thisX2;
+                bestFitY2=thisY2;
+                bestFitScale=thisScale;
+            }
+        }
+        else // didn't fit
+        {
+            maxScale=thisScale;
+        }
+    }
+    if(bestFitArea>0)   // only rearrange if we could fit -- otherwise just do nothing, let them start coming out, whatever
+    {
+        for(m=0; m<numMonitors; m++)
+        {
+            c = $("Monitor" + monitorPtr[m]);
+            c.style.position="absolute";
+            c.style.left=bestFitX[m].toString() + "px";
+            c.style.top=bestFitY[m].toString() + "px";
+            c.width = bestFitX2[m] - bestFitX[m] + 1 - borders;
+            c.height= bestFitY2[m] - bestFitY[m] + 1 - borders;
+        }
+        return 1;
+    }
+    else
+        return 0;
+}
+
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ End of handlers for reloading this program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 function showOneEvent(monId)  // link out to the normal view of one event's data
 {
     // We know the monitor, need to determine the event based on current time
-    for(var i=0; i<eventId.length; i++)  // Display all we loaded
+    for(var i=0; i<eId.length; i++)  // Display all we loaded
     {
-        if(eventMonitorId[i]==monId && currentTimeSecs >= eventStartTimeSecs[i] && currentTimeSecs <= eventEndTimeSecs[i])
+        if(eMonId[i]==monId && currentTimeSecs >= eStartSecs[i] && currentTimeSecs <= eEndSecs[i])
         {
-            var url = '?view=event&eid=' + eventId[i] + '&fid=' + parseInt(Math.max(1, Math.min(eventFrames[i], eventFrames[i] * (currentTimeSecs - eventStartTimeSecs[i]) / (eventEndTimeSecs[i] - eventStartTimeSecs[i] + 1) ) ));
-            createPopup(url, 'zmEvent', 'event', monitorWidth[eventMonitorId[i]], monitorHeight[eventMonitorId[i]]);
+            var url = '?view=event&eid=' + eId[i] + '&fid=' + parseInt(Math.max(1, Math.min(eventFrames[i], eventFrames[i] * (currentTimeSecs - eStartSecs[i]) / (eEndSecs[i] - eStartSecs[i] + 1) ) ));
+            createPopup(url, 'zmEvent', 'event', monitorWidth[eMonId[i]], monitorHeight[eMonId[i]]);
         }
     }
-
 }
 
+function zoom(monId,scale)
+{
+    var lastZoomMonPriorScale=monitorZoomScale[monId];
+    monitorZoomScale[monId] *= scale;
+    if(redrawScreen()==0) // failure here is probably because we zoomed too far
+    {
+        monitorZoomScale[monId]=lastZoomMonPriorScale;
+        alert("You can't zoom that far -- rolling back");
+        redrawScreen();  // put things back and hope it works
+    }
+}
+
+function clickMonitor(event,monId)
+{
+    var pos_x = event.offsetX ? (event.offsetX) : event.pageX - $("Monitor"+monId.toString()).offsetLeft;
+    var pos_y = event.offsetY ? (event.offsetY) : event.pageY - $("Monitor"+monId.toString()).offsetTop;
+    if(pos_x < $("Monitor"+monId.toString()).width/4     && pos_y < $("Monitor"+monId.toString()).height/4) zoom(monId,1.15);
+    else if(pos_x > $("Monitor"+monId.toString()).width * 3/4 && pos_y < $("Monitor"+monId.toString()).height/4) zoom(monId,1/1.15);
+    else showOneEvent(monId);
+    return;
+}
 
-// Do this on load implicitly
-liveview(<?php echo $initialModeIsLive?>);
 drawGraph();
-timerObj=setInterval(TimerFire,timerInterval=currentDisplayInterval); //start the timer
-changespeed(<?php echo $speedIndex ?>);
-outputUpdate(currentTimeSecs);
-window.addEventListener("resize",drawGraph);
+setScale(currentScale);
+setSpeed(speedIndex);
+liveSet(liveMode);  // will redraw
+window.addEventListener("resize",redrawScreen);
 
 </script>
 
 </div>
 </body>
 </html>
-
-

From e7264a8167059bee96f2e700403e0aa95ff57fcb Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Mon, 3 Aug 2015 15:31:13 -0400
Subject: [PATCH 024/362] Minox fixes, make live mode default, 1 hour default

---
 web/skins/classic/views/montagereview.php | 45 +++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index eb9760c02..2ee386428 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -26,6 +26,25 @@
 // It also will do a pseudo play function from history, as well as a live display of images.
 //
 
+// Valid query string:
+//
+//        &maxTime, minTime = string formats (locale) of starting and ending time for history (pass both or none), default = last hour
+//
+//        &current = string format of time, where the slider is positioned first in history mode (normally only used in reloads, default = half scale)
+//
+//        &speed = one of the valid speeds below (see $speeds in php section, default = 1.0)
+//
+//        &scale = image sie scale (.1 to 1.0, or 1.1 = fit, default = fit)
+//
+//        &live=1 whether to start in live mode, 1 = yes, 0 = no
+//
+//        &archive = if "1" then include archive frames, if "0" do not, default "1"
+//
+//        &z1, &z2, etc. = initial monitor specific zoom, numeral is a monitor id, default = 1.0, used in page reloads normally
+//
+//        &group = group number of monitors to display, comes from console if set, default is none (i.e. not limited by group)
+//
+
 // It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
 // change the playback slider to 0 and then it does not try to play at the same time it is scrubbing.
 //
@@ -56,6 +75,8 @@
 //          - Add max fit, make it default
 //          - Remove timeline in live mode, and restore when switched back (live button becomes toggle)
 //          - Add +/- zooms to individual monitors so you can adjust size, persist across reload buttons (only)
+//          - Change default to 1 hour and live mode (reduce workload on initial load, let people ask for huge history amounts)
+//          - Since this may be run as a standalone window for shortcuts, etc., add a "console" link to get back to the console
 //
 if ( !canView( 'Events' ) )
 {
@@ -107,12 +128,21 @@ if ( !empty($user['MonitorIds']) )
 // Parse input parameters -- note for future, validate/clean up better in case we don't get called from self.
 // Live overrides all the min/max stuff but it is still processed
 
+// The default (nothing at all specified) is for 1 hour so we do not read the whole database
+
+
+if ( !isset($_REQUEST['minTime']) && !isset($_REQUEST['maxTime']) )
+{
+    $maxTime=strftime("%c",time());
+    $minTime=strftime("%c",time() - 3600);
+}
 if ( isset($_REQUEST['minTime']) )
     $minTime = validHtmlStr($_REQUEST['minTime']);
 
 if ( isset($_REQUEST['maxTime']) )
     $maxTime = validHtmlStr($_REQUEST['maxTime']);
 
+
 if ( isset($_REQUEST['scale']) )
     $defaultScale=validHtmlStr($_REQUEST['scale']);
 else
@@ -137,9 +167,9 @@ if (isset($_REQUEST['current']) )
     $defaultCurrentTime=validHtmlStr($_REQUEST['current']);
 
 
-$initialModeIsLive=0;
-if(isset($_REQUEST['live']) )
-    $initialModeIsLive=1;
+$initialModeIsLive=1;
+if(isset($_REQUEST['live']) && $_REQUEST['live']=='0' )
+    $initialModeIsLive=0;
 
 $initialDisplayInterval=1000;
 if(isset($_REQUEST['displayinterval']))
@@ -192,6 +222,7 @@ input[type=range]::-ms-tooltip {
   <div id="page">
     <div id="header">
       <div id="headerButtons">
+        <a href="./" "><?php echo translate('Console') ?></a>
         <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
       <h2><?php echo translate('Montage Review') ?></h2>
@@ -245,7 +276,7 @@ var liveMode=<?php echo $initialModeIsLive?>;
 var currentSpeed=<?php echo $speeds[$speedIndex]?>;  // slider scale, which is only for replay and relative to real time
 var speedIndex=<?php echo $speedIndex?>;
 var currentDisplayInterval=<?php echo $initialDisplayInterval?>;  // will be set based on performance, this is the display interval in milliseconds for history, and fps for live, and dynamically determined (in ms)
-var playSecsperInterval;         // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval;
+var playSecsperInterval=1;         // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
 var timerInterval;               // milliseconds between interrupts
 var timerObj;               // object to hold timer interval;
 var freeTimeLastIntervals=[];    // Percentage of current interval used in loading most recent image
@@ -410,7 +441,7 @@ foreach ($monitors as $m)
     echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d'); ";
     echo "  monitorNormalizeScale["  . $m['Id'] . "]=" . ( $m['Width'] * $m['Height'] / $avgArea ) . "; ";
     $zoomScale=1.0;
-    if(isset($_REQUEST[ 'z' . $m[Id] ]) )
+    if(isset($_REQUEST[ 'z' . $m['Id'] ]) )
         $zoomScale = floatval( validHtmlStr($_REQUEST[ 'z' . $m['Id'] ]) );
     echo "  monitorZoomScale["       . $m['Id'] . "]=" . $zoomScale . ";";
     echo "  monitorPtr["         . $numMonitors . "]=" . $m['Id'] . ";\n";
@@ -878,9 +909,9 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
         if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
         currentStr="&current=" + secs2dbstr(currentTimeSecs);
     }
-    var liveStr="";
+    var liveStr="&live=0";
     if(live==1)
-        liveStr="&live";
+        liveStr="&live=1";
     var zoomStr="";
     for(var i=0; i<numMonitors; i++)
         if(monitorZoomScale[monitorPtr[i]] < 0.99 || monitorZoomScale[monitorPtr[i]] > 1.01)  // allow for some up/down changes and just treat as 1 of almost 1

From 76c037f06ab63e4c379d070af3e0ac15741891b1 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Mon, 3 Aug 2015 16:36:14 -0400
Subject: [PATCH 025/362] Fix bug in scale calling to zms

---
 web/skins/classic/views/montagereview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 2ee386428..ab4867fc5 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -528,7 +528,7 @@ function SetImageSource(monId,val)
 {
     if(liveMode==1)
     {
-        var effectiveScale = monitorCanvasObj[monId].width / monitorWidth[monId];
+        var effectiveScale = 100 * monitorCanvasObj[monId].width / monitorWidth[monId];
         return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + "&cachekill=" + Math.random().toString();
     }
     else

From 278434ec3f2e46fcde1736db9019a94fb83cfda5 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Mon, 3 Aug 2015 22:00:00 -0400
Subject: [PATCH 026/362] Fix regression in last commit where ALL not working

---
 web/skins/classic/views/montagereview.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index ab4867fc5..99319fc5f 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -142,6 +142,13 @@ if ( isset($_REQUEST['minTime']) )
 if ( isset($_REQUEST['maxTime']) )
     $maxTime = validHtmlStr($_REQUEST['maxTime']);
 
+// AS a special case a "all" is passed in as an exterme interval - if so , clear them here and let the database query find them
+
+if ( (strtotime($maxTime) - strtotime($minTime))/(365*24*3600) > 30 ) // test years
+{
+    $minTime=null;
+    $maxTime=null;
+}
 
 if ( isset($_REQUEST['scale']) )
     $defaultScale=validHtmlStr($_REQUEST['scale']);
@@ -901,6 +908,11 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
     }
     if(maxSecs>0)
         minStr="&minTime=" + secs2dbstr(minSecs);
+    if(maxSecs==0 && minSecs==0)
+    {
+        minStr="&minTime=01/01/1950 12:00:00";
+        maxStr="&maxTime=12/31/2035 12:00:00";
+    }
     if(arch==0)
         archiveStr="&archive=0";
     var intervalStr="&displayinterval=" + currentDisplayInterval.toString();

From 3ce365ea8c15b46d90bf66f77e1c36104391c43e Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Thu, 6 Aug 2015 15:42:04 -0400
Subject: [PATCH 027/362] Tweaks to live display to remove sliders in fit mode
 and general fixes

---
 web/skins/classic/views/montagereview.php | 294 ++++++++++++----------
 1 file changed, 163 insertions(+), 131 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 99319fc5f..d685e096c 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -38,12 +38,12 @@
 //
 //        &live=1 whether to start in live mode, 1 = yes, 0 = no
 //
-//        &archive = if "1" then include archive frames, if "0" do not, default "1"
-//
 //        &z1, &z2, etc. = initial monitor specific zoom, numeral is a monitor id, default = 1.0, used in page reloads normally
 //
 //        &group = group number of monitors to display, comes from console if set, default is none (i.e. not limited by group)
 //
+//        &fit = if present then use fit-mode and ignore scale
+//
 
 // It takes very high bandwidth to the server, and a pretty fast client to keep up with the image rate.  To reduce the rate
 // change the playback slider to 0 and then it does not try to play at the same time it is scrubbing.
@@ -78,6 +78,13 @@
 //          - Change default to 1 hour and live mode (reduce workload on initial load, let people ask for huge history amounts)
 //          - Since this may be run as a standalone window for shortcuts, etc., add a "console" link to get back to the console
 //
+// August 6, 2015 update
+//          - Fix regression on linkage to events when starting and staying in live mode
+//          - Remove zoom/pan buttons in live mode as they are meaningless
+//          - Change "fit" to a button, and remove scale when fit is in use (this means fit/live has no sliders)
+//
+
+
 if ( !canView( 'Events' ) )
 {
     $view = "error";
@@ -150,10 +157,14 @@ if ( (strtotime($maxTime) - strtotime($minTime))/(365*24*3600) > 30 ) // test ye
     $maxTime=null;
 }
 
+$fitMode=1;
+if (isset($_REQUEST['fit']) && $_REQUEST['fit']=='0' )
+    $fitMode=0;
+
 if ( isset($_REQUEST['scale']) )
     $defaultScale=validHtmlStr($_REQUEST['scale']);
 else
-    $defaultScale=1.1; // fit
+    $defaultScale=1;
 
 $speeds=[0, 0.1, 0.25, 0.5, 0.75, 1.0, 1.5, 2, 3, 5, 10, 20, 50];
 
@@ -182,16 +193,6 @@ $initialDisplayInterval=1000;
 if(isset($_REQUEST['displayinterval']))
     $initialDisplayInterval=validHtmlStr($_REQUEST['displayinterval']);
 
-$archive=1;
-if (isset($_REQUEST['archive']) )
-    $archive=validHtmlStr($_REQUEST['archive']);
-
-if ($archive==0)
-{
-    $eventsSql .= " and E.Archived=0 ";
-    $frameSql .= " and E.Archived=0 ";
-}
-
 $eventsSql .= "group by E.Id,E.Name,E.StartTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId ";
 
 if( isset($minTime) && isset($maxTime) )
@@ -229,15 +230,14 @@ input[type=range]::-ms-tooltip {
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="./" "><?php echo translate('Console') ?></a>
+        <a href="./"><?php echo translate('Console') ?></a>
         <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
       <h2><?php echo translate('Montage Review') ?></h2>
     </div>
-
-    <div style='display: inline-flex; border: 1px solid black;'>
+    <div id='ScaleDiv' style='display: inline-flex; border: 1px solid black;'>
         <label style='margin:5px;' for=scaleslider><?php echo translate('Scale')?></label>
-        <input id=scaleslider type=range min=0.1 max=1.10 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='setScale(this.value)' oninput='showScale(this.value)'/>
+        <input id=scaleslider type=range min=0.1 max=1.0 value=<?php echo $defaultScale ?> step=0.10 width=20% onchange='setScale(this.value)' oninput='showScale(this.value)'/>
         <span style='margin:5px;' id=scaleslideroutput><?php echo number_format((float)$defaultScale,2,'.','')?> x</span>
     </div>
     <div id='SpeedDiv' style='display: inline-flex; border: 1px solid black;'>
@@ -246,16 +246,16 @@ input[type=range]::-ms-tooltip {
         <span style='margin:5px;' id=speedslideroutput><?php echo $speeds[$speedIndex] ?> fps</span>
     </div>
     <div style='display: inline-flex; border: 1px solid black; flex-flow: row wrap;'>
-        <button type='button' id=panleft   onclick='panleft()          '>&lt; <?php echo translate('Pan Left') ?></button>
-        <button type='button' id=zoomin    onclick='zoomin()           '><?php echo translate('Zoom In +') ?></button>
-        <button type='button' id=zoomout   onclick='zoomout()          '><?php echo translate('Zoom Out -') ?></button>
-        <button type='button' id=lasthour  onclick='lasthour()         '><?php echo translate('Last Hour') ?></button>
+        <button type='button' id=panleft   onclick='panleft()     '>&lt; <?php echo translate('Pan') ?></button>
+        <button type='button' id=zoomin    onclick='zoomin()           '><?php echo translate('In +') ?></button>
+        <button type='button' id=zoomout   onclick='zoomout()          '><?php echo translate('Out -') ?></button>
+        <button type='button' id=lasteight onclick='lastEight()        '><?php echo translate('8 Hour') ?></button>
+        <button type='button' id=lasthour  onclick='lastHour()         '><?php echo translate('1 Hour') ?></button>
         <button type='button' id=allof     onclick='allof()            '><?php echo translate('All Events') ?></button>
-        <button type='button' id=allnon    onclick='allnon()           '><?php echo translate('All Non-Archive') ?></button>
-        <button type='button' id=live      onclick='liveSet(1-liveMode)'><?php echo translate('Live Feed') ?></button>
-        <button type='button' id=panright  onclick='panright()         '><?php echo translate('Pan Right &gt;') ?></button>
+        <button type='button' id=live      onclick='setLive(1-liveMode)'><?php echo translate('Live') ?></button>
+        <button type='button' id=fit       onclick='setFit(1-fitMode)  '><?php echo translate('Fit') ?></button>
+        <button type='button' id=panright  onclick='panright()         '><?php echo translate('Pan') ?> &gt;</button>
     </div>
-
     <div id=timelinediv style='position:relative; width:93%;'>
         <canvas id=timeline style='border:1px solid;' onmousemove='mmove(event)' ontouchmove='tmove(event)' onmousedown='mdown(event)' onmouseup='mup(event)' onmouseout='mout(event)' ></canvas>
         <span id=scrubleft ></span>
@@ -280,6 +280,7 @@ echo "<script>\n";
 
 var currentScale=<?php echo $defaultScale?>;
 var liveMode=<?php echo $initialModeIsLive?>;
+var fitMode=<?php echo $fitMode?>;
 var currentSpeed=<?php echo $speeds[$speedIndex]?>;  // slider scale, which is only for replay and relative to real time
 var speedIndex=<?php echo $speedIndex?>;
 var currentDisplayInterval=<?php echo $initialDisplayInterval?>;  // will be set based on performance, this is the display interval in milliseconds for history, and fps for live, and dynamically determined (in ms)
@@ -520,17 +521,6 @@ function evaluateLoadTimes()
     $(fps).innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
 }
 
-function outputUpdate(val)
-{
-    drawSliderOnGraph(val);
-    for(var i=0; i<numMonitors; i++)
-    {
-            loadImage2Monitor(monitorPtr[i],SetImageSource(monitorPtr[i],val));
-    }
-    var currentTimeMS = new Date(val*1000);
-    currentTimeSecs=val;
-}
-
 function SetImageSource(monId,val)
 {
     if(liveMode==1)
@@ -603,59 +593,6 @@ function loadImage2Monitor(monId,url)
         monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
     }
 }
-
-function showScale(newscale) // updates slider only
-{
-    if(newscale == parseFloat($(scaleslider).max))
-        $(scaleslideroutput).innerHTML="Fit";
-    else
-        $(scaleslideroutput).innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
-    return;
-}
-
-function setScale(newscale) // makes actual change
-{
-    var ret=1;
-    showScale(newscale);
-    if(newscale == parseFloat($(scaleslider).max))
-    {
-        var vh=window.innerHeight;
-        var vw=window.innerWidth;
-        var pos=$(monitors).getPosition();
-        var mh=(vh - pos.y - $(fps).getSize().y);
-        $(monitors).setStyle('height',mh.toString() + "px");  // leave a small gap at bottom
-        ret=maxfit2($(monitors).getSize().x,$(monitors).getSize().y);   /// if we fail to fix we want to bubble up the failure so we can react
-    }
-    else
-    {
-        for(var i=0; i<numMonitors; i++)
-        {
-            monitorCanvasObj[monitorPtr[i]].width=monitorWidth[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
-            monitorCanvasObj[monitorPtr[i]].height=monitorHeight[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
-            monitorCanvasObj[monitorPtr[i]].style.position="";
-        }
-        $(monitors).setStyle('height',"auto");
-    }
-    outputUpdate(currentTimeSecs);
-    currentScale=newscale;
-    return ret;
-}
-function showSpeed(val) // updates slider only
-{
-    $(speedslideroutput).innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
-}
-
-function setSpeed(val)   // Note parameter is the index not the speed
-{
-    var t;
-    if(liveMode==1) return;  // we shouldn't actually get here but just in case
-    currentSpeed=parseFloat(speeds[val]);
-    speedIndex=val;
-    playSecsperInterval = currentSpeed * currentDisplayInterval / 1000;
-    showSpeed(val);
-    if( timerInterval != currentDisplayInterval || currentSpeed == 0 )  timerFire(); // if the timer isn't firing we need to trigger it to update
-}
-
 function timerFire()
 {
     // See if we need to reschedule
@@ -821,6 +758,72 @@ function drawGraph()
     return;
 }
 
+function redrawScreen()
+{
+    if(fitMode==0) // if we fit, then monitors were absolutely positioned already (or will be) otherwise release them to float
+    {
+        for(var i=0; i<numMonitors; i++)
+            monitorCanvasObj[monitorPtr[i]].style.position="";
+        $(monitors).setStyle('height',"auto");
+    }
+    if(liveMode==1) // if we are not in live view switch to history -- this has to come before fit in case we re-establish the timeline
+    {
+        $('SpeedDiv').style.display="none";
+        $('timelinediv').style.display="none";
+        $('live').innerHTML="History";
+        $('zoomin').style.display="none";
+        $('zoomout').style.display="none";
+        $('panleft').style.display="none";
+        $('panright').style.display="none";
+
+    }
+    else  // switch out of liveview mode
+    {
+        $('SpeedDiv').style.display="inline-flex";
+        $('timelinediv').style.display=null;
+        $('live').innerHTML="Live";
+        $('zoomin').style.display="inline-flex";
+        $('zoomout').style.display="inline-flex";
+        $('panleft').style.display="inline-flex";
+        $('panright').style.display="inline-flex";
+    }
+
+    if(fitMode==1)
+    {
+        $(ScaleDiv).style.display="none";
+        $(fit).innerHTML="Scale";
+        var vh=window.innerHeight;
+        var vw=window.innerWidth;
+        var pos=$(monitors).getPosition();
+        var mh=(vh - pos.y - $(fps).getSize().y);
+        $(monitors).setStyle('height',mh.toString() + "px");  // leave a small gap at bottom
+        if(maxfit2($(monitors).getSize().x,$(monitors).getSize().y) == 0)   /// if we fail to fix we back out of fit mode -- ??? This may need some better handling
+            fitMode=1-fitMode;
+    }
+    else  // switch out of fit mode
+    {
+        $(ScaleDiv).style.display="inline-flex";
+        $(fit).innerHTML="Fit";
+        setScale(currentScale);
+    }
+    drawGraph();
+    outputUpdate(currentTimeSecs);
+    timerFire();  // force a fire in case it's not timing
+}
+
+
+function outputUpdate(val)
+{
+    drawSliderOnGraph(val);
+    for(var i=0; i<numMonitors; i++)
+    {
+            loadImage2Monitor(monitorPtr[i],SetImageSource(monitorPtr[i],val));
+    }
+    var currentTimeMS = new Date(val*1000);
+    currentTimeSecs=val;
+}
+
+
 /// Found this here: http://stackoverflow.com/questions/55677/how-do-i-get-the-coordinates-of-a-mouse-click-on-a-canvas-element
 function relMouseCoords(event){
     var totalOffsetX = 0;
@@ -846,8 +849,8 @@ HTMLCanvasElement.prototype.relMouseCoords = relMouseCoords;
 
 var mouseisdown=false;
 function mdown(event) {mouseisdown=true; mmove(event)}
-function mup(event) {mouseisdown=false;}
-function mout(event) {mouseisdown=false;} // if we go outside treat it as release
+function mup(event)   {mouseisdown=false;}
+function mout(event)  {mouseisdown=false;} // if we go outside treat it as release
 function tmove(event) {mouseisdown=true; mmove(event);}
 
 function mmove(event)
@@ -865,33 +868,54 @@ function secs2dbstr (s)
     return st;
 }
 
-function liveSet(value)
+function setFit(value)
+{
+    fitMode=value;
+    redrawScreen();
+}
+
+function showScale(newscale) // updates slider only
+{
+    $(scaleslideroutput).innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
+    return;
+}
+
+function setScale(newscale) // makes actual change
+{
+    showScale(newscale);
+    for(var i=0; i<numMonitors; i++)
+    {
+        monitorCanvasObj[monitorPtr[i]].width=monitorWidth[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
+        monitorCanvasObj[monitorPtr[i]].height=monitorHeight[monitorPtr[i]]*monitorNormalizeScale[monitorPtr[i]]*monitorZoomScale[monitorPtr[i]]*newscale;
+    }
+    currentScale=newscale;
+}
+
+function showSpeed(val) // updates slider only
+{
+    $(speedslideroutput).innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
+}
+
+function setSpeed(val)   // Note parameter is the index not the speed
+{
+    var t;
+    if(liveMode==1) return;  // we shouldn't actually get here but just in case
+    currentSpeed=parseFloat(speeds[val]);
+    speedIndex=val;
+    playSecsperInterval = currentSpeed * currentDisplayInterval / 1000;
+    showSpeed(val);
+    if( timerInterval != currentDisplayInterval || currentSpeed == 0 )  timerFire(); // if the timer isn't firing we need to trigger it to update
+}
+
+function setLive(value)
 {
     liveMode=value;
-    if(liveMode==1) // if we are not in live view switch to
-    {
-        $(SpeedDiv).style.display="none";
-        $(timelinediv).style.display="none";
-        $(live).innerHTML="History";
-
-    }
-    else  // switch out of liveview mode
-    {
-        $(SpeedDiv).style.display="inline-flex";
-        $(timelinediv).style.display=null;
-        $(live).innerHTML="Live";
-    }
     redrawScreen();
-    timerFire();  // force a fire in case it's not timing
-}
-function redrawScreen()
-{
-    drawGraph();
-    return setScale(currentScale);  // this might be bubbling up an error
 }
 
+
 //vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-// The sceond below are to reload this program with new parameters
+// The section below are to reload this program with new parameters
 
 function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we can
 {
@@ -899,7 +923,6 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
     var minStr="";
     var maxStr="";
     var currentStr="";
-    var archiveStr="";
     if(minSecs>0)
     {
         if(maxSecs > now)
@@ -913,33 +936,41 @@ function clicknav(minSecs,maxSecs,arch,live)  // we use the current time if we c
         minStr="&minTime=01/01/1950 12:00:00";
         maxStr="&maxTime=12/31/2035 12:00:00";
     }
-    if(arch==0)
-        archiveStr="&archive=0";
     var intervalStr="&displayinterval=" + currentDisplayInterval.toString();
     if(minSecs && maxSecs)
     {
         if(currentTimeSecs > minSecs && currentTimeSecs < maxSecs)  // make sure time is in the new range
         currentStr="&current=" + secs2dbstr(currentTimeSecs);
     }
+
     var liveStr="&live=0";
     if(live==1)
         liveStr="&live=1";
+
+    var fitStr="&fit=0";
+    if(fitMode==1)
+        fitStr="&fit=1";
+
     var zoomStr="";
     for(var i=0; i<numMonitors; i++)
         if(monitorZoomScale[monitorPtr[i]] < 0.99 || monitorZoomScale[monitorPtr[i]] > 1.01)  // allow for some up/down changes and just treat as 1 of almost 1
             zoomStr += "&z" + monitorPtr[i].toString() + "=" + monitorZoomScale[monitorPtr[i]].toFixed(2);
 
     var groupStr=<?php if($group=="") echo '""'; else echo "\"&group=$group\""; ?>;
-    var uri = "?view=" + currentView + groupStr + minStr + maxStr + currentStr + intervalStr + liveStr + zoomStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + speeds[document.getElementById("speedslider").value] + "&archive=" + arch;
+    var uri = "?view=" + currentView + fitStr + groupStr + minStr + maxStr + currentStr + intervalStr + liveStr + zoomStr + "&scale=" + document.getElementById("scaleslider").value + "&speed=" + speeds[document.getElementById("speedslider").value];
     window.location=uri;
 }
 
-function lasthour()
+function lastHour()
 {
     var now = new Date() / 1000;
     clicknav(now - 3600 + 1, now,1,0);
 }
-
+function lastEight()
+{
+    var now = new Date() / 1000;
+    clicknav(now - 3600*8 + 1, now,1,0);
+}
 function zoomin()
 {
     rangeTimeSecs = parseInt(rangeTimeSecs / 2);
@@ -1105,19 +1136,18 @@ function maxfit2(divW, divH)
         return 0;
 }
 
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ End of handlers for reloading this program ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+// >>>>>>>>>>>>>>>> Handles individual monitor clicks and navigation to the standard event/watch display
 
-function showOneEvent(monId)  // link out to the normal view of one event's data
+function showOneMonitor(monId)  // link out to the normal view of one event's data
 {
     // We know the monitor, need to determine the event based on current time
-    for(var i=0; i<eId.length; i++)  // Display all we loaded
-    {
-        if(eMonId[i]==monId && currentTimeSecs >= eStartSecs[i] && currentTimeSecs <= eEndSecs[i])
-        {
-            var url = '?view=event&eid=' + eId[i] + '&fid=' + parseInt(Math.max(1, Math.min(eventFrames[i], eventFrames[i] * (currentTimeSecs - eStartSecs[i]) / (eEndSecs[i] - eStartSecs[i] + 1) ) ));
-            createPopup(url, 'zmEvent', 'event', monitorWidth[eMonId[i]], monitorHeight[eMonId[i]]);
-        }
-    }
+    var url;
+    if(liveMode!=0) url="?view=watch&mid=" + monId.toString();
+    else
+        for(var i=0; i<eId.length; i++)
+            if(eMonId[i]==monId && currentTimeSecs >= eStartSecs[i] && currentTimeSecs <= eEndSecs[i])
+                url="?view=event&eid=" + eId[i] + '&fid=' + parseInt(Math.max(1, Math.min(eventFrames[i], eventFrames[i] * (currentTimeSecs - eStartSecs[i]) / (eEndSecs[i] - eStartSecs[i] + 1) ) ));
+    createPopup(url, 'zmEvent', 'event', monitorWidth[eMonId[i]], monitorHeight[eMonId[i]]);
 }
 
 function zoom(monId,scale)
@@ -1138,14 +1168,16 @@ function clickMonitor(event,monId)
     var pos_y = event.offsetY ? (event.offsetY) : event.pageY - $("Monitor"+monId.toString()).offsetTop;
     if(pos_x < $("Monitor"+monId.toString()).width/4     && pos_y < $("Monitor"+monId.toString()).height/4) zoom(monId,1.15);
     else if(pos_x > $("Monitor"+monId.toString()).width * 3/4 && pos_y < $("Monitor"+monId.toString()).height/4) zoom(monId,1/1.15);
-    else showOneEvent(monId);
+    else showOneMonitor(monId);
     return;
 }
 
+// >>>>>>>>> Initialization that runs on window load by being at the bottom 
+
 drawGraph();
-setScale(currentScale);
 setSpeed(speedIndex);
-liveSet(liveMode);  // will redraw
+setFit(fitMode);  // will redraw 
+setLive(liveMode);  // will redraw
 window.addEventListener("resize",redrawScreen);
 
 </script>

From bf655b6656d371767ef242c0798c61e423c3050a Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Fri, 7 Aug 2015 22:26:03 -0400
Subject: [PATCH 028/362] Corrections from askers testing.

---
 web/graphics/NoDataImage.gif              | Bin 7002 -> 0 bytes
 web/skins/classic/views/montagereview.php |  61 ++++++++++++++++------
 2 files changed, 46 insertions(+), 15 deletions(-)
 delete mode 100644 web/graphics/NoDataImage.gif

diff --git a/web/graphics/NoDataImage.gif b/web/graphics/NoDataImage.gif
deleted file mode 100644
index ff97eb1a96f13e5caaba7a7707bea402a1be4e5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7002
zcmV-g8>Qq&Nk%w1VITuo0`wdJ9v&VwH8n>^M_E}}X=!PCdU}b8iI<m`rlzK|v$MOq
zyTQT1#l^+S%F52p&ePM=*x1<G+S=UQ+~MKj<>lq)=jZ9^>F)0C^78WY^Yi!j_xk$!
z|Ns900000000000A^8LV00000EC2ui03ZWc0ssa6ASaGwX`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjw0g~MyWjA*d`_?1
z@A$la&+q&HfPsR8goTEOh>41ejE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}
ztgWuEu(7hUw6(UkxVgH!yuH4^z`?@9#Kp$P$jQpf%+1cv(9zP<)YaD4*xB0K+}+;a
z;Njxq<mKk)=;`X~?CtLF@bU8V^!4`l`1$(#{Qds_00RmfNU)&6g9sBUT*$DY!-o(f
zN}NcsqQ#3CGiuz(v7^V2AVZ2ANwTELlPLaEs$9vkrOTHvW6GRKv!>0PICJXU$+M@=
zpFo2O9ZIyQ(W6L{DqYI7sne%Wqe`7hwW`&tShH%~%C)Q4uVBN99ZR;X*|TWVs$I*r
zt=qS7<I0^&x31m0c=PJr%eSxJzkmY^9!$8f;lqd%D_+dFvE#>(BTJr4xw7TUm@{kM
z%(=7Y&!9t#9!<Km>C>oFt6t5zwd>cgW6PdRySDAyxO3~?&AYen-@t<lA5Ofu@#Dyo
zD__pMx%21Hqf4Joy}I@5*t2Wj&b_<$@8H9WA5Xr#`Sa-0t6$H)z5Dm@<IA5<zrOwZ
z`19-E&%eL_{{RLk;D7`cXyAbeCjO}4f($nJUjz;yfPeu63;=+GLOHO2gai-(z=t4)
zh+$A6mT2OIBmQ*aiYWHvA&Vb6&;kN5mMG&DHL^(0i#hfP;*F#D_~B0h<S0M}EYRp9
zkW~m7A^|%(xnwC$s@S6eNeam%6;gf(<vcug$>IW33Tb7JWU8QKk6TV5=9lt>Ddvd?
zlp-Ml1;}aQnK=f4WD0BM*rpV3MmZ;ob*56|PX~0Ur-=oqut1(27HMLK2vmRtg&o!?
zfTM}ZlR%@7hB$zu6~cIcDvJt*rVEdPQDdn2)YxVQ37iP$DXo&&=btOY`o*mL*ouOM
zCGKiUuR!@2DGS1SLF_)p{+@8arL4j@l#pqv5N#LJ>Qk)=3z#TCwmQ1%qo2W^C@YM#
z;xldu8MvE@r7LbL<g+P!%SE`g!Z@f1$cmUssY9yEt+)0{3vaOkr*Ocj1xPrsC<wRM
ztds1b;BN~N;2CBB1RRh6us#61f`$_k5I~y?7$Crh10aAhy$HDMrOh}*m?yF&M_@w+
z8>R{($t5F@z@0fe`e_Rh5-{_JpJqyf&pL<rX~h@EFs}|F=NTf&Cf{5|1`aGOHJ0QW
zfUE!qXi7r@Zi7gG0c0W^fWA)hYr@AVRB*u5H5wpy4=RrUAp(u!8zQX<5I%OdBUE63
z<402tg9DetNPy7(F+|Y$p#Uh0v*fyh4)W+dnmxnUHVBUTiiWEYp~$FK8siA0=I*Ga
zs*iy7h7@8BzyKvgzGA#AWPpJ2AkO|I-%e^i0^lY%-{k?W+mJX1fwH(N2M$OdVgkZH
zUnBZ3Bv5dT0kGdf1qG0<HK5Qh-@E}`cKrhEGti!txQBx9tq4dN`%wuT;G;h|Ac1TH
znfZKVx}J!sV<o^I2_o=5Ck>!`H29tYQ<p#xp)UdXGm-pO5P=e^umvczUx`kTf%*+l
z1rbPL#BcyWIr+^59Gue!PcT9g0jYxrT;P&2aIGFO?*zHBUj=!hD;)yhha%9R2y#fe
zA?iScGCcm#1Xpx8Kpo0|QC!iftXQIR(F=)FIsq5O^h6l|5OWa(A{$}kMG_RzMk9#h
z2pHI-tO*hY5eVZHcS5If)yR5Uoa2cGkN^$A5ky$50T{z*zdV|t0+;j=@>1Z)NviIT
z*djp&LfN4Sx{+REJe46Imjl?<t3-8_q=_hLNf==fl?oKWA<4(dRHC2)d(6=ybwVc&
z*pNj>%3#B?7s@_nAY;}G;loS-%wp!KjH*l~jIzlAWU?rD96;FkQ1HwW4d8J6ThR(d
z@W*%h(M0R?-VX1HOBz-aSl1k93AzaYVEG7~g!Cqe&`E-f2|z+JtI;xZ(##B4F`pcW
z=l%=}2qSP-07kF8!S_POAyLjUjPoQx6HOF=iVd!CDA1^hJjsDHvb1}pG!Z(@7g7<V
z5S$#q+(cav#wViEqafvIx}>?($}vr$7#)F4XIg?pvS_F`X(ln}Wxy$Zltnb<Kqvu_
z(${U%j37Ok2m+c`xj8_GQ57EQ2ry5X?vjQAttyPlngR3C^pC+y=rl*r&eGLVhRpja
z?M^V(vf6c{OwE@HdQ^Zkz14FlNMTQfc~$CxC{!z5Q8ejk%o2q5h1~SzVG*?gR5CB8
zCSu-HlZC_R4Qz~1gpuo1mD?3rPq6(Q0V>-RzEO%4u_iceiOPz~OlIr^&z&qE{<nn6
zy_sOP=Q{yr6-LXoju8Os>}qB^dII2<$hya6k^fMMf_+wQyJn25aJ7|O`kDZ~Bnahh
zSL8Qf8h}akQ<?)n=r!b)K!-rx>Wa|YQ2RExsoK@83Cs)G{7U$~o#pOlH<%;PiI-f=
zA_0X%#85lBmxvA~!HGG$qM`b4#0iV+U;~+95-4`YEG{i<7i<8v{-CHO*l~qLTqA}?
zSH^piE`({k<Qto-y*1ugaOcZM($Y4yQ7!=h3#{JOrkKem8Weu7_T_YznFBETtH2z<
z<~Cy&L^hTZB?)X+7Rj=e`r~JdQvkaoKUlJSK68j`I%Y7JmQNcl!B_$QP^S+g`N|Py
zZF-ZaCP8-@!+Ul?*iKsJ$A$=~FlMv~3TwYd_laj;T(JS;m9a%8&d=97v!UGy<t2L>
zMDi`P1!Mb3D~9aQ1k-hnwW`lcqZQCvHnxhhOhW{Gcgf((D+%8GA)vaDf=U!qA158=
zNGEy(V|DdeV-0OsV_H|WMs^m*z3fc;YRV)K@{=6hZg-!X*qU7NKrKz_WZRpF;>59&
zOGMLK8}{C$!=O}!NN1wzo7eS5ce?St?sCg|*pT+Ox`WE@Sx-;HAF89lnT=*)mz+gq
z<#NB3x^aw$NX#T(>$T53^59u@<sQFai3v@|)#BWz@ILv!BaZ&sKjYZk8V9z^qlfUI
z=iE!44LJ%{DWwWZG|<Y{X4bLXa-kd1+mM?2qCaJ{uJ@Hi@k3G!SCnfh7J$GNn7P5Y
z{dFL=*#Qi_`o!yQ^dy@a&PtYe)9p6+ZznzDh?Y7ctIk-H*Qntv*fN#7{%}c;8tqmS
zL8w!p%Pxg=>44V(=K}7(7D!$N;l}!k%!YKN6aC|bKltlI)b^q8+Ua^OBy<O@`6}~J
z-?{hu;a?7R+*4Zs2)%gcg;d9iuW08nK-&mn_H0qp9gs3eAPPcl+`bRl`8b|E)Qb;$
za0}by%!GIfNKJBJZolJo{`tP4?RD%A-|!=t;BPO^f&Lm+-G3w3d@N8jmU1(q^F1op
zZ8G3~<pqBk(<ZL>bh3AU<3|GQH+K{`fr)2*DR6eW2SfmLR6eJG#}<B-muDOXZJWme
z<zplV0DZxCUXXVJs52<k#)0{^bs!Uh<n=cl7lELsff8ssz*JV~M^Svod3!WPV-#1R
z^m!(xgE5GK;s*dF)^Q@3Z70HD_>(LIa3=!>0|QqgnN(GAgJg9Cd@yi&D$s<Dw^%1|
zfmDMsYu9x{xOe3z0%K?@*>i+AL4qo9gM`;x3wARw761tre}IT$^v7=$7j0mbJQFlg
z3ott=2Lp0QGi?$f5k*!dP*`!bhX9~(S|@)n{sbeWc!-H8h!4d$&$a^RM{)^70CIyX
zV}w;Q5jBr;XSEYk%9H|Ql}A*Ef;50CHF9UP!YQ}-g(8puVsll@NInz-QXLXO@)kW1
z^<4qLI3-h6yO;wvCsBAtRl&E7C^L*F0);HFG!t@+sB!?A#{$8qN}<$z7FA5BGDs4l
zTv}r>&B!>Ycqc@rOpEp*NE3}YK~TFRc6ujA614zn^Mp4LYBhFC*k)!QsE{#sj|#Ob
ze>7S*ppkYqf4k%;sF;W?Ab0l1LJt{{kyvR8)gmI9D026A_9K8Xp^;r<PBGVv_VacV
zStz|HBwuoEUm}uIC`IojQSc}s5ZPw_FjxX3*FXa~C*%YxXY>Msm?J>B0tMM6ljlU>
zmm?*>liq}rFrkwxbA(&@l0n%ea6*w+W|UUuBU0IsRk$u+h>{{Om4Z^0U2=(7IVYtz
zZHJ<cs#JZ)vqxc>BQ#khRTXezsS|4HWwuvUikUg0CzJ~IfpiIpc6paMVmRHjD_`j&
z20&nSC?o-30D0FX0uYrcnUydQ0hwu#SLsilLMCn5nA1{|dSoOvQ$lF@5|z0Ew}zNf
z^_34bgHXena`|zesgV_=K4KJ)BNqVq)RwFXgU(ZZ18@LWDQAKS11d>;GT=Tv(ws8j
ze`2&kQ~63WIhMTFe+EZMm81Sc@uL+$^Mwh(mnTpGE#o)@P%*NZ2)I%JMRF<#z)-`8
zGzNeG3s7Qy$uY7SG895M1uCHphc+#vCz!GT0NMotT0Bo;pc6Sd0)RIspivZKG0sT@
z0-819$xw47OBOSt4Wc}pv{@<A5+Ye-KME5LaGE_*o<k}U8Sq&Dl{Wj>AzxXXN$L>`
zU_3s$L1QJQQ>qc}S#%w^S6gZl%LgKm*Mng?61c?z;fQ!=3KDGSOj6jU95Ge_0DVg;
zK5|MD-Gn!)qamzAj(Mu2w|OOjS`uR_CIXO~g~}0kN;>Shs3##iQnI3o3aKIy0cs;P
zrqUts7>1Vmsh}FFqW(Inq*|(`da9_Js;auGtlFxs`l_%RtFk()v|6jSdaJmatGc?Y
zyxOb2`m4Yitin31#9FMzdaTHrtjfBq%-XEZ`mE3zt<pNJ)LO09dac-+t=hV++}f?)
z`mNv^uHrhb<XW!gdamf2uIjq3?AosG`mXRAukt#t^jfd>dawAJull;L{MxVn`mX>R
zumU@<1Y58Md$0(bunN1d4BM~{`>+rju@XD66kD+td$Aasu^PLv9NV!T`>`M!vLZXO
zO|StMU;z^#0S?dr3P7?nkO2^~017a(3g7?_FaZ~^2p3QRDZ8>X`?E8<3KuW|IJ*I+
zS^*3Iv`VW0{s+nj7qGNYn+g_?v_IRlVVVIf3$;Ky0g3RmS_`zOFac0om|I!_GW)eZ
zo3n`EwP+i(rogsKtD{LOwrxwZmFfp@i?*lm0AJexmRbRI`?FlzwSn8RrqH&K3b=)<
z01IHWiJ$=!&}MpjxRV>G8gRBs+W?Mh0TOVwgS!Wis{t@jxn>Z$NMO1z-~eAswj&Y&
zT5AEH^tpJD0TYn5YU=`|D+aV{yG5|OGkd!&AOT-1w-~YkUmK%v0J&L9v%t#&t2+kD
z3$)GK1JRqdF|fQq>$iofxKWF@e7m&Ms{+pp1{d(XN*lg8P`*%$zA3N)*gLZh;JAV6
zx?21G2VX0{Eik@caKAvnzcNq(s=ELWK)flUy7k)!8t}C-pub&^zz6ID4&1%A`o3V>
z2YFk;FTlWDaKS$d1RPAWxSG3p@WF1I!CK3@Q9#0m>jNqr!V266bSuHQd%|E4!%GVU
zHmtNR{J_yS0S{onGYgRsPyzT00~s*1DvNg}P`*ja01f~FL_7mIjKMQJwk5CuKFqQL
zOu#8Hv_G7+co(Bn+`&IE#vp717cjJu%d#zSvJ()q(`x|`K(!4p0Yyv#SPaAtV8>`2
zxm2qFPCNmk8yo;k!G(*y8V~`P`?V1;$Q{VD5a0lR{Igpkyh|&)Dv-!*w#bXC0Mq`f
zzZU=jP`d!^y8;)W$g2xN8W71E(#h8Q0;{~quFSk7kj6yIW<0!BLmRV~Y-5vbx3F6R
ziOk7C%*7ml#lNhyp6VNxJj=gp0$A+I5^%?Z)V560%t{-~ETF=NYy!`F0YI#^n9Kqd
zV8~FLh};~wrM$$>EWIO;&SyLV*sQgna{<Y`wIhJV#0<0qJOTR*wd0%{X57uHWX^4?
zx!ZTp?|i&20MBjv$y&Pr2CcMBi#D#DU=EG8>s$gE{k6B7(Iqg@lx)#;t0`t1xH`H4
z=3BT{`x+u$x4=s@?W_O@Z36eK!^eEnjQau|t+fz6(?6@tDKO8AJH0)<zWy+9)Zn|&
zfg935J<6Tz$SB~x&b-mF5ze!GyD|;64Nw6mJJAnt0!_^UA`JmN{nVc9&1fCO)GPuT
zFwqLl(P(YeObyf@UARuY)-!F^?Q76%rqg!|8(8hi`E1ZNeawR$)N0+f8xX<geAZ7b
z)_Sb~0e#H>ytqQm0ZNV2kPXze9JpKZ(vyw0Qe6To{j&|=$n+bx!J)w>AkwAn*h<R)
zOPt0k49;I0*yZ)YCTz`btkW|a)+j*KL430j0Ne_|*9o1=JCNA%yaJH>#?B4D^g^_e
z8@LV7%9EXl+^e)VbJMg99Ij0QvJJE)Hqj`_$Y?78H89;PT*afz{>LIf)e+skzw7|u
zwAxFny~{1bJmB6lFy12Y(hLyAh>f-)I>;Ar*-U!^8*tOgJpu!bysshPTQs~UAkxAu
z+1Rb!joaS54d1g}+T|p|szkF4fWE+OJ0bqxEiU3fdodzC&KB^s>|K`Q-Q7T&*_tiR
z;!VS(^tB}3<1an}g$pbu%j26<<l+nD!ffIsAhtJ-0wT@g%q@CMz5*6r<s81$PwwO-
zV9?a8wHw|W7GC2_&duFZw+lewE0g6YAmC75%cczH0R97azQACf*ZytfKHcTYYy#y?
z#)}>3zp>>OuF-M+&_0moFiy#fe&sRH!YSbBE-vX>zUNW?&g32q=rR7<9&OvUt>aY8
z8y4=~7lXEy-L_MH>3yE*R_y7et^&0C!wf#_A_nI+VCj!evog-<e_rT@P6DUx*@v#_
zBQVja{<W)~+ig9Ox-RUWF6)Hez7v4lm`*;?el^=J?T}98z>d`3?&}k#*C-4diJtC0
zPVF??>aKpnql@euFy{k)>-5g+Sf1@EfasFm>Elk_C7{<Ie(bT%?f`G_3Xq73j_2L(
z=LH||S-t`8J=XmV?~UH@B*5>lKJUQ}@eeNoYu)CpE$<vp@(cg(C4BMvj`9No<@Bw!
zPVBSUj_)}@^RT|Ozuxa1pYddl@}T_y&z>6=uI&E%?!PD>-VDF;9*^^pzVXFww}M>P
z7Qfp{KLa-3<R8E3Ixp@^ue9S#@5piLP_DxK&GJET^#<Sa$WH1gUfPsi@toZQXy5e1
z4(eO)<z0`@3&haSq4689!j)a}Ob-NepZDKx_BQ>x>^$=rzvNYK_~Z`mcYnSHKhC18
zweHRw7M=kouk}zn<RDM-J=6GduIZeA<!?{*8$bGw&+}O?;o*+=uHVaizO)1H92U+2
zz<u8IjP-+`^Z*_2uP^v@Kj1>X__lB5!LRbmFZ{o6_Z!dmkUz8IJm^1L=2O?mBR~Ac
zAJIij!V3WUq0jxSFV2pu0XrK3U5)tc5B~dF8{y@2*<Ca7@{Rr#AOY*o?aY4u>7W1Y
zU;7}Sh$B~;<(QJEsj3rOKCaqa@ij$^Sj9guC>#=t#v?MRTr!)^Cp0RZQk}Vpgf?PK
zx>(<-p%p<+8?hFK^NtmZhj*fxI@)dZHPYrzz}LOk9EXJ+9|TX^f{uekOr2d?(<7vd
zT1kZjR-)GpM}&g|q86xH#ls{GX~_iystW^XnMnqv0%$0WY}GDrukSB#u<$Uk@I<YO
z0}E}NL&Ze}S}xEr@<?aYjP-~zM|ExYH)ZF>!Zv01iS~KA()xD0D<sT@b+`Ozi8v(7
z{<%VfVgd&eENJi`!h}iup^H)B{$Gj*8>s!m2Ib+ufZpusvxbc!L~aftYFvWxTuBc2
z?r^xkQ6;#J$YSUTDPp3+oH}>%?CBFBNIUIJ1cjvQN6|4Bp-9^%Gv-EQ79rS7^`ogZ
zCs=2iSUCoUOJw(;CROo+s?DW8*RpNv_U+HIR)1s=RcnETA#z=0pmGM~(}q!NEv;z>
zf`+m~OZ?rIQb}WLDZNGt3zc$;a9Mwx+!moP+|Z&&lP(=)Z!#g#C~?6l1a*pC8!(T6
zBWN(CMz|r}HX*?r4KBA0(^#N8#_U?Qp(LlY`~>Y6Enh~r6<BDH4HN8+X%Hc=>G0ym
zlP@17aVy{=9KZoR`oaVL^|shcsNi1V22<u5IGAvsF&Ybi62Sx({PzQV$<SxtF7U|*
z$^-QsXdV(7Owfub>=o!5g&lhMA&4Q0I3kH9ns_3LDXO?4i!HkNB8)N0I3tZU+IS<5
zIqJA0k3IVMBalG~IV6!q8hIp=Nh-M{lTAALB$QD~IVF`<T6rawS!%f@mtA`KC75A~
zIVPE9nt3LgX{xy<n{B%JCY*7~IVYWU+Ic6QdFr_*pMCoIC!m1}Iw+xq8hR+Ai7L7%
zqm4THD5Q}}Iw_@<T6!s_nQFQzr=5EGDX5`}Ix4B9ntCd#sj9jvtF5~FDy*@}IxDTU
z+IlOlx$3$ruf6{I`YW)(3Og*Z#Tt7ovdJpDEVIoz`z*B4N;@sJ)mnQkw%KaCEw|lz
z`z^TPiaRd3<(hjgy6LLBF1ziz`!2lk$~!N;_1b$czWM6AFTefz`!B!&3p_Bv1si-Y
z!U-$9FvATy{4m53OFS{f6<d5U#u;n8F~=Qy{4vNOi##&PC7XOQ$|<Y7GRrNy{4&fj
z%RDp9HQRhM&N=J6GtWKy{4>x&3q3T^MH_uI(n%}5G}BEx{WR23OFcE!Ra<>E)>&)4
zHP>Bx{WaKOi#;~kWt)9A+G(r3Hrs8x{Wjcj%RM*Ub=!S6-g)c2H{X5x{Wsu&3qCmE
zg&Tf2;_-<qzBuEJJN`K2kxM=~<&|50Ip&#bzB%Wed;U4-p^H8`>7|=~I_jybzB=oz
zyZ$=tvCBR??X}x}JMOvbzB})|`~Exd!3#e;@x>c|Jo3pazdZBJJO4cN(Mvx)_0?N{
zJ@(mazdiTed;dN7;fp^$`Q@8`KKkjazdrlzyZ=7?@ykCy{q@^_KmPgazd!%|`~N=x
z11P`&60m><JRkxSsK5m>uz?PIAOs^Q!3k2Zf)>0W1~aI^4RWx99{eB(Lny)#lCXp(
sJRu5GsKOPpu!SysAq-<E!x_@BhBmw*4s)o(9rCb;KKvmNUl;-aJ2k^{jsO4v

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index d685e096c..a3c523ec2 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -83,6 +83,11 @@
 //          - Remove zoom/pan buttons in live mode as they are meaningless
 //          - Change "fit" to a button, and remove scale when fit is in use (this means fit/live has no sliders)
 //
+// August 8, 2015 update:
+//          - Optimize events query to significantly decrease load times
+//          - Consolidate frames to 10 seconds not 1 for faster load and less memory usage
+//          - Replace graphic image for no-data with text-on-canvas (faster)
+//          - Correct sorting issue related to normalized scale so biggest goes to top left more reliably
 
 
 if ( !canView( 'Events' ) )
@@ -108,11 +113,22 @@ else
 // Note we round up just a bit on the end time as otherwise you get gaps, like 59.78 to 00 in the next second, which can give blank frames when moved through slowly.
 
 $eventsSql = "
-    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta+0.5 Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
-    from Events as E
-    inner join Monitors as M on (E.MonitorId = M.Id)
-    inner join Frames F on F.EventId=E.Id
-    where not isnull(E.Frames) and not isnull(StartTime) ";
+  select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,
+         case when E.EndTime is null then (Select UNIX_TIMESTAMP(DATE_ADD(E.StartTime, Interval max(Delta)+0.5 Second)) from Frames F where F.EventId=E.Id)
+              else UNIX_TIMESTAMP(E.EndTime)
+         end as CalcEndTimeSecs, E.Length,
+         case when E.Frames is null then (Select count(*) from Frames F where F.EventId=E.Id) else E.Frames end as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+  from Events as E
+  inner join Monitors as M on (E.MonitorId = M.Id)
+  where not isnull(E.Frames) and not isnull(StartTime) ";
+
+
+
+//    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta+0.5 Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+//    from Events as E
+//    inner join Monitors as M on (E.MonitorId = M.Id)
+//    inner join Frames F on F.EventId=E.Id
+//    where not isnull(E.Frames) and not isnull(StartTime) ";
 
 // Note that the delta value seems more accurate than the time stamp for some reason.
 $frameSql = "
@@ -354,7 +370,8 @@ else
     $maxTimeSecs = strtotime($maxTime);
 }
 
-// If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments
+// If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments 
+// comparison in else governs how aggressively it consolidates
 
 echo "var fMonId = [];\n";
 echo "var fTimeFromSecs = [];\n";
@@ -377,7 +394,7 @@ if($anyAlarms)
             $toSecs=$frame['TimeStampSecs'];
             $maxScore=$frame['Score'];
         }
-        else if ($mId != $frame['MonitorId'] || $frame['TimeStampSecs'] - $toSecs > 1) // dump this one start a new
+        else if ($mId != $frame['MonitorId'] || $frame['TimeStampSecs'] - $toSecs > 10) // dump this one start a new
         {
             $index++;
             echo "  fMonId[$index]=" . $mId . ";";
@@ -447,7 +464,7 @@ foreach ($monitors as $m)
     echo "  monitorLoadEndTimems["   . $m['Id'] . "]=0; ";
     echo "  monitorCanvasObj["       . $m['Id'] . "]=document.getElementById('Monitor" . $m['Id'] . "'); ";
     echo "  monitorCanvasCtx["       . $m['Id'] . "]=monitorCanvasObj[" . $m['Id'] . "].getContext('2d'); ";
-    echo "  monitorNormalizeScale["  . $m['Id'] . "]=" . ( $m['Width'] * $m['Height'] / $avgArea ) . "; ";
+    echo "  monitorNormalizeScale["  . $m['Id'] . "]=" . sqrt($avgArea / ($m['Width'] * $m['Height'] )) . "; ";
     $zoomScale=1.0;
     if(isset($_REQUEST[ 'z' . $m['Id'] ]) )
         $zoomScale = floatval( validHtmlStr($_REQUEST[ 'z' . $m['Id'] ]) );
@@ -525,7 +542,7 @@ function SetImageSource(monId,val)
 {
     if(liveMode==1)
     {
-        var effectiveScale = 100 * monitorCanvasObj[monId].width / monitorWidth[monId];
+        var effectiveScale = (100.0 * monitorCanvasObj[monId].width) / monitorWidth[monId];
         return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + "&cachekill=" + Math.random().toString();
     }
     else
@@ -541,7 +558,7 @@ function SetImageSource(monId,val)
                return img;
             }
         }
-        return "graphics/NoDataImage.gif";
+        return "no data";
     }
 }
 
@@ -588,9 +605,23 @@ function loadImage2Monitor(monId,url)
             monitorImageObject[monId].onload  = function() {imagedone(this, monId,true )};
             monitorImageObject[monId].onerror = function() {imagedone(this, monId,false)};
         }
-        monitorLoading[monId]=true;
-        monitorLoadStartTimems[monId]=new Date().getTime();
-        monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
+        if(url=='no data')
+        {
+            monitorCanvasCtx[monId].fillStyle="white";
+            monitorCanvasCtx[monId].fillRect(0,0,monitorCanvasObj[monId].width,monitorCanvasObj[monId].height);
+            var textSize=monitorCanvasObj[monId].width * 0.15;
+            var text="No Data";
+            monitorCanvasCtx[monId].font = "600 " + textSize.toString() + "px Arial";
+            monitorCanvasCtx[monId].fillStyle="black";
+            var textWidth = monitorCanvasCtx[monId].measureText(text).width;
+            monitorCanvasCtx[monId].fillText(text,monitorCanvasObj[monId].width/2 - textWidth/2,monitorCanvasObj[monId].height/2);
+        }
+        else
+        {
+            monitorLoading[monId]=true;
+            monitorLoadStartTimems[monId]=new Date().getTime();
+            monitorImageObject[monId].src=url;  // starts a load but doesn't refresh yet, wait until ready
+        }
     }
 }
 function timerFire()
@@ -1010,8 +1041,8 @@ function allnon()
 
 function compSize(a, b) // sort array by some size parameter  - height seems to work best.  A semi-greedy algorithm
 {
-    if      ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] >  monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b] ) return -1;
-    else if ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] == monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b])  return 0;
+    if      ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] * monitorNormalizeScale[a] * monitorZoomScale[a] >  monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b] * monitorNormalizeScale[b] * monitorZoomScale[b]) return -1;
+    else if ( monitorHeight[a] * monitorWidth[a] * monitorNormalizeScale[a] * monitorZoomScale[a] * monitorNormalizeScale[a] * monitorZoomScale[a] == monitorHeight[b] * monitorWidth[b] * monitorNormalizeScale[b] * monitorZoomScale[b] * monitorNormalizeScale[b] * monitorZoomScale[b])  return 0;
     else return 1;
 }
 

From 9d7dc0d81b7888959ba51d696baf4180503ef2f1 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Fri, 7 Aug 2015 23:27:26 -0400
Subject: [PATCH 029/362] Safari compatibility changes

---
 web/skins/classic/views/montagereview.php | 45 +++++++++++++++--------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index a3c523ec2..4a355da81 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -88,6 +88,7 @@
 //          - Consolidate frames to 10 seconds not 1 for faster load and less memory usage
 //          - Replace graphic image for no-data with text-on-canvas (faster)
 //          - Correct sorting issue related to normalized scale so biggest goes to top left more reliably
+//          - Corrections to Safari which won't support inline-flex (thanks Apple, really?!)
 
 
 if ( !canView( 'Events' ) )
@@ -535,7 +536,7 @@ function evaluateLoadTimes()
     currentDisplayInterval=Math.min(Math.max(currentDisplayInterval, 30),10000);   // limit this from about 30fps to .1 fps
     imageLoadTimesEvaluated=0;
     setSpeed(speedIndex);
-    $(fps).innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
+    $('fps').innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
 }
 
 function SetImageSource(monId,val)
@@ -684,7 +685,7 @@ function drawSliderOnGraph(val)
             ctx.strokeRect(sliderX+sliderLineWidth,sliderLineWidth,sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
             underSliderX=sliderX;
         }
-        var o = $(scruboutput);
+        var o = $('scruboutput');
         if(liveMode==1)
         {
             o.innerHTML="Live Feed @ " + (1000 / currentDisplayInterval).toFixed(1) + " fps";
@@ -712,7 +713,7 @@ function drawSliderOnGraph(val)
     // Because these change widths if the slider is too close, use the slider width as an estimate for the left/right label length (i.e. don't recalculate len from above)
     // If this starts to collide increase some of the extra space
 
-    var o = $(scrubleft);
+    var o = $('scrubleft');
     o.innerHTML=secs2dbstr(minTimeSecs);
     o.style.position="absolute";
     o.style.bottom=labbottom;
@@ -724,9 +725,12 @@ function drawSliderOnGraph(val)
     if(len + 10 > sliderX || cWidth < len * 4 )  // that last check is for very narrow browsers
         o.style.display="none";
     else
+    {
         o.style.display="inline";
+        o.style.display="inline-flex";  // safari won't take this but will just ignore
+    }
 
-    var o = $(scrubright);
+    var o = $('scrubright');
     o.innerHTML=secs2dbstr(maxTimeSecs);
     o.style.position="absolute";
     o.style.bottom=labbottom;
@@ -736,12 +740,15 @@ function drawSliderOnGraph(val)
     if(sliderX > cWidth - len - 20 || cWidth < len * 4 )
         o.style.display="none";
     else
+    {
         o.style.display="inline";
+        o.style.display="inline-flex";
+    }
 }
 
 function drawGraph()
 {
-    var divWidth=$(timelinediv).clientWidth
+    var divWidth=$('timelinediv').clientWidth
     canvas.width = cWidth = divWidth;   // Let it float and determine width (it should be sized a bit smaller percentage of window)
     canvas.height=cHeight = parseInt(window.innerHeight * 0.10);
     if(eId.length==0)
@@ -795,7 +802,7 @@ function redrawScreen()
     {
         for(var i=0; i<numMonitors; i++)
             monitorCanvasObj[monitorPtr[i]].style.position="";
-        $(monitors).setStyle('height',"auto");
+        $('monitors').setStyle('height',"auto");
     }
     if(liveMode==1) // if we are not in live view switch to history -- this has to come before fit in case we re-establish the timeline
     {
@@ -810,31 +817,37 @@ function redrawScreen()
     }
     else  // switch out of liveview mode
     {
+        $('SpeedDiv').style.display="inline";
         $('SpeedDiv').style.display="inline-flex";
         $('timelinediv').style.display=null;
         $('live').innerHTML="Live";
+        $('zoomin').style.display="inline";
         $('zoomin').style.display="inline-flex";
+        $('zoomout').style.display="inline";
         $('zoomout').style.display="inline-flex";
+        $('panleft').style.display="inline";
         $('panleft').style.display="inline-flex";
+        $('panright').style.display="inline";
         $('panright').style.display="inline-flex";
     }
 
     if(fitMode==1)
     {
-        $(ScaleDiv).style.display="none";
-        $(fit).innerHTML="Scale";
+        $('ScaleDiv').style.display="none";
+        $('fit').innerHTML="Scale";
         var vh=window.innerHeight;
         var vw=window.innerWidth;
-        var pos=$(monitors).getPosition();
-        var mh=(vh - pos.y - $(fps).getSize().y);
-        $(monitors).setStyle('height',mh.toString() + "px");  // leave a small gap at bottom
-        if(maxfit2($(monitors).getSize().x,$(monitors).getSize().y) == 0)   /// if we fail to fix we back out of fit mode -- ??? This may need some better handling
+        var pos=$('monitors').getPosition();
+        var mh=(vh - pos.y - $('fps').getSize().y);
+        $('monitors').setStyle('height',mh.toString() + "px");  // leave a small gap at bottom
+        if(maxfit2($('monitors').getSize().x,$('monitors').getSize().y) == 0)   /// if we fail to fix we back out of fit mode -- ??? This may need some better handling
             fitMode=1-fitMode;
     }
     else  // switch out of fit mode
     {
-        $(ScaleDiv).style.display="inline-flex";
-        $(fit).innerHTML="Fit";
+        $('ScaleDiv').style.display="inline";
+        $('ScaleDiv').style.display="inline-flex";
+        $('fit').innerHTML="Fit";
         setScale(currentScale);
     }
     drawGraph();
@@ -907,7 +920,7 @@ function setFit(value)
 
 function showScale(newscale) // updates slider only
 {
-    $(scaleslideroutput).innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
+    $('scaleslideroutput').innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
     return;
 }
 
@@ -924,7 +937,7 @@ function setScale(newscale) // makes actual change
 
 function showSpeed(val) // updates slider only
 {
-    $(speedslideroutput).innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
+    $('speedslideroutput').innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
 }
 
 function setSpeed(val)   // Note parameter is the index not the speed

From 7a76cb3df1e63d815ef78d3cbf4cd3cfb0a306fc Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Sun, 9 Aug 2015 12:24:04 -0400
Subject: [PATCH 030/362] Add security for those using authorization

---
 web/skins/classic/views/montagereview.php | 28 ++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 4a355da81..20a75b6da 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -89,7 +89,10 @@
 //          - Replace graphic image for no-data with text-on-canvas (faster)
 //          - Correct sorting issue related to normalized scale so biggest goes to top left more reliably
 //          - Corrections to Safari which won't support inline-flex (thanks Apple, really?!)
-
+//
+// August 9, 2015 updates:
+//          - Add auth tokens to zms call for those using authorization
+//
 
 if ( !canView( 'Events' ) )
 {
@@ -543,8 +546,27 @@ function SetImageSource(monId,val)
 {
     if(liveMode==1)
     {
+
+        authstr="<?php
+             $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+             if ( ZM_OPT_USE_AUTH )
+             {
+                 if ( ZM_AUTH_RELAY == "hashed" )
+                 {
+                     echo "&auth=" . generateAuthHash( ZM_AUTH_HASH_IPS );
+                 }
+                 elseif ( ZM_AUTH_RELAY == "plain" )
+                 {
+                     echo "&user=" . $_SESSION['username'] . "&pass=" . $_SESSION['password'];
+                 }
+                 elseif ( ZM_AUTH_RELAY == "none" )
+                 {
+                      echo "&user=" . $_SESSION['username'];
+                 }
+             }
+        ?>";
         var effectiveScale = (100.0 * monitorCanvasObj[monId].width) / monitorWidth[monId];
-        return "../cgi-bin/nph-zms?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + "&cachekill=" + Math.random().toString();
+        return "<?php echo $streamSrc?>?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + authstr + "&cachekill=" + Math.random().toString();
     }
     else
     {
@@ -555,7 +577,7 @@ function SetImageSource(monId,val)
             {
                 var frame=parseInt((val - eStartSecs[i])/(eEndSecs[i]-eStartSecs[i])*eventFrames[i])+1;
 //                img = ePath[i] + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
-                  img = "index.php?view=image&path=" + ePath[i].substring(6) + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg";
+                  img = "index.php?view=image&path=" + ePath[i].substring(6) + zeropad.substr(frame.toString().length) + frame.toString() + "-capture.jpg" + "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
                return img;
             }
         }

From 6425df76c78e2d6f38d6a4735a6cb22728c95926 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Sun, 9 Aug 2015 13:10:43 -0400
Subject: [PATCH 031/362] Switch to the standard routine in web functions
 include for auth

---
 web/skins/classic/views/montagereview.php | 24 +++--------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 20a75b6da..2769184c0 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -545,28 +545,10 @@ function evaluateLoadTimes()
 function SetImageSource(monId,val)
 {
     if(liveMode==1)
-    {
-
-        authstr="<?php
-             $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
-             if ( ZM_OPT_USE_AUTH )
-             {
-                 if ( ZM_AUTH_RELAY == "hashed" )
-                 {
-                     echo "&auth=" . generateAuthHash( ZM_AUTH_HASH_IPS );
-                 }
-                 elseif ( ZM_AUTH_RELAY == "plain" )
-                 {
-                     echo "&user=" . $_SESSION['username'] . "&pass=" . $_SESSION['password'];
-                 }
-                 elseif ( ZM_AUTH_RELAY == "none" )
-                 {
-                      echo "&user=" . $_SESSION['username'];
-                 }
-             }
-        ?>";
+    {   // This uses the standard php routine to set up the url and authentication, but because it is called repeatedly the built in random number is not usable, so one is appended below for two total (yuck)
         var effectiveScale = (100.0 * monitorCanvasObj[monId].width) / monitorWidth[monId];
-        return "<?php echo $streamSrc?>?mode=single&monitor=" + monId.toString() + "&scale=" + effectiveScale + authstr + "&cachekill=" + Math.random().toString();
+        var $x =  "<?php echo getStreamSrc( array("mode=single"),"&" )?>" + "&monitor=" + monId.toString() +  "&scale=" + effectiveScale +  Math.random().toString() ;
+        return $x;
     }
     else
     {

From 3b5638e54dd143443b796e7b6f7c2cee27bd8ce6 Mon Sep 17 00:00:00 2001
From: Linwood-F <Linwood-F@users.noreply.github.com>
Date: Sun, 9 Aug 2015 13:12:45 -0400
Subject: [PATCH 032/362] Fix omitted reference to gif file

---
 web/skins/classic/views/montagereview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 2769184c0..b9b5765fc 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -584,7 +584,7 @@ function imagedone(obj, monId, success)
     }
     monitorLoading[monId]=false;
     if(!success) // if we had a failrue queue up the no-data image
-        loadImage2Monitor(monId,"graphics/NoDataImage.gif");  // leave the staged URL if there is one, just ignore it here.
+        loadImage2Monitor(monId,"no data");  // leave the staged URL if there is one, just ignore it here.
     else
     {
         if(monitorLoadingStageURL[monId]=="") return;

From 95087beeb97a01ef38fdca5e1eaf888292e118b4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 12 Aug 2015 11:00:41 -0400
Subject: [PATCH 033/362] use return value of stat instead of just checking
 errno.  This has the added benefit of catching other errors when stating

---
 src/zm_event.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3e723fa48..72df9a1cf 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -119,13 +119,16 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
 
             struct stat statbuf;
             errno = 0;
-            stat( path, &statbuf );
-            if ( errno == ENOENT || errno == ENOTDIR )
-            {
-                if ( mkdir( path, 0755 ) )
-                {
-                    Fatal( "Can't mkdir %s: %s", path, strerror(errno));
-                }
+            if ( stat( path, &statbuf ) ) {
+				if ( errno == ENOENT || errno == ENOTDIR )
+				{
+					if ( mkdir( path, 0755 ) )
+					{
+						Fatal( "Can't mkdir %s: %s", path, strerror(errno));
+					}
+				} else {
+					Warning( "Error stat'ing %s, may be fatal. error is %s", path, strerror(errno));
+				}
             }
             if ( i == 2 )
                 strncpy( date_path, path, sizeof(date_path) );

From 89e13c1cc0c0e19a16137b16d28c3a6d467e4586 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 14 Aug 2015 16:10:44 -0400
Subject: [PATCH 034/362] leave 1 char at end for \0

---
 src/zm_monitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c6b8c167d..5822c106f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -325,10 +325,10 @@ Monitor::Monitor(
     timestamps( 0 ),
     images( 0 )
 {
-    strncpy( name, p_name, sizeof(name) );
+    strncpy( name, p_name, sizeof(name)-1 );
 
-    strncpy( event_prefix, p_event_prefix, sizeof(event_prefix) );
-    strncpy( label_format, p_label_format, sizeof(label_format) );
+    strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
+    strncpy( label_format, p_label_format, sizeof(label_format)-1 );
 
     // Change \n to actual line feeds
     char *token_ptr = label_format;

From 9117e2949a6359adc003d99a39ff274321be7ccd Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sun, 16 Aug 2015 10:52:47 -0400
Subject: [PATCH 035/362] add server.php.

---
 web/skins/classic/views/server.php | 99 ++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 web/skins/classic/views/server.php

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
new file mode 100644
index 000000000..c53bef2bc
--- /dev/null
+++ b/web/skins/classic/views/server.php
@@ -0,0 +1,99 @@
+<?php
+//
+// ZoneMinder web user view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+if ( !canEdit( 'System' ) )
+{
+    $view = "error";
+    return;
+}
+
+if ( $_REQUEST['id'] ) {
+	if ( !($newServer = dbFetchOne( 'SELECT * FROM Servers WHERE Id = ?', NULL, ARRAY($_REQUEST['id'])) ) ) {
+		$view = "error";
+		return;
+	}
+} else {
+	$newServer = array();
+	$newServer['Name'] = translate('NewServer');
+}
+
+$yesno = array( 0=>translate('No'), 1=>translate('Yes') );
+$nv = array( 'None'=>translate('None'), 'View'=>translate('View') );
+$nve = array( 'None'=>translate('None'), 'View'=>translate('View'), 'Edit'=>translate('Edit') );
+
+$sql = "select Id,Name from Monitors order by Sequence asc";
+$monitors = array();
+foreach( dbFetchAll( $sql ) as $monitor )
+{
+    $monitors[] = $monitor;
+}
+
+$focusWindow = true;
+
+xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
+?>
+<body>
+  <div id="page">
+    <div id="header">
+      <h2><?php echo translate('Server')." - ".$newServer['Name'] ?></h2>
+    </div>
+    <div id="content">
+      <form name="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this, <?php echo empty($newServer['Name'])?'true':'false' ?> )">
+        <input type="hidden" name="view" value="<?php echo $view ?>"/>
+        <input type="hidden" name="object" value="server"/>
+        <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
+        <input type="hidden" name="newServer[MonitorIds]" value="<?php echo $newServer['MonitorIds'] ?>"/>
+        <table id="contentTable" class="major" cellspacing="0">
+          <tbody>
+            <tr>
+              <th scope="row"><?php echo translate('ServerName') ?></th>
+              <td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td>
+            </tr>
+			<tr>
+              <th scope="row"><?php echo translate('RestrictedMonitors') ?></th>
+              <td>
+                <select name="monitorIds" size="4" multiple="multiple">
+<?php
+    foreach ( $monitors as $monitor )
+    {
+        if ( visibleMonitor( $monitor['Id'] ) )
+        {
+?>
+                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo htmlentities($monitor['Name']) ?></option>
+<?php
+        }
+    }
+?>
+                </select>
+              </td>
+            </tr>
+<?php
+}
+?>
+          </tbody>
+        </table>
+        <div id="contentButtons">
+          <input type="submit" value="<?php echo translate('Save') ?>"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+        </div>
+      </form>
+    </div>
+  </div>
+</body>
+</html>

From b3240bbc8f2c411ef5c501774c3ca30a677f88e9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sun, 16 Aug 2015 12:21:52 -0400
Subject: [PATCH 036/362] set name=action on submit tag, and remove stuff that
 we don't want right now

---
 web/skins/classic/views/server.php | 36 ++----------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index c53bef2bc..fa57a7e97 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -34,17 +34,6 @@ if ( $_REQUEST['id'] ) {
 	$newServer['Name'] = translate('NewServer');
 }
 
-$yesno = array( 0=>translate('No'), 1=>translate('Yes') );
-$nv = array( 'None'=>translate('None'), 'View'=>translate('View') );
-$nve = array( 'None'=>translate('None'), 'View'=>translate('View'), 'Edit'=>translate('Edit') );
-
-$sql = "select Id,Name from Monitors order by Sequence asc";
-$monitors = array();
-foreach( dbFetchAll( $sql ) as $monitor )
-{
-    $monitors[] = $monitor;
-}
-
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
@@ -59,38 +48,17 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="object" value="server"/>
         <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <input type="hidden" name="newServer[MonitorIds]" value="<?php echo $newServer['MonitorIds'] ?>"/>
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('ServerName') ?></th>
               <td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td>
             </tr>
-			<tr>
-              <th scope="row"><?php echo translate('RestrictedMonitors') ?></th>
-              <td>
-                <select name="monitorIds" size="4" multiple="multiple">
-<?php
-    foreach ( $monitors as $monitor )
-    {
-        if ( visibleMonitor( $monitor['Id'] ) )
-        {
-?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo htmlentities($monitor['Name']) ?></option>
-<?php
-        }
-    }
-?>
-                </select>
-              </td>
-            </tr>
-<?php
-}
-?>
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <input type="submit" name="action" value="<?php echo translate('Save') ?>"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>

From 99d674ef788a4ec32a9f39205563a068b7d604ce Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sun, 16 Aug 2015 12:22:31 -0400
Subject: [PATCH 037/362] remove code that put a * next to the server name. It
 was copied from the user list and indicated the logged in user.

---
 web/skins/classic/views/options.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 5e335ce43..92d019666 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -225,7 +225,7 @@ elseif ( $tab == "users" )
           <tbody>
 <?php foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) { ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Name']).($user['Name']==$row['Name']?"*":""), $canEdit ) ?></td>
+              <td class="colName"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Name']), $canEdit ) ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
 			</tr>
 <?php } #end foreach Server ?>

From 41637278c95abd45175ae2046da95a4964310423 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 19 Aug 2015 16:08:12 -0400
Subject: [PATCH 038/362] merge master

---
 docs/installationguide/centos.rst             |   5 -
 docs/installationguide/debian.rst             |  37 -----
 docs/installationguide/fedora.rst             |   4 -
 docs/installationguide/index.rst              |  12 --
 docs/installationguide/ubuntu.rst             |  52 -------
 misc/apache.conf.in                           |   8 +-
 .../lib/ZoneMinder/ConfigData.pm.in           |   2 +-
 src/zm_monitor.cpp                            | 145 ++----------------
 src/zm_monitor.h                              |   2 +-
 web/api/.gitattributes                        |  33 ----
 web/api/.gitignore                            |  21 ---
 web/api/app/Config/core.php                   |   4 +-
 web/skins/classic/includes/functions.php      |   1 -
 13 files changed, 20 insertions(+), 306 deletions(-)
 delete mode 100644 docs/installationguide/centos.rst
 delete mode 100644 docs/installationguide/debian.rst
 delete mode 100644 docs/installationguide/fedora.rst
 delete mode 100644 docs/installationguide/index.rst
 delete mode 100644 docs/installationguide/ubuntu.rst
 delete mode 100644 web/api/.gitattributes
 delete mode 100644 web/api/.gitignore

diff --git a/docs/installationguide/centos.rst b/docs/installationguide/centos.rst
deleted file mode 100644
index 606aaffd5..000000000
--- a/docs/installationguide/centos.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Centos
-======
-
-
-
diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
deleted file mode 100644
index 9294ebeb6..000000000
--- a/docs/installationguide/debian.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-Debian
-======
-
-A fresh build based on master branch running Debian 7 (wheezy)\:
-::
-
-  root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-  root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-  root@host:~# cd zoneminder;
-  root@host:~# ln -s distros/debian;
-  root@host:~# dpkg-checkbuilddeps;
-  root@host:~# dpkg-buildpackage;
-
-One level above you'll now find a deb package matching the architecture of the build host:
-::
-
-  root@host:~# ls -1 ~/zoneminder*;
-  /root/zoneminder_1.26.4-1_amd64.changes
-  /root/zoneminder_1.26.4-1_amd64.deb
-  /root/zoneminder_1.26.4-1.dsc
-  /root/zoneminder_1.26.4-1.tar.gz
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
-::
-
-  root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-  root@host:~# dpkg-reconfigure zoneminder;
-
-Alternatively you may also use gdebi to automatically resolve dependencies during installation:
-::
-
-  root@host:~# aptitude install -y gdebi;
-  root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-
diff --git a/docs/installationguide/fedora.rst b/docs/installationguide/fedora.rst
deleted file mode 100644
index 09ffe4297..000000000
--- a/docs/installationguide/fedora.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fedora
-======
-
-
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
deleted file mode 100644
index 58a8f4b21..000000000
--- a/docs/installationguide/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Installation Guide
-======================================
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   ubuntu
-   debian
-   fedora
-   centos
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
deleted file mode 100644
index 4f6d8289d..000000000
--- a/docs/installationguide/ubuntu.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-Ubuntu
-======
-
-PPA Install
------------
-Follow these instructions to install current release version on Ubuntu.:
-
-  sudo apt-add-repository ppa:iconnor/zoneminder
-
-Once you have updated the repository then update and install the package.:
-  
-  sudo apt-get update
-  sudo apt-get install zoneminder
-
-
-
-Build Package From Source
--------------------------
-
-A fresh build based on master branch running Ubuntu 1204 LTS.  Will likely work for other versions as well.::
-
-  root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-  root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-  root@host:~# cd zoneminder;
-  root@host:~# ln -s distros/ubuntu1204 debian;
-  root@host:~# dpkg-checkbuilddeps;
-  root@host:~# dpkg-buildpackage;
-
-
-One level above you'll now find a deb package matching the architecture of the build host\:::
-
-  root@host:~# ls -1 ~/zoneminder\*;
-  /root/zoneminder_1.26.4-1_amd64.changes
-  /root/zoneminder_1.26.4-1_amd64.deb
-  /root/zoneminder_1.26.4-1.dsc
-  /root/zoneminder_1.26.4-1.tar.gz
-
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.::
-
-  root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-  root@host:~# dpkg-reconfigure zoneminder;
-
-Alternatively you may also use gdebi to automatically resolve dependencies during installation\:::
-
-  root@host:~# aptitude install -y gdebi;
-  root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-
-  sudo apt-get install apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli
diff --git a/misc/apache.conf.in b/misc/apache.conf.in
index 06c9beb15..7fd0a1617 100644
--- a/misc/apache.conf.in
+++ b/misc/apache.conf.in
@@ -14,17 +14,19 @@
         AllowOverride All
     </Directory>
 
-    ScriptAlias /cgi-bin/ "@CGI_PREFIX@"
+    # Remember to enable cgi mod (i.e. "a2enmod cgi").
+    ScriptAlias /cgi-bin "@CGI_PREFIX@"
     <Directory "@CGI_PREFIX@">
         Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
         AllowOverride All
+        Require all granted
     </Directory>
 
     # Use the first option to have Apache logs written to the general log
     # directory, or the second to have them written to the regular Apache
     # directory (you may have to change the path to that used on your system)
     ErrorLog @ZM_LOGDIR@/apache-error.log
-    ErrorLog /var/log/httpd/zm-error.log
+#    ErrorLog /var/log/httpd/zm-error.log
 
     # Possible values include: debug, info, notice, warn, error, crit,
     # alert, emerg.
@@ -34,6 +36,6 @@
     # directory, or the second to have them written to the regular Apache
     # directory (you may have to change the path to that used on your system)
     CustomLog @ZM_LOGDIR@/apache-access.log combined
-    CustomLog /var/log/httpd/zm-access.log combined
+#    CustomLog /var/log/httpd/zm-access.log combined
 
 </VirtualHost>
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index e55e856e4..8b42a2274 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -428,7 +428,7 @@ our @options =
     },
     {
         name        => "ZM_PATH_ZMS",
-        default     => "/cgi-bin/nph-zms",
+        default     => "/zm/cgi-bin/nph-zms",
         description => "Web path to zms streaming server",
         help        => qqq("
             The ZoneMinder streaming server is required to send streamed
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 017c12502..df1174e36 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2013,7 +2013,7 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
 #if ZM_HAS_V4L
 int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose )
 {
-	std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
+	std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
 ;
     if ( device[0] ) {
 		sql += " AND Device='";
@@ -2196,7 +2196,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 
 int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose )
 {
-    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
+    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
     if ( staticConfig.SERVER_ID ) {
         sql += " AND ServerId='";
         sql += staticConfig.SERVER_ID;
@@ -2373,7 +2373,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 
 int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose )
 {
-        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'File'";
+        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'File'";
     if ( file[0] ) {
 		sql += " AND Path='";
 		sql += file;
@@ -2516,7 +2516,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 #if HAVE_LIBAVFORMAT
 int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose )
 {
-        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Ffmpeg'";
+        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Ffmpeg'";
     if ( file[0] ) {
 		sql += " AND Path = '";
 		sql += file;
@@ -2663,7 +2663,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 
 Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
 {
-    std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", p_id );
+    std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", p_id );
 
 	MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
     if ( ! dbrow ) {
@@ -2704,7 +2704,6 @@ Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
 		v4l_captures_per_frame = config.captures_per_frame;
 	}
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-<<<<<<< HEAD
 	col++;
 
 	std::string protocol = dbrow[col]; col++;
@@ -2732,6 +2731,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 
 	int label_x = atoi(dbrow[col]); col++;
 	int label_y = atoi(dbrow[col]); col++;
+	int label_size = atoi(dbrow[col]); col++;
 
 	int image_buffer_count = atoi(dbrow[col]); col++;
 	int warmup_count = atoi(dbrow[col]); col++;
@@ -2742,6 +2742,8 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 	int section_length = atoi(dbrow[col]); col++;
 	int frame_skip = atoi(dbrow[col]); col++;
 	int motion_frame_skip = atoi(dbrow[col]); col++;
+	double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+	unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
 	int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
 	int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
 	int fps_report_interval = atoi(dbrow[col]); col++;
@@ -2764,71 +2766,6 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 	Camera *camera = 0;
 	if ( type == "Local" )
 	{
-=======
-        col++;
-
-        std::string protocol = dbrow[col]; col++;
-        std::string method = dbrow[col]; col++;
-        std::string host = dbrow[col]; col++;
-        std::string port = dbrow[col]; col++;
-        std::string path = dbrow[col]; col++;
-        std::string options = dbrow[col]; col++;
-        std::string user = dbrow[col]; col++;
-        std::string pass = dbrow[col]; col++;
-
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        int palette = atoi(dbrow[col]); col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
-
-        std::string event_prefix = dbrow[col]; col++;
-        std::string label_format = dbrow[col]; col++;
-
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
-        int label_size = atoi(dbrow[col]); col++;
-
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-        unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
-
-        int signal_check_colour;
-        if ( dbrow[col][0] == '#' )
-            signal_check_colour = strtol(dbrow[col]+1,0,16);
-        else
-            signal_check_colour = strtol(dbrow[col],0,16);
-        col++;
-        bool embed_exif = (*dbrow[col] != '0'); col++;
-
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-        int extras = (deinterlacing>>24)&0xff;
-
-        Camera *camera = 0;
-        if ( type == "Local" )
-        {
->>>>>>> master
 #if ZM_HAS_V4L
 		camera = new LocalCamera(
 			id,
@@ -2977,7 +2914,6 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 #else // HAVE_LIBCURL
 		Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
 #endif // HAVE_LIBCURL
-<<<<<<< HEAD
 	}
 	else
 	{
@@ -2996,6 +2932,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 		event_prefix.c_str(),
 		label_format.c_str(),
 		Coord( label_x, label_y ),
+		label_size,
 		image_buffer_count,
 		warmup_count,
 		pre_event_count,
@@ -3005,6 +2942,8 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 		section_length,
 		frame_skip,
 		motion_frame_skip,
+		analysis_fps,
+		analysis_update_delay,
 		capture_delay,
 		alarm_capture_delay,
 		fps_report_interval,
@@ -3027,68 +2966,6 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 		monitor->AddZones( n_zones, zones );
 	}
 	Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
-=======
-        }
-        else
-        {
-            Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
-        }
-        monitor = new Monitor(
-            id,
-            name.c_str(),
-            function,
-            enabled,
-            linked_monitors.c_str(),
-            camera,
-            orientation,
-            deinterlacing,
-            event_prefix.c_str(),
-            label_format.c_str(),
-            Coord( label_x, label_y ),
-            label_size,
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            analysis_fps,
-            analysis_update_delay,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            signal_check_colour,
-            embed_exif,
-            purpose,
-            0,
-            0
-
-        );
-
-        int n_zones = 0;
-        if ( load_zones )
-        {
-            Zone **zones = 0;
-            n_zones = Zone::Load( monitor, zones );
-            monitor->AddZones( n_zones, zones );
-        }
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
-
->>>>>>> master
     return( monitor );
 }
 
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index d75d4a856..46ace886a 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -307,7 +307,7 @@ protected:
 public:
 // OurCheckAlarms seems to be unused. Check it on zm_monitor.cpp for more info.
 //bool OurCheckAlarms( Zone *zone, const Image *pImage );
-	Monitor( int p_id, const char *p_name, unsigned int p_server_id, int p_function, bool p_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, unsigned int p_deinterlacing, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord, int p_image_buffer_count, int p_warmup_count, int p_pre_event_count, int p_post_event_count, int p_stream_replay_buffer, int p_alarm_frame_count, int p_section_length, int p_frame_skip, int p_motion_frame_skip, double p_analysis_fps, unsigned int p_analysis_update_delay, int p_capture_delay, int p_alarm_capture_delay, int p_fps_report_interval, int p_ref_blend_perc, int p_alarm_ref_blend_perc, bool p_track_motion, Rgb p_signal_check_colour, bool p_embed_exif, Purpose p_purpose, int p_n_zones=0, Zone *p_zones[]=0 );
+	Monitor( int p_id, const char *p_name, unsigned int p_server_id, int p_function, bool p_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, unsigned int p_deinterlacing, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord, int label_size, int p_image_buffer_count, int p_warmup_count, int p_pre_event_count, int p_post_event_count, int p_stream_replay_buffer, int p_alarm_frame_count, int p_section_length, int p_frame_skip, int p_motion_frame_skip, double p_analysis_fps, unsigned int p_analysis_update_delay, int p_capture_delay, int p_alarm_capture_delay, int p_fps_report_interval, int p_ref_blend_perc, int p_alarm_ref_blend_perc, bool p_track_motion, Rgb p_signal_check_colour, bool p_embed_exif, Purpose p_purpose, int p_n_zones=0, Zone *p_zones[]=0 );
 	~Monitor();
 
 	void AddZones( int p_n_zones, Zone *p_zones[] );
diff --git a/web/api/.gitattributes b/web/api/.gitattributes
deleted file mode 100644
index fc3f49166..000000000
--- a/web/api/.gitattributes
+++ /dev/null
@@ -1,33 +0,0 @@
-# Define the line ending behavior of the different file extensions
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
-*.php text
-*.default text
-*.ctp text
-*.sql text
-*.md text
-*.po text
-*.js text
-*.css text
-*.ini text
-*.properties text
-*.txt text
-*.xml text
-*.yml text
-.htaccess text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.bat eol=crlf
-
-# Declare files that will always have LF line endings on checkout.
-*.pem eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
-*.gif binary
-*.ico binary
-*.mo binary
\ No newline at end of file
diff --git a/web/api/.gitignore b/web/api/.gitignore
deleted file mode 100644
index 4a1adb886..000000000
--- a/web/api/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# User specific & automatically generated files #
-#################################################
-/app/Config/database.php
-/app/tmp
-/lib/Cake/Console/Templates/skel/tmp/
-/plugins
-/vendors
-/build
-/dist
-/tags
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
\ No newline at end of file
diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 34f8e5ec4..a698a4ea0 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -222,12 +222,12 @@
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', 'ycA4zI3Xb3Eb640RoiWehDeQCHDqKlwBFDK7aSLI');
+	Configure::write('Security.salt', '4AlwR5ePsf7gY8OxBCp1ftqw5pHhY7bQIJWwSRSB');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '41940792832193579176474142058');
+	Configure::write('Security.cipherSeed', '65025553361572663298232797852');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 683f1a270..c9328563f 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -67,7 +67,6 @@ function xhtmlHeaders( $file, $title )
 ?>
   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
-  <script type="text/javascript" src="js/mootools.ext.js"></script>
   <script type="text/javascript" src="js/logger.js"></script>
   <script type="text/javascript" src="js/overlay.js"></script>
 <?php

From 0184d2501621b17af2184e78531d114f75afe642 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:08:42 -0400
Subject: [PATCH 039/362] restore missing docs

---
 docs/installationguide/centos.rst |  5 +++++
 docs/installationguide/debian.rst | 37 +++++++++++++++++++++++++++++++
 docs/installationguide/fedora.rst |  4 ++++
 docs/installationguide/index.rst  | 12 ++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 docs/installationguide/centos.rst
 create mode 100644 docs/installationguide/debian.rst
 create mode 100644 docs/installationguide/fedora.rst
 create mode 100644 docs/installationguide/index.rst

diff --git a/docs/installationguide/centos.rst b/docs/installationguide/centos.rst
new file mode 100644
index 000000000..606aaffd5
--- /dev/null
+++ b/docs/installationguide/centos.rst
@@ -0,0 +1,5 @@
+Centos
+======
+
+
+
diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
new file mode 100644
index 000000000..9294ebeb6
--- /dev/null
+++ b/docs/installationguide/debian.rst
@@ -0,0 +1,37 @@
+Debian
+======
+
+A fresh build based on master branch running Debian 7 (wheezy)\:
+::
+
+  root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
+
+  root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
+  root@host:~# cd zoneminder;
+  root@host:~# ln -s distros/debian;
+  root@host:~# dpkg-checkbuilddeps;
+  root@host:~# dpkg-buildpackage;
+
+One level above you'll now find a deb package matching the architecture of the build host:
+::
+
+  root@host:~# ls -1 ~/zoneminder*;
+  /root/zoneminder_1.26.4-1_amd64.changes
+  /root/zoneminder_1.26.4-1_amd64.deb
+  /root/zoneminder_1.26.4-1.dsc
+  /root/zoneminder_1.26.4-1.tar.gz
+
+The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
+
+To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
+::
+
+  root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
+  root@host:~# dpkg-reconfigure zoneminder;
+
+Alternatively you may also use gdebi to automatically resolve dependencies during installation:
+::
+
+  root@host:~# aptitude install -y gdebi;
+  root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
+
diff --git a/docs/installationguide/fedora.rst b/docs/installationguide/fedora.rst
new file mode 100644
index 000000000..09ffe4297
--- /dev/null
+++ b/docs/installationguide/fedora.rst
@@ -0,0 +1,4 @@
+Fedora
+======
+
+
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
new file mode 100644
index 000000000..58a8f4b21
--- /dev/null
+++ b/docs/installationguide/index.rst
@@ -0,0 +1,12 @@
+Installation Guide
+======================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   ubuntu
+   debian
+   fedora
+   centos

From 53159ed12ca0e48275b819cde2c912ea966d08ec Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:10:05 -0400
Subject: [PATCH 040/362] restore changelog to keep PR clean

---
 distros/ubuntu1504/changelog | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/distros/ubuntu1504/changelog b/distros/ubuntu1504/changelog
index 47a2032bb..9dea00498 100644
--- a/distros/ubuntu1504/changelog
+++ b/distros/ubuntu1504/changelog
@@ -6,24 +6,6 @@ zoneminder (1.28.1+1-vivid-SNAPSHOT2015071501) vivid; urgency=medium
 
  -- Isaac Connor <iconnor@connortechnology.com>  Wed, 15 Jul 2015 11:56:28 -0400
 
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015070402) vivid; urgency=medium
-
-  * Correct PRIMARY KEY update code on States table
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 07 Jul 2015 15:40:21 -0400
-
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015070401) vivid; urgency=medium
-
-  * Bump actual version # so that db upgrade scripts run
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 07 Jul 2015 12:44:55 -0400
-
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015070301) vivid; urgency=medium
-
-  * initial merge of api.  Various other small fixes/improvements.
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 06 Jul 2015 15:59:08 -0400
-
 zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium
 
   * maybe fix for RTSP Basic Auth

From 80a294da348afcfcc116479a811fcf135a45aa2b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:10:13 -0400
Subject: [PATCH 041/362] tabs to spaces

---
 scripts/zmfilter.pl.in | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 4280f4e48..d98d31809 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -349,10 +349,10 @@ sub getFilters
                         my ( $temp_attr_name ) = $filter_expr->{terms}[$i]->{attr} =~ /^Monitor(.+)$/;
                         $db_filter->{Sql} .= "M.".$temp_attr_name;
                     }
-					elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' )
-					{
-						$db_filter->{Sql} .= "M.ServerId";
-					}
+                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' )
+                    {
+                        $db_filter->{Sql} .= "M.ServerId";
+                    }
                     elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' )
                     {
                         $db_filter->{Sql} .= "E.StartTime";
@@ -396,13 +396,13 @@ sub getFilters
                         {
                             $value = "'$temp_value'";
                         }
-						elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' ) {
-							if ( $temp_value eq 'ZM_SERVER_ID' ) {
-								$value = "'$Config{ZM_SERVER_ID}'";
-							} else {
-								$value = "'$temp_value'";
-							}
-						}
+                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' ) {
+                            if ( $temp_value eq 'ZM_SERVER_ID' ) {
+                                $value = "'$Config{ZM_SERVER_ID}'";
+                            } else {
+                                $value = "'$temp_value'";
+                            }
+                        }
                         elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name'
                                 || $filter_expr->{terms}[$i]->{attr} eq 'Cause'
                                 || $filter_expr->{terms}[$i]->{attr} eq 'Notes'

From 9cdf8ec31780b0d2c81307237aa14a09b163b26e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:13:44 -0400
Subject: [PATCH 042/362] tabs to spaces

---
 scripts/zmpkg.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 38f19275e..97b3eff18 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -121,7 +121,7 @@ my $retval = 0;
 if ( $command eq "state" )
 {
     Info( "Updating DB: $state->{Name}\n" );
-	my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=? ORDER BY Id ASC' : 'SELECT * FROM Monitors ORDER BY Id ASC';
+    my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=? ORDER BY Id ASC' : 'SELECT * FROM Monitors ORDER BY Id ASC';
     my $sth = $dbh->prepare_cached( $sql )
         or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID}: () )
@@ -226,7 +226,7 @@ if ( $command =~ /^(?:start|restart)$/ )
         zmMemTidy();
         runCommand( "zmdc.pl startup" );
 
-		my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
+        my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
         my $sth = $dbh->prepare_cached( $sql )
             or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )

From bca9a194888603afda09b026139c779382e8f174 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:14:00 -0400
Subject: [PATCH 043/362] tabs to spaces

---
 src/zm_monitor.cpp | 980 ++++++++++++++++++++++-----------------------
 1 file changed, 490 insertions(+), 490 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 3b5c69cd4..6f9f0e9fa 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -263,7 +263,7 @@ bool Monitor::MonitorLink::hasAlarmed()
 Monitor::Monitor(
     int p_id,
     const char *p_name,
-	const unsigned int p_server_id,
+    const unsigned int p_server_id,
     int p_function,
     bool p_enabled,
     const char *p_linked_monitors,
@@ -297,7 +297,7 @@ Monitor::Monitor(
     int p_n_zones,
     Zone *p_zones[]
 ) : id( p_id ),
-	server_id( p_server_id ),
+    server_id( p_server_id ),
     function( (Function)p_function ),
     enabled( p_enabled ),
     width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
@@ -389,11 +389,11 @@ Monitor::Monitor(
              + 64; /* Padding used to permit aligning the images buffer to 16 byte boundary */
 
     Debug( 1, "mem.size=%d", mem_size );
-	mem_ptr = NULL;
+    mem_ptr = NULL;
 
     if ( purpose == CAPTURE ) {
-		this->connect();
-		if ( ! mem_ptr ) exit(-1);
+        this->connect();
+        if ( ! mem_ptr ) exit(-1);
         memset( mem_ptr, 0, mem_size );
         shared_data->size = sizeof(SharedData);
         shared_data->active = enabled;
@@ -420,8 +420,8 @@ Monitor::Monitor(
         trigger_data->trigger_showtext[0] = 0;
         shared_data->valid = true;
     } else if ( purpose == ANALYSIS ) {
-		this->connect();
-		if ( ! mem_ptr ) exit(-1);
+        this->connect();
+        if ( ! mem_ptr ) exit(-1);
         shared_data->state = IDLE;
         shared_data->last_read_time = 0;
         shared_data->alarm_x = -1;
@@ -437,9 +437,9 @@ Monitor::Monitor(
         }
     }
 
-	// Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
+    // Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
     if ( !n_zones ) {
-		Debug( 1, "Monitor %s has no zones, adding one.", name );
+        Debug( 1, "Monitor %s has no zones, adding one.", name );
         n_zones = 1;
         zones = new Zone *[1];
         Coord coords[4] = { Coord( 0, 0 ), Coord( width-1, 0 ), Coord( width-1, height-1 ), Coord( 0, height-1 ) };
@@ -521,28 +521,28 @@ bool Monitor::connect() {
         // Allocate the size
         if ( ftruncate( map_fd, mem_size ) < 0 ) {
             Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
-		}
+        }
     } else if ( map_stat.st_size == 0 ) {
         Error( "Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size, mem_size );
-		return false;
+        return false;
     } else if ( map_stat.st_size != mem_size ) {
         Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
-		return false;
-	} else {
+        return false;
+    } else {
 #ifdef MAP_LOCKED
-		mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
-		if ( mem_ptr == MAP_FAILED ) {
-			if ( errno == EAGAIN ) {
-				Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
+        mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
+        if ( mem_ptr == MAP_FAILED ) {
+            if ( errno == EAGAIN ) {
+                Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
 #endif
-				mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
-				Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
+                mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+                Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
 #ifdef MAP_LOCKED
-			}
-		}
+            }
+        }
 #endif
-		if ( mem_ptr == MAP_FAILED )
-			Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
+        if ( mem_ptr == MAP_FAILED )
+            Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
     }
 #else // ZM_MEM_MAPPED
     shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
@@ -563,9 +563,9 @@ bool Monitor::connect() {
     unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
     
     if(((unsigned long)shared_images % 16) != 0) {
-		/* Align images buffer to nearest 16 byte boundary */
-		Debug(3,"Aligning shared memory images to the next 16 byte boundary");
-		shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
+        /* Align images buffer to nearest 16 byte boundary */
+        Debug(3,"Aligning shared memory images to the next 16 byte boundary");
+        shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
     }
     image_buffer = new Snapshot[image_buffer_count];
     for ( int i = 0; i < image_buffer_count; i++ )
@@ -596,39 +596,39 @@ bool Monitor::connect() {
         }
     }
 
-	return true;
+    return true;
 }
 
 Monitor::~Monitor()
 {
-	if ( timestamps ) {
-		delete[] timestamps;
-		timestamps = 0;
-	}
-	if ( images ) {
-		delete[] images;
-		images = 0;
-	}
+    if ( timestamps ) {
+        delete[] timestamps;
+        timestamps = 0;
+    }
+    if ( images ) {
+        delete[] images;
+        images = 0;
+    }
         if ( privacy_bitmask ) {
             delete[] privacy_bitmask;
             privacy_bitmask = NULL;
         }
-	if ( mem_ptr ) {
-		if ( event )
-			Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
-		closeEvent();
+    if ( mem_ptr ) {
+        if ( event )
+            Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
+        closeEvent();
 
-		if ( (deinterlacing & 0xff) == 4)
-		{
-			delete next_buffer.image;
-			delete next_buffer.timestamp;
-		}
-		for ( int i = 0; i < image_buffer_count; i++ )
-		{
-			delete image_buffer[i].image;
-		}
-		delete[] image_buffer;
-	} // end if mem_ptr
+        if ( (deinterlacing & 0xff) == 4)
+        {
+            delete next_buffer.image;
+            delete next_buffer.timestamp;
+        }
+        for ( int i = 0; i < image_buffer_count; i++ )
+        {
+            delete image_buffer[i].image;
+        }
+        delete[] image_buffer;
+    } // end if mem_ptr
 
     for ( int i = 0; i < n_zones; i++ )
     {
@@ -638,49 +638,49 @@ Monitor::~Monitor()
 
     delete camera;
 
-	if ( mem_ptr ) {
-		if ( purpose == ANALYSIS )
-		{
-			shared_data->state = state = IDLE;
-			shared_data->last_read_index = image_buffer_count;
-			shared_data->last_read_time = 0;
+    if ( mem_ptr ) {
+        if ( purpose == ANALYSIS )
+        {
+            shared_data->state = state = IDLE;
+            shared_data->last_read_index = image_buffer_count;
+            shared_data->last_read_time = 0;
 
-			if ( analysis_fps )
-			{
-				for ( int i = 0; i < pre_event_buffer_count; i++ )
-				{
-					delete pre_event_buffer[i].image;
-					delete pre_event_buffer[i].timestamp;
-				}
-				delete[] pre_event_buffer;
-			}
-		}
-		else if ( purpose == CAPTURE )
-		{
-			shared_data->valid = false;
-			memset( mem_ptr, 0, mem_size );
-		}
+            if ( analysis_fps )
+            {
+                for ( int i = 0; i < pre_event_buffer_count; i++ )
+                {
+                    delete pre_event_buffer[i].image;
+                    delete pre_event_buffer[i].timestamp;
+                }
+                delete[] pre_event_buffer;
+            }
+        }
+        else if ( purpose == CAPTURE )
+        {
+            shared_data->valid = false;
+            memset( mem_ptr, 0, mem_size );
+        }
 
 #if ZM_MEM_MAPPED
-		if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
-			Error( "Can't msync: %s", strerror(errno) );
-		if ( munmap( mem_ptr, mem_size ) < 0 )
-			Fatal( "Can't munmap: %s", strerror(errno) );
-		close( map_fd );
+        if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
+            Error( "Can't msync: %s", strerror(errno) );
+        if ( munmap( mem_ptr, mem_size ) < 0 )
+            Fatal( "Can't munmap: %s", strerror(errno) );
+        close( map_fd );
 #else // ZM_MEM_MAPPED
-		struct shmid_ds shm_data;
-		if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
-			Error( "Can't shmctl: %s", strerror(errno) );
-			exit( -1 );
-		}
-		if ( shm_data.shm_nattch <= 1 ) {
-			if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
-				Error( "Can't shmctl: %s", strerror(errno) );
-				exit( -1 );
-			}
-		}
+        struct shmid_ds shm_data;
+        if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
+            Error( "Can't shmctl: %s", strerror(errno) );
+            exit( -1 );
+        }
+        if ( shm_data.shm_nattch <= 1 ) {
+            if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
+                Error( "Can't shmctl: %s", strerror(errno) );
+                exit( -1 );
+            }
+        }
 #endif // ZM_MEM_MAPPED
-	} // end if mem_ptr
+    } // end if mem_ptr
 }
 
 void Monitor::AddZones( int p_n_zones, Zone *p_zones[] )
@@ -728,7 +728,7 @@ int Monitor::GetImage( int index, int scale )
     if ( index != image_buffer_count )
     {
         Image *image;
-		// If we are going to be modifying the snapshot before writing, then we need to copy it
+        // If we are going to be modifying the snapshot before writing, then we need to copy it
         if ( ( scale != ZM_SCALE_BASE ) || ( !config.timestamp_on_capture ) ) {
             Snapshot *snap = &image_buffer[index];
             Image *snap_image = snap->image;
@@ -1228,32 +1228,32 @@ bool Monitor::CheckSignal( const Image *image )
                     break;
             }
             
-		if(colours == ZM_COLOUR_GRAY8) {
-			if ( *(buffer+index) != grayscale_val )
-				return true;
-			
-		} else if(colours == ZM_COLOUR_RGB24) {
-			const uint8_t *ptr = buffer+(index*colours);
-			
-			if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
-				if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
-					return true;
-			} else {
-				/* Assume RGB */
-				if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
-					return true;
-			}
-			
-		} else if(colours == ZM_COLOUR_RGB32) {
-			if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
-				if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
-					return true;
-			} else {
-				/* Assume RGBA or BGRA */
-				if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
-					return true;
-			}
-		}
+        if(colours == ZM_COLOUR_GRAY8) {
+            if ( *(buffer+index) != grayscale_val )
+                return true;
+            
+        } else if(colours == ZM_COLOUR_RGB24) {
+            const uint8_t *ptr = buffer+(index*colours);
+            
+            if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
+                if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
+                    return true;
+            } else {
+                /* Assume RGB */
+                if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
+                    return true;
+            }
+            
+        } else if(colours == ZM_COLOUR_RGB32) {
+            if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
+                if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
+                    return true;
+            } else {
+                /* Assume RGBA or BGRA */
+                if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
+                    return true;
+            }
+        }
         
         }
         return( false );
@@ -1724,7 +1724,7 @@ bool Monitor::Analyse()
                         if ( config.create_analysis_images )
                         {
                             bool got_anal_image = false;
-							alarm_image.Assign( *snap_image );
+                            alarm_image.Assign( *snap_image );
                             for( int i = 0; i < n_zones; i++ )
                             {
                                 if ( zones[i]->Alarmed() )
@@ -2038,18 +2038,18 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
 #if ZM_HAS_V4L
 int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose )
 {
-	std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
+    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
 ;
     if ( device[0] ) {
-		sql += " AND Device='";
-		sql += device;
-		sql += "'";
-	}
-	if ( staticConfig.SERVER_ID ) {
-		sql += " AND ServerId='";
-		sql += staticConfig.SERVER_ID;
-		sql += "'";
-	}
+        sql += " AND Device='";
+        sql += device;
+        sql += "'";
+    }
+    if ( staticConfig.SERVER_ID ) {
+        sql += " AND ServerId='";
+        sql += staticConfig.SERVER_ID;
+        sql += "'";
+    }
 
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result ) {
@@ -2066,7 +2066,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-		unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2074,26 +2074,26 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
         const char *device = dbrow[col]; col++;
         int channel = atoi(dbrow[col]); col++;
         int format = atoi(dbrow[col]); col++;
-		bool v4l_multi_buffer;
-		if ( dbrow[col] ) {
-			if (*dbrow[col] == '0' ) {
-				v4l_multi_buffer = false;
-			} else if ( *dbrow[col] == '1' ) {
-				v4l_multi_buffer = true;
-			} 
-		} else {
-			v4l_multi_buffer = config.v4l_multi_buffer;
-		}
-		col++;
-		
-		int v4l_captures_per_frame = 0;
-		if ( dbrow[col] ) {
-			 v4l_captures_per_frame = atoi(dbrow[col]);
-		} else {
-			v4l_captures_per_frame = config.captures_per_frame;
-		}
+        bool v4l_multi_buffer;
+        if ( dbrow[col] ) {
+            if (*dbrow[col] == '0' ) {
+                v4l_multi_buffer = false;
+            } else if ( *dbrow[col] == '1' ) {
+                v4l_multi_buffer = true;
+            } 
+        } else {
+            v4l_multi_buffer = config.v4l_multi_buffer;
+        }
+        col++;
+        
+        int v4l_captures_per_frame = 0;
+        if ( dbrow[col] ) {
+             v4l_captures_per_frame = atoi(dbrow[col]);
+        } else {
+            v4l_captures_per_frame = config.captures_per_frame;
+        }
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-		col++;
+        col++;
         const char *method = dbrow[col]; col++;
 
         int width = atoi(dbrow[col]); col++;
@@ -2150,8 +2150,8 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
             device,
             channel,
             format,
-			v4l_multi_buffer,
-			v4l_captures_per_frame,
+            v4l_multi_buffer,
+            v4l_captures_per_frame,
             method,
             cam_width,
             cam_height,
@@ -2168,7 +2168,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
         monitors[i] = new Monitor(
             id,
             name,
-			server_id,
+            server_id,
             function,
             enabled,
             linked_monitors,
@@ -2248,7 +2248,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 
         int id = atoi(dbrow[col]); col++;
         std::string name = dbrow[col]; col++;
-		unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2346,7 +2346,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
         monitors[i] = new Monitor(
             id,
             name.c_str(),
-			server_id,
+            server_id,
             function,
             enabled,
             linked_monitors,
@@ -2402,9 +2402,9 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 {
         std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'File'";
     if ( file[0] ) {
-		sql += " AND Path='";
-		sql += file;
-		sql += "'";
+        sql += " AND Path='";
+        sql += file;
+        sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
         sql += " AND ServerId='";
@@ -2427,7 +2427,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-		unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2490,7 +2490,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
         monitors[i] = new Monitor(
             id,
             name,
-			server_id,
+            server_id,
             function,
             enabled,
             linked_monitors,
@@ -2546,9 +2546,9 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 {
         std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Ffmpeg'";
     if ( file[0] ) {
-		sql += " AND Path = '";
-		sql += file;
-		sql += "'";
+        sql += " AND Path = '";
+        sql += file;
+        sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
         sql += " AND ServerId='";
@@ -2571,7 +2571,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-		unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = atoi(dbrow[col]); col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2638,7 +2638,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
         monitors[i] = new Monitor(
             id,
             name,
-			server_id,
+            server_id,
             function,
             enabled,
             linked_monitors,
@@ -2694,337 +2694,337 @@ Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
 {
     std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", p_id );
 
-	MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
+    MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
     if ( ! dbrow ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
     }
     Monitor *monitor = 0;
-	unsigned int col = 0;
+    unsigned int col = 0;
 
-	unsigned int id = atoi(dbrow[col]); col++;
-	std::string name = dbrow[col]; col++;
-	unsigned int server_id = atoi(dbrow[col]); col++;
-	std::string type = dbrow[col]; col++;
-	int function = atoi(dbrow[col]); col++;
-	int enabled = atoi(dbrow[col]); col++;
-	std::string linked_monitors = dbrow[col]; col++;
+    unsigned int id = atoi(dbrow[col]); col++;
+    std::string name = dbrow[col]; col++;
+    unsigned int server_id = atoi(dbrow[col]); col++;
+    std::string type = dbrow[col]; col++;
+    int function = atoi(dbrow[col]); col++;
+    int enabled = atoi(dbrow[col]); col++;
+    std::string linked_monitors = dbrow[col]; col++;
 
-	std::string device = dbrow[col]; col++;
-	int channel = atoi(dbrow[col]); col++;
-	int format = atoi(dbrow[col]); col++;
+    std::string device = dbrow[col]; col++;
+    int channel = atoi(dbrow[col]); col++;
+    int format = atoi(dbrow[col]); col++;
 
-	bool v4l_multi_buffer;
-	if ( dbrow[col] ) {
-		if (*dbrow[col] == '0' ) {
-			v4l_multi_buffer = false;
-		} else if ( *dbrow[col] == '1' ) {
-			v4l_multi_buffer = true;
-		}
-	} else {
-		v4l_multi_buffer = config.v4l_multi_buffer;
-	}
-	col++;
+    bool v4l_multi_buffer;
+    if ( dbrow[col] ) {
+        if (*dbrow[col] == '0' ) {
+            v4l_multi_buffer = false;
+        } else if ( *dbrow[col] == '1' ) {
+            v4l_multi_buffer = true;
+        }
+    } else {
+        v4l_multi_buffer = config.v4l_multi_buffer;
+    }
+    col++;
 
-	int v4l_captures_per_frame = 0;
-	if ( dbrow[col] ) {
-		 v4l_captures_per_frame = atoi(dbrow[col]);
-	} else {
-		v4l_captures_per_frame = config.captures_per_frame;
-	}
+    int v4l_captures_per_frame = 0;
+    if ( dbrow[col] ) {
+         v4l_captures_per_frame = atoi(dbrow[col]);
+    } else {
+        v4l_captures_per_frame = config.captures_per_frame;
+    }
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-	col++;
+    col++;
 
-	std::string protocol = dbrow[col]; col++;
-	std::string method = dbrow[col]; col++;
-	std::string host = dbrow[col]; col++;
-	std::string port = dbrow[col]; col++;
-	std::string path = dbrow[col]; col++;
-	std::string options = dbrow[col]; col++;
-	std::string user = dbrow[col]; col++;
-	std::string pass = dbrow[col]; col++;
+    std::string protocol = dbrow[col]; col++;
+    std::string method = dbrow[col]; col++;
+    std::string host = dbrow[col]; col++;
+    std::string port = dbrow[col]; col++;
+    std::string path = dbrow[col]; col++;
+    std::string options = dbrow[col]; col++;
+    std::string user = dbrow[col]; col++;
+    std::string pass = dbrow[col]; col++;
 
-	int width = atoi(dbrow[col]); col++;
-	int height = atoi(dbrow[col]); col++;
-	int colours = atoi(dbrow[col]); col++;
-	int palette = atoi(dbrow[col]); col++;
-	Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-	unsigned int deinterlacing = atoi(dbrow[col]); col++;
-	int brightness = atoi(dbrow[col]); col++;
-	int contrast = atoi(dbrow[col]); col++;
-	int hue = atoi(dbrow[col]); col++;
-	int colour = atoi(dbrow[col]); col++;
+    int width = atoi(dbrow[col]); col++;
+    int height = atoi(dbrow[col]); col++;
+    int colours = atoi(dbrow[col]); col++;
+    int palette = atoi(dbrow[col]); col++;
+    Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+    unsigned int deinterlacing = atoi(dbrow[col]); col++;
+    int brightness = atoi(dbrow[col]); col++;
+    int contrast = atoi(dbrow[col]); col++;
+    int hue = atoi(dbrow[col]); col++;
+    int colour = atoi(dbrow[col]); col++;
 
-	std::string event_prefix = dbrow[col]; col++;
-	std::string label_format = dbrow[col]; col++;
+    std::string event_prefix = dbrow[col]; col++;
+    std::string label_format = dbrow[col]; col++;
 
-	int label_x = atoi(dbrow[col]); col++;
-	int label_y = atoi(dbrow[col]); col++;
-	int label_size = atoi(dbrow[col]); col++;
+    int label_x = atoi(dbrow[col]); col++;
+    int label_y = atoi(dbrow[col]); col++;
+    int label_size = atoi(dbrow[col]); col++;
 
-	int image_buffer_count = atoi(dbrow[col]); col++;
-	int warmup_count = atoi(dbrow[col]); col++;
-	int pre_event_count = atoi(dbrow[col]); col++;
-	int post_event_count = atoi(dbrow[col]); col++;
-	int stream_replay_buffer = atoi(dbrow[col]); col++;
-	int alarm_frame_count = atoi(dbrow[col]); col++;
-	int section_length = atoi(dbrow[col]); col++;
-	int frame_skip = atoi(dbrow[col]); col++;
-	int motion_frame_skip = atoi(dbrow[col]); col++;
-	double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-	unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-	int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-	int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-	int fps_report_interval = atoi(dbrow[col]); col++;
-	int ref_blend_perc = atoi(dbrow[col]); col++;
-	int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-	int track_motion = atoi(dbrow[col]); col++;
+    int image_buffer_count = atoi(dbrow[col]); col++;
+    int warmup_count = atoi(dbrow[col]); col++;
+    int pre_event_count = atoi(dbrow[col]); col++;
+    int post_event_count = atoi(dbrow[col]); col++;
+    int stream_replay_buffer = atoi(dbrow[col]); col++;
+    int alarm_frame_count = atoi(dbrow[col]); col++;
+    int section_length = atoi(dbrow[col]); col++;
+    int frame_skip = atoi(dbrow[col]); col++;
+    int motion_frame_skip = atoi(dbrow[col]); col++;
+    double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+    unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
+    int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int fps_report_interval = atoi(dbrow[col]); col++;
+    int ref_blend_perc = atoi(dbrow[col]); col++;
+    int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+    int track_motion = atoi(dbrow[col]); col++;
 
-	int signal_check_colour;
-	if ( dbrow[col][0] == '#' )
-		signal_check_colour = strtol(dbrow[col]+1,0,16);
-	else
-		signal_check_colour = strtol(dbrow[col],0,16);
+    int signal_check_colour;
+    if ( dbrow[col][0] == '#' )
+        signal_check_colour = strtol(dbrow[col]+1,0,16);
+    else
+        signal_check_colour = strtol(dbrow[col],0,16);
     bool embed_exif = (*dbrow[col] != '0'); col++;
 
-	int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-	int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
+    int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
+    int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
 
-	int extras = (deinterlacing>>24)&0xff;
+    int extras = (deinterlacing>>24)&0xff;
 
-	Camera *camera = 0;
-	if ( type == "Local" )
-	{
+    Camera *camera = 0;
+    if ( type == "Local" )
+    {
 #if ZM_HAS_V4L
-		camera = new LocalCamera(
-			id,
-			device.c_str(),
-			channel,
-			format,
-			v4l_multi_buffer,
-			v4l_captures_per_frame,
-			method,
-			cam_width,
-			cam_height,
-			colours,
-			palette,
-			brightness,
-			contrast,
-			hue,
-			colour,
-			purpose==CAPTURE,
-			extras
-		);
+        camera = new LocalCamera(
+            id,
+            device.c_str(),
+            channel,
+            format,
+            v4l_multi_buffer,
+            v4l_captures_per_frame,
+            method,
+            cam_width,
+            cam_height,
+            colours,
+            palette,
+            brightness,
+            contrast,
+            hue,
+            colour,
+            purpose==CAPTURE,
+            extras
+        );
 #else // ZM_HAS_V4L
-		Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
+        Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
 #endif // ZM_HAS_V4L
-	}
-	else if ( type == "Remote" )
-	{
-		if ( protocol == "http" )
-		{
-			camera = new RemoteCameraHttp(
-				id,
-				method.c_str(),
-				host.c_str(),
-				port.c_str(),
-				path.c_str(),
-				cam_width,
-				cam_height,
-				colours,
-				brightness,
-				contrast,
-				hue,
-				colour,
-				purpose==CAPTURE
-			);
-		}
-		else if ( protocol == "rtsp" )
-		{
+    }
+    else if ( type == "Remote" )
+    {
+        if ( protocol == "http" )
+        {
+            camera = new RemoteCameraHttp(
+                id,
+                method.c_str(),
+                host.c_str(),
+                port.c_str(),
+                path.c_str(),
+                cam_width,
+                cam_height,
+                colours,
+                brightness,
+                contrast,
+                hue,
+                colour,
+                purpose==CAPTURE
+            );
+        }
+        else if ( protocol == "rtsp" )
+        {
 #if HAVE_LIBAVFORMAT
-			camera = new RemoteCameraRtsp(
-				id,
-				method.c_str(),
-				host.c_str(),
-				port.c_str(),
-				path.c_str(),
-				cam_width,
-				cam_height,
-				colours,
-				brightness,
-				contrast,
-				hue,
-				colour,
-				purpose==CAPTURE
-			);
+            camera = new RemoteCameraRtsp(
+                id,
+                method.c_str(),
+                host.c_str(),
+                port.c_str(),
+                path.c_str(),
+                cam_width,
+                cam_height,
+                colours,
+                brightness,
+                contrast,
+                hue,
+                colour,
+                purpose==CAPTURE
+            );
 #else // HAVE_LIBAVFORMAT
-			Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
+            Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
 #endif // HAVE_LIBAVFORMAT
-		}
-		else
-		{
-			Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
-		}
-	}
-	else if ( type == "File" )
-	{
-		camera = new FileCamera(
-			id,
-			path.c_str(),
-			cam_width,
-			cam_height,
-			colours,
-			brightness,
-			contrast,
-			hue,
-			colour,
-			purpose==CAPTURE
-		);
-	}
-	else if ( type == "Ffmpeg" )
-	{
+        }
+        else
+        {
+            Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
+        }
+    }
+    else if ( type == "File" )
+    {
+        camera = new FileCamera(
+            id,
+            path.c_str(),
+            cam_width,
+            cam_height,
+            colours,
+            brightness,
+            contrast,
+            hue,
+            colour,
+            purpose==CAPTURE
+        );
+    }
+    else if ( type == "Ffmpeg" )
+    {
 #if HAVE_LIBAVFORMAT
-		camera = new FfmpegCamera(
-			id,
-			path.c_str(),
-			method,
-			options,
-			cam_width,
-			cam_height,
-			colours,
-			brightness,
-			contrast,
-			hue,
-			colour,
-			purpose==CAPTURE
-		);
+        camera = new FfmpegCamera(
+            id,
+            path.c_str(),
+            method,
+            options,
+            cam_width,
+            cam_height,
+            colours,
+            brightness,
+            contrast,
+            hue,
+            colour,
+            purpose==CAPTURE
+        );
 #else // HAVE_LIBAVFORMAT
-		Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
+        Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
 #endif // HAVE_LIBAVFORMAT
-	}
-	else if (type == "Libvlc")
-	{
+    }
+    else if (type == "Libvlc")
+    {
 #if HAVE_LIBVLC
-		camera = new LibvlcCamera(
-			id,
-			path.c_str(),
-			method,
-			options,
-			cam_width,
-			cam_height,
-			colours,
-			brightness,
-			contrast,
-			hue,
-			colour,
-			purpose==CAPTURE
-		);
+        camera = new LibvlcCamera(
+            id,
+            path.c_str(),
+            method,
+            options,
+            cam_width,
+            cam_height,
+            colours,
+            brightness,
+            contrast,
+            hue,
+            colour,
+            purpose==CAPTURE
+        );
 #else // HAVE_LIBVLC
-		Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
+        Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
 #endif // HAVE_LIBVLC
-	}
-	else if ( type == "cURL" )
-	{
+    }
+    else if ( type == "cURL" )
+    {
 #if HAVE_LIBCURL
-		camera = new cURLCamera(
-			id,
-			path.c_str(),
-			user.c_str(),
-			pass.c_str(),
-			cam_width,
-			cam_height,
-			colours,
-			brightness,
-			contrast,
-			hue,
-			colour,
-			purpose==CAPTURE
-		);
+        camera = new cURLCamera(
+            id,
+            path.c_str(),
+            user.c_str(),
+            pass.c_str(),
+            cam_width,
+            cam_height,
+            colours,
+            brightness,
+            contrast,
+            hue,
+            colour,
+            purpose==CAPTURE
+        );
 #else // HAVE_LIBCURL
-		Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
+        Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
 #endif // HAVE_LIBCURL
-	}
-	else
-	{
-		Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
-	}
-	monitor = new Monitor(
-		id,
-		name.c_str(),
-		server_id,
-		function,
-		enabled,
-		linked_monitors.c_str(),
-		camera,
-		orientation,
-		deinterlacing,
-		event_prefix.c_str(),
-		label_format.c_str(),
-		Coord( label_x, label_y ),
-		label_size,
-		image_buffer_count,
-		warmup_count,
-		pre_event_count,
-		post_event_count,
-		stream_replay_buffer,
-		alarm_frame_count,
-		section_length,
-		frame_skip,
-		motion_frame_skip,
-		analysis_fps,
-		analysis_update_delay,
-		capture_delay,
-		alarm_capture_delay,
-		fps_report_interval,
-		ref_blend_perc,
-		alarm_ref_blend_perc,
-		track_motion,
-		signal_check_colour,
+    }
+    else
+    {
+        Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
+    }
+    monitor = new Monitor(
+        id,
+        name.c_str(),
+        server_id,
+        function,
+        enabled,
+        linked_monitors.c_str(),
+        camera,
+        orientation,
+        deinterlacing,
+        event_prefix.c_str(),
+        label_format.c_str(),
+        Coord( label_x, label_y ),
+        label_size,
+        image_buffer_count,
+        warmup_count,
+        pre_event_count,
+        post_event_count,
+        stream_replay_buffer,
+        alarm_frame_count,
+        section_length,
+        frame_skip,
+        motion_frame_skip,
+        analysis_fps,
+        analysis_update_delay,
+        capture_delay,
+        alarm_capture_delay,
+        fps_report_interval,
+        ref_blend_perc,
+        alarm_ref_blend_perc,
+        track_motion,
+        signal_check_colour,
         embed_exif,
-		purpose,
-		0,
-		0
+        purpose,
+        0,
+        0
 
-	);
+    );
 
-	int n_zones = 0;
-	if ( load_zones )
-	{
-		Zone **zones = 0;
-		n_zones = Zone::Load( monitor, zones );
-		monitor->AddZones( n_zones, zones );
+    int n_zones = 0;
+    if ( load_zones )
+    {
+        Zone **zones = 0;
+        n_zones = Zone::Load( monitor, zones );
+        monitor->AddZones( n_zones, zones );
         monitor->AddPrivacyBitmask( zones );
-	}
-	Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
+    }
+    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
     return( monitor );
 }
 
 int Monitor::Capture()
 {
-	static int FirstCapture = 1;
-	int captureResult;
-	
-	int index = image_count%image_buffer_count;
-	Image* capture_image = image_buffer[index].image;
-	
-	if ( (deinterlacing & 0xff) == 4) {
-		if ( FirstCapture != 1 ) {
-			/* Copy the next image into the shared memory */
-			capture_image->CopyBuffer(*(next_buffer.image)); 
-		}
-		
-		/* Capture a new next image */
-		captureResult = camera->Capture(*(next_buffer.image));
-		
-		if ( FirstCapture ) {
-			FirstCapture = 0;
-			return 0;
-		}
-		
-	} else {
-		/* Capture directly into image buffer, avoiding the need to memcpy() */
-		captureResult = camera->Capture(*capture_image);
-	}
+    static int FirstCapture = 1;
+    int captureResult;
+    
+    int index = image_count%image_buffer_count;
+    Image* capture_image = image_buffer[index].image;
+    
+    if ( (deinterlacing & 0xff) == 4) {
+        if ( FirstCapture != 1 ) {
+            /* Copy the next image into the shared memory */
+            capture_image->CopyBuffer(*(next_buffer.image)); 
+        }
+        
+        /* Capture a new next image */
+        captureResult = camera->Capture(*(next_buffer.image));
+        
+        if ( FirstCapture ) {
+            FirstCapture = 0;
+            return 0;
+        }
+        
+    } else {
+        /* Capture directly into image buffer, avoiding the need to memcpy() */
+        captureResult = camera->Capture(*capture_image);
+    }
     
     if ( captureResult != 0 )
     {
@@ -3041,18 +3041,18 @@ int Monitor::Capture()
     if ( captureResult == 1 )
     {
         
-	/* Deinterlacing */
-	if ( (deinterlacing & 0xff) == 1 ) {
-		capture_image->Deinterlace_Discard();
-	} else if ( (deinterlacing & 0xff) == 2 ) {
-		capture_image->Deinterlace_Linear();
-	} else if ( (deinterlacing & 0xff) == 3 ) {
-		capture_image->Deinterlace_Blend();
-	} else if ( (deinterlacing & 0xff) == 4 ) {
-		capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
-	} else if ( (deinterlacing & 0xff) == 5 ) {
-		capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
-	}
+    /* Deinterlacing */
+    if ( (deinterlacing & 0xff) == 1 ) {
+        capture_image->Deinterlace_Discard();
+    } else if ( (deinterlacing & 0xff) == 2 ) {
+        capture_image->Deinterlace_Linear();
+    } else if ( (deinterlacing & 0xff) == 3 ) {
+        capture_image->Deinterlace_Blend();
+    } else if ( (deinterlacing & 0xff) == 4 ) {
+        capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
+    } else if ( (deinterlacing & 0xff) == 5 ) {
+        capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
+    }
         
         
         if ( orientation != ROTATE_0 )
@@ -3085,7 +3085,7 @@ int Monitor::Capture()
 
         if ( capture_image->Size() > camera->ImageSize() )
         {
-			Error( "Captured image %d does not match expected size %d check width, height and colour depth",capture_image->Size(),camera->ImageSize() );
+            Error( "Captured image %d does not match expected size %d check width, height and colour depth",capture_image->Size(),camera->ImageSize() );
             return( -1 );
         }
 
@@ -3464,7 +3464,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
                 }
                 if (zone->CheckExtendAlarmCount()) {
                     alarm=true;
-		    zone->SetAlarm();
+            zone->SetAlarm();
                 } else {
                     zone->ClearAlarm();
                 }
@@ -4161,36 +4161,36 @@ void MonitorStream::runStream()
 
     char *swap_path = 0;
     bool buffered_playback = false;
-	int swap_path_length = strlen(config.path_swap)+1; // +1 for NULL terminator
+    int swap_path_length = strlen(config.path_swap)+1; // +1 for NULL terminator
 
-	if ( connkey && playback_buffer > 0 ) {
+    if ( connkey && playback_buffer > 0 ) {
 
-		if ( swap_path_length + 15 > PATH_MAX ) {
-			// 15 is for /zmswap-whatever, assuming max 6 digits for monitor id
-			Error( "Swap Path is too long. %d > %d ", swap_path_length+15, PATH_MAX );
-		} else {
-			swap_path = (char *)malloc( swap_path_length+15 );
-			Debug( 3, "Checking swap image path %s", config.path_swap );
-			strncpy( swap_path, config.path_swap, swap_path_length );
-			if ( checkSwapPath( swap_path, false ) ) {
-				snprintf( &(swap_path[swap_path_length]), sizeof(swap_path)-swap_path_length, "/zmswap-m%d", monitor->Id() );
-				if ( checkSwapPath( swap_path, true ) ) {
-					snprintf( &(swap_path[swap_path_length]), sizeof(swap_path)-swap_path_length, "/zmswap-q%06d", connkey );
-					if ( checkSwapPath( swap_path, true ) ) {
-						buffered_playback = true;
-					}
-				}
-			}
+        if ( swap_path_length + 15 > PATH_MAX ) {
+            // 15 is for /zmswap-whatever, assuming max 6 digits for monitor id
+            Error( "Swap Path is too long. %d > %d ", swap_path_length+15, PATH_MAX );
+        } else {
+            swap_path = (char *)malloc( swap_path_length+15 );
+            Debug( 3, "Checking swap image path %s", config.path_swap );
+            strncpy( swap_path, config.path_swap, swap_path_length );
+            if ( checkSwapPath( swap_path, false ) ) {
+                snprintf( &(swap_path[swap_path_length]), sizeof(swap_path)-swap_path_length, "/zmswap-m%d", monitor->Id() );
+                if ( checkSwapPath( swap_path, true ) ) {
+                    snprintf( &(swap_path[swap_path_length]), sizeof(swap_path)-swap_path_length, "/zmswap-q%06d", connkey );
+                    if ( checkSwapPath( swap_path, true ) ) {
+                        buffered_playback = true;
+                    }
+                }
+            }
 
-			if ( !buffered_playback ) {
-				Error( "Unable to validate swap image path, disabling buffered playback" );
-			} else {
-				Debug( 2, "Assigning temporary buffer" );
-				temp_image_buffer = new SwapImage[temp_image_buffer_count];
-				memset( temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count );
-				Debug( 2, "Assigned temporary buffer" );
-			}
-		}
+            if ( !buffered_playback ) {
+                Error( "Unable to validate swap image path, disabling buffered playback" );
+            } else {
+                Debug( 2, "Assigning temporary buffer" );
+                temp_image_buffer = new SwapImage[temp_image_buffer_count];
+                memset( temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count );
+                Debug( 2, "Assigned temporary buffer" );
+            }
+        }
     }
 
     float max_secs_since_last_sent_frame = 10.0; //should be > keep alive amount (5 secs)
@@ -4428,7 +4428,7 @@ void MonitorStream::runStream()
             }
         }
     }
-	if ( swap_path ) free( swap_path );
+    if ( swap_path ) free( swap_path );
     closeComms();
 }
 

From 09e5463a81df2cc8fd6b7513f9b04df32f9ed6ab Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:16:58 -0400
Subject: [PATCH 044/362] test for value in server_id before atoi

---
 src/zm_monitor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 6f9f0e9fa..35f82ac8f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2066,7 +2066,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-        unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2248,7 +2248,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 
         int id = atoi(dbrow[col]); col++;
         std::string name = dbrow[col]; col++;
-        unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2427,7 +2427,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-        unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2571,7 +2571,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
 
         int id = atoi(dbrow[col]); col++;
         const char *name = dbrow[col]; col++;
-        unsigned int server_id = atoi(dbrow[col]); col++;
+        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
         int function = atoi(dbrow[col]); col++;
         int enabled = atoi(dbrow[col]); col++;
         const char *linked_monitors = dbrow[col]; col++;
@@ -2704,7 +2704,7 @@ Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
 
     unsigned int id = atoi(dbrow[col]); col++;
     std::string name = dbrow[col]; col++;
-    unsigned int server_id = atoi(dbrow[col]); col++;
+    unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
     std::string type = dbrow[col]; col++;
     int function = atoi(dbrow[col]); col++;
     int enabled = atoi(dbrow[col]); col++;

From b2699237c78c35c5a5b5c1a6bb393b543ac01d48 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:35:47 -0400
Subject: [PATCH 045/362] put back mootools

---
 web/skins/classic/includes/functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index c9328563f..683f1a270 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -67,6 +67,7 @@ function xhtmlHeaders( $file, $title )
 ?>
   <script type="text/javascript" src="tools/mootools/mootools-core.js"></script>
   <script type="text/javascript" src="tools/mootools/mootools-more.js"></script>
+  <script type="text/javascript" src="js/mootools.ext.js"></script>
   <script type="text/javascript" src="js/logger.js"></script>
   <script type="text/javascript" src="js/overlay.js"></script>
 <?php

From c48bd3ebca9b14057e3b200a3e39a3fa877c8014 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:37:33 -0400
Subject: [PATCH 046/362] restore

---
 web/api/app/Config/core.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 9bb177506..5902a2235 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -223,12 +223,12 @@
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', '4AlwR5ePsf7gY8OxBCp1ftqw5pHhY7bQIJWwSRSB');
+	Configure::write('Security.salt', 'Q0MjGG2xRQEhJVQR85WhFJKI7f2St8RYMlVR7GNQ');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '65025553361572663298232797852');
+	Configure::write('Security.cipherSeed', '02670120062639232092038865362');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).

From f5ba7cb20856cd77b29d677dffbb481dffbbc595 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 27 Aug 2015 11:39:16 -0400
Subject: [PATCH 047/362] restore

---
 web/api/.gitattributes | 33 +++++++++++++++++++++++++++++++++
 web/api/.gitignore     | 21 +++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 web/api/.gitattributes
 create mode 100644 web/api/.gitignore

diff --git a/web/api/.gitattributes b/web/api/.gitattributes
new file mode 100644
index 000000000..fc3f49166
--- /dev/null
+++ b/web/api/.gitattributes
@@ -0,0 +1,33 @@
+# Define the line ending behavior of the different file extensions
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted
+# to native line endings on checkout.
+*.php text
+*.default text
+*.ctp text
+*.sql text
+*.md text
+*.po text
+*.js text
+*.css text
+*.ini text
+*.properties text
+*.txt text
+*.xml text
+*.yml text
+.htaccess text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat eol=crlf
+
+# Declare files that will always have LF line endings on checkout.
+*.pem eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.gif binary
+*.ico binary
+*.mo binary
\ No newline at end of file
diff --git a/web/api/.gitignore b/web/api/.gitignore
new file mode 100644
index 000000000..4a1adb886
--- /dev/null
+++ b/web/api/.gitignore
@@ -0,0 +1,21 @@
+# User specific & automatically generated files #
+#################################################
+/app/Config/database.php
+/app/tmp
+/lib/Cake/Console/Templates/skel/tmp/
+/plugins
+/vendors
+/build
+/dist
+/tags
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
\ No newline at end of file

From 70fa177a32fb0428b228f8a78b8086533b284a78 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 31 Aug 2015 16:04:34 -0400
Subject: [PATCH 048/362] bump db version

---
 CMakeLists.txt | 2 +-
 configure.ac   | 2 +-
 version        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3e3779f0..aa052ccc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.28.106")
+set(zoneminder_VERSION "1.28.107")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
diff --git a/configure.ac b/configure.ac
index 32ba09ae1..0bdb55fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.28.107,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
diff --git a/version b/version
index 71864bd8d..0234b6353 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.28.106
+1.28.107

From e4238edd53bf0e78730466b10640d52102c4ab5f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 14 Sep 2015 14:11:49 -0400
Subject: [PATCH 049/362] this build patch is no longer needed

---
 .../ubuntu1504_cmake/patches/apache2.patch    | 40 -------------------
 distros/ubuntu1504_cmake/patches/series       |  1 -
 2 files changed, 41 deletions(-)
 delete mode 100644 distros/ubuntu1504_cmake/patches/apache2.patch

diff --git a/distros/ubuntu1504_cmake/patches/apache2.patch b/distros/ubuntu1504_cmake/patches/apache2.patch
deleted file mode 100644
index 9710b3b63..000000000
--- a/distros/ubuntu1504_cmake/patches/apache2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Last-Update: 2015-04-02
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Description: adapt apache2.conf to work out-of-the-box.
-
---- a/misc/apache.conf.in
-+++ b/misc/apache.conf.in
-@@ -13,19 +13,21 @@
-         Options FollowSymLinks
-         AllowOverride All
-     </Directory>
- 
--    ScriptAlias /cgi-bin/ "@CGI_PREFIX@"
-+    # Remember to enable cgi mod (i.e. "a2enmod cgi").
-+    ScriptAlias /cgi-bin "@CGI_PREFIX@"
-     <Directory "@CGI_PREFIX@">
-         Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-         AllowOverride All
-+        Require all granted
-     </Directory>
- 
-     # Use the first option to have Apache logs written to the general log
-     # directory, or the second to have them written to the regular Apache
-     # directory (you may have to change the path to that used on your system)
-     ErrorLog @ZM_LOGDIR@/apache-error.log
--    ErrorLog /var/log/httpd/zm-error.log
-+#    ErrorLog /var/log/httpd/zm-error.log
- 
-     # Possible values include: debug, info, notice, warn, error, crit,
-     # alert, emerg.
-     LogLevel warn
-@@ -33,7 +35,7 @@
-     # Use the first option to have Apache logs written to the general log
-     # directory, or the second to have them written to the regular Apache
-     # directory (you may have to change the path to that used on your system)
-     CustomLog @ZM_LOGDIR@/apache-access.log combined
--    CustomLog /var/log/httpd/zm-access.log combined
-+#    CustomLog /var/log/httpd/zm-access.log combined
- 
- </VirtualHost>
diff --git a/distros/ubuntu1504_cmake/patches/series b/distros/ubuntu1504_cmake/patches/series
index 4f6f53a23..fc70f4006 100644
--- a/distros/ubuntu1504_cmake/patches/series
+++ b/distros/ubuntu1504_cmake/patches/series
@@ -1,3 +1,2 @@
-apache2.patch
 default_cgi-path.patch
 use_libjs-mootools.patch

From 6e3c8bb3800edf526a49d0bc7abcdd3e3cf80981 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 14 Sep 2015 15:15:44 -0400
Subject: [PATCH 050/362] revert

---
 .../lib/ZoneMinder/ConfigData.pm.in           | 56 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 8b42a2274..7fff3d62e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -357,6 +357,60 @@ our @options =
         type        => $types{boolean},
         category    => "system",
     },
+    # PP - Google reCaptcha settings
+    {
+	name 		=> "ZM_OPT_USE_GOOG_RECAPTCHA",
+	default 	=> "no",
+	description	=> "Add Google reCaptcha to login page",
+	help 		=> qqq("
+			This option allows you to include a google 
+			reCaptcha validation at login. This means in addition to providing
+			a valid usernane and password, you will also have to 
+			pass the reCaptcha test. Please note that enabling this
+			option results in the zoneminder login page reach out
+			to google servers for captcha validation. Also please note
+			that enabling this option will break 3rd party clients
+			like zmNinja and zmView as they also need to login to ZoneMinder
+			and they will fail the reCaptcha test.
+			"),
+	requires	=> [
+				{name=>"ZM_OPT_USE_AUTH", value=>"yes"}
+			  ],
+	type		=> $types {boolean},
+	category	=> "system",
+    },
+	
+    {
+	name 		=> "ZM_OPT_GOOG_RECAPTCHA_SITEKEY",
+	default 	=> "...Insert your recaptcha site-key here...",
+	description 	=> "Your recaptcha site-key",
+	help		=> qqq("You need to generate your keys from
+				the Google reCaptcha website. 
+				Please refer to https://www.google.com/recaptcha/ 
+				for more details.
+			"),
+	requires	=> [
+				{name=>"ZM_OPT_USE_GOOG_RECAPTCHA", value=>"yes"}
+			  ],
+	type		=> $types {string},
+	category	=> "system",
+    },
+    {
+	name 		=> "ZM_OPT_GOOG_RECAPTCHA_SECRETKEY",
+	default 	=> "...Insert your recaptcha secret-key here...",
+	description 	=> "Your recaptcha secret-key",
+	help		=> qqq("You need to generate your keys from
+				the Google reCaptcha website. 
+				Please refer to https://www.google.com/recaptcha/ 
+				for more details.
+			"),
+	requires	=> [
+				{name=>"ZM_OPT_USE_GOOG_RECAPTCHA", value=>"yes"}
+			  ],
+	type		=> $types {string},
+	category	=> "system",
+    },
+
     {
         name        => "ZM_DIR_EVENTS",
         default     => "events",
@@ -428,7 +482,7 @@ our @options =
     },
     {
         name        => "ZM_PATH_ZMS",
-        default     => "/zm/cgi-bin/nph-zms",
+        default     => "/cgi-bin/nph-zms",
         description => "Web path to zms streaming server",
         help        => qqq("
             The ZoneMinder streaming server is required to send streamed

From d235733290c5afb3733e9cdd15aa9752ee343673 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 14 Sep 2015 15:57:22 -0400
Subject: [PATCH 051/362] Need to include logger if we are going to use Error

---
 web/includes/config.php.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index e4ea1b651..3168cee1a 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -167,6 +167,7 @@ function loadConfig( $defineConsts=true )
     //print_r( $configCats );
 }
 
+require_once( 'logger.php' );
 // For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
 if ( ! defined('ZM_SERVER_ID') ) {
 	if ( defined('ZM_SERVER_NAME') ) {

From b680aa41c5bd3b26af4ee968b05d68351b936588 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 15 Sep 2015 17:26:31 -0400
Subject: [PATCH 052/362] save should be Save

---
 web/includes/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/actions.php b/web/includes/actions.php
index 53d9c8a6e..b6d477b04 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -691,7 +691,7 @@ if ( !empty($action) )
     {
 		if ( $_REQUEST['object'] == 'server' ) {
 
-			if ( $action == "save" ) {
+			if ( $action == "Save" ) {
 				if ( !empty($_REQUEST['id']) )
 					$dbServer = dbFetchOne( "SELECT * FROM Servers WHERE Id=?", NULL, array($_REQUEST['id']) );
 				else

From fb872315d1e836861c4d1349049be488a667ed0d Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 08:38:53 -0400
Subject: [PATCH 053/362] add an error log entry for unknown action

---
 web/includes/actions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/includes/actions.php b/web/includes/actions.php
index b6d477b04..b1d79dcc2 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -715,6 +715,8 @@ if ( !empty($action) )
 						dbQuery( "DELETE FROM Servers WHERE Id=?", array($Id) );
 				}
                 $refreshParent = true;
+			} else {
+				Error( "Unknown action $action in saving Server" );
 			}
 
         } else if ( $action == "version" && isset($_REQUEST['option']) )

From 4fa6948e5c22f93e81fab214c02dc48ba6855ee8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 09:12:21 -0400
Subject: [PATCH 054/362] add form validation for server editing.  Currently
 just requires a name

---
 web/skins/classic/views/js/server.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 web/skins/classic/views/js/server.js

diff --git a/web/skins/classic/views/js/server.js b/web/skins/classic/views/js/server.js
new file mode 100644
index 000000000..70063d1de
--- /dev/null
+++ b/web/skins/classic/views/js/server.js
@@ -0,0 +1,14 @@
+function validateForm( form, newServer )
+{
+    var errors = new Array();
+    if ( !form.elements['newServer[Name]'].value )
+    {
+        errors[errors.length] = "You must supply a name";
+    }
+    if ( errors.length )
+    {
+        alert( errors.join( "\n" ) );
+        return( false );
+    }
+    return( true );
+}

From 681718e908a0276e96dbd88e205887fbfffd6abb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 11:07:08 -0400
Subject: [PATCH 055/362] init  to avoid error message

---
 web/skins/classic/views/monitor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 369319608..5d0330c53 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -40,6 +40,7 @@ if ( isset($_REQUEST['tab']) )
 else
     $tab = "general";
 
+	$Server = null;
     if ( defined( 'ZM_SERVER_ID' ) ) {
         $Server = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( ZM_SERVER_ID ) );
 	}

From 73badd1c2d560eb895371181b86ed92861e3d7b9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 11:12:04 -0400
Subject: [PATCH 056/362] check for value of ZM_SERVER_NAME and ZM_SERVER_HOST
 and include it in the error message

---
 web/includes/config.php.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 3168cee1a..466e195f2 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -170,17 +170,17 @@ function loadConfig( $defineConsts=true )
 require_once( 'logger.php' );
 // For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
 if ( ! defined('ZM_SERVER_ID') ) {
-	if ( defined('ZM_SERVER_NAME') ) {
+	if ( defined('ZM_SERVER_NAME') and ZM_SERVER_NAME ) {
 		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
 		if ( ! $server_id ) {
-			Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
+			Error("ZM_SERVER_NAME set to " . ZM_SERVER_NAME . " in config, but not found in Servers table.");
 		} else {
 			define( 'ZM_SERVER_ID', $server_id );
 		}
-	} else if ( defined('ZM_SERVER_HOST') ) {
+	} else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) {
 		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
 		if ( ! $server_id ) {
-			Error("ZM_SERVER_HOST set in config, but not found in Servers table.");
+			Error("ZM_SERVER_HOST set to " . ZM_SERVER_HOST . " in config, but not found in Servers table.");
 		} else {
 			define( 'ZM_SERVER_ID', $server_id );
 		}

From e172911088816053f343edfd8d63aa3303532e86 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 14:51:05 -0400
Subject: [PATCH 057/362] include Server object and fix Server dropdown

---
 web/skins/classic/views/monitor.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 5d0330c53..2ec5982ab 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -18,6 +18,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
+require_once( 'includes/Server.php');
+
 if ( !canView( 'Monitors' ) )
 {
     $view = "error";
@@ -647,8 +649,12 @@ switch ( $tab )
             <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
             <tr><td><?php echo translate('Server') ?></td><td>
 <?php 
-	$servers = dbFetchAssoc( 'SELECT Id,Name FROM Servers ORDER BY Name', 'Id', 'Name' ); 
-	array_unshift( $servers, 'None' );
+	$servers = array(''=>'None');
+	$result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+	$results = $result->fetchALL(PDO::FETCH_CLASS, 'Server' );
+	foreach ( $results as $row => $server_obj ) {
+		$servers[ $server_obj->Id] = $server_obj->Name;
+	}
 ?>
 	<?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
 </td></tr>

From 0f181b72d1d0e9c437b3c3a37ff7510e0f10da27 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 14:51:23 -0400
Subject: [PATCH 058/362] include Server object and display the server column

---
 web/skins/classic/views/console.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 915972d10..37ab27414 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -18,6 +18,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
+require_once('includes/Server.php');
+
 $eventCounts = array(
     array(
         "title" => translate('Events'),
@@ -235,6 +237,7 @@ else
           <tr>
             <th class="colName"><?php echo translate('Name') ?></th>
             <th class="colFunction"><?php echo translate('Function') ?></th>
+			<th class="colServer"><?php echo translate('Server') ?></th>
             <th class="colSource"><?php echo translate('Source') ?></th>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ )
@@ -258,7 +261,7 @@ if ( canEdit('Monitors') )
         </thead>
         <tfoot>
           <tr>
-            <td class="colLeftButtons" colspan="3">
+            <td class="colLeftButtons" colspan="4">
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
               <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
@@ -304,6 +307,7 @@ foreach( $displayMonitors as $monitor )
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
             <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
+			<td class="colServer"><?php echo new Server( $monitor['ServerId'] )->Name() ?></td>
 <?php if ( $monitor['Type'] == "Local" ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>

From a8ba32db649c26e41e9f591aad791768249b358f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 14:51:59 -0400
Subject: [PATCH 059/362] add Server.php to autoconf build

---
 web/includes/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/includes/Makefile.am b/web/includes/Makefile.am
index 93fe65380..7943e32d1 100644
--- a/web/includes/Makefile.am
+++ b/web/includes/Makefile.am
@@ -6,6 +6,7 @@ web_DATA = \
 	config.php
 
 dist_web_DATA = \
+	Server.php \
 	actions.php \
 	database.php \
 	functions.php \

From ac5f42efcf5f5971e241f49d0e1dff7a1424e546 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 16 Sep 2015 15:16:07 -0400
Subject: [PATCH 060/362] add a class for Server objects

---
 web/includes/Server.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 web/includes/Server.php

diff --git a/web/includes/Server.php b/web/includes/Server.php
new file mode 100644
index 000000000..e49167ed9
--- /dev/null
+++ b/web/includes/Server.php
@@ -0,0 +1,20 @@
+<?php
+require_once( 'database.php' );
+class Server {
+	public function __construct( array $params = array() ) {
+		if ( isset( $params['Id']) and $params['Id'] ) {
+			$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $params['Id'] ) );
+			if ( $s ) {
+				foreach ($s as $k => $v) {
+					$this->{$k} = $v;
+				}
+			} else {
+				Error("Unable to load Server record for Id=" . $params['Id'] );
+			}
+		}
+	}
+	public function Name() {
+	return $this->{'Name'};
+	}
+}
+?>

From 52cdb8a05a31410aab9882c8b9b52caa4bb67bb4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:29:36 -0400
Subject: [PATCH 061/362] add Monitor class

---
 web/includes/Makefile.am |  1 +
 web/includes/Monitor.php | 61 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 web/includes/Monitor.php

diff --git a/web/includes/Makefile.am b/web/includes/Makefile.am
index 7943e32d1..d4a1ece9b 100644
--- a/web/includes/Makefile.am
+++ b/web/includes/Makefile.am
@@ -6,6 +6,7 @@ web_DATA = \
 	config.php
 
 dist_web_DATA = \
+	Monitor.php \
 	Server.php \
 	actions.php \
 	database.php \
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
new file mode 100644
index 000000000..a3d3ebebb
--- /dev/null
+++ b/web/includes/Monitor.php
@@ -0,0 +1,61 @@
+<?php
+require_once( 'database.php' );
+require_once( 'Server.php' );
+
+class Monitor {
+	public function __construct( $id ) {
+		if ( $id ) {
+		$s = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $id ) );
+		if ( $s ) {
+			foreach ($s as $k => $v) {
+				$this->{$k} = $v;
+			}
+		} else {
+			Error("Unable to load Monitor record for Id=" . $id );
+		}
+		} else {
+			
+		}
+	} // end function __construct
+	public function __call( $fn, array $args){
+        if(isset($this->{$fn})){
+			return $fn;
+            #array_unshift($args, $this);
+            #call_user_func_array( $this->{$fn}, $args);
+        }
+    }
+	public function getStreamSrc( $args, $querySep='&amp;' ) {
+		if ( isset($this->{'ServerId'}) and $this->{'ServerId'} ) {
+			$Server = new Server( $this->{'ServerId'} );
+			$streamSrc = ZM_BASE_PROTOCOL.'://'.$Server->Hostname.ZM_PATH_ZMS;
+		} else {
+			$streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+		}
+
+		$args[] = "monitor=".$this->{'Id'};
+
+		if ( ZM_OPT_USE_AUTH ) {
+			if ( ZM_AUTH_RELAY == "hashed" ) {
+				$args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
+			} elseif ( ZM_AUTH_RELAY == "plain" ) {
+				$args[] = "user=".$_SESSION['username'];
+				$args[] = "pass=".$_SESSION['password'];
+			} elseif ( ZM_AUTH_RELAY == "none" ) {
+				$args[] = "user=".$_SESSION['username'];
+			}
+		}
+		if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) ) {
+			$args[] = "connkey=".$GLOBALS['connkey'];
+		}
+		if ( ZM_RAND_STREAM ) {
+			$args[] = "rand=".time();
+		}
+
+		if ( count($args) ) {
+			$streamSrc .= "?".join( $querySep, $args );
+		}
+
+		return( $streamSrc );
+	} // end function etStreamSrc
+}
+?>

From 13327b765194159f0b43f9bc29aa6b0ac40e6f9e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:34:09 -0400
Subject: [PATCH 062/362] Load Controls if appropriate

---
 web/includes/Monitor.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index a3d3ebebb..9ebe76c3e 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -5,14 +5,20 @@ require_once( 'Server.php' );
 class Monitor {
 	public function __construct( $id ) {
 		if ( $id ) {
-		$s = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $id ) );
-		if ( $s ) {
-			foreach ($s as $k => $v) {
-				$this->{$k} = $v;
+			$s = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $id ) );
+			if ( $s ) {
+				foreach ($s as $k => $v) {
+					$this->{$k} = $v;
+				}
+				if ( $this->{'Controllable'} ) {
+					$s = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $this->{'ControlId'} ) );
+					foreach ($s as $k => $v) {
+						$this->{$k} = $v;
+					}
+				}
+			} else {
+				Error("Unable to load Monitor record for Id=" . $id );
 			}
-		} else {
-			Error("Unable to load Monitor record for Id=" . $id );
-		}
 		} else {
 			
 		}

From 01718aaffb88264e08bad536cfe6f5d91ff75842 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:34:26 -0400
Subject: [PATCH 063/362] consturctor just takes an id

---
 web/includes/Server.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index e49167ed9..ec01ea032 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,20 +1,27 @@
 <?php
 require_once( 'database.php' );
 class Server {
-	public function __construct( array $params = array() ) {
-		if ( isset( $params['Id']) and $params['Id'] ) {
-			$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $params['Id'] ) );
-			if ( $s ) {
-				foreach ($s as $k => $v) {
-					$this->{$k} = $v;
-				}
-			} else {
-				Error("Unable to load Server record for Id=" . $params['Id'] );
+    public function __construct( $id ) {
+		if ( $id ) {
+		$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $id ) );
+		if ( $s ) {
+			foreach ($s as $k => $v) {
+				$this->{$k} = $v;
 			}
+		} else {
+			Error("Unable to load Server record for Id=" . $id );
 		}
-	}
+		} else {
+			$this->{'Name'} = '';
+			$this->{'Hostname'} = '';
+		}
+    }
+
 	public function Name() {
-	return $this->{'Name'};
+		return $this->{'Name'};
+	}
+	public function Hostname() {
+		return $this->{'Hostname'};
 	}
 }
 ?>

From 4a65ae1d2aff8e5d4e0ecedac943a23ed71dfb46 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:34:48 -0400
Subject: [PATCH 064/362] fix error in display of Server

---
 web/skins/classic/views/console.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 37ab27414..1a77e76d5 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -307,7 +307,10 @@ foreach( $displayMonitors as $monitor )
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
             <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
-			<td class="colServer"><?php echo new Server( $monitor['ServerId'] )->Name() ?></td>
+			<td class="colServer"><?php 
+$Server = new Server( $monitor['ServerId'] );
+echo $Server->Name();
+ ?></td>
 <?php if ( $monitor['Type'] == "Local" ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>

From 366c4ec67673758412e422fcf585b7ffb428bbeb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:35:09 -0400
Subject: [PATCH 065/362]  monitor array to class

---
 web/skins/classic/views/js/watch.js.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index f33983d9f..829beb0e7 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -44,9 +44,9 @@ var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"eve
 var connKey = '<?php echo $connkey ?>';
 var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
 
-var monitorId = <?php echo $monitor['Id'] ?>;
-var monitorWidth = <?php echo $monitor['Width'] ?>;
-var monitorHeight = <?php echo $monitor['Height'] ?>;
+var monitorId = <?php echo $monitor->Id ?>;
+var monitorWidth = <?php echo $monitor->Width ?>;
+var monitorHeight = <?php echo $monitor->Height ?>;
 
 var scale = <?php echo $scale ?>;
 
@@ -61,11 +61,11 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
 var canPlayPauseAudio = Browser.ie;
 
-<?php if ( $monitor['CanMoveMap'] ) { ?>
+<?php if ( $monitor->CanMoveMap ) { ?>
 var imageControlMode = "moveMap";
-<?php } elseif ( $monitor['CanMoveRel'] ) { ?>
+<?php } elseif ( $monitor->CanMoveRel ) { ?>
 var imageControlMode = "movePseudoMap";
-<?php } elseif ( $monitor['CanMoveCon'] ) { ?>
+<?php } elseif ( $monitor->CanMoveCon ) { ?>
 var imageControlMode = "moveConMap";
 <?php } else { ?>
 var imageControlMode = null;

From c415399043eaf3afc8874ccc82d21bdf9abd757b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:35:27 -0400
Subject: [PATCH 066/362] add Hostname to Server

---
 web/skins/classic/views/server.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index fa57a7e97..51863e7dc 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -54,6 +54,10 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
               <th scope="row"><?php echo translate('ServerName') ?></th>
               <td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td>
             </tr>
+            <tr>
+              <th scope="row"><?php echo translate('ServerHostname') ?></th>
+              <td><input type="text" name="newServer[Hostname]" value="<?php echo $newServer['Hostname'] ?>"/></td>
+            </tr>
           </tbody>
         </table>
         <div id="contentButtons">

From aac45e54b87ed279f262cac54eab28b8e909eb2b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:35:38 -0400
Subject: [PATCH 067/362]  monitor array to class

---
 web/skins/classic/views/watch.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 8a955840f..a93d05c89 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -18,6 +18,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
+require_once('includes/Monitor.php');
+
 if ( !canView( 'Stream' ) )
 {
     $view = "error";
@@ -29,50 +31,51 @@ if ( ! visibleMonitor( $_REQUEST['mid'] ) ) {
 }
 
 $sql = 'SELECT C.*, M.* FROM Monitors AS M LEFT JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?';
-$monitor = dbFetchOne( $sql, NULL, array( $_REQUEST['mid'] ) );
+$monitor = new Monitor( $_REQUEST['mid'] );
+#dbFetchOne( $sql, NULL, array( $_REQUEST['mid'] ) );
 
 if ( isset($_REQUEST['showControls']) )
     $showControls = validInt($_REQUEST['showControls']);
 else
-    $showControls = (canView( 'Control' ) && ($monitor['DefaultView'] == 'Control'));
+    $showControls = (canView( 'Control' ) && ($monitor->DefaultView == 'Control'));
 
-$showPtzControls = ( ZM_OPT_CONTROL && $monitor['Controllable'] && canView( 'Control' ) );
+$showPtzControls = ( ZM_OPT_CONTROL && $monitor->Controllable && canView( 'Control' ) );
 
 if ( isset( $_REQUEST['scale'] ) )
     $scale = validInt($_REQUEST['scale']);
 else
-    $scale = reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+    $scale = reScale( SCALE_BASE, $monitor->DefaultScale, ZM_WEB_DEFAULT_SCALE );
 
 $connkey = generateConnKey();
 
 if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 {
     $streamMode = "mpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
 }
 elseif ( canStream() )
 {
     $streamMode = "jpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor['StreamReplayBuffer'] ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor->StreamReplayBuffer() ) );
 }
 else
 {
     $streamMode = "single";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale ) );
     Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.");
 }
 
-$showDvrControls = ( $streamMode == 'jpeg' && $monitor['StreamReplayBuffer'] != 0 );
+$showDvrControls = ( $streamMode == 'jpeg' && $monitor->StreamReplayBuffer() != 0 );
 
 noCacheHeaders();
 
-xhtmlHeaders( __FILE__, $monitor['Name']." - ".translate('Feed') );
+xhtmlHeaders( __FILE__, $monitor->Name()." - ".translate('Feed') );
 ?>
 <body>
   <div id="page">
     <div id="content">
       <div id="menuBar">
-        <div id="monitorName"><?php echo $monitor['Name'] ?></div>
+        <div id="monitorName"><?php echo $monitor->Name() ?></div>
         <div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a></div>
         <div id="menuControls">
 <?php
@@ -93,7 +96,7 @@ if ( $showPtzControls )
 }
 ?>
 <?php
-if ( canView( 'Control' ) && $monitor['Type'] == "Local" )
+if ( canView( 'Control' ) && $monitor->Type() == "Local" )
 {
 ?>
           <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>

From 3008974c89fe3d7e37e779360ada030f2a8e6e7f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 15:39:04 -0400
Subject: [PATCH 068/362] add Hostname to Servers

---
 db/zm_update-1.28.107.sql | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 db/zm_update-1.28.107.sql

diff --git a/db/zm_update-1.28.107.sql b/db/zm_update-1.28.107.sql
new file mode 100644
index 000000000..a5f75c9d8
--- /dev/null
+++ b/db/zm_update-1.28.107.sql
@@ -0,0 +1,21 @@
+--
+-- This updates a 1.28.105 database to 1.28.106
+--
+
+--
+-- Add Monitor RTSPDescribe field
+-- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Servers'
+	AND table_schema = DATABASE()
+	AND column_name = 'Hostname'
+	) > 0,
+"SELECT 'Column Hostname already exists in Servers'",
+"ALTER TABLE `Servers` ADD `Hostname` TEXT NOT NULL default '' AFTER `StateId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From ba1100fc03ac2b838f5ad8d400189c7918820ed8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 16:06:47 -0400
Subject: [PATCH 069/362] continue conversion from array to class of Monitor

---
 web/api/app/Config/core.php                   |  7 +-
 web/includes/Monitor.php                      |  5 +-
 web/includes/Server.php                       |  3 +
 .../classic/includes/control_functions.php    | 90 +++++++++----------
 web/skins/classic/views/watch.php             | 12 +--
 5 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
index 5902a2235..feb8779bf 100644
--- a/web/api/app/Config/core.php
+++ b/web/api/app/Config/core.php
@@ -216,19 +216,18 @@
  *
  */
 	Configure::write('Session', array(
-		'defaults' => 'php',
-		'cookie'=>'ZMSESSID'
+		'defaults' => 'php'
 	));
 
 /**
  * A random string used in security hashing methods.
  */
-	Configure::write('Security.salt', 'Q0MjGG2xRQEhJVQR85WhFJKI7f2St8RYMlVR7GNQ');
+	Configure::write('Security.salt', 'URWfoFspTQASBP8afw8enOLNCSMWZnrh2TRwoGaF');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-	Configure::write('Security.cipherSeed', '02670120062639232092038865362');
+	Configure::write('Security.cipherSeed', '07283205205652438276688533540');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 9ebe76c3e..983bbbd86 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -13,6 +13,9 @@ class Monitor {
 				if ( $this->{'Controllable'} ) {
 					$s = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $this->{'ControlId'} ) );
 					foreach ($s as $k => $v) {
+							if ( $k == 'Id' ) {
+								continue;
+							}
 						$this->{$k} = $v;
 					}
 				}
@@ -33,7 +36,7 @@ class Monitor {
 	public function getStreamSrc( $args, $querySep='&amp;' ) {
 		if ( isset($this->{'ServerId'}) and $this->{'ServerId'} ) {
 			$Server = new Server( $this->{'ServerId'} );
-			$streamSrc = ZM_BASE_PROTOCOL.'://'.$Server->Hostname.ZM_PATH_ZMS;
+			$streamSrc = ZM_BASE_PROTOCOL.'://'.$Server->Hostname().ZM_PATH_ZMS;
 		} else {
 			$streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
 		}
diff --git a/web/includes/Server.php b/web/includes/Server.php
index ec01ea032..97361e544 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -21,6 +21,9 @@ class Server {
 		return $this->{'Name'};
 	}
 	public function Hostname() {
+		if ( ! isset( $this->{'Hostname'} ) ) {
+			return $this->{'Name'};
+		}
 		return $this->{'Hostname'};
 	}
 }
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index b09a53138..d77818fbf 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -30,13 +30,13 @@ function getControlCommands( $monitor )
     $cmds['PresetGoto'] = "presetGoto";
     $cmds['PresetHome'] = "presetHome";
 
-    if ( !empty($monitor['CanZoom']) )
+    if ( !empty($monitor->CanZoom) )
     {
-        if ( $monitor['CanZoomCon'] )
+        if ( $monitor->CanZoomCon )
             $cmds['ZoomRoot'] = "zoomCon";
-        elseif ( $monitor['CanZoomRel'] )
+        elseif ( $monitor->CanZoomRel )
             $cmds['ZoomRoot'] = "zoomRel";
-        elseif ( $monitor['CanZoomAbs'] )
+        elseif ( $monitor->CanZoomAbs )
             $cmds['ZoomRoot'] = "zoomAbs";
         $cmds['ZoomTele'] = $cmds['ZoomRoot']."Tele";
         $cmds['ZoomWide'] = $cmds['ZoomRoot']."Wide";
@@ -45,13 +45,13 @@ function getControlCommands( $monitor )
         $cmds['ZoomMan'] = "zoomMan";
     }
 
-    if ( !empty($monitor['CanFocus']) )
+    if ( !empty($monitor->CanFocus) )
     {
-        if ( $monitor['CanFocusCon'] )
+        if ( $monitor->CanFocusCon )
             $cmds['FocusRoot'] = "focusCon";
-        elseif ( $monitor['CanFocusRel'] )
+        elseif ( $monitor->CanFocusRel )
             $cmds['FocusRoot'] = "focusRel";
-        elseif ( $monitor['CanFocusAbs'] )
+        elseif ( $monitor->CanFocusAbs )
             $cmds['FocusRoot'] = "focusAbs";
         $cmds['FocusFar'] = $cmds['FocusRoot']."Far";
         $cmds['FocusNear'] = $cmds['FocusRoot']."Near";
@@ -60,13 +60,13 @@ function getControlCommands( $monitor )
         $cmds['FocusMan'] = "focusMan";
     }
 
-    if ( !empty($monitor['CanIris']) )
+    if ( !empty($monitor->CanIris) )
     {
-        if ( $monitor['CanIrisCon'] )
+        if ( $monitor->CanIrisCon )
             $cmds['IrisRoot'] = "irisCon";
-        elseif ( $monitor['CanIrisRel'] )
+        elseif ( $monitor->CanIrisRel )
             $cmds['IrisRoot'] = "irisRel";
-        elseif ( $monitor['CanIrisAbs'] )
+        elseif ( $monitor->CanIrisAbs )
             $cmds['IrisRoot'] = "irisAbs";
         $cmds['IrisOpen'] = $cmds['IrisRoot']."Open";
         $cmds['IrisClose'] = $cmds['IrisRoot']."Close";
@@ -75,13 +75,13 @@ function getControlCommands( $monitor )
         $cmds['IrisMan'] = "irisMan";
     }
 
-    if ( !empty($monitor['CanWhite']) )
+    if ( !empty($monitor->CanWhite) )
     {
-        if ( $monitor['CanWhiteCon'] )
+        if ( $monitor->CanWhiteCon )
             $cmds['WhiteRoot'] = "whiteCon";
-        elseif ( $monitor['CanWhiteRel'] )
+        elseif ( $monitor->CanWhiteRel )
             $cmds['WhiteRoot'] = "whiteRel";
-        elseif ( $monitor['CanWhiteAbs'] )
+        elseif ( $monitor->CanWhiteAbs )
             $cmds['WhiteRoot'] = "whiteAbs";
         $cmds['WhiteIn'] = $cmds['WhiteRoot']."In";
         $cmds['WhiteOut'] = $cmds['WhiteRoot']."Out";
@@ -89,13 +89,13 @@ function getControlCommands( $monitor )
         $cmds['WhiteMan'] = "whiteMan";
     }
 
-    if ( !empty($monitor['CanGain']) )
+    if ( !empty($monitor->CanGain) )
     {
-        if ( $monitor['CanGainCon'] )
+        if ( $monitor->CanGainCon )
             $cmds['GainRoot'] = "gainCon";
-        elseif ( $monitor['CanGainRel'] )
+        elseif ( $monitor->CanGainRel )
             $cmds['GainRoot'] = "gainRel";
-        elseif ( $monitor['CanGainAbs'] )
+        elseif ( $monitor->CanGainAbs )
             $cmds['GainRoot'] = "gainAbs";
         $cmds['GainUp'] = $cmds['GainRoot']."Up";
         $cmds['GainDown'] = $cmds['GainRoot']."Down";
@@ -103,19 +103,19 @@ function getControlCommands( $monitor )
         $cmds['GainMan'] = "gainMan";
     }
 
-    if ( !empty($monitor['CanMove']) )
+    if ( !empty($monitor->CanMove) )
     {
-        if ( $monitor['CanMoveCon'] )
+        if ( $monitor->CanMoveCon )
         {
             $cmds['MoveRoot'] = "moveCon";
             $cmds['Center'] = "moveStop";
         }
-        elseif ( $monitor['CanMoveRel'] )
+        elseif ( $monitor->CanMoveRel )
         {
             $cmds['MoveRoot'] = "moveRel";
             $cmds['Center'] = $cmds['PresetHome'];
         }
-        elseif ( $monitor['CanMoveAbs'] )
+        elseif ( $monitor->CanMoveAbs )
         {
             $cmds['MoveRoot'] = "moveAbs";
             $cmds['Center'] = $cmds['PresetHome'];
@@ -246,9 +246,9 @@ function controlPanTilt( $monitor, $cmds )
   <div class="pantilLabel"><?php echo translate('PanTilt') ?></div>
   <div class="pantiltButtons">
 <?php
-    $hasPan = $monitor['CanPan'];
-    $hasTilt = $monitor['CanTilt'];
-    $hasDiag = $hasPan && $hasTilt && $monitor['CanMoveDiag'];
+    $hasPan = $monitor->CanPan;
+    $hasTilt = $monitor->CanTilt;
+    $hasDiag = $hasPan && $hasTilt && $monitor->CanMoveDiag;
 ?>
       <div class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpLeft'] ?>',event,-1,-1)"></div>
       <div class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUp'] ?>',event,0,-1)"></div>
@@ -271,14 +271,14 @@ function controlPresets( $monitor, $cmds )
 
     define( "MAX_PRESETS", "12" );
 
-    $sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";
+    $sql = 'select * from ControlPresets where MonitorId = ?';
     $labels = array();
-    foreach( dbFetchAll( $sql ) as $row )
+    foreach( dbFetchAll( $sql, NULL, array( $monitor->Id ) ) as $row )
     {
         $labels[$row['Preset']] = $row['Label'];
     }
 
-    $presetBreak = (int)(($monitor['NumPresets']+1)/((int)(($monitor['NumPresets']-1)/MAX_PRESETS)+1));
+    $presetBreak = (int)(($monitor->NumPresets+1)/((int)(($monitor->NumPresets-1)/MAX_PRESETS)+1));
 
     ob_start();
 ?>
@@ -286,7 +286,7 @@ function controlPresets( $monitor, $cmds )
   <!--<div><?php echo translate('Presets') ?></div>-->
   <div>
 <?php
-    for ( $i = 1; $i <= $monitor['NumPresets']; $i++ )
+    for ( $i = 1; $i <= $monitor->NumPresets; $i++ )
     {
 ?><input type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?$labels[$i]:"" ?>" value="<?php echo $i ?>" onclick="controlCmd('<?php echo $cmds['PresetGoto'] ?><?php echo $i ?>');"/><?php
         if ( $i && (($i%$presetBreak) == 0) )
@@ -298,16 +298,16 @@ function controlPresets( $monitor, $cmds )
   </div>
   <div>
 <?php
-    if ( $monitor['HasHomePreset'] )
+    if ( $monitor->HasHomePreset )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Home') ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
 <?php
     }
-    if ( canEdit( 'Monitors') && $monitor['CanSetPresets'] )
+    if ( canEdit( 'Monitors') && $monitor->CanSetPresets )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo translate('Set') ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmPreset', 'preset' );"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Set') ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor->Id ?>', 'zmPreset', 'preset' );"/>
 <?php
     }
 ?>
@@ -327,19 +327,19 @@ function controlPower( $monitor, $cmds )
   <div class="powerLabel"><?php echo translate('Control') ?></div>
   <div>
 <?php
-    if ( $monitor['CanWake'] )
+    if ( $monitor->CanWake )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Wake') ?>" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"/>
 <?php
     }
-    if ( $monitor['CanSleep'] )
+    if ( $monitor->CanSleep )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Sleep') ?>" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"/>
 <?php
     }
-    if ( $monitor['CanReset'] )
+    if ( $monitor->CanReset )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Reset') ?>" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"/>
@@ -359,22 +359,22 @@ function ptzControls( $monitor )
 ?>
         <div class="controlsPanel">
 <?php
-        if ( $monitor['CanFocus'] )
+        if ( $monitor->CanFocus )
             echo controlFocus( $monitor, $cmds );
-        if ( $monitor['CanZoom'] )
+        if ( $monitor->CanZoom )
             echo controlZoom( $monitor, $cmds );
-        if ( $monitor['CanIris'] )
+        if ( $monitor->CanIris )
             echo controlIris( $monitor, $cmds );
-        if ( $monitor['CanWhite'] )
+        if ( $monitor->CanWhite )
             echo controlWhite( $monitor, $cmds );
-        if ( $monitor['CanMove'] || ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] ) )
+        if ( $monitor->CanMove || ( $monitor->CanWake || $monitor->CanSleep || $monitor->CanReset ) )
         {
 ?>
           <div class="pantiltPanel">
 <?php
-            if ( $monitor['CanMove'] )
+            if ( $monitor->CanMove )
                 echo controlPanTilt( $monitor, $cmds );
-            if ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] )
+            if ( $monitor->CanWake || $monitor->CanSleep || $monitor->CanReset )
                 echo controlPower( $monitor, $cmds );
 ?>
           </div>
@@ -383,7 +383,7 @@ function ptzControls( $monitor )
 ?>
         </div>
 <?php
-        if ( $monitor['HasPresets'] )
+        if ( $monitor->HasPresets )
             echo controlPresets( $monitor, $cmds );
     return( ob_get_clean() );
 }
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index a93d05c89..ad1857f9a 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -56,7 +56,7 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 elseif ( canStream() )
 {
     $streamMode = "jpeg";
-    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor->StreamReplayBuffer() ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor->StreamReplayBuffer ) );
 }
 else
 {
@@ -99,7 +99,7 @@ if ( $showPtzControls )
 if ( canView( 'Control' ) && $monitor->Type() == "Local" )
 {
 ?>
-          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
+          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id, 'zmSettings'.$monitor->Id, 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
 <?php
 }
 ?>
@@ -110,18 +110,18 @@ if ( canView( 'Control' ) && $monitor->Type() == "Local" )
 <?php
 if ( $streamMode == "mpeg" )
 {
-    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), ZM_MPEG_LIVE_FORMAT, $monitor['Name'] );
+    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name );
 }
 elseif ( $streamMode == "jpeg" )
 {
     if ( canStreamNative() )
-        outputImageStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
+        outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
     elseif ( canStreamApplet() )
-        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
+        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
 }
 else
 {
-    outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
+    outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
 }
 ?>
       </div>

From b25958df142eede8c81350f4e58e77b7d4f09e99 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 17 Sep 2015 16:07:04 -0400
Subject: [PATCH 070/362] add a check for StateId

---
 db/zm_update-1.28.107.sql | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/db/zm_update-1.28.107.sql b/db/zm_update-1.28.107.sql
index a5f75c9d8..a44dc76ad 100644
--- a/db/zm_update-1.28.107.sql
+++ b/db/zm_update-1.28.107.sql
@@ -2,6 +2,23 @@
 -- This updates a 1.28.105 database to 1.28.106
 --
 
+--
+-- Add Monitor StateId field
+--
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Servers'
+    AND table_schema = DATABASE()
+    AND column_name = 'StateId'
+    ) > 0,
+"SELECT 'Column StateId already exists in Servers'",
+"ALTER TABLE `Servers` ADD `StateId` int(10) unsigned AFTER `Name`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
 --
 -- Add Monitor RTSPDescribe field
 -- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header

From e4b0e74f6907b64e0edd728e1b5935dd0352d079 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 24 Sep 2015 10:01:27 -0400
Subject: [PATCH 071/362] merge master

---
 CONTRIBUTING.md                        |  17 ++
 README.md                              |   2 +-
 docs/api.rst                           |  24 +-
 scripts/zmwatch.pl.in                  |  12 +-
 src/zm_buffer.h                        |   2 +-
 web/api/app/Config/core.php            | 387 -------------------------
 web/api/app/Config/core.php.default    |   3 +-
 web/skins/classic/css/classic/skin.css |   2 +-
 web/skins/classic/css/dark/skin.css    |   2 +-
 web/skins/classic/css/flat/skin.css    |   2 +-
 10 files changed, 56 insertions(+), 397 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100644 web/api/app/Config/core.php

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..5e211cb31
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,17 @@
+# Contributing
+
+The ZoneMinder project was originally written by Philip Coombes in 2001. It has since moved to Github and is maintained by just a few who volunteer their spare time.  
+
+Over the years, ZoneMinder has accumulated a rather large user base. This presents a challenge to the development team when it comes to managing communications. Welcome to the world of software development, right?
+
+In order to keep the kinds of issues, which require changes to the source code, separate from all other questions and comments, our methods of communication are organized in the following manner:
+
+- The ZoneMinder Github forum is intended for bug reports and serious feature requests only
+- The ZoneMinder user forum is intended for general questions and tech support
+- The ZoneMinder IRC channel is intended for general questions and tech support
+
+More details can be found in our [Github Posting Rules](https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules). Please read this before creating an issue in our Github forum.
+
+Knowledge of Github is a necessary first step to contribute to the project. To contribute, one must generate a pull request. For those just starting out, [this guide](https://github.com/ZoneMinder/ZoneMinder/wiki/Understanding-Github-and-Pull-Requests) will step you through the process. 
+
+Note that pasting code into our Github forum, with the expectation we will do the work for you, is not acceptable.
diff --git a/README.md b/README.md
index b1d96befb..381b2dd54 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki
 
 ZoneMinder is an integrated set of applications which provide a complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras attached to a Linux based machine. It is designed to run on distributions which support the Video For Linux (V4L) interface and has been tested with video cameras attached to BTTV cards, various USB cameras and also supports most IP network cameras. 
 
-## Contacting the Developement Team
+## Contacting the Development Team
 Before creating an issue in our github forum, please read our posting rules:
 https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules
 
diff --git a/docs/api.rst b/docs/api.rst
index f42f5c4a2..53c6d155b 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -20,14 +20,34 @@ OPT_AUTH enabled, you need to log into ZoneMinder using the same browser you pla
 use the APIs from. If you are developing an app that relies on the API, you need 
 to do a POST login from the app into ZoneMinder before you can access the API.
 
+Then, you need to re-use the authentication information of the login (returned as cookie states)
+with subsequent APIs for the authentication information to flow through to the APIs.
+
 This means if you plan to use cuRL to experiment with these APIs, you first need to do
 
 ::
 
-	curl -d "username=XXXX&password=YYYY&action=login&view=console"  http://yourzmip/zm/index.php -c cookies.txt
+	curl -d "username=XXXX&password=YYYY&action=login&view=console" -c cookies.txt  http://yourzmip/zm/index.php
 
 replacing *XXXX* and *YYYY* with your username and password, respectively.
-Then for each of the examples below, add a ``-c cookies.txt`` at the end of the requests.
+
+Please make sure you do this in a directory where you have write permissions, otherwise cookies.txt will not be created
+and the command will silently  fail.
+
+
+What the "-c cookies.txt" does is store a cookie state reflecting that you have logged into ZM. You now need
+to apply that cookie state to all subsequent APIs. You do that by using a '-b cookies.txt' to subsequent APIs if you are 
+using CuRL like so:
+
+::
+
+	curl -b cookies.txt http://yourzmip/zm/api/monitors.json
+
+This would return a list of monitors and pass on the authentication information to the ZM API layer. 
+
+So remember, if you are using authentication, please add a ``-b cookies.txt``  to each of the commands below if you are using
+CuRL. If you are not using CuRL and writing your own app, you need to make sure you pass on cookies to subsequent requests
+in your app.
 
 Examples (please read security notice above)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 3e97733a1..5e0767487 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -93,8 +93,16 @@ while( 1 )
         {
             # Check we have got an image recently
             my $image_time = zmGetLastWriteTime( $monitor );
-            next if ( !defined($image_time) ); # Can't read from shared data
-            next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
+            if ( !defined($image_time) ) {
+				 # Can't read from shared data
+				Debug( "LastWriteTime is not defined." );
+				next;
+			}
+            if ( !$image_time ) {
+				# We can't get the last capture time so can't be sure it's died.
+				Debug( "LastWriteTime is = $image_time." );
+				next;
+			}
 
             my $max_image_delay = ( $monitor->{MaxFPS}
                                     &&($monitor->{MaxFPS}>0)
diff --git a/src/zm_buffer.h b/src/zm_buffer.h
index a0db4a2c5..007df4459 100644
--- a/src/zm_buffer.h
+++ b/src/zm_buffer.h
@@ -10,7 +10,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more demTails.
+ * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
diff --git a/web/api/app/Config/core.php b/web/api/app/Config/core.php
deleted file mode 100644
index feb8779bf..000000000
--- a/web/api/app/Config/core.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
- * This is core configuration file.
- *
- * Use it to configure core behavior of Cake.
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.Config
- * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-/**
- * CakePHP Debug Level:
- *
- * Production Mode:
- * 	0: No error messages, errors, or warnings shown. Flash messages redirect.
- *
- * Development Mode:
- * 	1: Errors and warnings shown, model caches refreshed, flash messages halted.
- * 	2: As in 1, but also with full debug messages and SQL output.
- *
- * In production mode, flash messages redirect after a time interval.
- * In development mode, you need to click the flash message to continue.
- */
-	Configure::write('debug', 2);
-
-/**
- * Configure the Error handler used to handle errors for your application. By default
- * ErrorHandler::handleError() is used. It will display errors using Debugger, when debug > 0
- * and log errors with CakeLog when debug = 0.
- *
- * Options:
- *
- * - `handler` - callback - The callback to handle errors. You can set this to any callable type,
- *   including anonymous functions.
- *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
- * - `level` - integer - The level of errors you are interested in capturing.
- * - `trace` - boolean - Include stack traces for errors in log files.
- *
- * @see ErrorHandler for more information on error handling and configuration.
- */
-	Configure::write('Error', array(
-		'handler' => 'ErrorHandler::handleError',
-		'level' => E_ALL & ~E_DEPRECATED,
-		'trace' => true
-	));
-
-/**
- * Configure the Exception handler used for uncaught exceptions. By default,
- * ErrorHandler::handleException() is used. It will display a HTML page for the exception, and
- * while debug > 0, framework errors like Missing Controller will be displayed. When debug = 0,
- * framework errors will be coerced into generic HTTP errors.
- *
- * Options:
- *
- * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
- *   including anonymous functions.
- *   Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
- * - `renderer` - string - The class responsible for rendering uncaught exceptions. If you choose a custom class you
- *   should place the file for that class in app/Lib/Error. This class needs to implement a render method.
- * - `log` - boolean - Should Exceptions be logged?
- * - `skipLog` - array - list of exceptions to skip for logging. Exceptions that
- *   extend one of the listed exceptions will also be skipped for logging.
- *   Example: `'skipLog' => array('NotFoundException', 'UnauthorizedException')`
- *
- * @see ErrorHandler for more information on exception handling and configuration.
- */
-	Configure::write('Exception', array(
-		'handler' => 'ErrorHandler::handleException',
-		'renderer' => 'ExceptionRenderer',
-		'log' => true
-	));
-
-/**
- * Application wide charset encoding
- */
-	Configure::write('App.encoding', 'UTF-8');
-
-/**
- * To configure CakePHP *not* to use mod_rewrite and to
- * use CakePHP pretty URLs, remove these .htaccess
- * files:
- *
- * /.htaccess
- * /app/.htaccess
- * /app/webroot/.htaccess
- *
- * And uncomment the App.baseUrl below. But keep in mind
- * that plugin assets such as images, CSS and JavaScript files
- * will not work without URL rewriting!
- * To work around this issue you should either symlink or copy
- * the plugin assets into you app's webroot directory. This is
- * recommended even when you are using mod_rewrite. Handling static
- * assets through the Dispatcher is incredibly inefficient and
- * included primarily as a development convenience - and
- * thus not recommended for production applications.
- */
-	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
-
-/**
- * To configure CakePHP to use a particular domain URL
- * for any URL generation inside the application, set the following
- * configuration variable to the http(s) address to your domain. This
- * will override the automatic detection of full base URL and can be
- * useful when generating links from the CLI (e.g. sending emails)
- */
-	//Configure::write('App.fullBaseUrl', 'http://example.com');
-
-/**
- * Web path to the public images directory under webroot.
- * If not set defaults to 'img/'
- */
-	//Configure::write('App.imageBaseUrl', 'img/');
-
-/**
- * Web path to the CSS files directory under webroot.
- * If not set defaults to 'css/'
- */
-	//Configure::write('App.cssBaseUrl', 'css/');
-
-/**
- * Web path to the js files directory under webroot.
- * If not set defaults to 'js/'
- */
-	//Configure::write('App.jsBaseUrl', 'js/');
-
-/**
- * Uncomment the define below to use CakePHP prefix routes.
- *
- * The value of the define determines the names of the routes
- * and their associated controller actions:
- *
- * Set to an array of prefixes you want to use in your application. Use for
- * admin or other prefixed routes.
- *
- * 	Routing.prefixes = array('admin', 'manager');
- *
- * Enables:
- *	`admin_index()` and `/admin/controller/index`
- *	`manager_index()` and `/manager/controller/index`
- *
- */
-	//Configure::write('Routing.prefixes', array('admin'));
-
-/**
- * Turn off all caching application-wide.
- *
- */
-	//Configure::write('Cache.disable', true);
-
-/**
- * Enable cache checking.
- *
- * If set to true, for view caching you must still use the controller
- * public $cacheAction inside your controllers to define caching settings.
- * You can either set it controller-wide by setting public $cacheAction = true,
- * or in each action using $this->cacheAction = true.
- *
- */
-	//Configure::write('Cache.check', true);
-
-/**
- * Enable cache view prefixes.
- *
- * If set it will be prepended to the cache name for view file caching. This is
- * helpful if you deploy the same application via multiple subdomains and languages,
- * for instance. Each version can then have its own view cache namespace.
- * Note: The final cache file name will then be `prefix_cachefilename`.
- */
-	//Configure::write('Cache.viewPrefix', 'prefix');
-
-/**
- * Session configuration.
- *
- * Contains an array of settings to use for session configuration. The defaults key is
- * used to define a default preset to use for sessions, any settings declared here will override
- * the settings of the default config.
- *
- * ## Options
- *
- * - `Session.cookie` - The name of the cookie to use. Defaults to 'CAKEPHP'
- * - `Session.timeout` - The number of minutes you want sessions to live for. This timeout is handled by CakePHP
- * - `Session.cookieTimeout` - The number of minutes you want session cookies to live for.
- * - `Session.checkAgent` - Do you want the user agent to be checked when starting sessions? You might want to set the
- *    value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
- * - `Session.defaults` - The default configuration set to use as a basis for your session.
- *    There are four builtins: php, cake, cache, database.
- * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of callables,
- *    that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler`
- *    to the ini array.
- * - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and
- *    sessionids that change frequently. See CakeSession::$requestCountdown.
- * - `Session.ini` - An associative array of additional ini values to set.
- *
- * The built in defaults are:
- *
- * - 'php' - Uses settings defined in your php.ini.
- * - 'cake' - Saves session files in CakePHP's /tmp directory.
- * - 'database' - Uses CakePHP's database sessions.
- * - 'cache' - Use the Cache class to save sessions.
- *
- * To define a custom session handler, save it at /app/Model/Datasource/Session/<name>.php.
- * Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to <name>
- *
- * To use database sessions, run the app/Config/Schema/sessions.php schema using
- * the cake shell command: cake schema create Sessions
- *
- */
-	Configure::write('Session', array(
-		'defaults' => 'php'
-	));
-
-/**
- * A random string used in security hashing methods.
- */
-	Configure::write('Security.salt', 'URWfoFspTQASBP8afw8enOLNCSMWZnrh2TRwoGaF');
-
-/**
- * A random numeric string (digits only) used to encrypt/decrypt strings.
- */
-	Configure::write('Security.cipherSeed', '07283205205652438276688533540');
-
-/**
- * Apply timestamps with the last modified time to static assets (js, css, images).
- * Will append a query string parameter containing the time the file was modified. This is
- * useful for invalidating browser caches.
- *
- * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
- * timestamping regardless of debug value.
- */
-	//Configure::write('Asset.timestamp', true);
-
-/**
- * Compress CSS output by removing comments, whitespace, repeating tags, etc.
- * This requires a/var/cache directory to be writable by the web server for caching.
- * and /vendors/csspp/csspp.php
- *
- * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
- */
-	//Configure::write('Asset.filter.css', 'css.php');
-
-/**
- * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
- * output, and setting the config below to the name of the script.
- *
- * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JsHelper::link().
- */
-	//Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
-
-/**
- * The class name and database used in CakePHP's
- * access control lists.
- */
-	Configure::write('Acl.classname', 'DbAcl');
-	Configure::write('Acl.database', 'default');
-
-/**
- * Uncomment this line and correct your server timezone to fix
- * any date & time related errors.
- */
-	//date_default_timezone_set('UTC');
-
-/**
- * `Config.timezone` is available in which you can set users' timezone string.
- * If a method of CakeTime class is called with $timezone parameter as null and `Config.timezone` is set,
- * then the value of `Config.timezone` will be used. This feature allows you to set users' timezone just
- * once instead of passing it each time in function calls.
- */
-	//Configure::write('Config.timezone', 'Europe/Paris');
-
-/**
- *
- * Cache Engine Configuration
- * Default settings provided below
- *
- * File storage engine.
- *
- * 	 Cache::config('default', array(
- *		'engine' => 'File', //[required]
- *		'duration' => 3600, //[optional]
- *		'probability' => 100, //[optional]
- * 		'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
- * 		'prefix' => 'cake_', //[optional]  prefix every cache file with this string
- * 		'lock' => false, //[optional]  use file locking
- * 		'serialize' => true, //[optional]
- * 		'mask' => 0664, //[optional]
- *	));
- *
- * APC (http://pecl.php.net/package/APC)
- *
- * 	 Cache::config('default', array(
- *		'engine' => 'Apc', //[required]
- *		'duration' => 3600, //[optional]
- *		'probability' => 100, //[optional]
- * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
- *	));
- *
- * Xcache (http://xcache.lighttpd.net/)
- *
- * 	 Cache::config('default', array(
- *		'engine' => 'Xcache', //[required]
- *		'duration' => 3600, //[optional]
- *		'probability' => 100, //[optional]
- *		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- *		'user' => 'user', //user from xcache.admin.user settings
- *		'password' => 'password', //plaintext password (xcache.admin.pass)
- *	));
- *
- * Memcached (http://www.danga.com/memcached/)
- *
- * Uses the memcached extension. See http://php.net/memcached
- *
- * 	 Cache::config('default', array(
- *		'engine' => 'Memcached', //[required]
- *		'duration' => 3600, //[optional]
- *		'probability' => 100, //[optional]
- * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
- * 		'servers' => array(
- * 			'127.0.0.1:11211' // localhost, default port 11211
- * 		), //[optional]
- * 		'persistent' => 'my_connection', // [optional] The name of the persistent connection.
- * 		'compress' => false, // [optional] compress data in Memcached (slower, but uses less memory)
- *	));
- *
- *  Wincache (http://php.net/wincache)
- *
- * 	 Cache::config('default', array(
- *		'engine' => 'Wincache', //[required]
- *		'duration' => 3600, //[optional]
- *		'probability' => 100, //[optional]
- *		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
- *	));
- */
-
-/**
- * Configure the cache handlers that CakePHP will use for internal
- * metadata like class maps, and model schema.
- *
- * By default File is used, but for improved performance you should use APC.
- *
- * Note: 'default' and other application caches should be configured in app/Config/bootstrap.php.
- *       Please check the comments in bootstrap.php for more info on the cache engines available
- *       and their settings.
- */
-$engine = 'File';
-
-// In development mode, caches should expire quickly.
-$duration = '+999 days';
-if (Configure::read('debug') > 0) {
-	$duration = '+10 seconds';
-}
-
-// Prefix each application on the same server with a different string, to avoid Memcache and APC conflicts.
-$prefix = 'myapp_';
-
-/**
- * Configure the cache used for general framework caching. Path information,
- * object listings, and translation cache files are stored with this configuration.
- */
-Cache::config('_cake_core_', array(
-	'engine' => $engine,
-	'prefix' => $prefix . 'cake_core_',
-	'path' => CACHE . 'persistent' . DS,
-	'serialize' => ($engine === 'File'),
-	'duration' => $duration
-));
-
-/**
- * Configure the cache for model and datasource caches. This cache configuration
- * is used to store schema descriptions, and table listings in connections.
- */
-Cache::config('_cake_model_', array(
-	'engine' => $engine,
-	'prefix' => $prefix . 'cake_model_',
-	'path' => CACHE . 'models' . DS,
-	'serialize' => ($engine === 'File'),
-	'duration' => $duration
-));
diff --git a/web/api/app/Config/core.php.default b/web/api/app/Config/core.php.default
index 156f404df..43736a61f 100644
--- a/web/api/app/Config/core.php.default
+++ b/web/api/app/Config/core.php.default
@@ -216,7 +216,8 @@
  *
  */
 	Configure::write('Session', array(
-		'defaults' => 'php'
+		'defaults' => 'php',
+		'cookie'=>'ZMSESSID'
 	));
 
 /**
diff --git a/web/skins/classic/css/classic/skin.css b/web/skins/classic/css/classic/skin.css
index 735ac7e5c..f066837bb 100644
--- a/web/skins/classic/css/classic/skin.css
+++ b/web/skins/classic/css/classic/skin.css
@@ -5,7 +5,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) input[type=password], any later version.
+ * of the License, or (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index d8b2afe9e..d8ecbc006 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -5,7 +5,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) input[type=password], any later version.
+ * of the License, or (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css
index a818d4c1b..6a871c416 100644
--- a/web/skins/classic/css/flat/skin.css
+++ b/web/skins/classic/css/flat/skin.css
@@ -5,7 +5,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) input[type=password], any later version.
+ * of the License, or (at your option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

From 4edf997791f1d62db49eee4a03c51b2b94665053 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 12:32:12 +0000
Subject: [PATCH 072/362] change docroot to /usr/share/zoneminder/www and
 cgi-bin to /usr/lib/zoneminder/cgi-bin

---
 distros/debian_cmake/apache.conf |  4 ++--
 distros/debian_cmake/changelog   | 18 ++++++++++++++++++
 distros/debian_cmake/install     |  5 +++--
 distros/debian_cmake/links       |  2 +-
 distros/debian_cmake/rules       |  4 ++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/distros/debian_cmake/apache.conf b/distros/debian_cmake/apache.conf
index 92a2b6414..2f1eec9bf 100644
--- a/distros/debian_cmake/apache.conf
+++ b/distros/debian_cmake/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder>/www
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/debian_cmake/changelog b/distros/debian_cmake/changelog
index 0edaefce7..46f1e2bd9 100644
--- a/distros/debian_cmake/changelog
+++ b/distros/debian_cmake/changelog
@@ -1,3 +1,21 @@
+zoneminder (1.28.108-nmu2015100101) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 01 Oct 2015 18:20:29 +0000
+
+zoneminder (1.28.107-nmu2015092401) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 24 Sep 2015 14:15:46 +0000
+
+zoneminder (1.28.1+106-nmu2015091001) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 10 Sep 2015 18:03:43 +0000
+
 zoneminder (1.28.0-0.1) wheezy; urgency=low
 
   * Use CMake instead of Autotools to simplify
diff --git a/distros/debian_cmake/install b/distros/debian_cmake/install
index 9e8953409..97c5f7a03 100644
--- a/distros/debian_cmake/install
+++ b/distros/debian_cmake/install
@@ -1,7 +1,8 @@
 usr/bin
-usr/lib/cgi-bin
+usr/lib/zoneminder/cgi-bin
 usr/share/man
 usr/share/perl5/ZoneMinder
 usr/share/perl5/ZoneMinder.pm
-usr/share/zoneminder
+usr/share/zoneminder/db
+usr/share/zoneminder/www
 etc/zm
diff --git a/distros/debian_cmake/links b/distros/debian_cmake/links
index 9715ee428..9f24ba6d1 100644
--- a/distros/debian_cmake/links
+++ b/distros/debian_cmake/links
@@ -1,4 +1,4 @@
 var/cache/zoneminder/events usr/share/zoneminder/events
 var/cache/zoneminder/images usr/share/zoneminder/images
 var/cache/zoneminder/temp   usr/share/zoneminder/temp
-usr/lib/cgi-bin             usr/share/zoneminder/cgi-bin
+usr/lib/zoneminder/cgi-bin             usr/share/zoneminder/cgi-bin
diff --git a/distros/debian_cmake/rules b/distros/debian_cmake/rules
index aa0501ab1..4bdc7cb0c 100755
--- a/distros/debian_cmake/rules
+++ b/distros/debian_cmake/rules
@@ -17,9 +17,9 @@ override_dh_auto_configure:
 		-DZM_SOCKDIR=/var/run/zm \
 		-DZM_TMPDIR=/var/tmp/zm \
 		-DZM_LOGDIR=/var/log/zm \
-		-DZM_WEBDIR=/usr/share/zoneminder \
+		-DZM_WEBDIR=/usr/share/zoneminder/www \
 		-DZM_CONTENTDIR=/var/cache/zoneminder \
-		-DZM_CGIDIR=/usr/lib/cgi-bin \
+		-DZM_CGIDIR=/usr/lib/zoneminder/cgi-bin \
 		-DZM_WEB_USER=www-data \
 		-DZM_WEB_GROUP=www-data \
 		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm

From b0b69c5176b5a6ce536ac87c967e188eb6202db2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 12:32:41 +0000
Subject: [PATCH 073/362] parse ZM_SERVER_HOST into ZM_SERVER

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index e38d151c0..b7dcf3946 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -102,6 +102,18 @@ BEGIN
     }
     $sth->finish();
     #$dbh->disconnect();
+
+	if ( ! exists $Config{ZM_SERVER_ID} ) {
+		$sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
+		if ( $Config{ZM_SERVER_NAME} ) {
+			$res = $sth->execute( $Config{ZM_SERVER_NAME} );
+		} elsif ( $Config{ZM_SERVER_HOST} ) {
+			$res = $sth->execute( $Config{ZM_SERVER_HOST} );
+		} else {
+		}
+		my $result = $sth->fetchrow_hashref();
+		$Config{ZM_SERVER_ID} = $$result{Id};
+	}
 }
 
 1;

From aa108eff6e36cbd38dd5220d82d10f55cc434c5e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 12:33:09 +0000
Subject: [PATCH 074/362] Add Info line on startup saying which Server it is
 loading for

---
 scripts/zmpkg.pl.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 97b3eff18..be563118b 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -226,6 +226,7 @@ if ( $command =~ /^(?:start|restart)$/ )
         zmMemTidy();
         runCommand( "zmdc.pl startup" );
 
+		Info( "Starting up services for server $Config{ZM_SERVER_ID}\n" );
         my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
         my $sth = $dbh->prepare_cached( $sql )
             or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );

From 7b253bcd7edb0b74aa10cb25e3b769b0ca24b3b8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 15:28:51 +0000
Subject: [PATCH 075/362] Debug line

---
 src/zm_monitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 1293d99d1..c798cdb5a 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2056,6 +2056,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
         sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
+Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
         sql += " AND ServerId='";
         sql += staticConfig.SERVER_ID;
         sql += "'";

From 00ef8499083713211800dcb263a4e2b94c819eaa Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 15:29:17 +0000
Subject: [PATCH 076/362] fix line testing for Hostname

---
 web/includes/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 97361e544..c96dbf37a 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -21,7 +21,7 @@ class Server {
 		return $this->{'Name'};
 	}
 	public function Hostname() {
-		if ( ! isset( $this->{'Hostname'} ) ) {
+		if ( ( ! isset( $this->{'Hostname'} ) and $this->{'Hostname'} != '' ) ) {
 			return $this->{'Name'};
 		}
 		return $this->{'Hostname'};

From 6570a8d8557dc855666840b3dfebf00952f2ea9a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 18:22:19 +0000
Subject: [PATCH 077/362] fix Server->Hostname()

---
 web/includes/Server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index c96dbf37a..308099b77 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -21,10 +21,10 @@ class Server {
 		return $this->{'Name'};
 	}
 	public function Hostname() {
-		if ( ( ! isset( $this->{'Hostname'} ) and $this->{'Hostname'} != '' ) ) {
-			return $this->{'Name'};
+		if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) {
+			return $this->{'Hostname'};
 		}
-		return $this->{'Hostname'};
+		return $this->{'Name'};
 	}
 }
 ?>

From ac8bfc71dc10572e50152506bd46f6a15728b509 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 2 Oct 2015 18:22:48 +0000
Subject: [PATCH 078/362] fix specifying ServerId

---
 src/zm_monitor.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 44f3d71d3..f22db9494 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2057,9 +2057,7 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
     }
     if ( staticConfig.SERVER_ID ) {
 Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
-        sql += " AND ServerId='";
-        sql += staticConfig.SERVER_ID;
-        sql += "'";
+        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
 
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
@@ -2233,9 +2231,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
 {
     std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
     if ( staticConfig.SERVER_ID ) {
-        sql += " AND ServerId='";
-        sql += staticConfig.SERVER_ID;
-        sql += "'";
+        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
 
     if ( protocol ) {
@@ -2418,9 +2414,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
         sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
-        sql += " AND ServerId='";
-        sql += staticConfig.SERVER_ID;
-        sql += "'";
+        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result )
@@ -2562,9 +2556,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
         sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
-        sql += " AND ServerId='";
-        sql += staticConfig.SERVER_ID;
-        sql += "'";
+        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( ! result ) {

From 1367de292ed94d47f373ae02e98713ce171266eb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 7 Oct 2015 08:57:50 -0400
Subject: [PATCH 079/362] Fix error message when no ZM_SERVER_NAME or
 ZM_SERVER_HOST set

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index b7dcf3946..3998f650d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -107,12 +107,13 @@ BEGIN
 		$sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
 		if ( $Config{ZM_SERVER_NAME} ) {
 			$res = $sth->execute( $Config{ZM_SERVER_NAME} );
+			my $result = $sth->fetchrow_hashref();
+			$Config{ZM_SERVER_ID} = $$result{Id};
 		} elsif ( $Config{ZM_SERVER_HOST} ) {
 			$res = $sth->execute( $Config{ZM_SERVER_HOST} );
-		} else {
+			my $result = $sth->fetchrow_hashref();
+			$Config{ZM_SERVER_ID} = $$result{Id};
 		}
-		my $result = $sth->fetchrow_hashref();
-		$Config{ZM_SERVER_ID} = $$result{Id};
 	}
 }
 

From 22373918763aab67876281c2a66e769d67670889 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 15 Oct 2015 09:28:35 -0400
Subject: [PATCH 080/362] white spacing, and fix loading of Server objects in
 monitor

---
 web/includes/Server.php             | 14 +++++++-------
 web/skins/classic/views/monitor.php |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 308099b77..66c56637b 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -3,14 +3,14 @@ require_once( 'database.php' );
 class Server {
     public function __construct( $id ) {
 		if ( $id ) {
-		$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $id ) );
-		if ( $s ) {
-			foreach ($s as $k => $v) {
-				$this->{$k} = $v;
+			$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $id ) );
+			if ( $s ) {
+				foreach ($s as $k => $v) {
+					$this->{$k} = $v;
+				}
+			} else {
+				Error("Unable to load Server record for Id=" . $id );
 			}
-		} else {
-			Error("Unable to load Server record for Id=" . $id );
-		}
 		} else {
 			$this->{'Name'} = '';
 			$this->{'Hostname'} = '';
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 2ec5982ab..74249f6ff 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -651,9 +651,9 @@ switch ( $tab )
 <?php 
 	$servers = array(''=>'None');
 	$result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-	$results = $result->fetchALL(PDO::FETCH_CLASS, 'Server' );
+	$results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
 	foreach ( $results as $row => $server_obj ) {
-		$servers[ $server_obj->Id] = $server_obj->Name;
+		$servers[$server_obj->Id] = $server_obj->Name();
 	}
 ?>
 	<?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>

From a942b22541e5bf3ff95d1b42f3662f0c89cc6042 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Wed, 23 Sep 2015 16:18:49 +0200
Subject: [PATCH 081/362] Add camera control module for Vivotek ePTZ protocol

---
 .../lib/ZoneMinder/Control/Vivotek_ePTZ.pm    | 227 ++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100644 scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm
new file mode 100644
index 000000000..b407a9bde
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm
@@ -0,0 +1,227 @@
+# ==========================================================================
+#
+# ZoneMinder Vivotek ePTZ Control Protocol Module
+# Copyright (C) 2015 Robin Daermann
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Vivotek ePTZ camera control
+# protocol
+#
+package ZoneMinder::Control::Vivotek_ePTZ;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# Vivotek ePTZ Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    Debug( "Camera New" );
+    bless( $self, $class );
+    srand( time() );
+    return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    Debug( "Camera AUTOLOAD" );
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
+}
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+    Debug( "Camera open" );
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub close
+{
+    my $self = shift;
+    $self->{state} = 'closed';
+}
+
+sub printMsg
+{
+    my $msg = shift;
+    my $msg_len = length($msg);
+
+    Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my ($self, $cmd, $speedcmd) = @_;
+
+    my $result = undef;
+
+    printMsg( $speedcmd, "Tx" );
+    printMsg( $cmd, "Tx" );
+
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/cgi-bin/camctrl/eCamCtrl.cgi?stream=0&$speedcmd&$cmd" );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+        Error( "Error check failed: '".$res->status_line()."'" );
+    }
+
+    return( $result );
+}
+
+sub moveConUp
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedtilt=' . ($params->{tiltspeed} - 6);
+    Debug( "Move Up" );
+    $self->sendCmd( 'move=up', $speed );
+}
+
+sub moveConDown
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedtilt=' . ($params->{tiltspeed} - 6);
+    Debug( "Move Down" );
+    $self->sendCmd( 'move=down', $speed );
+}
+
+sub moveConLeft
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedpan=-' . $params->{panspeed};
+    Debug( "Move Left" );
+    $self->sendCmd( 'move=left', $speed );
+}
+
+sub moveConRight
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedpan=' . ($params->{panspeed} - 6);
+    Debug( "Move Right" );
+    $self->sendCmd( 'move=right', $speed );
+}
+
+sub moveStop
+{
+    my $self = shift;
+    Debug( "Move Stop" );
+    # not implemented
+}
+
+sub zoomConTele
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedzoom=' . ($params->{speed} - 6);
+    Debug( "Zoom In" );
+    $self->sendCmd( 'zoom=tele', $speed );
+}
+
+sub zoomConWide
+{
+    my ($self, $params) = @_;
+    my $speed = 'speedzoom=' . ($params->{speed} - 6);
+    Debug( "Zoom Out" );
+    $self->sendCmd( 'zoom=wide', $speed );
+}
+
+sub reset
+{
+    my $self = shift;
+    Debug( "Camera Reset" );
+    $self->sendCmd( 'move=home' );
+}
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Control::Vivotek_ePTZ - ZoneMinder Perl extension for Vivotek ePTZ
+camera control protocol
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Control::Vivotek_ePTZ;
+
+=head1 DESCRIPTION
+
+This module implements the ePTZ protocol used in various Vivotek IP cameras,
+developed with a Vivotek IB8369 model.
+
+Currently, only simple pan, tilt and zoom function is implemented. Presets will
+follow later.
+
+=head2 EXPORT
+
+None.
+
+=head1 SEE ALSO
+
+I would say, see ZoneMinder::Control documentation. But it is a stub.
+
+=head1 AUTHOR
+
+Robin Daermann E<lt>r.daermann@ids-services.deE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2015 by Robin Daermann
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+=cut

From 330e0d7adf431f6798c1e1fd53f920467705cf6c Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Wed, 4 Nov 2015 17:29:07 +0100
Subject: [PATCH 082/362] Add Vivotek ePTZ control module to database

---
 db/zm_update-1.28.109.sql | 110 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 db/zm_update-1.28.109.sql

diff --git a/db/zm_update-1.28.109.sql b/db/zm_update-1.28.109.sql
new file mode 100644
index 000000000..298668e08
--- /dev/null
+++ b/db/zm_update-1.28.109.sql
@@ -0,0 +1,110 @@
+--
+-- This updates a 1.28.108 database to 1.28.109
+--
+
+--
+-- Add Controls definition for Vivotek ePTZ
+--
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                    'Vivotek ePTZ' as Name,
+                    'Remote' as Type,
+                    'Vivotek_ePTZ' as Protocol,
+                    0 as CanWake,
+                    0 as CanSleep,
+                    1 as CanReset,
+                    1 as CanZoom,
+                    0 as CanAutoZoom,
+                    0 as CanZoomAbs,
+                    0 as CanZoomRel,
+                    1 as CanZoomCon,
+                    0 as MinZoomRange,
+                    0 as MaxZoomRange,
+                    0 as MinZoomStep,
+                    0 as MaxZoomStep,
+                    1 as HasZoomSpeed,
+                    0 as MinZoomSpeed,
+                    5 as MaxZoomSpeed,
+                    0 as CanFocus,
+                    0 as CanAutoFocus,
+                    0 as CanFocusAbs,
+                    0 as CanFocusRel,
+                    0 as CanFocusCon,
+                    0 as MinFocusRange,
+                    0 as MaxFocusRange,
+                    0 as MinFocusStep,
+                    0 as MaxFocusStep,
+                    0 as HasFocusSpeed,
+                    0 as MinFocusSpeed,
+                    0 as MaxFocusSpeed,
+                    0 as CanIris,
+                    0 as CanAutoIris,
+                    0 as CanIrisAbs,
+                    0 as CanIrisRel,
+                    0 as CanIrisCon,
+                    0 as MinIrisRange,
+                    0 as MaxIrisRange,
+                    0 as MinIrisStep,
+                    0 as MaxIrisStep,
+                    0 as HasIrisSpeed,
+                    0 as MinIrisSpeed,
+                    0 as MaxIrisSpeed,
+                    0 as CanGain,
+                    0 as CanAutoGain,
+                    0 as CanGainAbs,
+                    0 as CanGainRel,
+                    0 as CanGainCon,
+                    0 as MinGainRange,
+                    0 as MaxGainRange,
+                    0 as MinGainStep,
+                    0 as MaxGainStep,
+                    0 as HasGainSpeed,
+                    0 as MinGainSpeed,
+                    0 as MaxGainSpeed,
+                    0 as CanWhite,
+                    0 as CanAutoWhite,
+                    0 as CanWhiteAbs,
+                    0 as CanWhiteRel,
+                    0 as CanWhiteCon,
+                    0 as MinWhiteRange,
+                    0 as MaxWhiteRange,
+                    0 as MinWhiteStep,
+                    0 as MaxWhiteStep,
+                    0 as HasWhiteSpeed,
+                    0 as MinWhiteSpeed,
+                    0 as MaxWhiteSpeed,
+                    0 as HasPresets,
+                    0 as NumPresets,
+                    0 as HasHomePreset,
+                    0 as CanSetPresets,
+                    1 as CanMove,
+                    0 as CanMoveDiag,
+                    0 as CanMoveMap,
+                    0 as CanMoveAbs,
+                    0 as CanMoveRel,
+                    1 as CanMoveCon,
+                    1 as CanPan,
+                    0 as MinPanRange,
+                    0 as MaxPanRange,
+                    0 as MinPanStep,
+                    0 as MaxPanStep,
+                    1 as HasPanSpeed,
+                    0 as MinPanSpeed,
+                    5 as MaxPanSpeed,
+                    0 as HasTurboPan,
+                    0 as TurboPanSpeed,
+                    1 as CanTilt,
+                    0 as MinTiltRange,
+                    0 as MaxTiltRange,
+                    0 as MinTiltStep,
+                    0 as MaxTiltStep,
+                    1 as HasTiltSpeed,
+                    0 as MinTiltSpeed,
+                    5 as MaxTiltSpeed,
+                    0 as HasTurboTilt,
+                    0 as TurboTiltSpeed,
+                    0 as CanAutoScan,
+                    0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'Vivotek ePTZ'
+) LIMIT 1;

From b611d9fcae619a662a7fb439218c9bb01bf721f9 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Wed, 4 Nov 2015 17:29:37 +0100
Subject: [PATCH 083/362] Bump database version to 1.28.109

---
 CMakeLists.txt | 2 +-
 configure.ac   | 2 +-
 version        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea67474d6..c7be1ceec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.28.108")
+set(zoneminder_VERSION "1.28.109")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
diff --git a/configure.ac b/configure.ac
index 436be34cf..b9d4ef2ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-AC_INIT(zm,1.28.108,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.28.109,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
diff --git a/version b/version
index ca2c9c84c..a960d2a6d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.28.108
+1.28.109

From 1f1b48ed5137e33e026647f8e02825a33db29469 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Wed, 4 Nov 2015 19:17:47 +0100
Subject: [PATCH 084/362] Added Vivotek ePTZ control to zm_create.sql

---
 db/zm_create.sql.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 53bfa1fa8..22c9af7f6 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -588,6 +588,7 @@ INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,0,0,0,
 INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
 
 
 

From 49a89b75a851ddbbace2766b938e13c008a7052f Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Mon, 9 Nov 2015 16:15:53 +0100
Subject: [PATCH 085/362] More verbose error reporting

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm
index b407a9bde..3649b35bc 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Vivotek_ePTZ.pm
@@ -107,7 +107,7 @@ sub sendCmd
     printMsg( $speedcmd, "Tx" );
     printMsg( $cmd, "Tx" );
 
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/cgi-bin/camctrl/eCamCtrl.cgi?stream=0&$speedcmd&$cmd" );
+    my $req = HTTP::Request->new( GET => "http://" . $self->{Monitor}->{ControlAddress} . "/cgi-bin/camctrl/eCamCtrl.cgi?stream=0&$speedcmd&$cmd" );
     my $res = $self->{ua}->request($req);
 
     if ( $res->is_success )
@@ -116,7 +116,7 @@ sub sendCmd
     }
     else
     {
-        Error( "Error check failed: '".$res->status_line()."'" );
+        Error( "Request failed: '" . $res->status_line() . "' (URI: '" . $req->as_string() . "')" );
     }
 
     return( $result );

From fc85ccbf5f7c945b23caafbb72a065b998116601 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 11 Nov 2015 16:43:23 -0500
Subject: [PATCH 086/362] Set value for Hostname to avoid php warning. fix save
 button.  Can't use it to pass action value because it gets translated.

---
 web/skins/classic/views/server.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index 51863e7dc..fd22bf367 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -32,6 +32,7 @@ if ( $_REQUEST['id'] ) {
 } else {
 	$newServer = array();
 	$newServer['Name'] = translate('NewServer');
+	$newServer['Hostname'] = '';
 }
 
 $focusWindow = true;
@@ -61,8 +62,9 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" name="action" value="<?php echo translate('Save') ?>"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+		<input type="hidden" name="action" value="Save"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
     </div>

From 79d486b5aacbbc158417add9f99c37f75d28e857 Mon Sep 17 00:00:00 2001
From: Steve Gilvarry <SteveGilvarry@users.noreply.github.com>
Date: Sun, 22 Nov 2015 10:21:38 +1100
Subject: [PATCH 087/362] Test Example of 1.29 Changelog

---
 CHANGELOG.md | 537 ++++++++-------------------------------------------
 1 file changed, 82 insertions(+), 455 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc69f2f89..3296540eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,99 +1,88 @@
 # Change Log
 
-## [Unreleased](https://github.com/ZoneMinder/ZoneMinder/tree/HEAD)
-
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...HEAD)
-
-**Closed issues:**
-
-- Zoneminder Signal Loss event [\#964](https://github.com/ZoneMinder/ZoneMinder/issues/964)
-- Default scale other than actual skews image [\#963](https://github.com/ZoneMinder/ZoneMinder/issues/963)
-- Monitor configured with ffmpeg shows last part of URL instead of hostname in overview [\#950](https://github.com/ZoneMinder/ZoneMinder/issues/950)
-- please update bundled CakePHP [\#945](https://github.com/ZoneMinder/ZoneMinder/issues/945)
-- Montage shows only feed from the first camera [\#940](https://github.com/ZoneMinder/ZoneMinder/issues/940)
-- zmtrigger: minor message format correction [\#939](https://github.com/ZoneMinder/ZoneMinder/issues/939)
-- error starting zoneminder after latest upgrade [\#935](https://github.com/ZoneMinder/ZoneMinder/issues/935)
-- Error "Attempt to directly assign buffer from an undersized buffer of size" [\#932](https://github.com/ZoneMinder/ZoneMinder/issues/932)
-- External access to snapshots of cameras [\#929](https://github.com/ZoneMinder/ZoneMinder/issues/929)
-- virtualbox - zoneminder shows only six cams [\#927](https://github.com/ZoneMinder/ZoneMinder/issues/927)
-- zm\_update-1.28.99.sql not executable [\#924](https://github.com/ZoneMinder/ZoneMinder/issues/924)
-- m [\#922](https://github.com/ZoneMinder/ZoneMinder/issues/922)
-- loop recording [\#914](https://github.com/ZoneMinder/ZoneMinder/issues/914)
-- Implement Passive Source Type for Cams that Support Event Uploading [\#912](https://github.com/ZoneMinder/ZoneMinder/issues/912)
-- incorrect encoding of Russian language [\#907](https://github.com/ZoneMinder/ZoneMinder/issues/907)
-- Can't compile Zoneminder v1.28.1 [\#904](https://github.com/ZoneMinder/ZoneMinder/issues/904)
-- Add isRunning field to States [\#898](https://github.com/ZoneMinder/ZoneMinder/issues/898)
-- updated 9831W control script [\#893](https://github.com/ZoneMinder/ZoneMinder/issues/893)
-- 404 error on Ubuntu 14.04 install [\#889](https://github.com/ZoneMinder/ZoneMinder/issues/889)
-- Video Smear - Vertical Striping [\#888](https://github.com/ZoneMinder/ZoneMinder/issues/888)
-- Zoneminder mobile theme broken. [\#887](https://github.com/ZoneMinder/ZoneMinder/issues/887)
-- cgi-bin -\> symlink on zms not work for me \(Gentoo/SystemD\) [\#878](https://github.com/ZoneMinder/ZoneMinder/issues/878)
-- Replay Event Stuck [\#869](https://github.com/ZoneMinder/ZoneMinder/issues/869)
-- cant add or edit monitor [\#868](https://github.com/ZoneMinder/ZoneMinder/issues/868)
-- Odd window size differences when viewing frame alarm image between Chrome & FF [\#865](https://github.com/ZoneMinder/ZoneMinder/issues/865)
-- On ubuntu 14.04 zoneminder 1.28.1 alarm never terminate!! [\#852](https://github.com/ZoneMinder/ZoneMinder/issues/852)
-- X-10 configuration not working ZM V1.28.1 [\#848](https://github.com/ZoneMinder/ZoneMinder/issues/848)
-- Global symbol requires explicit package name... [\#846](https://github.com/ZoneMinder/ZoneMinder/issues/846)
-- Adapt to changes in Ubuntu 15.04 [\#840](https://github.com/ZoneMinder/ZoneMinder/issues/840)
-- After initial setup, unable to start again [\#839](https://github.com/ZoneMinder/ZoneMinder/issues/839)
-- FFMPEG path finding error \(formerly: Are you switching to a totally CMake based build?\) [\#835](https://github.com/ZoneMinder/ZoneMinder/issues/835)
-- Purchase a Raspberry Pi 2 + PiCam for ZoneMinder development \[$114\] [\#832](https://github.com/ZoneMinder/ZoneMinder/issues/832)
-- Can't Login Web getting a Loop [\#831](https://github.com/ZoneMinder/ZoneMinder/issues/831)
-- Missing function drop down values \(db issue?\) [\#828](https://github.com/ZoneMinder/ZoneMinder/issues/828)
-- curl using HEAD instead of GET for http requests results in 404 on some servers [\#827](https://github.com/ZoneMinder/ZoneMinder/issues/827)
-- Empty string if missing index in lang files [\#819](https://github.com/ZoneMinder/ZoneMinder/issues/819)
-- fix for RTSP streaming over UDP [\#811](https://github.com/ZoneMinder/ZoneMinder/issues/811)
-- bundled CakePHP overhead [\#810](https://github.com/ZoneMinder/ZoneMinder/issues/810)
-- PHP session locks serialize access to all scripts causing UI hangs [\#806](https://github.com/ZoneMinder/ZoneMinder/issues/806)
-- How do I add authentication to ZM APIs? [\#797](https://github.com/ZoneMinder/ZoneMinder/issues/797)
-- Add man page for zmsystemctl.pl [\#788](https://github.com/ZoneMinder/ZoneMinder/issues/788)
-- man pages please; improve --help option [\#787](https://github.com/ZoneMinder/ZoneMinder/issues/787)
-- ZM\_CONTENTDIR issues [\#786](https://github.com/ZoneMinder/ZoneMinder/issues/786)
-- please update bundled jQuery [\#785](https://github.com/ZoneMinder/ZoneMinder/issues/785)
-- please update bundled Mootools [\#784](https://github.com/ZoneMinder/ZoneMinder/issues/784)
-- duplicated files in `cgi-bin` [\#777](https://github.com/ZoneMinder/ZoneMinder/issues/777)
-- FTBFS on kFreeBSD [\#771](https://github.com/ZoneMinder/ZoneMinder/issues/771)
-- CMake: incorrect installation of Perl modules \[patch\] [\#769](https://github.com/ZoneMinder/ZoneMinder/issues/769)
-- Issue when viewing events when users are restricted to limited cameras [\#766](https://github.com/ZoneMinder/ZoneMinder/issues/766)
-- zmupdate.pl: ignores ZM\_SERVER\_HOST in zm.conf [\#765](https://github.com/ZoneMinder/ZoneMinder/issues/765)
-- Remote Zoneminder installations [\#764](https://github.com/ZoneMinder/ZoneMinder/issues/764)
-- source code mess [\#760](https://github.com/ZoneMinder/ZoneMinder/issues/760)
-- bttv crashing zoneminder rpm [\#755](https://github.com/ZoneMinder/ZoneMinder/issues/755)
-- Make Uninstall no longer removes Perl modules [\#753](https://github.com/ZoneMinder/ZoneMinder/issues/753)
-- Playback video problem in v1.26.5 [\#752](https://github.com/ZoneMinder/ZoneMinder/issues/752)
-- Integrate Make Movie Branch [\#747](https://github.com/ZoneMinder/ZoneMinder/issues/747)
-- FI8620 ERR	Error while decoding frame [\#741](https://github.com/ZoneMinder/ZoneMinder/issues/741)
-- \[Critical\] 1.28.0 to 1.28.1 seems to have lost ability for RTSP Authentication [\#738](https://github.com/ZoneMinder/ZoneMinder/issues/738)
-- Disabling cambozola in options doesn't actually disable? [\#735](https://github.com/ZoneMinder/ZoneMinder/issues/735)
-- FI9821W v2 shows blue screen [\#734](https://github.com/ZoneMinder/ZoneMinder/issues/734)
-- Configure script checking for netpbm [\#731](https://github.com/ZoneMinder/ZoneMinder/issues/731)
-- Missing dependency for killall in rpm package [\#727](https://github.com/ZoneMinder/ZoneMinder/issues/727)
-- Build with ZM\_TARGET\_DISTRO=el7 fails to start under systemd [\#724](https://github.com/ZoneMinder/ZoneMinder/issues/724)
-- Issue with event page for users with restricted monitors [\#717](https://github.com/ZoneMinder/ZoneMinder/issues/717)
-- Unrecognised content type 'video/x-ms-asf' [\#716](https://github.com/ZoneMinder/ZoneMinder/issues/716)
-- Flat skin stopped working [\#715](https://github.com/ZoneMinder/ZoneMinder/issues/715)
-- Zone edit dots are gone [\#712](https://github.com/ZoneMinder/ZoneMinder/issues/712)
-- zm\_rtsp Use of avformat\_free\_context not version checked [\#710](https://github.com/ZoneMinder/ZoneMinder/issues/710)
-- Unable to generate video, check /usr/share/zoneminder/events/1/15/02/15/20/10/00/ffmpeg.log for details [\#705](https://github.com/ZoneMinder/ZoneMinder/issues/705)
-- Axis M5014 PTZ Control [\#703](https://github.com/ZoneMinder/ZoneMinder/issues/703)
-- 2nd network port breaks 'Probe' in 1.28 on Ubuntu 14.04LTS? [\#698](https://github.com/ZoneMinder/ZoneMinder/issues/698)
-- ZM's Develop actually [\#697](https://github.com/ZoneMinder/ZoneMinder/issues/697)
-- Release 1.28.1 [\#693](https://github.com/ZoneMinder/ZoneMinder/issues/693)
-- Image disappears \(flickers\) in monitor and event playback [\#689](https://github.com/ZoneMinder/ZoneMinder/issues/689)
-- Multiple issues.. [\#688](https://github.com/ZoneMinder/ZoneMinder/issues/688)
--  short PHP open tags paragraph on zoneminder.com Troubleshooting page [\#684](https://github.com/ZoneMinder/ZoneMinder/issues/684)
-- The monitorprobe.php code does not work in FreeBSD [\#683](https://github.com/ZoneMinder/ZoneMinder/issues/683)
-- ZoneMinder problem [\#680](https://github.com/ZoneMinder/ZoneMinder/issues/680)
-- CMAKE ZM\_PERL\_SUBPREFIX Slash Issue [\#677](https://github.com/ZoneMinder/ZoneMinder/issues/677)
-- Centos 6.5 crashes [\#619](https://github.com/ZoneMinder/ZoneMinder/issues/619)
-- ZMS crashes after "Attempt to directly assign buffer from an undersized buffer of size" error [\#586](https://github.com/ZoneMinder/ZoneMinder/issues/586)
-- hi all, i'm under Linux Gentoo with systemd - ZM v1.27.99.0 [\#511](https://github.com/ZoneMinder/ZoneMinder/issues/511)
-- Event export with ZM\_USE\_DEEP\_STORAGE option set [\#506](https://github.com/ZoneMinder/ZoneMinder/issues/506)
-- Streaming not working on Chrome when authentication is ON [\#328](https://github.com/ZoneMinder/ZoneMinder/issues/328)
-- Can add a simple send mail function？ [\#311](https://github.com/ZoneMinder/ZoneMinder/issues/311)
+## [1.29.0](https://github.com/ZoneMinder/ZoneMinder/tree/1.29.0) (2015-11-20)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...1.29.0)
 
 **Merged pull requests:**
 
+- compat for php 5.4 [\#1164](https://github.com/ZoneMinder/ZoneMinder/pull/1164) ([abishai](https://github.com/abishai))
+- remove comment at end of line [\#1157](https://github.com/ZoneMinder/ZoneMinder/pull/1157) ([connortechnology](https://github.com/connortechnology))
+- Reorder RTSPDescribe to avoid -wreorder warnings [\#1147](https://github.com/ZoneMinder/ZoneMinder/pull/1147) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update to \#1137 for backward compatibility. [\#1142](https://github.com/ZoneMinder/ZoneMinder/pull/1142) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Update Travis to ffmpeg 2.8.1 for testing [\#1139](https://github.com/ZoneMinder/ZoneMinder/pull/1139) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Replace deprecated FFmpeg API [\#1137](https://github.com/ZoneMinder/ZoneMinder/pull/1137) ([onlyjob](https://github.com/onlyjob))
+- added prev/next event ids [\#1136](https://github.com/ZoneMinder/ZoneMinder/pull/1136) ([pliablepixels](https://github.com/pliablepixels))
+- Install nph-zms with FILES so it is listed in install\_manifest.txt [\#1124](https://github.com/ZoneMinder/ZoneMinder/pull/1124) ([baffo32](https://github.com/baffo32))
+- Stray semicolon causes SQL error [\#1123](https://github.com/ZoneMinder/ZoneMinder/pull/1123) ([baffo32](https://github.com/baffo32))
+- Use relative URL's instead of absolute [\#1121](https://github.com/ZoneMinder/ZoneMinder/pull/1121) ([knnniggett](https://github.com/knnniggett))
+- Update version check URL [\#1120](https://github.com/ZoneMinder/ZoneMinder/pull/1120) ([kylejohnson](https://github.com/kylejohnson))
+- Add index to frames [\#1116](https://github.com/ZoneMinder/ZoneMinder/pull/1116) ([kylejohnson](https://github.com/kylejohnson))
+- Fatal if content dirs are unwritable [\#1113](https://github.com/ZoneMinder/ZoneMinder/pull/1113) ([baffo32](https://github.com/baffo32))
+- Fatal error if date.timezone is unset [\#1111](https://github.com/ZoneMinder/ZoneMinder/pull/1111) ([baffo32](https://github.com/baffo32))
+- Fix faulty zm.conf.new install line [\#1107](https://github.com/ZoneMinder/ZoneMinder/pull/1107) ([baffo32](https://github.com/baffo32))
+- Update preinst [\#1103](https://github.com/ZoneMinder/ZoneMinder/pull/1103) ([seebaer1976](https://github.com/seebaer1976))
+- Update apache.conf [\#1102](https://github.com/ZoneMinder/ZoneMinder/pull/1102) ([seebaer1976](https://github.com/seebaer1976))
+- Update rules [\#1101](https://github.com/ZoneMinder/ZoneMinder/pull/1101) ([seebaer1976](https://github.com/seebaer1976))
+- Update links [\#1100](https://github.com/ZoneMinder/ZoneMinder/pull/1100) ([seebaer1976](https://github.com/seebaer1976))
+- Update preinst [\#1099](https://github.com/ZoneMinder/ZoneMinder/pull/1099) ([seebaer1976](https://github.com/seebaer1976))
+- Fix zmaudit [\#1095](https://github.com/ZoneMinder/ZoneMinder/pull/1095) ([connortechnology](https://github.com/connortechnology))
+- fixed version compare logic [\#1094](https://github.com/ZoneMinder/ZoneMinder/pull/1094) ([pliablepixels](https://github.com/pliablepixels))
+- Don't install zm.conf if it already exists [\#1090](https://github.com/ZoneMinder/ZoneMinder/pull/1090) ([connortechnology](https://github.com/connortechnology))
+- change types and move things around to remove compile warnings [\#1089](https://github.com/ZoneMinder/ZoneMinder/pull/1089) ([connortechnology](https://github.com/connortechnology))
+- Tz [\#1084](https://github.com/ZoneMinder/ZoneMinder/pull/1084) ([connortechnology](https://github.com/connortechnology))
+- fixed orange display for monitor mode [\#1083](https://github.com/ZoneMinder/ZoneMinder/pull/1083) ([pliablepixels](https://github.com/pliablepixels))
+- use deleteAll\(\) vs. delete\(\) when deleting an Event's Frames [\#1080](https://github.com/ZoneMinder/ZoneMinder/pull/1080) ([kylejohnson](https://github.com/kylejohnson))
+- Added control script for SunEyes SP-P1802SWPTZ [\#1079](https://github.com/ZoneMinder/ZoneMinder/pull/1079) ([bofhdk](https://github.com/bofhdk))
+- Use the 3.0 branch of crud, compatible with cakephp 2.x [\#1078](https://github.com/ZoneMinder/ZoneMinder/pull/1078) ([kylejohnson](https://github.com/kylejohnson))
+- 663 frames primary key [\#1075](https://github.com/ZoneMinder/ZoneMinder/pull/1075) ([kylejohnson](https://github.com/kylejohnson))
+- Delete fixes for Events [\#1073](https://github.com/ZoneMinder/ZoneMinder/pull/1073) ([pliablepixels](https://github.com/pliablepixels))
+- restart monitor when edited via APIs [\#1070](https://github.com/ZoneMinder/ZoneMinder/pull/1070) ([pliablepixels](https://github.com/pliablepixels))
+- add debug statements for when LastWriteTime is not defined. [\#1067](https://github.com/ZoneMinder/ZoneMinder/pull/1067) ([connortechnology](https://github.com/connortechnology))
+- fixed recaptcha showing up pre DB update [\#1066](https://github.com/ZoneMinder/ZoneMinder/pull/1066) ([pliablepixels](https://github.com/pliablepixels))
+- fixed security instructions for curl [\#1062](https://github.com/ZoneMinder/ZoneMinder/pull/1062) ([pliablepixels](https://github.com/pliablepixels))
+- header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob))
+- quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology))
+- Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology))
+- link to cambozola pacakge, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett))
+- redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett))
+- remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett))
+- Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels))
+- enable/disable RTSP Describe Header [\#1045](https://github.com/ZoneMinder/ZoneMinder/pull/1045) ([knnniggett](https://github.com/knnniggett))
+- Add Documentation for Privacy zones [\#1044](https://github.com/ZoneMinder/ZoneMinder/pull/1044) ([schrorg](https://github.com/schrorg))
+- added note about potential Perl and PHP time translation conflict wit… [\#1043](https://github.com/ZoneMinder/ZoneMinder/pull/1043) ([pliablepixels](https://github.com/pliablepixels))
+- 1038 fixing state mgmt 1030 is active fix [\#1039](https://github.com/ZoneMinder/ZoneMinder/pull/1039) ([pliablepixels](https://github.com/pliablepixels))
+- Grey color for disabled buttons [\#1037](https://github.com/ZoneMinder/ZoneMinder/pull/1037) ([pliablepixels](https://github.com/pliablepixels))
+- Update filterevents.rst [\#1035](https://github.com/ZoneMinder/ZoneMinder/pull/1035) ([tikismoke](https://github.com/tikismoke))
+- update doc [\#1032](https://github.com/ZoneMinder/ZoneMinder/pull/1032) ([tikismoke](https://github.com/tikismoke))
+- Remove full path from Logger filename [\#1029](https://github.com/ZoneMinder/ZoneMinder/pull/1029) ([knnniggett](https://github.com/knnniggett))
+- Typo in README.md [\#1027](https://github.com/ZoneMinder/ZoneMinder/pull/1027) ([tikismoke](https://github.com/tikismoke))
+- Add new zone type - privacy zones [\#1026](https://github.com/ZoneMinder/ZoneMinder/pull/1026) ([schrorg](https://github.com/schrorg))
+- Send login activity to the zoneminder event log [\#1021](https://github.com/ZoneMinder/ZoneMinder/pull/1021) ([knnniggett](https://github.com/knnniggett))
+- Small dark CSS fixes in frames and timeline view [\#1019](https://github.com/ZoneMinder/ZoneMinder/pull/1019) ([schrorg](https://github.com/schrorg))
+- New User Permission "Groups" [\#1018](https://github.com/ZoneMinder/ZoneMinder/pull/1018) ([knnniggett](https://github.com/knnniggett))
+- 1013 document migration [\#1017](https://github.com/ZoneMinder/ZoneMinder/pull/1017) ([pliablepixels](https://github.com/pliablepixels))
+- Fix issue with score values less than 0 [\#1016](https://github.com/ZoneMinder/ZoneMinder/pull/1016) ([knnniggett](https://github.com/knnniggett))
+- Explained a caveat  with using relative times [\#1012](https://github.com/ZoneMinder/ZoneMinder/pull/1012) ([pliablepixels](https://github.com/pliablepixels))
+- Included logic to not enforce authentication in API layer if ZM auth is off [\#1008](https://github.com/ZoneMinder/ZoneMinder/pull/1008) ([pliablepixels](https://github.com/pliablepixels))
+- Update to ffmpeg 2.7.2 in travis build [\#1007](https://github.com/ZoneMinder/ZoneMinder/pull/1007) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- I was using the wrong field to check for portal authentication [\#1006](https://github.com/ZoneMinder/ZoneMinder/pull/1006) ([pliablepixels](https://github.com/pliablepixels))
+- Demote user auth info message to debug [\#1003](https://github.com/ZoneMinder/ZoneMinder/pull/1003) ([Linwood-F](https://github.com/Linwood-F))
+- Add scale as optional feature to image.php [\#1001](https://github.com/ZoneMinder/ZoneMinder/pull/1001) ([Linwood-F](https://github.com/Linwood-F))
+- 995 events count per api \(bumps up \# of events reported per API call\) [\#996](https://github.com/ZoneMinder/ZoneMinder/pull/996) ([pliablepixels](https://github.com/pliablepixels))
+- APIs will be served only if user is logged into the ZM portal [\#994](https://github.com/ZoneMinder/ZoneMinder/pull/994) ([pliablepixels](https://github.com/pliablepixels))
+- Add option to make TimeStamp larger [\#992](https://github.com/ZoneMinder/ZoneMinder/pull/992) ([schrorg](https://github.com/schrorg))
+- Implemented \#989 \(highlight current row in tables\) for dark CSS [\#990](https://github.com/ZoneMinder/ZoneMinder/pull/990) ([schrorg](https://github.com/schrorg))
+- CSS\[skins/classic\]: highlight current row in tables. [\#989](https://github.com/ZoneMinder/ZoneMinder/pull/989) ([onlyjob](https://github.com/onlyjob))
+- quiet error when no Servers in Servers table [\#986](https://github.com/ZoneMinder/ZoneMinder/pull/986) ([connortechnology](https://github.com/connortechnology))
+- fix \#948 1 [\#985](https://github.com/ZoneMinder/ZoneMinder/pull/985) ([connortechnology](https://github.com/connortechnology))
+- Remove shared data warning for purpose query only [\#984](https://github.com/ZoneMinder/ZoneMinder/pull/984) ([Linwood-F](https://github.com/Linwood-F))
+- Change from info to debug [\#983](https://github.com/ZoneMinder/ZoneMinder/pull/983) ([Linwood-F](https://github.com/Linwood-F))
+- Fix image dimensions check [\#980](https://github.com/ZoneMinder/ZoneMinder/pull/980) ([connortechnology](https://github.com/connortechnology))
+- Apache.conf modifications [\#968](https://github.com/ZoneMinder/ZoneMinder/pull/968) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Dark CSS for classic theme [\#967](https://github.com/ZoneMinder/ZoneMinder/pull/967) ([schrorg](https://github.com/schrorg))
+- Auto generated changelog [\#966](https://github.com/ZoneMinder/ZoneMinder/pull/966) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- 959 add exif date time to images [\#962](https://github.com/ZoneMinder/ZoneMinder/pull/962) ([Linwood-F](https://github.com/Linwood-F))
+- Add analysis interval parameter to monitors settings [\#956](https://github.com/ZoneMinder/ZoneMinder/pull/956) ([manupap1](https://github.com/manupap1))
 - Fixed Configs API to return all values [\#955](https://github.com/ZoneMinder/ZoneMinder/pull/955) ([pliablepixels](https://github.com/pliablepixels))
 - Change encoding of german language file to UTF-8 [\#952](https://github.com/ZoneMinder/ZoneMinder/pull/952) ([schrorg](https://github.com/schrorg))
 - Show correct part of URL \(hostname\) for ffmpeg sources in console [\#951](https://github.com/ZoneMinder/ZoneMinder/pull/951) ([schrorg](https://github.com/schrorg))
@@ -125,17 +114,12 @@
 - Generate man pages for perl scripts & C Binaries in the bin folder [\#896](https://github.com/ZoneMinder/ZoneMinder/pull/896) ([knnniggett](https://github.com/knnniggett))
 - 893 foscam 9831 w and other foscams [\#895](https://github.com/ZoneMinder/ZoneMinder/pull/895) ([pliablepixels](https://github.com/pliablepixels))
 - 893 foscam 9831 w and other foscams [\#894](https://github.com/ZoneMinder/ZoneMinder/pull/894) ([pliablepixels](https://github.com/pliablepixels))
-- improve debugging for analysis check and restart if can't read shared data [\#892](https://github.com/ZoneMinder/ZoneMinder/pull/892) ([connortechnology](https://github.com/connortechnology))
 - Zmwatch cleanup2 [\#891](https://github.com/ZoneMinder/ZoneMinder/pull/891) ([connortechnology](https://github.com/connortechnology))
 - reverse the if statement to reduce indenting [\#890](https://github.com/ZoneMinder/ZoneMinder/pull/890) ([connortechnology](https://github.com/connortechnology))
 - Updated API document  [\#886](https://github.com/ZoneMinder/ZoneMinder/pull/886) ([pliablepixels](https://github.com/pliablepixels))
 - Use avconv as alternative to ffmpeg executable [\#884](https://github.com/ZoneMinder/ZoneMinder/pull/884) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - 881 bootstrap loading config [\#883](https://github.com/ZoneMinder/ZoneMinder/pull/883) ([pliablepixels](https://github.com/pliablepixels))
 - Merged Angular UI branch API to master [\#882](https://github.com/ZoneMinder/ZoneMinder/pull/882) ([pliablepixels](https://github.com/pliablepixels))
-- h264 GUI translate fixes [\#880](https://github.com/ZoneMinder/ZoneMinder/pull/880) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Merging Master to feature-h264-videostorage [\#879](https://github.com/ZoneMinder/ZoneMinder/pull/879) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- 799 api improvements [\#877](https://github.com/ZoneMinder/ZoneMinder/pull/877) ([pliablepixels](https://github.com/pliablepixels))
-- Fixed daemonStatus API to return string returned by ZMC in addition t… [\#876](https://github.com/ZoneMinder/ZoneMinder/pull/876) ([pliablepixels](https://github.com/pliablepixels))
 - Add version to the startup log line [\#875](https://github.com/ZoneMinder/ZoneMinder/pull/875) ([connortechnology](https://github.com/connortechnology))
 - German translation update [\#874](https://github.com/ZoneMinder/ZoneMinder/pull/874) ([seeebek](https://github.com/seeebek))
 - reduce the wait to 2/10ths instead of a whole second [\#873](https://github.com/ZoneMinder/ZoneMinder/pull/873) ([connortechnology](https://github.com/connortechnology))
@@ -186,8 +170,6 @@
 - POD: zmupdate.pl converted to "pod2usage" [\#763](https://github.com/ZoneMinder/ZoneMinder/pull/763) ([onlyjob](https://github.com/onlyjob))
 - build: fix FTBFS with format-hardening \(please review\) [\#761](https://github.com/ZoneMinder/ZoneMinder/pull/761) ([onlyjob](https://github.com/onlyjob))
 - fixing POD errors [\#759](https://github.com/ZoneMinder/ZoneMinder/pull/759) ([onlyjob](https://github.com/onlyjob))
-- Fixed a missing bracket post merge and also SQL\_values now used for Even... [\#750](https://github.com/ZoneMinder/ZoneMinder/pull/750) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Keeping h264 updated. [\#749](https://github.com/ZoneMinder/ZoneMinder/pull/749) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Ignore autogenerated files in git [\#746](https://github.com/ZoneMinder/ZoneMinder/pull/746) ([manupap1](https://github.com/manupap1))
 - when auth is needed, try command again before dying. [\#739](https://github.com/ZoneMinder/ZoneMinder/pull/739) ([connortechnology](https://github.com/connortechnology))
 - remove NETPBM dependency from autotools [\#737](https://github.com/ZoneMinder/ZoneMinder/pull/737) ([knnniggett](https://github.com/knnniggett))
@@ -205,8 +187,6 @@
 - Check to make sure that skin and css are valid. [\#713](https://github.com/ZoneMinder/ZoneMinder/pull/713) ([connortechnology](https://github.com/connortechnology))
 - Fixes \#710 Added libavformat version check around free context functions [\#711](https://github.com/ZoneMinder/ZoneMinder/pull/711) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - try harder to find arp. [\#709](https://github.com/ZoneMinder/ZoneMinder/pull/709) ([connortechnology](https://github.com/connortechnology))
-- Merging Video and feature-h264-videostorage update [\#707](https://github.com/ZoneMinder/ZoneMinder/pull/707) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update Version.txt to 1.28.1 [\#706](https://github.com/ZoneMinder/ZoneMinder/pull/706) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Make el6 and el7 build process a little more automated [\#704](https://github.com/ZoneMinder/ZoneMinder/pull/704) ([clipo1979](https://github.com/clipo1979))
 - small improvements: [\#702](https://github.com/ZoneMinder/ZoneMinder/pull/702) ([connortechnology](https://github.com/connortechnology))
 - Centos 7 rpm packaging [\#700](https://github.com/ZoneMinder/ZoneMinder/pull/700) ([knnniggett](https://github.com/knnniggett))
@@ -217,76 +197,6 @@
 ## [v1.28.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.1) (2015-02-05)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.0...v1.28.1)
 
-**Implemented enhancements:**
-
-- Implement unit testing [\#266](https://github.com/ZoneMinder/ZoneMinder/issues/266)
-- Replace PHP short tags [\#11](https://github.com/ZoneMinder/ZoneMinder/issues/11)
-
-**Fixed bugs:**
-
-- Streaming an Event as MPEG fails. [\#686](https://github.com/ZoneMinder/ZoneMinder/issues/686)
-- Zoneminder Web UI No Longer Refreshes After Change [\#534](https://github.com/ZoneMinder/ZoneMinder/issues/534)
-- Monster log messages [\#491](https://github.com/ZoneMinder/ZoneMinder/issues/491)
-- zmu fails silently when it cannot read zm.conf [\#339](https://github.com/ZoneMinder/ZoneMinder/issues/339)
-- Errors on Monitors page during first view [\#175](https://github.com/ZoneMinder/ZoneMinder/issues/175)
-- Logs screen overflows when too much text in message column [\#138](https://github.com/ZoneMinder/ZoneMinder/issues/138)
-- When filtering in the Events view, filter options are lost between pages [\#25](https://github.com/ZoneMinder/ZoneMinder/issues/25)
-
-**Closed issues:**
-
-- Gentoo Systemd ZM V1.28.0- New old bug with PATH\_SOCK and PATH\_SWAP [\#681](https://github.com/ZoneMinder/ZoneMinder/issues/681)
-- PDO\_MYSQL the only PHP driver needed? [\#679](https://github.com/ZoneMinder/ZoneMinder/issues/679)
-- Unable to probe local cameras, status is '127' [\#673](https://github.com/ZoneMinder/ZoneMinder/issues/673)
-- zmc won't start automatically + Can't open memory map file [\#669](https://github.com/ZoneMinder/ZoneMinder/issues/669)
-- Fake camera support [\#659](https://github.com/ZoneMinder/ZoneMinder/issues/659)
-- Horrible error message when pressing probe [\#658](https://github.com/ZoneMinder/ZoneMinder/issues/658)
-- socket\_sendto\( /var/run/zm/zms-256303s.sock \) failed: No such file or directory [\#656](https://github.com/ZoneMinder/ZoneMinder/issues/656)
-- update feature should be removed or easily disabled [\#655](https://github.com/ZoneMinder/ZoneMinder/issues/655)
-- zmfilter.pl crashes when processing background filter with no terms [\#652](https://github.com/ZoneMinder/ZoneMinder/issues/652)
-- Use of undefined constants ZM\_SKIN\_DEFAULT and ZM\_CSS\_DEFAULT in index.php [\#650](https://github.com/ZoneMinder/ZoneMinder/issues/650)
-- Improper track URL handling in zm\_rtsp.cpp [\#644](https://github.com/ZoneMinder/ZoneMinder/issues/644)
-- Cannot install on jessie when running systemd [\#642](https://github.com/ZoneMinder/ZoneMinder/issues/642)
-- Version detection [\#626](https://github.com/ZoneMinder/ZoneMinder/issues/626)
-- some trash in debian package [\#625](https://github.com/ZoneMinder/ZoneMinder/issues/625)
-- signed integers awesome [\#624](https://github.com/ZoneMinder/ZoneMinder/issues/624)
-- cmake does not honor SYSCONFDIR [\#623](https://github.com/ZoneMinder/ZoneMinder/issues/623)
-- PTZ Control Icons have disappeared [\#622](https://github.com/ZoneMinder/ZoneMinder/issues/622)
-- RTSP Improvements [\#612](https://github.com/ZoneMinder/ZoneMinder/issues/612)
-- CCTV Camera to IP converter [\#603](https://github.com/ZoneMinder/ZoneMinder/issues/603)
-- mjpg streamer installations on fedora 20 [\#600](https://github.com/ZoneMinder/ZoneMinder/issues/600)
-- Changing the skin in the options SHOULD be permanent. [\#598](https://github.com/ZoneMinder/ZoneMinder/issues/598)
-- Zoneminder requires SElinux disabled on RHEL & derivatives. [\#593](https://github.com/ZoneMinder/ZoneMinder/issues/593)
-- Editing control settings on a monitor should probably try to kill any running zmcontrol [\#590](https://github.com/ZoneMinder/ZoneMinder/issues/590)
-- 1.28 missing dependency on debian jessie [\#581](https://github.com/ZoneMinder/ZoneMinder/issues/581)
-- LibVLC MJPEG stream slows down [\#571](https://github.com/ZoneMinder/ZoneMinder/issues/571)
-- %EV% in EMAIL\_BODY in E-mail options send still video [\#569](https://github.com/ZoneMinder/ZoneMinder/issues/569)
-- Add documentation for EMAIL\_BODY variables [\#568](https://github.com/ZoneMinder/ZoneMinder/issues/568)
-- 3S PTZ [\#566](https://github.com/ZoneMinder/ZoneMinder/issues/566)
-- Live view wrong socket name [\#563](https://github.com/ZoneMinder/ZoneMinder/issues/563)
-- V4L1 Support removal? [\#558](https://github.com/ZoneMinder/ZoneMinder/issues/558)
-- feature-h264-videostorage compile errors [\#553](https://github.com/ZoneMinder/ZoneMinder/issues/553)
-- zmc -m 1 crashed, signal 6 [\#540](https://github.com/ZoneMinder/ZoneMinder/issues/540)
-- Attempt to assign buffer from a NULL pointer [\#538](https://github.com/ZoneMinder/ZoneMinder/issues/538)
-- Please recommend ffmpeg settings for best video quality [\#536](https://github.com/ZoneMinder/ZoneMinder/issues/536)
-- Modect Mode\(Active\) - How to revert from alarm to idle [\#509](https://github.com/ZoneMinder/ZoneMinder/issues/509)
-- Update v1.27.99.0. [\#503](https://github.com/ZoneMinder/ZoneMinder/issues/503)
-- Docker Container Broken [\#498](https://github.com/ZoneMinder/ZoneMinder/issues/498)
-- Nordmark IP camera [\#483](https://github.com/ZoneMinder/ZoneMinder/issues/483)
-- Release v1.28.0 [\#467](https://github.com/ZoneMinder/ZoneMinder/issues/467)
-- Let's make a new website [\#446](https://github.com/ZoneMinder/ZoneMinder/issues/446)
-- Zoneminder, Onvif CPU and RTSP capture [\#431](https://github.com/ZoneMinder/ZoneMinder/issues/431)
-- Right memory settings to capture 1080p cameras [\#425](https://github.com/ZoneMinder/ZoneMinder/issues/425)
-- Startup problem on Ubuntu [\#424](https://github.com/ZoneMinder/ZoneMinder/issues/424)
-- Feature Request: Support for digest authentication over RTSP [\#399](https://github.com/ZoneMinder/ZoneMinder/issues/399)
-- Install Zm V1.27.0 on Linux Gentoo x64 \(systemd\) [\#396](https://github.com/ZoneMinder/ZoneMinder/issues/396)
-- Missing Dependencies [\#368](https://github.com/ZoneMinder/ZoneMinder/issues/368)
-- Error "‘AVOutputFormat’ does not name a type   AVOutputFormat \*of;" [\#340](https://github.com/ZoneMinder/ZoneMinder/issues/340)
-- Add the ability to force RTSP over TCP in ffmpeg cameras. [\#323](https://github.com/ZoneMinder/ZoneMinder/issues/323)
-- limited maximum path length for the device path prevents use of some by-id names [\#301](https://github.com/ZoneMinder/ZoneMinder/issues/301)
-- Stream acquired via RTSP/FFMPEG  won't recover from connection loss - "Unable to read packet from stream 0" [\#299](https://github.com/ZoneMinder/ZoneMinder/issues/299)
-- Invalid response status 501: Method Not Implemented [\#298](https://github.com/ZoneMinder/ZoneMinder/issues/298)
-- Invalid SOS parameters for sequential JPEG [\#279](https://github.com/ZoneMinder/ZoneMinder/issues/279)
-
 **Merged pull requests:**
 
 - fix content-type parsing when there are options on it [\#692](https://github.com/ZoneMinder/ZoneMinder/pull/692) ([connortechnology](https://github.com/connortechnology))
@@ -315,11 +225,8 @@
 - Output to stderror when zmu can't read zm.conf [\#627](https://github.com/ZoneMinder/ZoneMinder/pull/627) ([knnniggett](https://github.com/knnniggett))
 - Add missing dependency to policykit-1 [\#621](https://github.com/ZoneMinder/ZoneMinder/pull/621) ([manupap1](https://github.com/manupap1))
 - Replace PHP Short Open Tags - Fixes \#11 [\#620](https://github.com/ZoneMinder/ZoneMinder/pull/620) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Video Highlander [\#618](https://github.com/ZoneMinder/ZoneMinder/pull/618) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Merge Master to feature-h264-videostorage [\#616](https://github.com/ZoneMinder/ZoneMinder/pull/616) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Rtsp [\#615](https://github.com/ZoneMinder/ZoneMinder/pull/615) ([knnniggett](https://github.com/knnniggett))
 - Merge flat css to classic [\#614](https://github.com/ZoneMinder/ZoneMinder/pull/614) ([connortechnology](https://github.com/connortechnology))
-- feature-h264-videostorage mp4 container [\#613](https://github.com/ZoneMinder/ZoneMinder/pull/613) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - echo the URL to the RTSP device during the OPTIONS directive [\#608](https://github.com/ZoneMinder/ZoneMinder/pull/608) ([knnniggett](https://github.com/knnniggett))
 - Fix some memory leaks in zma [\#607](https://github.com/ZoneMinder/ZoneMinder/pull/607) ([manupap1](https://github.com/manupap1))
 - Fix a mismatched free in zmc binary [\#606](https://github.com/ZoneMinder/ZoneMinder/pull/606) ([manupap1](https://github.com/manupap1))
@@ -346,91 +253,16 @@
 - Fixed bug in rtsp streaming caused by a bad string concatenation [\#557](https://github.com/ZoneMinder/ZoneMinder/pull/557) ([manupap1](https://github.com/manupap1))
 - Add a stringVector join function for future use [\#556](https://github.com/ZoneMinder/ZoneMinder/pull/556) ([connortechnology](https://github.com/connortechnology))
 - Fixed bug in rtsp streaming caused by a signed - unsigned conversion. [\#555](https://github.com/ZoneMinder/ZoneMinder/pull/555) ([manupap1](https://github.com/manupap1))
-- Keeping branch current, and fixing libvlc compile issues [\#554](https://github.com/ZoneMinder/ZoneMinder/pull/554) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Bumped version being found by zmupdate.pl [\#551](https://github.com/ZoneMinder/ZoneMinder/pull/551) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Update Ubuntu install instructions [\#550](https://github.com/ZoneMinder/ZoneMinder/pull/550) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Ignore more files and initial travis framework [\#544](https://github.com/ZoneMinder/ZoneMinder/pull/544) ([kylejohnson](https://github.com/kylejohnson))
 - Update Travis to ffmpeg 2.4.2 [\#539](https://github.com/ZoneMinder/ZoneMinder/pull/539) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Add libvlc to Travis [\#535](https://github.com/ZoneMinder/ZoneMinder/pull/535) ([knnniggett](https://github.com/knnniggett))
-- Merge master to feature-h264-videostorage and restore web GUI [\#532](https://github.com/ZoneMinder/ZoneMinder/pull/532) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - 351-Rebase Attempt for ffmpeg stability fixes [\#531](https://github.com/ZoneMinder/ZoneMinder/pull/531) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- 478 Basic ONVIF Support [\#479](https://github.com/ZoneMinder/ZoneMinder/pull/479) ([altaroca](https://github.com/altaroca))
 
 ## [v1.28.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.0) (2014-10-18)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.27.0...v1.28.0)
 
-**Implemented enhancements:**
-
-- Migrate completely to C++ [\#265](https://github.com/ZoneMinder/ZoneMinder/issues/265)
-- All of the Config table shouldn't be written in Configure::write [\#192](https://github.com/ZoneMinder/ZoneMinder/issues/192)
-- Translation stuff done, please pull in and test... [\#72](https://github.com/ZoneMinder/ZoneMinder/issues/72)
-
-**Fixed bugs:**
-
-- zms crashes due to monitor not running. [\#468](https://github.com/ZoneMinder/ZoneMinder/issues/468)
-- Flat Skins Export Functions missing $ [\#455](https://github.com/ZoneMinder/ZoneMinder/issues/455)
-- unexpected } in console.php [\#354](https://github.com/ZoneMinder/ZoneMinder/issues/354)
-- incomplete path to arp in zoneminder/skins/classic/views/monitorprobe.php causes probe code 127 failures [\#271](https://github.com/ZoneMinder/ZoneMinder/issues/271)
-- Minor errors when either OPT\_MAIL, OPT\_MESSAGE, or OPT\_UPLOAD are not set [\#34](https://github.com/ZoneMinder/ZoneMinder/issues/34)
-
-**Closed issues:**
-
-- Travis Build failing due to build issues with ffmpeg master [\#520](https://github.com/ZoneMinder/ZoneMinder/issues/520)
-- 'zmfilter.pl' exited abnormally, exit status 9 [\#516](https://github.com/ZoneMinder/ZoneMinder/issues/516)
-- Get the script on alarm feature working [\#515](https://github.com/ZoneMinder/ZoneMinder/issues/515)
-- cmake installation on Arch Linux creates extraneous lib/perl5/... and share/man/... directories [\#514](https://github.com/ZoneMinder/ZoneMinder/issues/514)
-- ZM Gui Stopped SU Syntax Error [\#512](https://github.com/ZoneMinder/ZoneMinder/issues/512)
-- Error using log filter [\#504](https://github.com/ZoneMinder/ZoneMinder/issues/504)
-- fps drop in latest snapshot 1.27.99 [\#495](https://github.com/ZoneMinder/ZoneMinder/issues/495)
-- mysql missing field error after update [\#494](https://github.com/ZoneMinder/ZoneMinder/issues/494)
-- Emails not including video when I add %EV% [\#487](https://github.com/ZoneMinder/ZoneMinder/issues/487)
-- Cameras don't show remotely [\#484](https://github.com/ZoneMinder/ZoneMinder/issues/484)
-- ZM Gui Stopped SU Syntax Error [\#482](https://github.com/ZoneMinder/ZoneMinder/issues/482)
-- Airlink101 AIC500 mjpeg stream [\#481](https://github.com/ZoneMinder/ZoneMinder/issues/481)
-- When a monitor's size is changed, the zone does not resize with it. [\#477](https://github.com/ZoneMinder/ZoneMinder/issues/477)
-- .. [\#472](https://github.com/ZoneMinder/ZoneMinder/issues/472)
-- Just A Note When Compiling [\#471](https://github.com/ZoneMinder/ZoneMinder/issues/471)
-- firefox on windows not load all monitors in montage view [\#470](https://github.com/ZoneMinder/ZoneMinder/issues/470)
-- Default to FLAT Skin [\#466](https://github.com/ZoneMinder/ZoneMinder/issues/466)
-- zmlinkcontent.sh chown and chmod on symlink instead of content directory [\#463](https://github.com/ZoneMinder/ZoneMinder/issues/463)
-- Cannot compile Zoneminder on CentOS 6.4 [\#461](https://github.com/ZoneMinder/ZoneMinder/issues/461)
-- Video is not attached to e-mail anymore \(zm 1.27\) [\#460](https://github.com/ZoneMinder/ZoneMinder/issues/460)
-- \[Video Branch\] Unknown column 'SaveJPEGs' in 'field list' [\#453](https://github.com/ZoneMinder/ZoneMinder/issues/453)
-- Log Ajax loading oldest to newest [\#450](https://github.com/ZoneMinder/ZoneMinder/issues/450)
-- '@' in password of a remote camera makes things go wrong [\#443](https://github.com/ZoneMinder/ZoneMinder/issues/443)
-- Current code segfaults [\#439](https://github.com/ZoneMinder/ZoneMinder/issues/439)
-- Crashing under Arch Linux [\#437](https://github.com/ZoneMinder/ZoneMinder/issues/437)
-- Email Montage view on schedule [\#436](https://github.com/ZoneMinder/ZoneMinder/issues/436)
-- \[question\] vmware image for latest ZM [\#428](https://github.com/ZoneMinder/ZoneMinder/issues/428)
-- Cannot Compile [\#423](https://github.com/ZoneMinder/ZoneMinder/issues/423)
-- seg in nph-zms/loadEventData atoi [\#417](https://github.com/ZoneMinder/ZoneMinder/issues/417)
-- ffmpeg problem [\#414](https://github.com/ZoneMinder/ZoneMinder/issues/414)
-- Minor fixes \(?\) for zmtrigger and mobile skin [\#410](https://github.com/ZoneMinder/ZoneMinder/issues/410)
-- Misleading Config Dump [\#402](https://github.com/ZoneMinder/ZoneMinder/issues/402)
-- Call to undefined function fixdevices\(\) [\#401](https://github.com/ZoneMinder/ZoneMinder/issues/401)
-- Option to execute arbitrary script for each event. \[$100 awarded\] [\#400](https://github.com/ZoneMinder/ZoneMinder/issues/400)
-- Zoneminder without Analysation [\#398](https://github.com/ZoneMinder/ZoneMinder/issues/398)
-- Viewing 31 monitors in montage [\#379](https://github.com/ZoneMinder/ZoneMinder/issues/379)
-- flat theme usability / Layout issues [\#378](https://github.com/ZoneMinder/ZoneMinder/issues/378)
-- Undefined index: filter in /usr/share/zoneminder/skins/zmc/views/filter.php [\#369](https://github.com/ZoneMinder/ZoneMinder/issues/369)
-- docker install not working [\#366](https://github.com/ZoneMinder/ZoneMinder/issues/366)
-- Events are not being reported to table on main index page [\#364](https://github.com/ZoneMinder/ZoneMinder/issues/364)
-- PatternFly for design commanality and improved user experience [\#363](https://github.com/ZoneMinder/ZoneMinder/issues/363)
-- Radio buttons rendering in events replay in flat skin [\#356](https://github.com/ZoneMinder/ZoneMinder/issues/356)
-- Pick a git branching strategy [\#350](https://github.com/ZoneMinder/ZoneMinder/issues/350)
-- Compile directive ZM\_CGIDIR is not interpreted correctly [\#347](https://github.com/ZoneMinder/ZoneMinder/issues/347)
-- 736516 - FTBFS: zm\_image.cpp:2991:165: error: \_\_attribute\_\_\(\(\_\_target\_\_\("sse2"\)\)\) is invalid [\#345](https://github.com/ZoneMinder/ZoneMinder/issues/345)
-- zmcamtool isn't installed [\#344](https://github.com/ZoneMinder/ZoneMinder/issues/344)
-- Overload Frame Ignore Count has no function [\#337](https://github.com/ZoneMinder/ZoneMinder/issues/337)
-- preclusive zones calculated twice [\#336](https://github.com/ZoneMinder/ZoneMinder/issues/336)
-- Build issue - In function `matroska\_decode\_buffer' [\#335](https://github.com/ZoneMinder/ZoneMinder/issues/335)
-- High Load with Low CPU usage [\#326](https://github.com/ZoneMinder/ZoneMinder/issues/326)
-- AUTH\_TYPE=remote not working in 1.26.4 [\#324](https://github.com/ZoneMinder/ZoneMinder/issues/324)
-- Filter / Purge And Delete not running [\#321](https://github.com/ZoneMinder/ZoneMinder/issues/321)
-- /root/zoneminder\_1.26.4-1\_amd64.deb not created [\#260](https://github.com/ZoneMinder/ZoneMinder/issues/260)
-- 721161 - depends on ffmpeg which is going away [\#100](https://github.com/ZoneMinder/ZoneMinder/issues/100)
-- 694131 - FTBFS against libav 9 [\#98](https://github.com/ZoneMinder/ZoneMinder/issues/98)
-- Request: Better API/Remote control [\#23](https://github.com/ZoneMinder/ZoneMinder/issues/23)
-
 **Merged pull requests:**
 
 - fixes ftbs with no ffmpeg support [\#530](https://github.com/ZoneMinder/ZoneMinder/pull/530) ([knnniggett](https://github.com/knnniggett))
@@ -450,7 +282,6 @@
 - Fixes errors when opening Filters \(issue \#34\) [\#457](https://github.com/ZoneMinder/ZoneMinder/pull/457) ([knnniggett](https://github.com/knnniggett))
 - Fixed missing $ on ARRAY\(event\[id\]\). Fixes \#455 [\#456](https://github.com/ZoneMinder/ZoneMinder/pull/456) ([SteveGilvarry](https://github.com/SteveGilvarry))
 - Wrap sort order. Fixes \#450 [\#451](https://github.com/ZoneMinder/ZoneMinder/pull/451) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update downloads.html [\#448](https://github.com/ZoneMinder/ZoneMinder/pull/448) ([barjac](https://github.com/barjac))
 - scripts: BusyBox compatibility [\#445](https://github.com/ZoneMinder/ZoneMinder/pull/445) ([clandmeter](https://github.com/clandmeter))
 - Fixed issue DateTime handling in filter queries that broke timeline view... [\#442](https://github.com/ZoneMinder/ZoneMinder/pull/442) ([Tim-Craig](https://github.com/Tim-Craig))
 - Cleaning up the Contribution section of the README [\#440](https://github.com/ZoneMinder/ZoneMinder/pull/440) ([kylejohnson](https://github.com/kylejohnson))
@@ -502,49 +333,8 @@
 ## [v1.27.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.27.0) (2014-03-15)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.5...v1.27.0)
 
-**Implemented enhancements:**
-
-- Change help text of source "Maximum FPS" and "Alarm Maximum FPS" to note that this should only be used on analog cameras [\#273](https://github.com/ZoneMinder/ZoneMinder/issues/273)
-- Make zmpkg.pl 'better' [\#272](https://github.com/ZoneMinder/ZoneMinder/issues/272)
-- Enhance security by creating SELinux policies. [\#248](https://github.com/ZoneMinder/ZoneMinder/issues/248)
-- Update wiki page \(please?\) [\#91](https://github.com/ZoneMinder/ZoneMinder/issues/91)
-- Better ffmpeg Version Checking [\#31](https://github.com/ZoneMinder/ZoneMinder/issues/31)
-- Proposed: Enable purgewhenfull filter by default [\#332](https://github.com/ZoneMinder/ZoneMinder/issues/332)
-- Exportable Camera Configs [\#86](https://github.com/ZoneMinder/ZoneMinder/issues/86)
-
-**Fixed bugs:**
-
-- Vivotek cameras, ultra slow FPS. [\#204](https://github.com/ZoneMinder/ZoneMinder/issues/204)
-- Script to remove auto-generated files [\#112](https://github.com/ZoneMinder/ZoneMinder/issues/112)
-- zm\_mpeg no longer uses correct ffmpeg API's [\#83](https://github.com/ZoneMinder/ZoneMinder/issues/83)
-- Not all options in Monitors/add.ctp are saved to the database [\#13](https://github.com/ZoneMinder/ZoneMinder/issues/13)
-- Flat skin needs window widths fixed [\#331](https://github.com/ZoneMinder/ZoneMinder/issues/331)
-- Configuration gets broken in database after crash [\#239](https://github.com/ZoneMinder/ZoneMinder/issues/239)
-- zmc crashes after a few minutes of usage in 1.26.4 [\#237](https://github.com/ZoneMinder/ZoneMinder/issues/237)
-
-**Closed issues:**
-
-- Apache using private /tmp space [\#307](https://github.com/ZoneMinder/ZoneMinder/issues/307)
-- zmtrigger.pl crashes, which keeps Monitors in alarm state. [\#295](https://github.com/ZoneMinder/ZoneMinder/issues/295)
-- SQL-ERR using Timeline after executing Filter matching on string with whitespace [\#291](https://github.com/ZoneMinder/ZoneMinder/issues/291)
-- zm\_signal.cpp crashing signal 11 \(Segmentation fault\) [\#288](https://github.com/ZoneMinder/ZoneMinder/issues/288)
-- Zoneminder no longer builds when using -DZM\_NO\_FFMPEG=ON [\#285](https://github.com/ZoneMinder/ZoneMinder/issues/285)
-- Can't to use chinese [\#278](https://github.com/ZoneMinder/ZoneMinder/issues/278)
-- jquery is embedded inside export\_functions.php [\#274](https://github.com/ZoneMinder/ZoneMinder/issues/274)
-- Implement live streaming of H264 camera streams [\#176](https://github.com/ZoneMinder/ZoneMinder/issues/176)
-- Support non-embedded password challenge [\#33](https://github.com/ZoneMinder/ZoneMinder/issues/33)
-- libvlc source type not working in Ubuntu 12.04.3 [\#330](https://github.com/ZoneMinder/ZoneMinder/issues/330)
-- zmupdate.pl InnoDB conversion silent failure [\#320](https://github.com/ZoneMinder/ZoneMinder/issues/320)
-- Release v1.27.0 \[$100 awarded\] [\#315](https://github.com/ZoneMinder/ZoneMinder/issues/315)
-- Default skin is flat, can't switch to classic.  ?skin doesn't help [\#313](https://github.com/ZoneMinder/ZoneMinder/issues/313)
-- make failure [\#304](https://github.com/ZoneMinder/ZoneMinder/issues/304)
-- Fix 'remote' AUTH\_TYPE [\#296](https://github.com/ZoneMinder/ZoneMinder/issues/296)
-- Use libcurl for http\(s\) authentication with remote cameras \[$400 awarded\] [\#238](https://github.com/ZoneMinder/ZoneMinder/issues/238)
-
 **Merged pull requests:**
 
-- Release 1.27 [\#341](https://github.com/ZoneMinder/ZoneMinder/pull/341) ([kylejohnson](https://github.com/kylejohnson))
-- Fix popup sizes in flat skins.  Fixes \#331 [\#334](https://github.com/ZoneMinder/ZoneMinder/pull/334) ([kylejohnson](https://github.com/kylejohnson))
 - zmcamtool.pl - import and export ptz camera controls & camera presets [\#318](https://github.com/ZoneMinder/ZoneMinder/pull/318) ([kylejohnson](https://github.com/kylejohnson))
 - Example script to react to monitor alarms [\#317](https://github.com/ZoneMinder/ZoneMinder/pull/317) ([kylejohnson](https://github.com/kylejohnson))
 - Change comments for many Camera subclasses [\#316](https://github.com/ZoneMinder/ZoneMinder/pull/316) ([nereocystis](https://github.com/nereocystis))
@@ -572,34 +362,12 @@
 ## [v1.26.5](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.5) (2013-12-16)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.4...v1.26.5)
 
-**Implemented enhancements:**
-
-- ZoneMinder domain / website / email [\#225](https://github.com/ZoneMinder/ZoneMinder/issues/225)
-
-**Fixed bugs:**
-
-- Post shmget problem due to \*code\* not shmmax/shmall [\#226](https://github.com/ZoneMinder/ZoneMinder/issues/226)
-- SQL error when "pre event image count" \>150 or so due to insufficient ZM\_SQL\_LGE\_BUFSIZ [\#222](https://github.com/ZoneMinder/ZoneMinder/issues/222)
-- 'asm' operand has impossible constraints [\#219](https://github.com/ZoneMinder/ZoneMinder/issues/219)
-- ipv6 support [\#210](https://github.com/ZoneMinder/ZoneMinder/issues/210)
-- RTSP decoding errors in 1.26.4 \[$450 awarded\] [\#221](https://github.com/ZoneMinder/ZoneMinder/issues/221)
-- The Prev "\<+" button does not work [\#32](https://github.com/ZoneMinder/ZoneMinder/issues/32)
-
-**Closed issues:**
-
-- Strict subs error? [\#262](https://github.com/ZoneMinder/ZoneMinder/issues/262)
-- PHP depreciating [\#229](https://github.com/ZoneMinder/ZoneMinder/issues/229)
-- Add a feature to monitor camera\(s\) availability [\#228](https://github.com/ZoneMinder/ZoneMinder/issues/228)
-- Release 1.26.4 [\#202](https://github.com/ZoneMinder/ZoneMinder/issues/202)
-- 631969 - 2 problems with options screen [\#106](https://github.com/ZoneMinder/ZoneMinder/issues/106)
-- 657620 - Path issues for js scripts [\#102](https://github.com/ZoneMinder/ZoneMinder/issues/102)
-- Support http digest authentication for IP camera access [\#30](https://github.com/ZoneMinder/ZoneMinder/issues/30)
-
 **Merged pull requests:**
 
 - Add reference to zm\_update-1.26.5.sql in Makefile.am [\#269](https://github.com/ZoneMinder/ZoneMinder/pull/269) ([knnniggett](https://github.com/knnniggett))
 - Detection Support for WansView Cams [\#268](https://github.com/ZoneMinder/ZoneMinder/pull/268) ([Phhere](https://github.com/Phhere))
 - use proper DBI parameter passing to improve security [\#264](https://github.com/ZoneMinder/ZoneMinder/pull/264) ([connortechnology](https://github.com/connortechnology))
+- Fix RTSP decoding errors in 1.26.4 \(addresses \#221\) [\#259](https://github.com/ZoneMinder/ZoneMinder/pull/259) ([ebarnard](https://github.com/ebarnard))
 - Network Detection Support for Wansview [\#257](https://github.com/ZoneMinder/ZoneMinder/pull/257) ([Phhere](https://github.com/Phhere))
 - Fix checkJsonError messages [\#256](https://github.com/ZoneMinder/ZoneMinder/pull/256) ([Phhere](https://github.com/Phhere))
 - Update README.md [\#255](https://github.com/ZoneMinder/ZoneMinder/pull/255) ([zdanek](https://github.com/zdanek))
@@ -608,16 +376,9 @@
 - Fix shared memory errors on centos 6.4 [\#250](https://github.com/ZoneMinder/ZoneMinder/pull/250) ([insidenothing](https://github.com/insidenothing))
 - Update zoneminder.service [\#246](https://github.com/ZoneMinder/ZoneMinder/pull/246) ([dtmf](https://github.com/dtmf))
 - remove extra stuff that I don't think we need because we are the source.  Opinions? [\#240](https://github.com/ZoneMinder/ZoneMinder/pull/240) ([connortechnology](https://github.com/connortechnology))
-- Re-Add ZM\_PATH\_DATA [\#236](https://github.com/ZoneMinder/ZoneMinder/pull/236) ([knnniggett](https://github.com/knnniggett))
 - Cast content\_length to signed int for error-check comparison [\#232](https://github.com/ZoneMinder/ZoneMinder/pull/232) ([josephevans](https://github.com/josephevans))
 - Apply INSERTs in Event::AddFrames in batches to fix issue \#222 [\#223](https://github.com/ZoneMinder/ZoneMinder/pull/223) ([fastolfe](https://github.com/fastolfe))
-- Updates to the zones view and edit pages [\#220](https://github.com/ZoneMinder/ZoneMinder/pull/220) ([kylejohnson](https://github.com/kylejohnson))
 - ffmpeg detection improvements [\#218](https://github.com/ZoneMinder/ZoneMinder/pull/218) ([mastertheknife](https://github.com/mastertheknife))
-- cmake support files for redhat/centos distros [\#217](https://github.com/ZoneMinder/ZoneMinder/pull/217) ([knnniggett](https://github.com/knnniggett))
-- Create ZM\_TARGET\_DISTRO [\#216](https://github.com/ZoneMinder/ZoneMinder/pull/216) ([knnniggett](https://github.com/knnniggett))
-- We need a toggle for x10 support [\#215](https://github.com/ZoneMinder/ZoneMinder/pull/215) ([knnniggett](https://github.com/knnniggett))
-- Cmake support files for fedora distro [\#214](https://github.com/ZoneMinder/ZoneMinder/pull/214) ([knnniggett](https://github.com/knnniggett))
-- Initial zone editing in html5 canvas [\#213](https://github.com/ZoneMinder/ZoneMinder/pull/213) ([kylejohnson](https://github.com/kylejohnson))
 - ZoneMinder Dutch Translation updates by Alco \(a.k. nightcrawler\) [\#211](https://github.com/ZoneMinder/ZoneMinder/pull/211) ([kylejohnson](https://github.com/kylejohnson))
 - Change Prev Button functionality [\#207](https://github.com/ZoneMinder/ZoneMinder/pull/207) ([knnniggett](https://github.com/knnniggett))
 - Delete PATH\_BUILD and TIME\_BUILD from zm.conf and fix ZM\_DB\_TYPE [\#243](https://github.com/ZoneMinder/ZoneMinder/pull/243) ([mastertheknife](https://github.com/mastertheknife))
@@ -628,42 +389,6 @@
 ## [v1.26.4](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.4) (2013-10-08)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.3...v1.26.4)
 
-**Implemented enhancements:**
-
-- Configuration options should be handled in the model, not the controller [\#191](https://github.com/ZoneMinder/ZoneMinder/issues/191)
-- Travis CI automatic building [\#168](https://github.com/ZoneMinder/ZoneMinder/issues/168)
-- Switch h264 feature branch to track the modern branch [\#167](https://github.com/ZoneMinder/ZoneMinder/issues/167)
-- Add redhat specific files to source tree [\#115](https://github.com/ZoneMinder/ZoneMinder/issues/115)
-- Performing count\(\) in SQL is slower than in PHP [\#2](https://github.com/ZoneMinder/ZoneMinder/issues/2)
-
-**Fixed bugs:**
-
-- New WebUI displays horizontal scroll bar with 100% width [\#169](https://github.com/ZoneMinder/ZoneMinder/issues/169)
--  syntax error, unexpected $end on line 16 in LiveStreamHelper.php [\#147](https://github.com/ZoneMinder/ZoneMinder/issues/147)
-- Readme.fedora contains incorrect references [\#145](https://github.com/ZoneMinder/ZoneMinder/issues/145)
-- Bandwidth cookie issues [\#143](https://github.com/ZoneMinder/ZoneMinder/issues/143)
-- Monitor image invalid when monitor not enabled [\#140](https://github.com/ZoneMinder/ZoneMinder/issues/140)
-- Monitor image size too small [\#139](https://github.com/ZoneMinder/ZoneMinder/issues/139)
-
-**Closed issues:**
-
-- MJPEG without cambozola.jar on modern browsers \(including Linux ones\) [\#198](https://github.com/ZoneMinder/ZoneMinder/issues/198)
-- Ability to hide all 'controls' and menus [\#171](https://github.com/ZoneMinder/ZoneMinder/issues/171)
-- strace on zma gives "timer\_gettime...\(..\).. = -1 EINVAL \(Invalid argument\)" [\#170](https://github.com/ZoneMinder/ZoneMinder/issues/170)
-- Add ability to zms \(or use the segmenter\) to play back h264 video either directly or transcoded [\#166](https://github.com/ZoneMinder/ZoneMinder/issues/166)
-- I can delete multiple events at once. [\#137](https://github.com/ZoneMinder/ZoneMinder/issues/137)
-- I can view logs [\#135](https://github.com/ZoneMinder/ZoneMinder/issues/135)
-- I can update system config / options [\#134](https://github.com/ZoneMinder/ZoneMinder/issues/134)
-- I can change the order of monitors [\#132](https://github.com/ZoneMinder/ZoneMinder/issues/132)
-- When a new version is available, I am alerted [\#130](https://github.com/ZoneMinder/ZoneMinder/issues/130)
-- Bandwidth is updated on the UI after chaning it [\#129](https://github.com/ZoneMinder/ZoneMinder/issues/129)
-- I can change the bandwidth [\#128](https://github.com/ZoneMinder/ZoneMinder/issues/128)
-- I can delete events [\#126](https://github.com/ZoneMinder/ZoneMinder/issues/126)
-- I can view monitor streams individually [\#125](https://github.com/ZoneMinder/ZoneMinder/issues/125)
-- 667428 - ftbfs with GCC-4.7 [\#99](https://github.com/ZoneMinder/ZoneMinder/issues/99)
-- 707411 - FTBFS: zm\_local\_camera.cpp:742:49: error: invalid conversion from '\_\_u32 {aka unsigned int}' to 'v4l2\_buf\_type' [\#97](https://github.com/ZoneMinder/ZoneMinder/issues/97)
-- Change in monitor setup requested. [\#19](https://github.com/ZoneMinder/ZoneMinder/issues/19)
-
 **Merged pull requests:**
 
 - Change frameserver warnings to debug level 2 [\#205](https://github.com/ZoneMinder/ZoneMinder/pull/205) ([knnniggett](https://github.com/knnniggett))
@@ -671,26 +396,13 @@
 - Signal improvements and fixes [\#201](https://github.com/ZoneMinder/ZoneMinder/pull/201) ([mastertheknife](https://github.com/mastertheknife))
 - Create ZM\_PATH\_DATA and point zmupdate to ZM\_PATH\_DATA/db [\#200](https://github.com/ZoneMinder/ZoneMinder/pull/200) ([knnniggett](https://github.com/knnniggett))
 - remove ${CMAKE\_CURRENT\_SOURCE\_DIR} from add\_custom\_target [\#199](https://github.com/ZoneMinder/ZoneMinder/pull/199) ([knnniggett](https://github.com/knnniggett))
-- Updated cmake for the modern WebUI branch [\#196](https://github.com/ZoneMinder/ZoneMinder/pull/196) ([mastertheknife](https://github.com/mastertheknife))
 - Added missing word in readme [\#194](https://github.com/ZoneMinder/ZoneMinder/pull/194) ([WDKevin](https://github.com/WDKevin))
-- Moved writing of configure options from Controller to Model. Fixes \#191. [\#193](https://github.com/ZoneMinder/ZoneMinder/pull/193) ([kylejohnson](https://github.com/kylejohnson))
-- Moved zmBandwidth option from cookie to Configure:: option.  Might fix \#175 [\#190](https://github.com/ZoneMinder/ZoneMinder/pull/190) ([kylejohnson](https://github.com/kylejohnson))
-- Moved the Config tabs to the sidebar [\#185](https://github.com/ZoneMinder/ZoneMinder/pull/185) ([kylejohnson](https://github.com/kylejohnson))
-- Added datetime picker support and implemented on events sidebar [\#179](https://github.com/ZoneMinder/ZoneMinder/pull/179) ([WDKevin](https://github.com/WDKevin))
 - Add cmake to ZoneMinder [\#178](https://github.com/ZoneMinder/ZoneMinder/pull/178) ([mastertheknife](https://github.com/mastertheknife))
-- Fixes the fixed-width container bug in bootstrap [\#177](https://github.com/ZoneMinder/ZoneMinder/pull/177) ([WDKevin](https://github.com/WDKevin))
 - Rtsp updates [\#174](https://github.com/ZoneMinder/ZoneMinder/pull/174) ([POKKAHOH](https://github.com/POKKAHOH))
-- Minor patches to support older ffmpeg under distro's like Ubuntu 12.04 [\#173](https://github.com/ZoneMinder/ZoneMinder/pull/173) ([chetan-prime](https://github.com/chetan-prime))
 - Solution for Issue \#170 [\#172](https://github.com/ZoneMinder/ZoneMinder/pull/172) ([raulcaj](https://github.com/raulcaj))
 - Fixing debian build files including automated database setup [\#164](https://github.com/ZoneMinder/ZoneMinder/pull/164) ([jaydio](https://github.com/jaydio))
 - Add fedora rpm development files to zoneminder source tree [\#163](https://github.com/ZoneMinder/ZoneMinder/pull/163) ([knnniggett](https://github.com/knnniggett))
 - Improve Chrome browser support & log streaming events [\#162](https://github.com/ZoneMinder/ZoneMinder/pull/162) ([knnniggett](https://github.com/knnniggett))
-- Merge master into modern to keep changes up to date [\#161](https://github.com/ZoneMinder/ZoneMinder/pull/161) ([chriswiggins](https://github.com/chriswiggins))
-- Checks for updates every 5 minutes and notifies the user when there is one [\#158](https://github.com/ZoneMinder/ZoneMinder/pull/158) ([WDKevin](https://github.com/WDKevin))
-- Dynamic monitor resizing [\#157](https://github.com/ZoneMinder/ZoneMinder/pull/157) ([chriswiggins](https://github.com/chriswiggins))
-- Delete multiple events at once [\#156](https://github.com/ZoneMinder/ZoneMinder/pull/156) ([WDKevin](https://github.com/WDKevin))
-- Added missing jquery-2.0.1.min.map file [\#155](https://github.com/ZoneMinder/ZoneMinder/pull/155) ([WDKevin](https://github.com/WDKevin))
-- Add support to change order of monitors [\#154](https://github.com/ZoneMinder/ZoneMinder/pull/154) ([WDKevin](https://github.com/WDKevin))
 - Can't seem to catch a break tonight.  Moving debian files into correct folder [\#149](https://github.com/ZoneMinder/ZoneMinder/pull/149) ([knnniggett](https://github.com/knnniggett))
 - Move debian folder under distros [\#148](https://github.com/ZoneMinder/ZoneMinder/pull/148) ([knnniggett](https://github.com/knnniggett))
 - Removing the redhat folder from the root for real this time [\#141](https://github.com/ZoneMinder/ZoneMinder/pull/141) ([knnniggett](https://github.com/knnniggett))
@@ -702,11 +414,6 @@
 ## [v1.26.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.3) (2013-09-10)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.2...v1.26.3)
 
-**Fixed bugs:**
-
-- syntax error near unexpected token `5.6.0' [\#118](https://github.com/ZoneMinder/ZoneMinder/issues/118)
-- Must modify zmupdate whenever the zm release number is incremented [\#114](https://github.com/ZoneMinder/ZoneMinder/issues/114)
-
 **Merged pull requests:**
 
 - Add 1.26.1 and 1.26.2 releases to zmupdate [\#116](https://github.com/ZoneMinder/ZoneMinder/pull/116) ([knnniggett](https://github.com/knnniggett))
@@ -714,19 +421,6 @@
 ## [v1.26.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.2) (2013-09-06)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.1...v1.26.2)
 
-**Implemented enhancements:**
-
-- Update zmupdate to look at the github repo for the latest version [\#109](https://github.com/ZoneMinder/ZoneMinder/issues/109)
-
-**Fixed bugs:**
-
-- 666980 - hash authentication broken in update [\#105](https://github.com/ZoneMinder/ZoneMinder/issues/105)
-
-**Closed issues:**
-
-- 1.26.1 didn't get bumped from 1.26.0 [\#113](https://github.com/ZoneMinder/ZoneMinder/issues/113)
-- Migrate FAQ from ZoneMinder Wiki to GitHub Wiki [\#110](https://github.com/ZoneMinder/ZoneMinder/issues/110)
-
 **Merged pull requests:**
 
 - Use GitHub repo for version check [\#111](https://github.com/ZoneMinder/ZoneMinder/pull/111) ([chriswiggins](https://github.com/chriswiggins))
@@ -734,85 +428,18 @@
 ## [v1.26.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.1) (2013-09-06)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.0...v1.26.1)
 
-**Fixed bugs:**
-
-- Make and configure files are not in v1.26.0 [\#107](https://github.com/ZoneMinder/ZoneMinder/issues/107)
-
 ## [v1.26.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.0) (2013-09-05)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.3...v1.26.0)
 
-**Closed issues:**
-
-- AM is deprecated in automake-1.13 onwards [\#94](https://github.com/ZoneMinder/ZoneMinder/issues/94)
-- CVE-2013-0232 [\#93](https://github.com/ZoneMinder/ZoneMinder/issues/93)
-- \[CRITICAL\] zms crashes with hashed authentication [\#88](https://github.com/ZoneMinder/ZoneMinder/issues/88)
-
-**Merged pull requests:**
-
-- Fix "Can't stat : No such file or directory" message [\#95](https://github.com/ZoneMinder/ZoneMinder/pull/95) ([knnniggett](https://github.com/knnniggett))
-- Update getBrowser\(\) to match IE10 [\#92](https://github.com/ZoneMinder/ZoneMinder/pull/92) ([knnniggett](https://github.com/knnniggett))
-- Update zmupdate.pl.in to give option to convert to InnoDB tables [\#84](https://github.com/ZoneMinder/ZoneMinder/pull/84) ([knnniggett](https://github.com/knnniggett))
-
 ## [v1.26-beta.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.3) (2013-08-28)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.2...v1.26-beta.3)
 
-**Fixed bugs:**
-
-- libjpeg turbo errors during make [\#52](https://github.com/ZoneMinder/ZoneMinder/issues/52)
-
-**Closed issues:**
-
-- configure.ac checking for libavcore incorrectly [\#64](https://github.com/ZoneMinder/ZoneMinder/issues/64)
-
-**Merged pull requests:**
-
-- Fix for Issue \#88 - ZMS crashing [\#90](https://github.com/ZoneMinder/ZoneMinder/pull/90) ([knnniggett](https://github.com/knnniggett))
-- Fixed typo [\#89](https://github.com/ZoneMinder/ZoneMinder/pull/89) ([knnniggett](https://github.com/knnniggett))
-- edit zmupdate function in init script [\#87](https://github.com/ZoneMinder/ZoneMinder/pull/87) ([knnniggett](https://github.com/knnniggett))
-- Add PTZ control files and camera presets for specific ptz cameras. [\#85](https://github.com/ZoneMinder/ZoneMinder/pull/85) ([knnniggett](https://github.com/knnniggett))
-- Update Makefile.am [\#81](https://github.com/ZoneMinder/ZoneMinder/pull/81) ([knnniggett](https://github.com/knnniggett))
-- Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library [\#80](https://github.com/ZoneMinder/ZoneMinder/pull/80) ([knnniggett](https://github.com/knnniggett))
-- Added frameserver patch from Zoneminder Wiki [\#79](https://github.com/ZoneMinder/ZoneMinder/pull/79) ([knnniggett](https://github.com/knnniggett))
-- Don't check for gnutls-openssl on systems with older gnutls [\#78](https://github.com/ZoneMinder/ZoneMinder/pull/78) ([knnniggett](https://github.com/knnniggett))
-- Change default dB Engine from MyISAM to InnoDB [\#77](https://github.com/ZoneMinder/ZoneMinder/pull/77) ([knnniggett](https://github.com/knnniggett))
-- Added build notes for CentOS & RHEL [\#76](https://github.com/ZoneMinder/ZoneMinder/pull/76) ([knnniggett](https://github.com/knnniggett))
-
 ## [v1.26-beta.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.2) (2013-08-15)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.1...v1.26-beta.2)
 
-**Implemented enhancements:**
-
-- Updated Hungarian translation [\#35](https://github.com/ZoneMinder/ZoneMinder/issues/35)
-
-**Fixed bugs:**
-
-- 1.26 Beta does not install SkyIPCam7xx.pm Control Script [\#38](https://github.com/ZoneMinder/ZoneMinder/issues/38)
-
-**Closed issues:**
-
-- Store video in a \*video\* format [\#40](https://github.com/ZoneMinder/ZoneMinder/issues/40)
-
-**Merged pull requests:**
-
-- Update hu\_hu.php [\#37](https://github.com/ZoneMinder/ZoneMinder/pull/37) ([nagyrobi](https://github.com/nagyrobi))
-
 ## [v1.26-beta.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.1) (2013-08-13)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.25...v1.26-beta.1)
 
-**Implemented enhancements:**
-
-- Scripts should only be loaded on the pages they're needed [\#15](https://github.com/ZoneMinder/ZoneMinder/issues/15)
-
-**Fixed bugs:**
-
-- Control Types always none using source Ffmpeg [\#16](https://github.com/ZoneMinder/ZoneMinder/issues/16)
-- No PTZ control option when adding a new monitor [\#4](https://github.com/ZoneMinder/ZoneMinder/issues/4)
--  Monitors/index.ctp Undefined offset error [\#1](https://github.com/ZoneMinder/ZoneMinder/issues/1)
-
-**Closed issues:**
-
-- Please Add my code for 0-23Hour 0n/off  Zone Operation [\#24](https://github.com/ZoneMinder/ZoneMinder/issues/24)
-
 ## [v1.25](https://github.com/ZoneMinder/ZoneMinder/tree/v1.25) (2013-04-12)
 
 

From 7514f43ef45878115a5c822c968bfdea33038c04 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 27 Nov 2015 13:54:31 -0500
Subject: [PATCH 088/362] only update db if db is local

---
 distros/ubuntu1504_cmake/zoneminder.postinst | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/distros/ubuntu1504_cmake/zoneminder.postinst b/distros/ubuntu1504_cmake/zoneminder.postinst
index 4d2da7331..abe327c99 100644
--- a/distros/ubuntu1504_cmake/zoneminder.postinst
+++ b/distros/ubuntu1504_cmake/zoneminder.postinst
@@ -2,6 +2,8 @@
 
 set -e
 
+. /etc/zm/zm.conf
+
 if [ "$1" = "configure" ]; then
 		chown www-data:root /var/log/zm
 		chown www-data:www-data /var/lib/zm
@@ -15,9 +17,11 @@ if [ "$1" = "configure" ]; then
     # Ensure zoneminder is stopped
     deb-systemd-invoke stop zoneminder.service || exit $?
 
-	echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    # Run the ZoneMinder update tool
-    zmupdate.pl --nointeractive
+	if [ $ZM_DB_HOST == "localhost" ]; then
+		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+		# Run the ZoneMinder update tool
+		zmupdate.pl --nointeractive
+	fi;
 
 fi
 

From e4f5f7678276335a966ad3de32d8f5275bf6c727 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 14:03:55 -0500
Subject: [PATCH 089/362] rewrite constructor to take a row as well as an Id

---
 web/includes/Monitor.php | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 983bbbd86..2cb948952 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -3,27 +3,30 @@ require_once( 'database.php' );
 require_once( 'Server.php' );
 
 class Monitor {
-	public function __construct( $id ) {
-		if ( $id ) {
-			$s = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $id ) );
-			if ( $s ) {
+	public function __construct( $IdOrRow ) {
+		$row = NULL;
+		if ( is_int( $dOrRow ) ) {
+			$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
+		} else if ( is_array($idOrRow) ) {
+			$row = $idOrRow;
+		}
+
+		if ( $row ) {
+			foreach ($row as $k => $v) {
+				$this->{$k} = $v;
+			}
+			if ( $this->{'Controllable'} ) {
+				$s = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $this->{'ControlId'} ) );
 				foreach ($s as $k => $v) {
+						if ( $k == 'Id' ) {
+							continue;
+						}
 					$this->{$k} = $v;
 				}
-				if ( $this->{'Controllable'} ) {
-					$s = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $this->{'ControlId'} ) );
-					foreach ($s as $k => $v) {
-							if ( $k == 'Id' ) {
-								continue;
-							}
-						$this->{$k} = $v;
-					}
-				}
-			} else {
-				Error("Unable to load Monitor record for Id=" . $id );
 			}
+
 		} else {
-			
+			Error("No row for Monitor " . $IdOrRow );
 		}
 	} // end function __construct
 	public function __call( $fn, array $args){

From e85ba683e1811fca1f291d89e5f9ac748fdd9edd Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 14:29:57 -0500
Subject: [PATCH 090/362] improve constructor to handle numeric as well, and
 give error when something else

---
 web/includes/Monitor.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 2cb948952..6d28b5c41 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -5,10 +5,15 @@ require_once( 'Server.php' );
 class Monitor {
 	public function __construct( $IdOrRow ) {
 		$row = NULL;
-		if ( is_int( $dOrRow ) ) {
+		if ( is_int( $IdOrRow ) ) {
 			$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
-		} else if ( is_array($idOrRow) ) {
-			$row = $idOrRow;
+		} else if ( is_numeric( $IdOrRow ) ) {
+			$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
+		} else if ( is_array($IdOrRow) ) {
+			$row = $IdOrRow;
+		} else {
+			Error("Unknown argument passed to Monitor Constructor ($IdOrRow)");
+			return;
 		}
 
 		if ( $row ) {

From 382ad0f39064b74b9c2a72bba14d5e745dbc0acf Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 14:30:24 -0500
Subject: [PATCH 091/362] put () after property names of Monitor object

---
 web/skins/classic/views/js/watch.js.php | 12 ++++++------
 web/skins/classic/views/watch.php       | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 829beb0e7..5e6c48914 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -44,9 +44,9 @@ var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"eve
 var connKey = '<?php echo $connkey ?>';
 var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
 
-var monitorId = <?php echo $monitor->Id ?>;
-var monitorWidth = <?php echo $monitor->Width ?>;
-var monitorHeight = <?php echo $monitor->Height ?>;
+var monitorId = <?php echo $monitor->Id() ?>;
+var monitorWidth = <?php echo $monitor->Width() ?>;
+var monitorHeight = <?php echo $monitor->Height() ?>;
 
 var scale = <?php echo $scale ?>;
 
@@ -61,11 +61,11 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
 var canPlayPauseAudio = Browser.ie;
 
-<?php if ( $monitor->CanMoveMap ) { ?>
+<?php if ( $monitor->CanMoveMap() ) { ?>
 var imageControlMode = "moveMap";
-<?php } elseif ( $monitor->CanMoveRel ) { ?>
+<?php } elseif ( $monitor->CanMoveRel() ) { ?>
 var imageControlMode = "movePseudoMap";
-<?php } elseif ( $monitor->CanMoveCon ) { ?>
+<?php } elseif ( $monitor->CanMoveCon() ) { ?>
 var imageControlMode = "moveConMap";
 <?php } else { ?>
 var imageControlMode = null;
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index ad1857f9a..102ae41ac 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -25,21 +25,24 @@ if ( !canView( 'Stream' ) )
     $view = "error";
     return;
 }
-if ( ! visibleMonitor( $_REQUEST['mid'] ) ) {
+
+// This is for input sanitation
+$mid = intval( $_REQUEST['mid'] ); 
+if ( ! visibleMonitor( $mid ) ) {
     $view = "error";
     return;
 }
 
 $sql = 'SELECT C.*, M.* FROM Monitors AS M LEFT JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?';
-$monitor = new Monitor( $_REQUEST['mid'] );
+$monitor = new Monitor( $mid );
 #dbFetchOne( $sql, NULL, array( $_REQUEST['mid'] ) );
 
 if ( isset($_REQUEST['showControls']) )
     $showControls = validInt($_REQUEST['showControls']);
 else
-    $showControls = (canView( 'Control' ) && ($monitor->DefaultView == 'Control'));
+    $showControls = (canView( 'Control' ) && ($monitor->DefaultView() == 'Control'));
 
-$showPtzControls = ( ZM_OPT_CONTROL && $monitor->Controllable && canView( 'Control' ) );
+$showPtzControls = ( ZM_OPT_CONTROL && $monitor->Controllable() && canView( 'Control' ) );
 
 if ( isset( $_REQUEST['scale'] ) )
     $scale = validInt($_REQUEST['scale']);
@@ -56,7 +59,7 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 elseif ( canStream() )
 {
     $streamMode = "jpeg";
-    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor->StreamReplayBuffer ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=".$streamMode, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "buffer=".$monitor->StreamReplayBuffer() ) );
 }
 else
 {
@@ -99,7 +102,7 @@ if ( $showPtzControls )
 if ( canView( 'Control' ) && $monitor->Type() == "Local" )
 {
 ?>
-          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id, 'zmSettings'.$monitor->Id, 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
+          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
 <?php
 }
 ?>
@@ -110,18 +113,18 @@ if ( canView( 'Control' ) && $monitor->Type() == "Local" )
 <?php
 if ( $streamMode == "mpeg" )
 {
-    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name );
+    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
 }
 elseif ( $streamMode == "jpeg" )
 {
     if ( canStreamNative() )
-        outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
+        outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
     elseif ( canStreamApplet() )
-        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
+        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
 }
 else
 {
-    outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width, $scale ), reScale( $monitor->Height, $scale ), $monitor->Name );
+    outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
 }
 ?>
       </div>

From 2dfa6d6bae390dbcf4b3da309212a965a8228c02 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:16:07 -0500
Subject: [PATCH 092/362] add Url and __call functions

---
 web/includes/Server.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 66c56637b..03cb39d7f 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -17,8 +17,8 @@ class Server {
 		}
     }
 
-	public function Name() {
-		return $this->{'Name'};
+	public function Url() {
+		return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
 	}
 	public function Hostname() {
 		if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) {
@@ -26,5 +26,12 @@ class Server {
 		}
 		return $this->{'Name'};
 	}
+	public function __call( $fn, array $args= NULL){
+        if(isset($this->{$fn})){
+            return $this->{$fn};
+            #array_unshift($args, $this);
+            #call_user_func_array( $this->{$fn}, $args);
+        }
+    }
 }
 ?>

From 945949ebc04534a0783c9779db8d8f9636658984 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:16:18 -0500
Subject: [PATCH 093/362] fix __call to actually return the value

---
 web/includes/Monitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 6d28b5c41..ac9ca8333 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -36,7 +36,7 @@ class Monitor {
 	} // end function __construct
 	public function __call( $fn, array $args){
         if(isset($this->{$fn})){
-			return $fn;
+			return $this->{$fn};
             #array_unshift($args, $this);
             #call_user_func_array( $this->{$fn}, $args);
         }

From c5d57b5b649e070d3499278c3d96f4d6db3cdff8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:16:43 -0500
Subject: [PATCH 094/362] convert monitor hash accesses to function calls

---
 web/includes/control_functions.php | 224 ++++++++++++++---------------
 1 file changed, 112 insertions(+), 112 deletions(-)

diff --git a/web/includes/control_functions.php b/web/includes/control_functions.php
index dcb829296..dfbc8cb3e 100644
--- a/web/includes/control_functions.php
+++ b/web/includes/control_functions.php
@@ -20,9 +20,9 @@ function buildControlCommand( $monitor )
                 case 'focus' :
                 {
                     $factor = $_REQUEST['yge']/100;
-                    if ( $monitor['HasFocusSpeed'] )
+                    if ( $monitor->HasFocusSpeed() )
                     {
-                        $speed = intval(round($monitor['MinFocusSpeed']+(($monitor['MaxFocusSpeed']-$monitor['MinFocusSpeed'])*$factor)));
+                        $speed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$factor)));
                         $ctrlCommand .= " --speed=".$speed;
                     }
                     switch( $mode )
@@ -30,15 +30,15 @@ function buildControlCommand( $monitor )
                         case 'Abs' :
                         case 'Rel' :
                         {
-                            $step = intval(round($monitor['MinFocusStep']+(($monitor['MaxFocusStep']-$monitor['MinFocusStep'])*$factor)));
+                            $step = intval(round($monitor->MinFocusStep()+(($monitor->MaxFocusStep()-$monitor->MinFocusStep())*$factor)));
                             $ctrlCommand .= " --step=".$step;
                             break;
                         }
                         case 'Con' :
                         {
-                            if ( $monitor['AutoStopTimeout'] )
+                            if ( $monitor->AutoStopTimeout() )
                             {
-                                $slowSpeed = intval(round($monitor['MinFocusSpeed']+(($monitor['MaxFocusSpeed']-$monitor['MinFocusSpeed'])*$slow)));
+                                $slowSpeed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$slow)));
                                 if ( $speed < $slowSpeed )
                                 {
                                     $ctrlCommand .= " --autostop";
@@ -52,9 +52,9 @@ function buildControlCommand( $monitor )
                 case 'zoom' :
                 {
                     $factor = $_REQUEST['yge']/100;
-                    if ( $monitor['HasZoomSpeed'] )
+                    if ( $monitor->HasZoomSpeed() )
                     {
-                        $speed = intval(round($monitor['MinZoomSpeed']+(($monitor['MaxZoomSpeed']-$monitor['MinZoomSpeed'])*$factor)));
+                        $speed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$factor)));
                         $ctrlCommand .= " --speed=".$speed;
                     }
                     switch( $mode )
@@ -62,15 +62,15 @@ function buildControlCommand( $monitor )
                         case 'Abs' :
                         case 'Rel' :
                         {
-                            $step = intval(round($monitor['MinZoomStep']+(($monitor['MaxZoomStep']-$monitor['MinZoomStep'])*$factor)));
+                            $step = intval(round($monitor->MinZoomStep()+(($monitor->MaxZoomStep()-$monitor->MinZoomStep())*$factor)));
                             $ctrlCommand .= " --step=".$step;
                             break;
                         }
                         case 'Con' :
                         {
-                            if ( $monitor['AutoStopTimeout'] )
+                            if ( $monitor->AutoStopTimeout() )
                             {
-                                $slowSpeed = intval(round($monitor['MinZoomSpeed']+(($monitor['MaxZoomSpeed']-$monitor['MinZoomSpeed'])*$slow)));
+                                $slowSpeed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$slow)));
                                 if ( $speed < $slowSpeed )
                                 {
                                     $ctrlCommand .= " --autostop";
@@ -84,9 +84,9 @@ function buildControlCommand( $monitor )
                 case 'iris' :
                 {
                     $factor = $_REQUEST['yge']/100;
-                    if ( $monitor['HasIrisSpeed'] )
+                    if ( $monitor->HasIrisSpeed() )
                     {
-                        $speed = intval(round($monitor['MinIrisSpeed']+(($monitor['MaxIrisSpeed']-$monitor['MinIrisSpeed'])*$factor)));
+                        $speed = intval(round($monitor->MinIrisSpeed()+(($monitor->MaxIrisSpeed()-$monitor->MinIrisSpeed())*$factor)));
                         $ctrlCommand .= " --speed=".$speed;
                     }
                     switch( $mode )
@@ -94,7 +94,7 @@ function buildControlCommand( $monitor )
                         case 'Abs' :
                         case 'Rel' :
                         {
-                            $step = intval(round($monitor['MinIrisStep']+(($monitor['MaxIrisStep']-$monitor['MinIrisStep'])*$factor)));
+                            $step = intval(round($monitor->MinIrisStep()+(($monitor->MaxIrisStep()-$monitor->MinIrisStep())*$factor)));
                             $ctrlCommand .= " --step=".$step;
                             break;
                         }
@@ -104,9 +104,9 @@ function buildControlCommand( $monitor )
                 case 'white' :
                 {
                     $factor = $_REQUEST['yge']/100;
-                    if ( $monitor['HasWhiteSpeed'] )
+                    if ( $monitor->HasWhiteSpeed() )
                     {
-                        $speed = intval(round($monitor['MinWhiteSpeed']+(($monitor['MaxWhiteSpeed']-$monitor['MinWhiteSpeed'])*$factor)));
+                        $speed = intval(round($monitor->MinWhiteSpeed()+(($monitor->MaxWhiteSpeed()-$monitor->MinWhiteSpeed())*$factor)));
                         $ctrlCommand .= " --speed=".$speed;
                     }
                     switch( $mode )
@@ -114,7 +114,7 @@ function buildControlCommand( $monitor )
                         case 'Abs' :
                         case 'Rel' :
                         {
-                            $step = intval(round($monitor['MinWhiteStep']+(($monitor['MaxWhiteStep']-$monitor['MinWhiteStep'])*$factor)));
+                            $step = intval(round($monitor->MinWhiteStep()+(($monitor->MaxWhiteStep()-$monitor->MinWhiteStep())*$factor)));
                             $ctrlCommand .= " --step=".$step;
                             break;
                         }
@@ -124,9 +124,9 @@ function buildControlCommand( $monitor )
                 case 'gain' :
                 {
                     $factor = $_REQUEST['yge']/100;
-                    if ( $monitor['HasGainSpeed'] )
+                    if ( $monitor->HasGainSpeed() )
                     {
-                        $speed = intval(round($monitor['MinGainSpeed']+(($monitor['MaxGainSpeed']-$monitor['MinGainSpeed'])*$factor)));
+                        $speed = intval(round($monitor->MinGainSpeed()+(($monitor->MaxGainSpeed()-$monitor->MinGainSpeed())*$factor)));
                         $ctrlCommand .= " --speed=".$speed;
                     }
                     switch( $mode )
@@ -134,7 +134,7 @@ function buildControlCommand( $monitor )
                         case 'Abs' :
                         case 'Rel' :
                         {
-                            $step = intval(round($monitor['MinGainStep']+(($monitor['MaxGainStep']-$monitor['MinGainStep'])*$factor)));
+                            $step = intval(round($monitor->MinGainStep()+(($monitor->MaxGainStep()-$monitor->MinGainStep())*$factor)));
                             $ctrlCommand .= " --step=".$step;
                             break;
                         }
@@ -146,7 +146,7 @@ function buildControlCommand( $monitor )
                     $xFactor = empty($_REQUEST['xge'])?0:$_REQUEST['xge']/100;
                     $yFactor = empty($_REQUEST['yge'])?0:$_REQUEST['yge']/100;
 
-                    if ( $monitor['Orientation'] != '0' )
+                    if ( $monitor->Orientation() != '0' )
                     {
                         $conversions = array(
                             '90' => array(
@@ -200,48 +200,48 @@ function buildControlCommand( $monitor )
                                 'DownRight' => 'UpRight',
                             ),
                         );
-                        $new_dirn = $conversions[$monitor['Orientation']][$dirn];
+                        $new_dirn = $conversions[$monitor->Orientation()][$dirn];
                         $_REQUEST['control'] = preg_replace( "/_$dirn\$/", "_$new_dirn", $_REQUEST['control'] );
                         $dirn = $new_dirn;
                     }
 
-                    if ( $monitor['HasPanSpeed'] && $xFactor )
+                    if ( $monitor->HasPanSpeed() && $xFactor )
                     {
-                        if ( $monitor['HasTurboPan'] )
+                        if ( $monitor->HasTurboPan() )
                         {
                             if ( $xFactor >= $turbo )
                             {
-                                $panSpeed = $monitor['TurboPanSpeed'];
+                                $panSpeed = $monitor->TurboPanSpeed();
                             }
                             else
                             {
                                 $xFactor = $xFactor/$turbo;
-                                $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                                $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                             }
                         }
                         else
                         {
-                            $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                         }
                         $ctrlCommand .= " --panspeed=".$panSpeed;
                     }
-                    if ( $monitor['HasTiltSpeed'] && $yFactor )
+                    if ( $monitor->HasTiltSpeed() && $yFactor )
                     {
-                        if ( $monitor['HasTurboTilt'] )
+                        if ( $monitor->HasTurboTilt() )
                         {
                             if ( $yFactor >= $turbo )
                             {
-                                $tiltSpeed = $monitor['TurboTiltSpeed'];
+                                $tiltSpeed = $monitor->TurboTiltSpeed();
                             }
                             else
                             {
                                 $yFactor = $yFactor/$turbo;
-                                $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                                $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                             }
                         }
                         else
                         {
-                            $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                         }
                         $ctrlCommand .= " --tiltspeed=".$tiltSpeed;
                     }
@@ -252,22 +252,22 @@ function buildControlCommand( $monitor )
                         {
                             if ( preg_match( '/(Left|Right)$/', $dirn ) )
                             {
-                                $panStep = intval(round($monitor['MinPanStep']+(($monitor['MaxPanStep']-$monitor['MinPanStep'])*$xFactor)));
+                                $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
                                 $ctrlCommand .= " --panstep=".$panStep;
                             }
                             if ( preg_match( '/^(Up|Down)/', $dirn ) )
                             {
-                                $tiltStep = intval(round($monitor['MinTiltStep']+(($monitor['MaxTiltStep']-$monitor['MinTiltStep'])*$yFactor)));
+                                $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
                                 $ctrlCommand .= " --tiltstep=".$tiltStep;
                             }
                             break;
                         }
                         case 'Con' :
                         {
-                            if ( $monitor['AutoStopTimeout'] )
+                            if ( $monitor->AutoStopTimeout() )
                             {
-                                $slowPanSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$slow)));
-                                $slowTiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$slow)));
+                                $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
+                                $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
                                 if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) )
                                 {
                                     $ctrlCommand .= " --autostop";
@@ -286,22 +286,22 @@ function buildControlCommand( $monitor )
         {
             $x = deScale( $_REQUEST['x'], $_REQUEST['scale'] );
             $y = deScale( $_REQUEST['y'], $_REQUEST['scale'] );
-            switch ( $monitor['Orientation'] )
+            switch ( $monitor->Orientation() )
             {
                 case '0' :
                 case '180' :
                 case 'hori' :
                 case 'vert' :
-                    $width = $monitor['Width'];
-                    $height = $monitor['Height'];
+                    $width = $monitor->Width();
+                    $height = $monitor->Height();
                     break;
                 case '90' :
                 case '270' :
-                    $width = $monitor['Height'];
-                    $height = $monitor['Width'];
+                    $width = $monitor->Height();
+                    $height = $monitor->Width();
                     break;
             }
-            switch ( $monitor['Orientation'] )
+            switch ( $monitor->Orientation() )
             {
                 case '90' :
                     $tempY = $y;
@@ -332,12 +332,12 @@ function buildControlCommand( $monitor )
             $x = deScale( $_REQUEST['x'], $_REQUEST['scale'] );
             $y = deScale( $_REQUEST['y'], $_REQUEST['scale'] );
             
-            $halfWidth = $monitor['Width'] / 2;
-            $halfHeight = $monitor['Height'] / 2;
+            $halfWidth = $monitor->Width() / 2;
+            $halfHeight = $monitor->Height() / 2;
             $xFactor = ($x - $halfWidth)/$halfWidth;
             $yFactor = ($y - $halfHeight)/$halfHeight;
 
-            switch ( $monitor['Orientation'] )
+            switch ( $monitor->Orientation() )
             {
                 case '90' :
                     $tempYFactor = $y;
@@ -396,52 +396,52 @@ function buildControlCommand( $monitor )
                 $xFactor = abs($xFactor);
                 $yFactor = abs($yFactor);
 
-                if ( $monitor['HasPanSpeed'] && $xFactor )
+                if ( $monitor->HasPanSpeed() && $xFactor )
                 {
-                    if ( $monitor['HasTurboPan'] )
+                    if ( $monitor->HasTurboPan() )
                     {
                         if ( $xFactor >= $turbo )
                         {
-                            $panSpeed = $monitor['TurboPanSpeed'];
+                            $panSpeed = $monitor->TurboPanSpeed();
                         }
                         else
                         {
                             $xFactor = $xFactor/$turbo;
-                            $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                         }
                     }
                     else
                     {
-                        $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                        $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                     }
                 }
-                if ( $monitor['HasTiltSpeed'] && $yFactor )
+                if ( $monitor->HasTiltSpeed() && $yFactor )
                 {
-                    if ( $monitor['HasTurboTilt'] )
+                    if ( $monitor->HasTurboTilt() )
                     {
                         if ( $yFactor >= $turbo )
                         {
-                            $tiltSpeed = $monitor['TurboTiltSpeed'];
+                            $tiltSpeed = $monitor->TurboTiltSpeed();
                         }
                         else
                         {
                             $yFactor = $yFactor/$turbo;
-                            $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                         }
                     }
                     else
                     {
-                        $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                        $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                     }
                 }
                 if ( preg_match( '/(Left|Right)$/', $dirn ) )
                 {
-                    $panStep = intval(round($monitor['MinPanStep']+(($monitor['MaxPanStep']-$monitor['MinPanStep'])*$xFactor)));
+                    $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
                     $ctrlCommand .= " --panstep=".$panStep." --panspeed=".$panSpeed;
                 }
                 if ( preg_match( '/^(Up|Down)/', $dirn ) )
                 {
-                    $tiltStep = intval(round($monitor['MinTiltStep']+(($monitor['MaxTiltStep']-$monitor['MinTiltStep'])*$yFactor)));
+                    $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
                     $ctrlCommand .= " --tiltstep=".$tiltStep." --tiltspeed=".$tiltSpeed;
                 }
             }
@@ -451,12 +451,12 @@ function buildControlCommand( $monitor )
             $x = deScale( $_REQUEST['x'], $_REQUEST['scale'] );
             $y = deScale( $_REQUEST['y'], $_REQUEST['scale'] );
             
-            $halfWidth = $monitor['Width'] / 2;
-            $halfHeight = $monitor['Height'] / 2;
+            $halfWidth = $monitor->Width() / 2;
+            $halfHeight = $monitor->Height() / 2;
             $xFactor = ($x - $halfWidth)/$halfWidth;
             $yFactor = ($y - $halfHeight)/$halfHeight;
 
-            switch ( $monitor['Orientation'] )
+            switch ( $monitor->Orientation() )
             {
                 case '90' :
                     $tempYFactor = $y;
@@ -515,42 +515,42 @@ function buildControlCommand( $monitor )
                 $xFactor = abs($xFactor);
                 $yFactor = abs($yFactor);
 
-                if ( $monitor['HasPanSpeed'] && $xFactor )
+                if ( $monitor->HasPanSpeed() && $xFactor )
                 {
-                    if ( $monitor['HasTurboPan'] )
+                    if ( $monitor->HasTurboPan() )
                     {
                         if ( $xFactor >= $turbo )
                         {
-                            $panSpeed = $monitor['TurboPanSpeed'];
+                            $panSpeed = $monitor->TurboPanSpeed();
                         }
                         else
                         {
                             $xFactor = $xFactor/$turbo;
-                            $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                            $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                         }
                     }
                     else
                     {
-                        $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                        $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                     }
                 }
-                if ( $monitor['HasTiltSpeed'] && $yFactor )
+                if ( $monitor->HasTiltSpeed() && $yFactor )
                 {
-                    if ( $monitor['HasTurboTilt'] )
+                    if ( $monitor->HasTurboTilt() )
                     {
                         if ( $yFactor >= $turbo )
                         {
-                            $tiltSpeed = $monitor['TurboTiltSpeed'];
+                            $tiltSpeed = $monitor->TurboTiltSpeed();
                         }
                         else
                         {
                             $yFactor = $yFactor/$turbo;
-                            $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                            $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                         }
                     }
                     else
                     {
-                        $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                        $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                     }
                 }
                 if ( preg_match( '/(Left|Right)$/', $dirn ) )
@@ -561,10 +561,10 @@ function buildControlCommand( $monitor )
                 {
                     $ctrlCommand .= " --tiltspeed=".$tiltSpeed;
                 }
-                if ( $monitor['AutoStopTimeout'] )
+                if ( $monitor->AutoStopTimeout() )
                 {
-                    $slowPanSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$slow)));
-                    $slowTiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$slow)));
+                    $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
+                    $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
                     if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) )
                     {
                         $ctrlCommand .= " --autostop";
@@ -603,9 +603,9 @@ function buildControlCommand( $monitor )
                                 break;
                             }
                         }
-                        if ( $monitor['HasFocusSpeed'] )
+                        if ( $monitor->HasFocusSpeed() )
                         {
-                            $speed = intval(round($monitor['MinFocusSpeed']+(($monitor['MaxFocusSpeed']-$monitor['MinFocusSpeed'])*$factor)));
+                            $speed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$factor)));
                             $ctrlCommand .= " --speed=".$speed;
                         }
                         switch( $mode )
@@ -613,15 +613,15 @@ function buildControlCommand( $monitor )
                             case 'Abs' :
                             case 'Rel' :
                             {
-                                $step = intval(round($monitor['MinFocusStep']+(($monitor['MaxFocusStep']-$monitor['MinFocusStep'])*$factor)));
+                                $step = intval(round($monitor->MinFocusStep()+(($monitor->MaxFocusStep()-$monitor->MinFocusStep())*$factor)));
                                 $ctrlCommand .= " --step=".$step;
                                 break;
                             }
                             case 'Con' :
                             {
-                                if ( $monitor['AutoStopTimeout'] )
+                                if ( $monitor->AutoStopTimeout() )
                                 {
-                                    $slowSpeed = intval(round($monitor['MinFocusSpeed']+(($monitor['MaxFocusSpeed']-$monitor['MinFocusSpeed'])*$slow)));
+                                    $slowSpeed = intval(round($monitor->MinFocusSpeed()+(($monitor->MaxFocusSpeed()-$monitor->MinFocusSpeed())*$slow)));
                                     if ( $speed < $slowSpeed )
                                     {
                                         $ctrlCommand .= " --autostop";
@@ -647,9 +647,9 @@ function buildControlCommand( $monitor )
                                 break;
                             }
                         }
-                        if ( $monitor['HasZoomSpeed'] )
+                        if ( $monitor->HasZoomSpeed() )
                         {
-                            $speed = intval(round($monitor['MinZoomSpeed']+(($monitor['MaxZoomSpeed']-$monitor['MinZoomSpeed'])*$factor)));
+                            $speed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$factor)));
                             $ctrlCommand .= " --speed=".$speed;
                         }
                         switch( $mode )
@@ -657,15 +657,15 @@ function buildControlCommand( $monitor )
                             case 'Abs' :
                             case 'Rel' :
                             {
-                                $step = intval(round($monitor['MinZoomStep']+(($monitor['MaxZoomStep']-$monitor['MinZoomStep'])*$factor)));
+                                $step = intval(round($monitor->MinZoomStep()+(($monitor->MaxZoomStep()-$monitor->MinZoomStep())*$factor)));
                                 $ctrlCommand .= " --step=".$step;
                                 break;
                             }
                             case 'Con' :
                             {
-                                if ( $monitor['AutoStopTimeout'] )
+                                if ( $monitor->AutoStopTimeout() )
                                 {
-                                    $slowSpeed = intval(round($monitor['MinZoomSpeed']+(($monitor['MaxZoomSpeed']-$monitor['MinZoomSpeed'])*$slow)));
+                                    $slowSpeed = intval(round($monitor->MinZoomSpeed()+(($monitor->MaxZoomSpeed()-$monitor->MinZoomSpeed())*$slow)));
                                     if ( $speed < $slowSpeed )
                                     {
                                         $ctrlCommand .= " --autostop";
@@ -691,9 +691,9 @@ function buildControlCommand( $monitor )
                                 break;
                             }
                         }
-                        if ( $monitor['HasIrisSpeed'] )
+                        if ( $monitor->HasIrisSpeed() )
                         {
-                            $speed = intval(round($monitor['MinIrisSpeed']+(($monitor['MaxIrisSpeed']-$monitor['MinIrisSpeed'])*$factor)));
+                            $speed = intval(round($monitor->MinIrisSpeed()+(($monitor->MaxIrisSpeed()-$monitor->MinIrisSpeed())*$factor)));
                             $ctrlCommand .= " --speed=".$speed;
                         }
                         switch( $mode )
@@ -701,7 +701,7 @@ function buildControlCommand( $monitor )
                             case 'Abs' :
                             case 'Rel' :
                             {
-                                $step = intval(round($monitor['MinIrisStep']+(($monitor['MaxIrisStep']-$monitor['MinIrisStep'])*$factor)));
+                                $step = intval(round($monitor->MinIrisStep()+(($monitor->MaxIrisStep()-$monitor->MinIrisStep())*$factor)));
                                 $ctrlCommand .= " --step=".$step;
                                 break;
                             }
@@ -723,9 +723,9 @@ function buildControlCommand( $monitor )
                                 break;
                             }
                         }
-                        if ( $monitor['HasWhiteSpeed'] )
+                        if ( $monitor->HasWhiteSpeed() )
                         {
-                            $speed = intval(round($monitor['MinWhiteSpeed']+(($monitor['MaxWhiteSpeed']-$monitor['MinWhiteSpeed'])*$factor)));
+                            $speed = intval(round($monitor->MinWhiteSpeed()+(($monitor->MaxWhiteSpeed()-$monitor->MinWhiteSpeed())*$factor)));
                             $ctrlCommand .= " --speed=".$speed;
                         }
                         switch( $mode )
@@ -733,7 +733,7 @@ function buildControlCommand( $monitor )
                             case 'Abs' :
                             case 'Rel' :
                             {
-                                $step = intval(round($monitor['MinWhiteStep']+(($monitor['MaxWhiteStep']-$monitor['MinWhiteStep'])*$factor)));
+                                $step = intval(round($monitor->MinWhiteStep()+(($monitor->MaxWhiteStep()-$monitor->MinWhiteStep())*$factor)));
                                 $ctrlCommand .= " --step=".$step;
                                 break;
                             }
@@ -755,9 +755,9 @@ function buildControlCommand( $monitor )
                                 break;
                             }
                         }
-                        if ( $monitor['HasGainSpeed'] )
+                        if ( $monitor->HasGainSpeed() )
                         {
-                            $speed = intval(round($monitor['MinGainSpeed']+(($monitor['MaxGainSpeed']-$monitor['MinGainSpeed'])*$factor)));
+                            $speed = intval(round($monitor->MinGainSpeed()+(($monitor->MaxGainSpeed()-$monitor->MinGainSpeed())*$factor)));
                             $ctrlCommand .= " --speed=".$speed;
                         }
                         switch( $mode )
@@ -765,7 +765,7 @@ function buildControlCommand( $monitor )
                             case 'Abs' :
                             case 'Rel' :
                             {
-                                $step = intval(round($monitor['MinGainStep']+(($monitor['MaxGainStep']-$monitor['MinGainStep'])*$factor)));
+                                $step = intval(round($monitor->MinGainStep()+(($monitor->MaxGainStep()-$monitor->MinGainStep())*$factor)));
                                 $ctrlCommand .= " --step=".$step;
                                 break;
                             }
@@ -794,7 +794,7 @@ function buildControlCommand( $monitor )
                             $xFactor = ($x+1)/$short_x;
                         }
 
-                        if ( $monitor['Orientation'] != '0' )
+                        if ( $monitor->Orientation() != '0' )
                         {
                             $conversions = array(
                                 '90' => array(
@@ -848,48 +848,48 @@ function buildControlCommand( $monitor )
                                     'DownRight' => 'UpRight',
                                 ),
                             );
-                            $new_dirn = $conversions[$monitor['Orientation']][$dirn];
+                            $new_dirn = $conversions[$monitor->Orientation()][$dirn];
                             $_REQUEST['control'] = preg_replace( "/_$dirn\$/", "_$new_dirn", $_REQUEST['control'] );
                             $dirn = $new_dirn;
                         }
 
-                        if ( $monitor['HasPanSpeed'] && $xFactor )
+                        if ( $monitor->HasPanSpeed() && $xFactor )
                         {
-                            if ( $monitor['HasTurboPan'] )
+                            if ( $monitor->HasTurboPan() )
                             {
                                 if ( $xFactor >= $turbo )
                                 {
-                                    $panSpeed = $monitor['TurboPanSpeed'];
+                                    $panSpeed = $monitor->TurboPanSpeed();
                                 }
                                 else
                                 {
                                     $xFactor = $xFactor/$turbo;
-                                    $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                                    $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                                 }
                             }
                             else
                             {
-                                $panSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$xFactor)));
+                                $panSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$xFactor)));
                             }
                             $ctrlCommand .= " --panspeed=".$panSpeed;
                         }
-                        if ( $monitor['HasTiltSpeed'] && $yFactor )
+                        if ( $monitor->HasTiltSpeed() && $yFactor )
                         {
-                            if ( $monitor['HasTurboTilt'] )
+                            if ( $monitor->HasTurboTilt() )
                             {
                                 if ( $yFactor >= $turbo )
                                 {
-                                    $tiltSpeed = $monitor['TurboTiltSpeed'];
+                                    $tiltSpeed = $monitor->TurboTiltSpeed();
                                 }
                                 else
                                 {
                                     $yFactor = $yFactor/$turbo;
-                                    $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                                    $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                                 }
                             }
                             else
                             {
-                                $tiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$yFactor)));
+                                $tiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$yFactor)));
                             }
                             $ctrlCommand .= " --tiltspeed=".$tiltSpeed;
                         }
@@ -900,22 +900,22 @@ function buildControlCommand( $monitor )
                             {
                                 if ( preg_match( '/(Left|Right)$/', $dirn ) )
                                 {
-                                    $panStep = intval(round($monitor['MinPanStep']+(($monitor['MaxPanStep']-$monitor['MinPanStep'])*$xFactor)));
+                                    $panStep = intval(round($monitor->MinPanStep()+(($monitor->MaxPanStep()-$monitor->MinPanStep())*$xFactor)));
                                     $ctrlCommand .= " --panstep=".$panStep;
                                 }
                                 if ( preg_match( '/^(Up|Down)/', $dirn ) )
                                 {
-                                    $tiltStep = intval(round($monitor['MinTiltStep']+(($monitor['MaxTiltStep']-$monitor['MinTiltStep'])*$yFactor)));
+                                    $tiltStep = intval(round($monitor->MinTiltStep()+(($monitor->MaxTiltStep()-$monitor->MinTiltStep())*$yFactor)));
                                     $ctrlCommand .= " --tiltstep=".$tiltStep;
                                 }
                                 break;
                             }
                             case 'Con' :
                             {
-                                if ( $monitor['AutoStopTimeout'] )
+                                if ( $monitor->AutoStopTimeout() )
                                 {
-                                    $slowPanSpeed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$slow)));
-                                    $slowTiltSpeed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$slow)));
+                                    $slowPanSpeed = intval(round($monitor->MinPanSpeed()+(($monitor->MaxPanSpeed()-$monitor->MinPanSpeed())*$slow)));
+                                    $slowTiltSpeed = intval(round($monitor->MinTiltSpeed()+(($monitor->MaxTiltSpeed()-$monitor->MinTiltSpeed())*$slow)));
                                     if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) )
                                     {
                                         $ctrlCommand .= " --autostop";
@@ -943,12 +943,12 @@ function buildControlCommand( $monitor )
             if ( canEdit( 'Control' ) ) {
                 $preset = validInt($_REQUEST['preset']);
                 $newLabel = validJsStr($_REQUEST['newLabel']);
-                $row = dbFetchOne( 'SELECT * FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', NULL, array( $monitor['Id'], $preset ) );
+                $row = dbFetchOne( 'SELECT * FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', NULL, array( $monitor->Id(), $preset ) );
                 if ( $newLabel != $row['Label'] ) {
                     if ( $newLabel ) {
-						dbQuery( 'REPLACE INTO ControlPresets ( MonitorId, Preset, Label ) VALUES ( ?, ?, ? )', array( $monitor['Id'], $preset, $newLabel ) );
+						dbQuery( 'REPLACE INTO ControlPresets ( MonitorId, Preset, Label ) VALUES ( ?, ?, ? )', array( $monitor->Id(), $preset, $newLabel ) );
                     } else {
-                        dbQuery( 'DELETE FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', array( $monitor['Id'], $preset ) );
+                        dbQuery( 'DELETE FROM ControlPresets WHERE MonitorId = ? AND Preset = ?', array( $monitor->Id(), $preset ) );
 					}
                 }
                 $ctrlCommand .= " --preset=".$preset;

From 95f002c7d6e2dd999fd94f2387abe01413da6237 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:16:53 -0500
Subject: [PATCH 095/362] convert monitor hash accesses to function calls

---
 .../classic/includes/control_functions.php    | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index d77818fbf..0c8c31fe4 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -32,11 +32,11 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanZoom) )
     {
-        if ( $monitor->CanZoomCon )
+        if ( $monitor->CanZoomCon() )
             $cmds['ZoomRoot'] = "zoomCon";
-        elseif ( $monitor->CanZoomRel )
+        elseif ( $monitor->CanZoomRel() )
             $cmds['ZoomRoot'] = "zoomRel";
-        elseif ( $monitor->CanZoomAbs )
+        elseif ( $monitor->CanZoomAbs() )
             $cmds['ZoomRoot'] = "zoomAbs";
         $cmds['ZoomTele'] = $cmds['ZoomRoot']."Tele";
         $cmds['ZoomWide'] = $cmds['ZoomRoot']."Wide";
@@ -47,11 +47,11 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanFocus) )
     {
-        if ( $monitor->CanFocusCon )
+        if ( $monitor->CanFocusCon() )
             $cmds['FocusRoot'] = "focusCon";
-        elseif ( $monitor->CanFocusRel )
+        elseif ( $monitor->CanFocusRel() )
             $cmds['FocusRoot'] = "focusRel";
-        elseif ( $monitor->CanFocusAbs )
+        elseif ( $monitor->CanFocusAbs() )
             $cmds['FocusRoot'] = "focusAbs";
         $cmds['FocusFar'] = $cmds['FocusRoot']."Far";
         $cmds['FocusNear'] = $cmds['FocusRoot']."Near";
@@ -62,11 +62,11 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanIris) )
     {
-        if ( $monitor->CanIrisCon )
+        if ( $monitor->CanIrisCon() )
             $cmds['IrisRoot'] = "irisCon";
-        elseif ( $monitor->CanIrisRel )
+        elseif ( $monitor->CanIrisRel() )
             $cmds['IrisRoot'] = "irisRel";
-        elseif ( $monitor->CanIrisAbs )
+        elseif ( $monitor->CanIrisAbs() )
             $cmds['IrisRoot'] = "irisAbs";
         $cmds['IrisOpen'] = $cmds['IrisRoot']."Open";
         $cmds['IrisClose'] = $cmds['IrisRoot']."Close";
@@ -77,11 +77,11 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanWhite) )
     {
-        if ( $monitor->CanWhiteCon )
+        if ( $monitor->CanWhiteCon() )
             $cmds['WhiteRoot'] = "whiteCon";
-        elseif ( $monitor->CanWhiteRel )
+        elseif ( $monitor->CanWhiteRel() )
             $cmds['WhiteRoot'] = "whiteRel";
-        elseif ( $monitor->CanWhiteAbs )
+        elseif ( $monitor->CanWhiteAbs() )
             $cmds['WhiteRoot'] = "whiteAbs";
         $cmds['WhiteIn'] = $cmds['WhiteRoot']."In";
         $cmds['WhiteOut'] = $cmds['WhiteRoot']."Out";
@@ -91,11 +91,11 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanGain) )
     {
-        if ( $monitor->CanGainCon )
+        if ( $monitor->CanGainCon() )
             $cmds['GainRoot'] = "gainCon";
-        elseif ( $monitor->CanGainRel )
+        elseif ( $monitor->CanGainRel() )
             $cmds['GainRoot'] = "gainRel";
-        elseif ( $monitor->CanGainAbs )
+        elseif ( $monitor->CanGainAbs() )
             $cmds['GainRoot'] = "gainAbs";
         $cmds['GainUp'] = $cmds['GainRoot']."Up";
         $cmds['GainDown'] = $cmds['GainRoot']."Down";
@@ -105,17 +105,17 @@ function getControlCommands( $monitor )
 
     if ( !empty($monitor->CanMove) )
     {
-        if ( $monitor->CanMoveCon )
+        if ( $monitor->CanMoveCon() )
         {
             $cmds['MoveRoot'] = "moveCon";
             $cmds['Center'] = "moveStop";
         }
-        elseif ( $monitor->CanMoveRel )
+        elseif ( $monitor->CanMoveRel() )
         {
             $cmds['MoveRoot'] = "moveRel";
             $cmds['Center'] = $cmds['PresetHome'];
         }
-        elseif ( $monitor->CanMoveAbs )
+        elseif ( $monitor->CanMoveAbs() )
         {
             $cmds['MoveRoot'] = "moveAbs";
             $cmds['Center'] = $cmds['PresetHome'];
@@ -142,11 +142,11 @@ function controlFocus( $monitor, $cmds )
 <div class="arrowControl focusControls">
   <div class="arrowLabel"><?php echo translate('Near') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['FocusNear'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanFocusCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo translate('Focus') ?></div>
+  <div class="arrowCenter"<?php if ( $monitor->CanFocusCon() ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo translate('Focus') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['FocusFar'] ?>',event,0,1)"></div>
   <div class="arrowLabel"><?php echo translate('Far') ?></div>
 <?php
-    if ( $monitor['CanAutoFocus'] )
+    if ( $monitor->CanAutoFocus() )
     {
 ?>
   <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"/>
@@ -168,11 +168,11 @@ function controlZoom( $monitor, $cmds )
 <div class="arrowControl zoomControls">
   <div class="arrowLabel"><?php echo translate('Tele') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['ZoomTele'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanZoomCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo translate('Zoom') ?></div>
+  <div class="arrowCenter"<?php if ( $monitor->CanZoomCon() ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo translate('Zoom') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['ZoomWide'] ?>',event,0,1)"></div>
   <div class="arrowLabel"><?php echo translate('Wide') ?></div>
 <?php
-    if ( $monitor['CanAutoZoom'] )
+    if ( $monitor->CanAutoZoom() )
     {
 ?>
   <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"/>
@@ -193,11 +193,11 @@ function controlIris( $monitor, $cmds )
 <div class="arrowControl irisControls">
   <div class="arrowLabel"><?php echo translate('Open') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['IrisOpen'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanIrisCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo translate('Iris') ?></div>
+  <div class="arrowCenter"<?php if ( $monitor->CanIrisCon() ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo translate('Iris') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['IrisClose'] ?>',event,0,1)"></div>
   <div class="arrowLabel"><?php echo translate('Close') ?></div>
 <?php
-    if ( $monitor['CanAutoIris'] )
+    if ( $monitor->CanAutoIris() )
     {
 ?>
   <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"/>
@@ -219,11 +219,11 @@ function controlWhite( $monitor, $cmds )
 <div class="arrowControl whiteControls">
   <div class="arrowLabel"><?php echo translate('In') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['WhiteIn'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanWhiteCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo translate('White') ?></div>
+  <div class="arrowCenter"<?php if ( $monitor->CanWhiteCon() ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo translate('White') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['WhiteOut'] ?>',event,0,1)"></div>
   <div class="arrowLabel"><?php echo translate('Out') ?></div>
 <?php
-    if ( $monitor['CanAutoWhite'] )
+    if ( $monitor->CanAutoWhite() )
     {
 ?>
   <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"/>
@@ -273,7 +273,7 @@ function controlPresets( $monitor, $cmds )
 
     $sql = 'select * from ControlPresets where MonitorId = ?';
     $labels = array();
-    foreach( dbFetchAll( $sql, NULL, array( $monitor->Id ) ) as $row )
+    foreach( dbFetchAll( $sql, NULL, array( $monitor->Id() ) ) as $row )
     {
         $labels[$row['Preset']] = $row['Label'];
     }
@@ -298,16 +298,16 @@ function controlPresets( $monitor, $cmds )
   </div>
   <div>
 <?php
-    if ( $monitor->HasHomePreset )
+    if ( $monitor->HasHomePreset() )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Home') ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
 <?php
     }
-    if ( canEdit( 'Monitors') && $monitor->CanSetPresets )
+    if ( canEdit( 'Monitors') && $monitor->CanSetPresets() )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo translate('Set') ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor->Id ?>', 'zmPreset', 'preset' );"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Set') ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor->Id() ?>', 'zmPreset', 'preset' );"/>
 <?php
     }
 ?>
@@ -327,19 +327,19 @@ function controlPower( $monitor, $cmds )
   <div class="powerLabel"><?php echo translate('Control') ?></div>
   <div>
 <?php
-    if ( $monitor->CanWake )
+    if ( $monitor->CanWake() )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Wake') ?>" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"/>
 <?php
     }
-    if ( $monitor->CanSleep )
+    if ( $monitor->CanSleep() )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Sleep') ?>" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"/>
 <?php
     }
-    if ( $monitor->CanReset )
+    if ( $monitor->CanReset() )
     {
 ?>
     <input type="button" class="ptzTextBtn" value="<?php echo translate('Reset') ?>" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"/>
@@ -359,22 +359,22 @@ function ptzControls( $monitor )
 ?>
         <div class="controlsPanel">
 <?php
-        if ( $monitor->CanFocus )
+        if ( $monitor->CanFocus() )
             echo controlFocus( $monitor, $cmds );
-        if ( $monitor->CanZoom )
+        if ( $monitor->CanZoom() )
             echo controlZoom( $monitor, $cmds );
-        if ( $monitor->CanIris )
+        if ( $monitor->CanIris() )
             echo controlIris( $monitor, $cmds );
-        if ( $monitor->CanWhite )
+        if ( $monitor->CanWhite() )
             echo controlWhite( $monitor, $cmds );
-        if ( $monitor->CanMove || ( $monitor->CanWake || $monitor->CanSleep || $monitor->CanReset ) )
+        if ( $monitor->CanMove() || ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() ) )
         {
 ?>
           <div class="pantiltPanel">
 <?php
-            if ( $monitor->CanMove )
+            if ( $monitor->CanMove() )
                 echo controlPanTilt( $monitor, $cmds );
-            if ( $monitor->CanWake || $monitor->CanSleep || $monitor->CanReset )
+            if ( $monitor->CanWake() || $monitor->CanSleep() || $monitor->CanReset() )
                 echo controlPower( $monitor, $cmds );
 ?>
           </div>
@@ -383,7 +383,7 @@ function ptzControls( $monitor )
 ?>
         </div>
 <?php
-        if ( $monitor->HasPresets )
+        if ( $monitor->HasPresets() )
             echo controlPresets( $monitor, $cmds );
     return( ob_get_clean() );
 }

From 342326e159d0136883947ae442bc9bc65043bd69 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:17:25 -0500
Subject: [PATCH 096/362] append monitorUrl to thsiURL to get access to the
 recording server for the monitor stream

---
 web/skins/classic/views/js/watch.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index dc3f63d43..9c39c897a 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -100,7 +100,7 @@ function setAlarmState( currentAlarmState )
 }
 
 var streamCmdParms = "view=request&request=stream&connkey="+connKey;
-var streamCmdReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
+var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
 var streamCmdTimer = null;
 
 var streamStatus;
@@ -348,7 +348,7 @@ function streamCmdQuery()
 }       
 
 var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
-var statusCmdReq = new Request.JSON( { url: thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
+var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
 var statusCmdTimer = null;
 
 function getStatusCmdResponse( respObj, respText )
@@ -377,7 +377,7 @@ function statusCmdQuery()
 }       
 
 var alarmCmdParms = "view=request&request=alarm&id="+monitorId;
-var alarmCmdReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } );
+var alarmCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } );
 var alarmCmdFirst = true;
 
 function getAlarmCmdResponse( respObj, respText )

From aa91e69a9b3e6c475b779959d9a08da06653ae9f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 1 Dec 2015 15:17:49 -0500
Subject: [PATCH 097/362] add monitorUrl to be used to target the recording
 server for the monitor

---
 web/skins/classic/views/js/watch.js.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 5e6c48914..c5e7e316c 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -44,9 +44,11 @@ var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"eve
 var connKey = '<?php echo $connkey ?>';
 var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
 
+
 var monitorId = <?php echo $monitor->Id() ?>;
 var monitorWidth = <?php echo $monitor->Width() ?>;
 var monitorHeight = <?php echo $monitor->Height() ?>;
+var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
 
 var scale = <?php echo $scale ?>;
 

From a799a1ce79e336e63f103ab51d6f62d2d25156dc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 10:04:47 -0500
Subject: [PATCH 098/362] Make Server constructor take a row or an id

---
 web/includes/Server.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 03cb39d7f..5705c3ffb 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,15 +1,19 @@
 <?php
 require_once( 'database.php' );
 class Server {
-    public function __construct( $id ) {
-		if ( $id ) {
-			$s = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $id ) );
-			if ( $s ) {
-				foreach ($s as $k => $v) {
-					$this->{$k} = $v;
-				}
-			} else {
-				Error("Unable to load Server record for Id=" . $id );
+    public function __construct( $IdOrRow ) {
+		$row = NULL;
+		if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+			$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
+			if ( ! $row ) {
+				Error("Unable to load Server record for Id=" . $IdOrRow );
+			}
+		} elseif ( is_array( $IdOrRow ) ) {
+			$row = $IdOrRow;
+		}
+		if ( $row ) {
+			foreach ($row as $k => $v) {
+				$this->{$k} = $v;
 			}
 		} else {
 			$this->{'Name'} = '';

From 3f8a45bbbb5738430762b737123bdd1a040cfcd5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 10:05:03 -0500
Subject: [PATCH 099/362] Add a function to setup CORS access headers

---
 web/includes/functions.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 385ab673b..6eedf585e 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -94,6 +94,25 @@ function noCacheHeaders()
     header("Pragma: no-cache");         // HTTP/1.0
 }
 
+function CORSHeaders() {
+	# This just allows cross server requests with no verification.  This is ok, because we do auth later.
+	header("Access-Control-Allow-Origin: *" );
+
+	# The following is left for future reference/use.
+#$valid = false;
+#header("Access-Control-Allow-Headers: x-requested-with,x-request");
+#foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
+#$Server = new Server( $row );
+#if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
+#$valid = true;
+#header("Access-Control-Allow-Origin: " . $Server->Url() );
+#}
+#}
+#if ( ! $valid ) {
+#Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
+#}
+}
+
 function getAuthUser( $auth )
 {
     if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" && !empty($auth) )

From 644080fd416d01adef3fc4aabc2d0f026acdaaca Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 10:05:27 -0500
Subject: [PATCH 100/362] call CORSHeaders

---
 web/index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/index.php b/web/index.php
index 98df13e61..41e1eca7a 100644
--- a/web/index.php
+++ b/web/index.php
@@ -136,6 +136,9 @@ else
 require_once( 'includes/lang.php' );
 require_once( 'includes/functions.php' );
 
+# Add Cross domain access headers
+CORSHeaders();
+
 // Check for valid content dirs
 if ( !is_writable(ZM_DIR_EVENTS) || !is_writable(ZM_DIR_IMAGES) )
 {

From 62adb756a9a0e69b1b7ed6b8a1db23fee5ffa003 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 10:12:20 -0500
Subject: [PATCH 101/362] put back CORS validity checking code

---
 web/includes/functions.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 6eedf585e..10f12c712 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -95,22 +95,20 @@ function noCacheHeaders()
 }
 
 function CORSHeaders() {
-	# This just allows cross server requests with no verification.  This is ok, because we do auth later.
-	header("Access-Control-Allow-Origin: *" );
 
 	# The following is left for future reference/use.
-#$valid = false;
-#header("Access-Control-Allow-Headers: x-requested-with,x-request");
-#foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
-#$Server = new Server( $row );
-#if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
-#$valid = true;
-#header("Access-Control-Allow-Origin: " . $Server->Url() );
-#}
-#}
-#if ( ! $valid ) {
-#Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
-#}
+	$valid = false;
+	foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
+		$Server = new Server( $row );
+		if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
+			$valid = true;
+			header("Access-Control-Allow-Origin: " . $Server->Url() );
+			header("Access-Control-Allow-Headers: x-requested-with,x-request");
+		}
+	}
+	if ( ! $valid ) {
+		Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
+	}
 }
 
 function getAuthUser( $auth )

From 41d92bbf94f2979226365c62ba39d4d086040b09 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 10:26:11 -0500
Subject: [PATCH 102/362] need to include Server class

---
 web/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/index.php b/web/index.php
index 41e1eca7a..72e6dc8c0 100644
--- a/web/index.php
+++ b/web/index.php
@@ -48,6 +48,7 @@ if ( false )
 
 require_once( 'includes/config.php' );
 require_once( 'includes/logger.php' );
+require_once( 'includes/Server.php' );
 
 if ( isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on' )
 {

From b8fb711593afeb98914ff0edb0100124c0c5d607 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 11:02:47 -0500
Subject: [PATCH 103/362] only do CORS if Origin is set

---
 web/includes/functions.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 10f12c712..e14eb369d 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -95,19 +95,21 @@ function noCacheHeaders()
 }
 
 function CORSHeaders() {
+	if ( isset( $_SERVER['HTTP_ORIGIN'] ) ) {
 
-	# The following is left for future reference/use.
-	$valid = false;
-	foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
-		$Server = new Server( $row );
-		if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
-			$valid = true;
-			header("Access-Control-Allow-Origin: " . $Server->Url() );
-			header("Access-Control-Allow-Headers: x-requested-with,x-request");
+		# The following is left for future reference/use.
+		$valid = false;
+		foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
+			$Server = new Server( $row );
+			if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
+				$valid = true;
+				header("Access-Control-Allow-Origin: " . $Server->Url() );
+				header("Access-Control-Allow-Headers: x-requested-with,x-request");
+			}
+		}
+		if ( ! $valid ) {
+			Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
 		}
-	}
-	if ( ! $valid ) {
-		Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
 	}
 }
 

From 70fb6a678690ae67f5bdafcdeae8d860a8ccb755 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 11:17:23 -0500
Subject: [PATCH 104/362] output message when not doing dbupdate. put quotes in
 to fix bash error when ZM_DB_HOST is not defined

---
 distros/ubuntu1504_cmake/zoneminder.postinst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/distros/ubuntu1504_cmake/zoneminder.postinst b/distros/ubuntu1504_cmake/zoneminder.postinst
index abe327c99..1275906ff 100644
--- a/distros/ubuntu1504_cmake/zoneminder.postinst
+++ b/distros/ubuntu1504_cmake/zoneminder.postinst
@@ -17,10 +17,12 @@ if [ "$1" = "configure" ]; then
     # Ensure zoneminder is stopped
     deb-systemd-invoke stop zoneminder.service || exit $?
 
-	if [ $ZM_DB_HOST == "localhost" ]; then
+	if [ "$ZM_DB_HOST" == "localhost" ]; then
 		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 		# Run the ZoneMinder update tool
 		zmupdate.pl --nointeractive
+	else
+		echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
 	fi;
 
 fi

From 961dc90b0e3685f2a9018131ffd05bb963a5b218 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 11:21:04 -0500
Subject: [PATCH 105/362] add Server function

---
 web/includes/Monitor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index ac9ca8333..29f73d117 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -34,6 +34,9 @@ class Monitor {
 			Error("No row for Monitor " . $IdOrRow );
 		}
 	} // end function __construct
+	public function Server() {
+		return new Server( $this->{'ServerId'} );
+	}
 	public function __call( $fn, array $args){
         if(isset($this->{$fn})){
 			return $this->{$fn};

From 34f6590107a9c14708b0ea8ad491b02cd187bff3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 12:10:26 -0500
Subject: [PATCH 106/362] upgrade montage to use Monitor object and
 getStreamSrc which knows which server to connect to

---
 web/skins/classic/views/montage.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index d9f92805a..fc86ad64b 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -24,6 +24,8 @@ if ( !canView( 'Stream' ) )
     return;
 }
 
+require_once( 'includes/Monitor.php' );
+
 $groupSql = "";
 if ( !empty($_REQUEST['group']) )
 {
@@ -64,7 +66,7 @@ foreach( dbFetchAll( $sql ) as $row )
     $row['scaleWidth'] = $scaleWidth;
     $row['scaleHeight'] = $scaleHeight;
     $row['connKey'] = generateConnKey();
-    $monitors[] = $row;
+    $monitors[] = new Monitor( $row );
 }
 
 $focusWindow = true;
@@ -107,29 +109,29 @@ if ( $showControl )
 <?php
 foreach ( $monitors as $monitor )
 {
-    $connkey = $monitor['connKey']; // Minor hack
+    $connkey = $monitor->connKey(); // Minor hack
     if ( !isset( $scale ) )
-        $scale = reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+        $scale = reScale( SCALE_BASE, $monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE );
 ?>
-        <div id="monitorFrame<?php echo $monitor['index'] ?>" class="monitorFrame">
-          <div id="monitor<?php echo $monitor['index'] ?>" class="monitor idle">
-            <div id="imageFeed<?php echo $monitor['index'] ?>" class="imageFeed" onclick="createPopup( '?view=watch&amp;mid=<?php echo $monitor['Id'] ?>', 'zmWatch<?php echo $monitor['Id'] ?>', 'watch', <?php echo $monitor['scaleWidth'] ?>, <?php echo $monitor['scaleHeight'] ?> );">
+        <div id="monitorFrame<?php echo $monitor->index() ?>" class="monitorFrame">
+          <div id="monitor<?php echo $monitor->index() ?>" class="monitor idle">
+            <div id="imageFeed<?php echo $monitor->index() ?>" class="imageFeed" onclick="createPopup( '?view=watch&amp;mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo $monitor->scaleWidth() ?>, <?php echo $monitor->scaleHeight() ?> );">
 <?php
 if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 {
-    $streamSrc = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
-    outputVideoStream( "liveStream".$monitor['Id'], $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), ZM_MPEG_LIVE_FORMAT );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=mpeg", "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
+    outputVideoStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT );
 }
 else
 {
-    $streamSrc = getStreamSrc( array( "mode=jpeg", "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
+    $streamSrc = $monitor->getStreamSrc( array( "mode=jpeg", "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
     if ( canStreamNative() )
     {
-        outputImageStream( "liveStream".$monitor['Id'], $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), validHtmlStr($monitor['Name']) );
+        outputImageStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), validHtmlStr($monitor->Name()) );
     }
     else
     {
-        outputHelperStream( "liveStream".$monitor['Id'], $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) );
+        outputHelperStream( "liveStream".$monitor->Id(), $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ) );
     }
 }
 ?>
@@ -138,7 +140,7 @@ else
     if ( !ZM_WEB_COMPACT_MONTAGE )
     {
 ?>
-            <div id="monitorState<?php echo $monitor['index'] ?>" class="monitorState idle"><?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor['index'] ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor['index'] ?>"></span>&nbsp;fps</div>
+            <div id="monitorState<?php echo $monitor->index() ?>" class="monitorState idle"><?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->index() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->index() ?>"></span>&nbsp;fps</div>
 <?php
     }
 ?>

From f54b8c27eeeb456b9461eead00b4e09018fd8321 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Dec 2015 12:10:32 -0500
Subject: [PATCH 107/362] upgrade montage to use Monitor object and
 getStreamSrc which knows which server to connect to

---
 web/skins/classic/views/js/montage.js.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 655f993ff..80f652fd5 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -31,7 +31,12 @@ var monitorData = new Array();
 foreach ( $monitors as $monitor )
 {
 ?>
-monitorData[monitorData.length] = { 'id': <?php echo $monitor['Id'] ?>, 'connKey': <?php echo $monitor['connKey'] ?>, 'width': <?php echo $monitor['Width'] ?>,'height':<?php echo $monitor['Height'] ?> };
+monitorData[monitorData.length] = { 
+	'id': <?php echo $monitor->Id() ?>, 
+	'connKey': <?php echo $monitor->connKey() ?>, 
+	'width': <?php echo $monitor->Width() ?>,
+	'height':<?php echo $monitor->Height() ?>
+};
 <?php
 }
 ?>

From af59dbee2eae448b6f0f17a2d111f9a4c128aad8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 4 Dec 2015 10:40:55 -0500
Subject: [PATCH 108/362] == should be =

---
 distros/ubuntu1504_cmake/zoneminder.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu1504_cmake/zoneminder.postinst b/distros/ubuntu1504_cmake/zoneminder.postinst
index 1275906ff..f465bd7ea 100644
--- a/distros/ubuntu1504_cmake/zoneminder.postinst
+++ b/distros/ubuntu1504_cmake/zoneminder.postinst
@@ -17,7 +17,7 @@ if [ "$1" = "configure" ]; then
     # Ensure zoneminder is stopped
     deb-systemd-invoke stop zoneminder.service || exit $?
 
-	if [ "$ZM_DB_HOST" == "localhost" ]; then
+	if [ "$ZM_DB_HOST" = "localhost" ]; then
 		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 		# Run the ZoneMinder update tool
 		zmupdate.pl --nointeractive

From e6c983072864c43cd5279d24f2df29258e29c068 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Dec 2015 09:23:36 -0500
Subject: [PATCH 109/362] Use Monitor class instead of old sql

---
 web/includes/actions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/includes/actions.php b/web/includes/actions.php
index 5fac6f4a2..bf1a15390 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -246,13 +246,14 @@ if ( !empty($action) )
     if ( !empty($_REQUEST['mid']) && canView( 'Control', $_REQUEST['mid'] ) )
     {
         require_once( 'control_functions.php' );
+        require_once( 'Monitor.php' );
         $mid = validInt($_REQUEST['mid']);
         if ( $action == "control" )
         {
-            $monitor = dbFetchOne( "select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id) where M.Id = ?", NULL, array($mid) );
+            $monitor = new Monitor( $mid );
 
             $ctrlCommand = buildControlCommand( $monitor );
-			sendControlCommand( $monitor['Id'], $ctrlCommand );
+			sendControlCommand( $monitor->Id(), $ctrlCommand );
         }
         elseif ( $action == "settings" )
         {

From 6d34f8f42469636a240496a7237bad90ef000b98 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Dec 2015 09:23:42 -0500
Subject: [PATCH 110/362] Use Monitor class instead of old sql

---
 web/ajax/control.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/ajax/control.php b/web/ajax/control.php
index 7e2625b70..abdc8c8ef 100644
--- a/web/ajax/control.php
+++ b/web/ajax/control.php
@@ -1,5 +1,6 @@
 <?php
 require_once( 'includes/control_functions.php' );
+require_once( 'includes/Monitor.php' );
 
 // Monitor control actions, require a monitor id and control view permissions for that monitor
 if ( empty($_REQUEST['id']) )
@@ -7,7 +8,7 @@ if ( empty($_REQUEST['id']) )
 
 if ( canView( 'Control', $_REQUEST['id'] ) )
 {
-    $monitor = dbFetchOne( 'select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id ) where M.Id = ?', NULL, array($_REQUEST['id']) );
+    $monitor = new Monitor( $_REQUEST['id'] );
 
     $ctrlCommand = buildControlCommand( $monitor );
 
@@ -17,7 +18,7 @@ if ( canView( 'Control', $_REQUEST['id'] ) )
         if ( !$socket )
             ajaxError( "socket_create() failed: ".socket_strerror(socket_last_error()) );
 
-        $sock_file = ZM_PATH_SOCKS.'/zmcontrol-'.$monitor['Id'].'.sock';
+        $sock_file = ZM_PATH_SOCKS.'/zmcontrol-'.$monitor->Id().'.sock';
         if ( @socket_connect( $socket, $sock_file ) )
         {
             $options = array();
@@ -36,7 +37,7 @@ if ( canView( 'Control', $_REQUEST['id'] ) )
         }
         else
         {
-            $ctrlCommand .= " --id=".$monitor['Id'];
+            $ctrlCommand .= " --id=".$monitor->Id();
 
             // Can't connect so use script
             $ctrlStatus = '';

From b21b26a41b28e5bb2337555d6fad925c5086bb38 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Dec 2015 12:34:16 -0500
Subject: [PATCH 111/362] remove requirment for mysql. Mysql could be on
 another machine

---
 distros/ubuntu1504_cmake/zoneminder.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distros/ubuntu1504_cmake/zoneminder.service b/distros/ubuntu1504_cmake/zoneminder.service
index d5b326d59..e3575c039 100644
--- a/distros/ubuntu1504_cmake/zoneminder.service
+++ b/distros/ubuntu1504_cmake/zoneminder.service
@@ -4,7 +4,8 @@
 [Unit]
 Description=ZoneMinder CCTV recording and surveillance system
 After=network.target mysql.service
-Requires=mysql.service
+# Remarked out so that it will start ZM on machines that don't have mysql installed
+#Requires=mysql.service
 
 [Service]
 #User=www-data

From aaa9f3bcc99aca705c89917c6e968d421284abeb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 15 Dec 2015 11:19:50 -0500
Subject: [PATCH 112/362] Handle case where parameter is not passed to
 constuctor

---
 web/includes/Server.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 5705c3ffb..79dbb7ddb 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,16 +1,18 @@
 <?php
 require_once( 'database.php' );
 class Server {
-    public function __construct( $IdOrRow ) {
+    public function __construct( $IdOrRow = NULL ) {
 		$row = NULL;
-		if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-			$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
-			if ( ! $row ) {
-				Error("Unable to load Server record for Id=" . $IdOrRow );
+		if ( $IdOrRow ) {
+			if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+				$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
+				if ( ! $row ) {
+					Error("Unable to load Server record for Id=" . $IdOrRow );
+				}
+			} elseif ( is_array( $IdOrRow ) ) {
+				$row = $IdOrRow;
 			}
-		} elseif ( is_array( $IdOrRow ) ) {
-			$row = $IdOrRow;
-		}
+		} # end if isset($IdOrRow)
 		if ( $row ) {
 			foreach ($row as $k => $v) {
 				$this->{$k} = $v;

From 62095b30d0978ee7d54c5787ef3c9e51f3d7a6b6 Mon Sep 17 00:00:00 2001
From: Marco <marco.pozzuolo@gmail.com>
Date: Wed, 16 Dec 2015 16:58:20 +0100
Subject: [PATCH 113/362] Added autostop to Down command

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm
index 835f2943b..c9997526d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8918W.pm
@@ -173,6 +173,7 @@ sub moveConDown
 	Debug( "Move Down" );
 	my $cmd = "decoder_control.cgi?command=2";
 	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
 }
  
 #Left Arrow

From b78deb192b28d5b008c38858aed8e8f021fd7b71 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <steve.gilvarry@gmail.com>
Date: Sat, 19 Dec 2015 20:51:19 +1100
Subject: [PATCH 114/362] Add some documentation on Multi-Server

---
 docs/userguide/definemonitor.rst                |   3 +++
 .../options/images/Options_Servers.png          | Bin 0 -> 11202 bytes
 docs/userguide/options/options_servers.rst      |  10 ++++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 docs/userguide/options/images/Options_Servers.png
 create mode 100644 docs/userguide/options/options_servers.rst

diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst
index c2006eed9..d69b44425 100644
--- a/docs/userguide/definemonitor.rst
+++ b/docs/userguide/definemonitor.rst
@@ -21,6 +21,9 @@ Monitor Tab
 Name 
     The name for your monitor. This should be made up of alphanumeric characters (a-z,A-Z,0-9) and hyphen (-) and underscore(_) only. Whitespace is not allowed. 
 
+Server
+    Multi-Server implementation allows the ability to define multiple ZoneMinder servers sharing a single database. When servers are configured this setting allows you nominate the server for each monitor.
+
 Source Type 
     This determines whether the camera is a local one attached to a physical video or USB port on your machine, a remote network camera or an image source that is represented by a file (for instance periodically downloaded from a alternate location). Choosing one or the other affects which set of options are shown in the Source tab. 
 
diff --git a/docs/userguide/options/images/Options_Servers.png b/docs/userguide/options/images/Options_Servers.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ca47edba78531a2567a2e9ac2b932d30c0f8c93
GIT binary patch
literal 11202
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

literal 0
HcmV?d00001

diff --git a/docs/userguide/options/options_servers.rst b/docs/userguide/options/options_servers.rst
new file mode 100644
index 000000000..9ca5f40ee
--- /dev/null
+++ b/docs/userguide/options/options_servers.rst
@@ -0,0 +1,10 @@
+Options - Servers
+---------------
+
+.. image:: images/Options_Servers.png
+
+Servers options is used for setting up multiple ZoneMinder servers sharing the same database and using a shared file share for all event data. To add a new server use the Add Server button. All that is required is a Name for the Server and Hostname.
+
+To delete a server mark that server and click the Delete button.
+
+Currently Live view is only available on the monitors host server, but events can be viewed from any server due to the shared file share.

From b626712a2f7524220ba552aa35db534b61bd40dd Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 10:03:48 -0500
Subject: [PATCH 115/362] Add ServerId and ServerName to fields that we can
 filter on

---
 web/skins/classic/views/filter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 1c7c6e270..870d873df 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -84,6 +84,8 @@ $attrTypes = array(
     'DiskPercent' => translate('AttrDiskPercent'),
     'DiskBlocks'  => translate('AttrDiskBlocks'),
     'SystemLoad'  => translate('AttrSystemLoad'),
+	'ServerId'    => translate('AttrServerId'),
+	'ServerName'  => translate('AttrServerName'),
 );
 $opTypes = array(
     '='   => translate('OpEq'),

From 6f5c70dd5de222baedea0dd9fa6f31ea9daf1709 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 10:10:11 -0500
Subject: [PATCH 116/362] Add Attr lines for ServerId and ServerName

---
 web/lang/en_gb.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 83267ecdd..7292fb88f 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -124,6 +124,8 @@ $SLANG = array(
     'AttrMaxScore'          => 'Max. Score',
     'AttrMonitorId'         => 'Monitor Id',
     'AttrMonitorName'       => 'Monitor Name',
+    'AttrServerId'          => 'Server Id',
+    'AttrServerName'        => 'Server Name',
     'AttrName'              => 'Name',
     'AttrNotes'             => 'Notes',
     'AttrSystemLoad'        => 'System Load',

From 8682b1af28f546880834fc3e83c983987ce0587c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 11:03:53 -0500
Subject: [PATCH 117/362] rough in a Storage class for the perl side of things

---
 scripts/ZoneMinder/lib/ZoneMinder/Server.pm | 160 ++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 scripts/ZoneMinder/lib/ZoneMinder/Server.pm

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
new file mode 100644
index 000000000..42fcb1d59
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
@@ -0,0 +1,160 @@
+# ==========================================================================
+#
+# ZoneMinder Server Module, $Date$, $Revision$
+# Copyright (C) 2001-2008  Philip Coombes
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Server;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+require ZoneMinder::Base;
+
+our @ISA = qw(Exporter ZoneMinder::Base);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration   use ZoneMinder ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = (
+    'functions' => [ qw(
+    ) ]
+);
+push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw();
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use POSIX;
+
+sub new {
+    my ( $parent, $id, $data ) = @_;
+
+	my $self = {};
+	bless $self, $parent;
+	if ( ( $$self{id} = $id ) or $data ) {
+#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
+		$self->load( $data );
+	}
+} # end sub new
+
+sub load {
+	my ( $self, $data ) = @_;
+	my $type = ref $self;
+	if ( ! $data ) {
+#$log->debug("Object::load Loading from db $type");
+		$data = $ZoneMinder::dbh->selectrow_hashref( 'SELECT * FROM Servers WHERE Id=?', {}, $$self{Id} );
+		if ( ! $data ) {
+			if ( $ZoneMinder::dbh->errstr ) {
+				Error( "Failure to load Server record for $$self{id}: Reason: " . $ZoneMinder::dbh->errstr );
+			} # end if
+		} # end if
+	} # end if ! $data
+	if ( $data and %$data ) {
+		@$self{keys %$data} = values %$data;
+	} # end if
+} # end sub load
+
+sub Name {
+	if ( @_ > 1 ) {
+		$_[0]{Name} = $_[1];
+	}
+	return $_[0]{Name};
+} # end sub Name
+
+sub Hostname {
+	if ( @_ > 1 ) {
+		$_[0]{Hostname} = $_[1];
+	}
+	return $_[0]{Hostname};
+} # end sub Hostname
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Server;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut

From ac88867fd28f8b67a846dea36e0e1a81c7c14fcb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 11:10:24 -0500
Subject: [PATCH 118/362] fix namespace for dbh

---
 scripts/ZoneMinder/lib/ZoneMinder/Server.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
index 42fcb1d59..71fe39d36 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
@@ -80,10 +80,10 @@ sub load {
 	my $type = ref $self;
 	if ( ! $data ) {
 #$log->debug("Object::load Loading from db $type");
-		$data = $ZoneMinder::dbh->selectrow_hashref( 'SELECT * FROM Servers WHERE Id=?', {}, $$self{Id} );
+		$data = $ZoneMinder::Database::dbh->selectrow_hashref( 'SELECT * FROM Servers WHERE Id=?', {}, $$self{Id} );
 		if ( ! $data ) {
-			if ( $ZoneMinder::dbh->errstr ) {
-				Error( "Failure to load Server record for $$self{id}: Reason: " . $ZoneMinder::dbh->errstr );
+			if ( $ZoneMinder::Database::dbh->errstr ) {
+				Error( "Failure to load Server record for $$self{id}: Reason: " . $ZoneMinder::Database::dbh->errstr );
 			} # end if
 		} # end if
 	} # end if ! $data

From f6d52e77b9a81e386fd36d8af2105ed08194bd5c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 11:13:21 -0500
Subject: [PATCH 119/362] it is important to return the object from the
 constructor

---
 scripts/ZoneMinder/lib/ZoneMinder/Server.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
index 71fe39d36..cefc18df3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
@@ -73,6 +73,7 @@ sub new {
 #$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
 		$self->load( $data );
 	}
+	return $self;
 } # end sub new
 
 sub load {

From 118dc12ad516a8ac92932a19de62d560cd0ff0b0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 21 Dec 2015 11:25:17 -0500
Subject: [PATCH 120/362] id => Id

---
 scripts/ZoneMinder/lib/ZoneMinder/Server.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
index cefc18df3..df8f2fb10 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Server.pm
@@ -69,7 +69,7 @@ sub new {
 
 	my $self = {};
 	bless $self, $parent;
-	if ( ( $$self{id} = $id ) or $data ) {
+	if ( ( $$self{Id} = $id ) or $data ) {
 #$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
 		$self->load( $data );
 	}

From af9fc1de905e7a4c77bf319fa101671a55ea4af0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 12:57:05 -0500
Subject: [PATCH 121/362] revert white space changes.

---
 src/zm_monitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c1018f179..0346e740e 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -396,11 +396,11 @@ Monitor::Monitor(
              + 64; /* Padding used to permit aligning the images buffer to 16 byte boundary */
 
     Debug( 1, "mem.size=%d", mem_size );
-    mem_ptr = NULL;
+	mem_ptr = NULL;
 
     if ( purpose == CAPTURE ) {
-        this->connect();
-        if ( ! mem_ptr ) exit(-1);
+		this->connect();
+		if ( ! mem_ptr ) exit(-1);
         memset( mem_ptr, 0, mem_size );
         shared_data->size = sizeof(SharedData);
         shared_data->active = enabled;

From 70cac99e1791f55273eba2535c26f07c639afa29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:03:52 -0500
Subject: [PATCH 122/362] fix claim that live view must be done on host server

---
 docs/userguide/options/options_servers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userguide/options/options_servers.rst b/docs/userguide/options/options_servers.rst
index 9ca5f40ee..5a1264e47 100644
--- a/docs/userguide/options/options_servers.rst
+++ b/docs/userguide/options/options_servers.rst
@@ -3,8 +3,8 @@ Options - Servers
 
 .. image:: images/Options_Servers.png
 
-Servers options is used for setting up multiple ZoneMinder servers sharing the same database and using a shared file share for all event data. To add a new server use the Add Server button. All that is required is a Name for the Server and Hostname.
+Servers tab is used for setting up multiple ZoneMinder servers sharing the same database and using a shared file share for all event data. To add a new server use the Add Server button. All that is required is a Name for the Server and Hostname.
 
 To delete a server mark that server and click the Delete button.
 
-Currently Live view is only available on the monitors host server, but events can be viewed from any server due to the shared file share.
+Please note that all servers must have a functional web UI as the live view must come from the monitor's host server.

From bcb18b927b2c092d2ba8427bae9351f47e24becf Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:05:56 -0500
Subject: [PATCH 123/362] mention that you must set ZM_SERVER_NAME in
 /etc/zm/zm.conf

---
 docs/userguide/options/options_servers.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/userguide/options/options_servers.rst b/docs/userguide/options/options_servers.rst
index 5a1264e47..4736c305a 100644
--- a/docs/userguide/options/options_servers.rst
+++ b/docs/userguide/options/options_servers.rst
@@ -8,3 +8,5 @@ Servers tab is used for setting up multiple ZoneMinder servers sharing the same
 To delete a server mark that server and click the Delete button.
 
 Please note that all servers must have a functional web UI as the live view must come from the monitor's host server.
+
+On each server, you will have to edit /etc/zm/zm.conf and set either ZM_SERVER_NAME=

From fdf1912ec10a5de0e48245ae2991e05fb3bff056 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:11:18 -0500
Subject: [PATCH 124/362] revert whitespace changes

---
 src/zm_monitor.cpp | 148 ++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 0346e740e..c62dd9fbb 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -427,8 +427,8 @@ Monitor::Monitor(
         trigger_data->trigger_showtext[0] = 0;
         shared_data->valid = true;
     } else if ( purpose == ANALYSIS ) {
-        this->connect();
-        if ( ! mem_ptr ) exit(-1);
+		this->connect();
+		if ( ! mem_ptr ) exit(-1);
         shared_data->state = IDLE;
         shared_data->last_read_time = 0;
         shared_data->alarm_x = -1;
@@ -444,9 +444,9 @@ Monitor::Monitor(
         }
     }
 
-    // Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
+	// Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
     if ( !n_zones ) {
-        Debug( 1, "Monitor %s has no zones, adding one.", name );
+		Debug( 1, "Monitor %s has no zones, adding one.", name );
         n_zones = 1;
         zones = new Zone *[1];
         Coord coords[4] = { Coord( 0, 0 ), Coord( width-1, 0 ), Coord( width-1, height-1 ), Coord( 0, height-1 ) };
@@ -528,28 +528,28 @@ bool Monitor::connect() {
         // Allocate the size
         if ( ftruncate( map_fd, mem_size ) < 0 ) {
             Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
-        }
+		}
     } else if ( map_stat.st_size == 0 ) {
         Error( "Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size, mem_size );
-        return false;
+		return false;
     } else if ( map_stat.st_size != mem_size ) {
         Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
-        return false;
-    } else {
+		return false;
+	} else {
 #ifdef MAP_LOCKED
-        mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
-        if ( mem_ptr == MAP_FAILED ) {
-            if ( errno == EAGAIN ) {
-                Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
+		mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
+		if ( mem_ptr == MAP_FAILED ) {
+			if ( errno == EAGAIN ) {
+				Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
 #endif
-                mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
-                Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
+				mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+				Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
 #ifdef MAP_LOCKED
-            }
-        }
+			}
+		}
 #endif
-        if ( mem_ptr == MAP_FAILED )
-            Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
+		if ( mem_ptr == MAP_FAILED )
+			Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
     }
 #else // ZM_MEM_MAPPED
     shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
@@ -570,9 +570,9 @@ bool Monitor::connect() {
     unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
     
     if(((unsigned long)shared_images % 16) != 0) {
-        /* Align images buffer to nearest 16 byte boundary */
-        Debug(3,"Aligning shared memory images to the next 16 byte boundary");
-        shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
+		/* Align images buffer to nearest 16 byte boundary */
+		Debug(3,"Aligning shared memory images to the next 16 byte boundary");
+		shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
     }
     image_buffer = new Snapshot[image_buffer_count];
     for ( int i = 0; i < image_buffer_count; i++ )
@@ -603,7 +603,7 @@ bool Monitor::connect() {
         }
     }
 
-    return true;
+	return true;
 }
 
 Monitor::~Monitor()
@@ -620,22 +620,22 @@ Monitor::~Monitor()
             delete[] privacy_bitmask;
             privacy_bitmask = NULL;
         }
-    if ( mem_ptr ) {
-        if ( event )
-            Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
-        closeEvent();
+	if ( mem_ptr ) {
+		if ( event )
+			Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
+		closeEvent();
 
-        if ( (deinterlacing & 0xff) == 4)
-        {
-            delete next_buffer.image;
-            delete next_buffer.timestamp;
-        }
-        for ( int i = 0; i < image_buffer_count; i++ )
-        {
-            delete image_buffer[i].image;
-        }
-        delete[] image_buffer;
-    } // end if mem_ptr
+		if ( (deinterlacing & 0xff) == 4)
+		{
+			delete next_buffer.image;
+			delete next_buffer.timestamp;
+		}
+		for ( int i = 0; i < image_buffer_count; i++ )
+		{
+			delete image_buffer[i].image;
+		}
+		delete[] image_buffer;
+	} // end if mem_ptr
 
     for ( int i = 0; i < n_zones; i++ )
     {
@@ -645,47 +645,47 @@ Monitor::~Monitor()
 
     delete camera;
 
-    if ( mem_ptr ) {
-        if ( purpose == ANALYSIS )
-        {
-            shared_data->state = state = IDLE;
-            shared_data->last_read_index = image_buffer_count;
-            shared_data->last_read_time = 0;
+	if ( mem_ptr ) {
+		if ( purpose == ANALYSIS )
+		{
+			shared_data->state = state = IDLE;
+			shared_data->last_read_index = image_buffer_count;
+			shared_data->last_read_time = 0;
 
-            if ( analysis_fps )
-            {
-                for ( int i = 0; i < pre_event_buffer_count; i++ )
-                {
-                    delete pre_event_buffer[i].image;
-                    delete pre_event_buffer[i].timestamp;
-                }
-                delete[] pre_event_buffer;
-            }
-        }
-        else if ( purpose == CAPTURE )
-        {
-            shared_data->valid = false;
-            memset( mem_ptr, 0, mem_size );
-        }
+			if ( analysis_fps )
+			{
+				for ( int i = 0; i < pre_event_buffer_count; i++ )
+				{
+					delete pre_event_buffer[i].image;
+					delete pre_event_buffer[i].timestamp;
+				}
+				delete[] pre_event_buffer;
+			}
+		}
+		else if ( purpose == CAPTURE )
+		{
+			shared_data->valid = false;
+			memset( mem_ptr, 0, mem_size );
+		}
 
 #if ZM_MEM_MAPPED
-        if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
-            Error( "Can't msync: %s", strerror(errno) );
-        if ( munmap( mem_ptr, mem_size ) < 0 )
-            Fatal( "Can't munmap: %s", strerror(errno) );
-        close( map_fd );
+		if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
+			Error( "Can't msync: %s", strerror(errno) );
+		if ( munmap( mem_ptr, mem_size ) < 0 )
+			Fatal( "Can't munmap: %s", strerror(errno) );
+		close( map_fd );
 #else // ZM_MEM_MAPPED
-        struct shmid_ds shm_data;
-        if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
-            Error( "Can't shmctl: %s", strerror(errno) );
-            exit( -1 );
-        }
-        if ( shm_data.shm_nattch <= 1 ) {
-            if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
-                Error( "Can't shmctl: %s", strerror(errno) );
-                exit( -1 );
-            }
-        }
+		struct shmid_ds shm_data;
+		if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
+			Error( "Can't shmctl: %s", strerror(errno) );
+			exit( -1 );
+		}
+		if ( shm_data.shm_nattch <= 1 ) {
+			if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
+				Error( "Can't shmctl: %s", strerror(errno) );
+				exit( -1 );
+			}
+		}
 #endif // ZM_MEM_MAPPED
     } // end if mem_ptr
 }

From c0a79567e6dabe37c13bd4df10bf31b306f4a65c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:26:24 -0500
Subject: [PATCH 125/362] revert whitespace changes

---
 src/zm_monitor.cpp | 104 ++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c62dd9fbb..f77e5ae76 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -608,14 +608,14 @@ bool Monitor::connect() {
 
 Monitor::~Monitor()
 {
-    if ( timestamps ) {
-        delete[] timestamps;
-        timestamps = 0;
-    }
-    if ( images ) {
-        delete[] images;
-        images = 0;
-    }
+	if ( timestamps ) {
+		delete[] timestamps;
+		timestamps = 0;
+	}
+	if ( images ) {
+		delete[] images;
+		images = 0;
+	}
         if ( privacy_bitmask ) {
             delete[] privacy_bitmask;
             privacy_bitmask = NULL;
@@ -738,7 +738,7 @@ int Monitor::GetImage( int index, int scale )
     if ( index != image_buffer_count )
     {
         Image *image;
-        // If we are going to be modifying the snapshot before writing, then we need to copy it
+		// If we are going to be modifying the snapshot before writing, then we need to copy it
         if ( ( scale != ZM_SCALE_BASE ) || ( !config.timestamp_on_capture ) ) {
             Snapshot *snap = &image_buffer[index];
             Image *snap_image = snap->image;
@@ -1238,32 +1238,32 @@ bool Monitor::CheckSignal( const Image *image )
                     break;
             }
             
-        if(colours == ZM_COLOUR_GRAY8) {
-            if ( *(buffer+index) != grayscale_val )
-                return true;
-            
-        } else if(colours == ZM_COLOUR_RGB24) {
-            const uint8_t *ptr = buffer+(index*colours);
-            
-            if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
-                if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
-                    return true;
-            } else {
-                /* Assume RGB */
-                if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
-                    return true;
-            }
-            
-        } else if(colours == ZM_COLOUR_RGB32) {
-            if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
-                if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
-                    return true;
-            } else {
-                /* Assume RGBA or BGRA */
-                if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
-                    return true;
-            }
-        }
+			if(colours == ZM_COLOUR_GRAY8) {
+				if ( *(buffer+index) != grayscale_val )
+					return true;
+
+			} else if(colours == ZM_COLOUR_RGB24) {
+				const uint8_t *ptr = buffer+(index*colours);
+
+				if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
+					if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
+						return true;
+				} else {
+					/* Assume RGB */
+					if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
+						return true;
+				}
+
+			} else if(colours == ZM_COLOUR_RGB32) {
+				if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
+					if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
+						return true;
+				} else {
+					/* Assume RGBA or BGRA */
+					if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
+						return true;
+				}
+			}
         
         }
         return( false );
@@ -1734,7 +1734,7 @@ bool Monitor::Analyse()
                         if ( config.create_analysis_images )
                         {
                             bool got_anal_image = false;
-                            alarm_image.Assign( *snap_image );
+							alarm_image.Assign( *snap_image );
                             for( int i = 0; i < n_zones; i++ )
                             {
                                 if ( zones[i]->Alarmed() )
@@ -2083,22 +2083,22 @@ Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
         const char *device = dbrow[col]; col++;
         int channel = atoi(dbrow[col]); col++;
         int format = atoi(dbrow[col]); col++;
-        bool v4l_multi_buffer = config.v4l_multi_buffer;
-        if ( dbrow[col] ) {
-            if (*dbrow[col] == '0' ) {
-                v4l_multi_buffer = false;
-            } else if ( *dbrow[col] == '1' ) {
-                v4l_multi_buffer = true;
-            } 
-        }
-        col++;
-        
-        int v4l_captures_per_frame = 0;
-        if ( dbrow[col] ) {
-             v4l_captures_per_frame = atoi(dbrow[col]);
-        } else {
-            v4l_captures_per_frame = config.captures_per_frame;
-        }
+		bool v4l_multi_buffer = config.v4l_multi_buffer;
+		if ( dbrow[col] ) {
+			if (*dbrow[col] == '0' ) {
+				v4l_multi_buffer = false;
+			} else if ( *dbrow[col] == '1' ) {
+				v4l_multi_buffer = true;
+			} 
+		}
+		col++;
+
+		int v4l_captures_per_frame = 0;
+		if ( dbrow[col] ) {
+			v4l_captures_per_frame = atoi(dbrow[col]);
+		} else {
+			v4l_captures_per_frame = config.captures_per_frame;
+		}
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
         col++;
         const char *method = dbrow[col]; col++;

From 1fee421500a7f6069d17ddc506c9ca98f22b3fd1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:29:41 -0500
Subject: [PATCH 126/362] revert whitespace changes

---
 src/zm_monitor.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f77e5ae76..6c75b1819 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -687,7 +687,7 @@ Monitor::~Monitor()
 			}
 		}
 #endif // ZM_MEM_MAPPED
-    } // end if mem_ptr
+	} // end if mem_ptr
 }
 
 void Monitor::AddZones( int p_n_zones, Zone *p_zones[] )
@@ -1238,27 +1238,27 @@ bool Monitor::CheckSignal( const Image *image )
                     break;
             }
             
-			if(colours == ZM_COLOUR_GRAY8) {
-				if ( *(buffer+index) != grayscale_val )
+		if(colours == ZM_COLOUR_GRAY8) {
+			if ( *(buffer+index) != grayscale_val )
 					return true;
 
-			} else if(colours == ZM_COLOUR_RGB24) {
-				const uint8_t *ptr = buffer+(index*colours);
+		} else if(colours == ZM_COLOUR_RGB24) {
+			const uint8_t *ptr = buffer+(index*colours);
 
-				if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
-					if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
-						return true;
-				} else {
-					/* Assume RGB */
-					if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
-						return true;
-				}
+			if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
+				if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
+					return true;
+			} else {
+				/* Assume RGB */
+				if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
+					return true;
+			}
 
-			} else if(colours == ZM_COLOUR_RGB32) {
-				if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
-					if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
-						return true;
-				} else {
+		} else if(colours == ZM_COLOUR_RGB32) {
+			if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
+				if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
+					return true;
+			} else {
 					/* Assume RGBA or BGRA */
 					if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
 						return true;

From 609ab79f81f7117af352e97bda0b3582e0882a08 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:32:57 -0500
Subject: [PATCH 127/362] revert whitespace changes

---
 src/zm_monitor.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 6c75b1819..1a219c3b1 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1240,11 +1240,11 @@ bool Monitor::CheckSignal( const Image *image )
             
 		if(colours == ZM_COLOUR_GRAY8) {
 			if ( *(buffer+index) != grayscale_val )
-					return true;
-
+				return true;
+			
 		} else if(colours == ZM_COLOUR_RGB24) {
 			const uint8_t *ptr = buffer+(index*colours);
-
+			
 			if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
 				if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
 					return true;
@@ -1253,17 +1253,17 @@ bool Monitor::CheckSignal( const Image *image )
 				if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
 					return true;
 			}
-
+			
 		} else if(colours == ZM_COLOUR_RGB32) {
 			if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
 				if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
 					return true;
 			} else {
-					/* Assume RGBA or BGRA */
-					if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
-						return true;
-				}
+				/* Assume RGBA or BGRA */
+				if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
+					return true;
 			}
+		}
         
         }
         return( false );

From 36f83aa41259bc23deb2f528113b85fabdb40136 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:35:17 -0500
Subject: [PATCH 128/362] revert whitespace changes

---
 src/zm_monitor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 1a219c3b1..468a5c910 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2092,15 +2092,15 @@ Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
 			} 
 		}
 		col++;
-
+		
 		int v4l_captures_per_frame = 0;
 		if ( dbrow[col] ) {
-			v4l_captures_per_frame = atoi(dbrow[col]);
+			 v4l_captures_per_frame = atoi(dbrow[col]);
 		} else {
 			v4l_captures_per_frame = config.captures_per_frame;
 		}
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-        col++;
+		col++;
         const char *method = dbrow[col]; col++;
 
         int width = atoi(dbrow[col]); col++;
@@ -2157,8 +2157,8 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
             device,
             channel,
             format,
-            v4l_multi_buffer,
-            v4l_captures_per_frame,
+			v4l_multi_buffer,
+			v4l_captures_per_frame,
             method,
             cam_width,
             cam_height,

From e76cc59bad181665028853587fd18be447794d9a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 21 Dec 2015 13:42:44 -0500
Subject: [PATCH 129/362] revert whitespace changes

---
 src/zm_monitor.cpp | 72 +++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 468a5c910..f07713cd8 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3004,30 +3004,30 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
 
 int Monitor::Capture()
 {
-    static int FirstCapture = 1;
-    int captureResult;
-    
-    int index = image_count%image_buffer_count;
-    Image* capture_image = image_buffer[index].image;
-    
-    if ( (deinterlacing & 0xff) == 4) {
-        if ( FirstCapture != 1 ) {
-            /* Copy the next image into the shared memory */
-            capture_image->CopyBuffer(*(next_buffer.image)); 
-        }
-        
-        /* Capture a new next image */
-        captureResult = camera->Capture(*(next_buffer.image));
-        
-        if ( FirstCapture ) {
-            FirstCapture = 0;
-            return 0;
-        }
-        
-    } else {
-        /* Capture directly into image buffer, avoiding the need to memcpy() */
-        captureResult = camera->Capture(*capture_image);
-    }
+	static int FirstCapture = 1;
+	int captureResult;
+
+	int index = image_count%image_buffer_count;
+	Image* capture_image = image_buffer[index].image;
+
+	if ( (deinterlacing & 0xff) == 4) {
+		if ( FirstCapture != 1 ) {
+			/* Copy the next image into the shared memory */
+			capture_image->CopyBuffer(*(next_buffer.image)); 
+		}
+
+		/* Capture a new next image */
+		captureResult = camera->Capture(*(next_buffer.image));
+
+		if ( FirstCapture ) {
+			FirstCapture = 0;
+			return 0;
+		}
+
+	} else {
+		/* Capture directly into image buffer, avoiding the need to memcpy() */
+		captureResult = camera->Capture(*capture_image);
+	}
     
     if ( captureResult != 0 )
     {
@@ -3044,18 +3044,18 @@ int Monitor::Capture()
     if ( captureResult == 1 )
     {
         
-    /* Deinterlacing */
-    if ( (deinterlacing & 0xff) == 1 ) {
-        capture_image->Deinterlace_Discard();
-    } else if ( (deinterlacing & 0xff) == 2 ) {
-        capture_image->Deinterlace_Linear();
-    } else if ( (deinterlacing & 0xff) == 3 ) {
-        capture_image->Deinterlace_Blend();
-    } else if ( (deinterlacing & 0xff) == 4 ) {
-        capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
-    } else if ( (deinterlacing & 0xff) == 5 ) {
-        capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
-    }
+		/* Deinterlacing */
+		if ( (deinterlacing & 0xff) == 1 ) {
+			capture_image->Deinterlace_Discard();
+		} else if ( (deinterlacing & 0xff) == 2 ) {
+			capture_image->Deinterlace_Linear();
+		} else if ( (deinterlacing & 0xff) == 3 ) {
+			capture_image->Deinterlace_Blend();
+		} else if ( (deinterlacing & 0xff) == 4 ) {
+			capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
+		} else if ( (deinterlacing & 0xff) == 5 ) {
+			capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
+		}
         
         
         if ( orientation != ROTATE_0 )

From 658e130d339c5dd80bd9a63e6bb44e809e8d1c25 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 22 Dec 2015 09:44:46 -0500
Subject: [PATCH 130/362] sync up to c39 version

---
 web/api/app/Plugin/Crud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index e22c1563a..c3976f147 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit e22c1563a51d86aac0d5054beee28b4afb60c802
+Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5

From 6df14258973931ae86ea3fe6dddf8dcbd8b37115 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Tue, 22 Dec 2015 09:52:33 -0500
Subject: [PATCH 131/362] Slight update to allow the instantiation with no row
 or Id

---
 web/includes/Monitor.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 29f73d117..8aa7f4dc9 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -5,16 +5,19 @@ require_once( 'Server.php' );
 class Monitor {
 	public function __construct( $IdOrRow ) {
 		$row = NULL;
-		if ( is_int( $IdOrRow ) ) {
-			$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
-		} else if ( is_numeric( $IdOrRow ) ) {
-			$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
-		} else if ( is_array($IdOrRow) ) {
-			$row = $IdOrRow;
-		} else {
-			Error("Unknown argument passed to Monitor Constructor ($IdOrRow)");
-			return;
-		}
+        if ( $IdOrRow ) {
+            if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+				$row = dbFetchOne( 'SELECT * FROM Monitors WHERE Id=?', NULL, array( $IdOrRow ) );
+                if ( ! $row ) {
+                    Error("Unable to load Server record for Id=" . $IdOrRow );
+                }
+            } elseif ( is_array( $IdOrRow ) ) {
+                $row = $IdOrRow;
+			} else {
+				Error("Unknown argument passed to Monitor Constructor ($IdOrRow)");
+				return;
+            }
+        } # end if isset($IdOrRow)
 
 		if ( $row ) {
 			foreach ($row as $k => $v) {

From 39bcb20dacb4c88da00c9a4982956b4337597fd7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 22 Dec 2015 12:59:37 -0500
Subject: [PATCH 132/362] Skip directories that have non-digits in them

---
 scripts/zmaudit.pl.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index bdd92524b..1e01628b8 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -178,6 +178,8 @@ MAIN: while( $loop ) {
     my $fs_monitors;
     foreach my $monitor ( glob("[0-9]*") )
     {
+		# Thie glob above gives all files starting with a digit.  So a monitor with a name starting with a digit will be in this list.
+		next if $monitor =~ /\D/;
         Debug( "Found filesystem monitor '$monitor'" );
         my $fs_events = $fs_monitors->{$monitor} = {};
         ( my $monitor_dir ) = ( $monitor =~ /^(.*)$/ ); # De-taint

From 3f1c782ff755642f4e83f20ee7e7987af0b9111b Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Mon, 28 Dec 2015 16:29:04 +1100
Subject: [PATCH 133/362] Fix random extra semicolon

---
 src/zm_monitor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f07713cd8..657eb2e75 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2049,7 +2049,6 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
 int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose )
 {
     std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
-;
     if ( device[0] ) {
         sql += " AND Device='";
         sql += device;

From ccded54937f27761e7c49ddb88fd0f7c4d0b1c8e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 28 Dec 2015 11:52:40 -0500
Subject: [PATCH 134/362] put back missing col++

---
 src/zm_monitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f07713cd8..e12a8da67 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2787,6 +2787,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
         signal_check_colour = strtol(dbrow[col]+1,0,16);
     else
         signal_check_colour = strtol(dbrow[col],0,16);
+	col++;
     bool embed_exif = (*dbrow[col] != '0'); col++;
 
     int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);

From 28bf4dfe7bb0e6f19335e916629482ac4fe027de Mon Sep 17 00:00:00 2001
From: Adam Reiser <reiser@defensivecomputing.io>
Date: Tue, 29 Dec 2015 16:34:11 -0800
Subject: [PATCH 135/362] Add option for strict host key checking

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 14 ++++++++++++++
 scripts/zmfilter.pl.in                             |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 9a065f8cf..cb8530749 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2077,6 +2077,20 @@ our @options =
         type        => $types{integer},
         category    => "upload",
     },
+    {
+        name        => "ZM_UPLOAD_STRICT",
+        default     => "no",
+        description => "Whether to require strict host key checking for SFTP uploads",
+        help        => qqq("
+            You can require SFTP uploads to verify the host key of the remote server
+			for protection against man-in-the-middle attacks. You will need to add the
+			server's key to \$HOME/.ssh/known_hosts, where \$HOME is the home directory
+			of the web server running ZoneMinder.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{boolean},
+        category    => "upload",
+    },
     {
         name        => "ZM_UPLOAD_FTP_PASSIVE",
         default     => "yes",
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 54f372262..2ae637997 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -924,7 +924,8 @@ sub uploadArchFile
                 if $Config{ZM_UPLOAD_PORT};
             $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
                 if $Config{ZM_UPLOAD_TIMEOUT};
-            $sftpOptions{more} = [ '-o'=>'StrictHostKeyChecking=no' ];
+            $sftpOptions{more} = [ '-o'=>'StrictHostKeyChecking=no' ]
+				if ! $Config{ZM_UPLOAD_STRICT};
             $Net::SFTP::Foreign::debug = -1
                 if $Config{ZM_UPLOAD_DEBUG};
             my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );

From 659b3f37f5a82094791adde5296ac191206e46cd Mon Sep 17 00:00:00 2001
From: Adam Reiser <reiser@defensivecomputing.io>
Date: Tue, 29 Dec 2015 21:08:24 -0800
Subject: [PATCH 136/362] Stylistic fix

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index cb8530749..198ff2194 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2080,12 +2080,13 @@ our @options =
     {
         name        => "ZM_UPLOAD_STRICT",
         default     => "no",
-        description => "Whether to require strict host key checking for SFTP uploads",
+        description => "Require strict host key checking for SFTP uploads",
         help        => qqq("
             You can require SFTP uploads to verify the host key of the remote server
 			for protection against man-in-the-middle attacks. You will need to add the
-			server's key to \$HOME/.ssh/known_hosts, where \$HOME is the home directory
-			of the web server running ZoneMinder.
+			server's key to the known_hosts file. On most systems, this will be
+			~/.ssh/known_hosts, where ~ is the home directory of the web server running
+			ZoneMinder.
         "),
         requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
         type        => $types{boolean},

From 3a18a62bc69e511c2f68694d79108a81a267666e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Wed, 30 Dec 2015 08:29:45 -0500
Subject: [PATCH 137/362] Add ServerId column when inserting log line into
 database

---
 src/zm_logger.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 91c2ff63b..f9f62efb1 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -603,7 +603,8 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
             char escapedString[(strlen(syslogStart)*2)+1];
 
             mysql_real_escape_string( &mDbConnection, escapedString, syslogStart, strlen(syslogStart) );
-            snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), tid, level, classString, escapedString, file, line );
+			
+            snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line );
             if ( mysql_query( &mDbConnection, sql ) )
             {
                 databaseLevel( NOLOG );

From 3c2c393de6acd5a51b6f1df274f016d7ca822368 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 31 Dec 2015 16:24:56 +1100
Subject: [PATCH 138/362] Initial draft of Multi-server install docs

---
 .../images/zm-multiserver.png                 | Bin 0 -> 48299 bytes
 .../images/zm-multiserver.xml                 |   1 +
 docs/installationguide/index.rst              |   2 +
 docs/installationguide/multiserver.rst        |  46 ++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 docs/installationguide/images/zm-multiserver.png
 create mode 100644 docs/installationguide/images/zm-multiserver.xml
 create mode 100644 docs/installationguide/multiserver.rst

diff --git a/docs/installationguide/images/zm-multiserver.png b/docs/installationguide/images/zm-multiserver.png
new file mode 100644
index 0000000000000000000000000000000000000000..db3ca1aff16094c9bc72435a94bde0829277988c
GIT binary patch
literal 48299
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

literal 0
HcmV?d00001

diff --git a/docs/installationguide/images/zm-multiserver.xml b/docs/installationguide/images/zm-multiserver.xml
new file mode 100644
index 000000000..ce9c36ee9
--- /dev/null
+++ b/docs/installationguide/images/zm-multiserver.xml
@@ -0,0 +1 @@
+<mxfile type="device" userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9" version="5.2.7.2" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
index 58a8f4b21..f1d86f4ab 100644
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@@ -10,3 +10,5 @@ Contents:
    debian
    fedora
    centos
+
+   multiserver
diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
new file mode 100644
index 000000000..faa5cbebb
--- /dev/null
+++ b/docs/installationguide/multiserver.rst
@@ -0,0 +1,46 @@
+Multi-Server Install
+====================
+
+It is possible to run multiple ZoneMinder servers and manage them from a single interface. To achieve this each zoneminder server is connected to a single shared database server and shares file storage for event data.
+
+.. image:: images/zm-multiserver.png
+
+New installs
+============
+
+1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder servers.
+
+2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database server.
+
+3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder servers to the machine targeted as the Database server.
+
+4. Install mysql/mariadb server onto the Database Server.
+
+5. It is advised to run "mysql_secure_installation" to help secure the server.
+
+6. Using the password for the root account set during the previous step, create the ZoneMinder database and configure a database account for ZoneMinder to use:
+
+::
+
+  mysql -u root -p < zm_create.sql
+  mysql -u root -p
+    mysql> grant all on zm.* to 'zmuser'@'%' identified by 'zmpass';
+    mysql> exit;
+  mysqladmin -u root -p reload
+
+The database account credentials, zmuser/zmpass, are arbitrary. Set them to anything that suits your environment.
+Note that these commands are just an example and might not be secure enough for your environment.
+
+7. If you have chosen to change the ZoneMinder database account credentials to something other than zmuser/zmpass, you must now update zm.conf on each ZoneMinder Server. Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous step.
+
+Additionally, you must also edit /usr/share/zoneminder/www/api/app/Config/database.php in a similar manner on each ZoneMinder Server. Scroll down and change login and password to the values you created in the previous step.
+
+8. All ZoneMinders Servers must share a common events folder. This can be done in any manner supported by the underlying operating system. From the Storage Server, share/export a folder to be used for ZoneMinder events.
+
+9. From each ZoneMinder Server, mount the shared events folder on the Storage Server to the events folder on the local ZoneMinder server.
+
+NOTE: The location of this folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
+
+10. Open your browser and point it to the web console on any of the ZoneMinder Servers (they will all be the same). Open Options, click the Servers tab,and populate this screen with all of your ZoneMinder Servers.
+
+11. When creating a new Monitor, remember to select the server the camera will be assigned to from the Server drop down box.

From 251d73ffe02125aff51dde0f05e4b3305b508a0a Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 31 Dec 2015 16:40:49 +1100
Subject: [PATCH 139/362] Edit Toc

---
 docs/installationguide/index.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
index f1d86f4ab..be0df2c06 100644
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@@ -10,5 +10,4 @@ Contents:
    debian
    fedora
    centos
-
    multiserver

From 15fbf587db8014ca2e3aa2254de265a4669add22 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 31 Dec 2015 16:45:22 +1100
Subject: [PATCH 140/362] Fix heading indentation

---
 docs/installationguide/multiserver.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
index faa5cbebb..512184baa 100644
--- a/docs/installationguide/multiserver.rst
+++ b/docs/installationguide/multiserver.rst
@@ -6,7 +6,7 @@ It is possible to run multiple ZoneMinder servers and manage them from a single
 .. image:: images/zm-multiserver.png
 
 New installs
-============
+------------
 
 1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder servers.
 

From 072c11fa825766288e5bb58a564a758cdce1cbd1 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 31 Dec 2015 16:53:38 +1100
Subject: [PATCH 141/362] Fix image border

---
 .../images/zm-multiserver.png                 | Bin 48299 -> 42301 bytes
 .../images/zm-multiserver.xml                 |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/images/zm-multiserver.png b/docs/installationguide/images/zm-multiserver.png
index db3ca1aff16094c9bc72435a94bde0829277988c..894665c33efe79d1424158a6765325d856808e87 100644
GIT binary patch
literal 42301
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
ZJ{~+2I;rK$dYJ_9*HsJS+AHqy{{oqlOb`G7

literal 48299
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

diff --git a/docs/installationguide/images/zm-multiserver.xml b/docs/installationguide/images/zm-multiserver.xml
index ce9c36ee9..ac66909a8 100644
--- a/docs/installationguide/images/zm-multiserver.xml
+++ b/docs/installationguide/images/zm-multiserver.xml
@@ -1 +1 @@
-<mxfile type="device" userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9" version="5.2.7.2" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file
+<mxfile type="device" userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9" version="5.2.7.2" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file

From 0ccce76ef8c64b40f3424be1bbc10ef882e132f8 Mon Sep 17 00:00:00 2001
From: RBxx <rbxx@mail.rbxx.org>
Date: Thu, 31 Dec 2015 16:58:56 +0300
Subject: [PATCH 142/362] Convert ru_ru.php to UTF-8

In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
---
 web/lang/ru_ru.php | 525 +++++++++++++++++++++++----------------------
 1 file changed, 263 insertions(+), 262 deletions(-)

diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 64f7a8ec7..e12c857d2 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -1,3 +1,4 @@
+
 <?php
 //
 // ZoneMinder web UK English language file, $Date$, $Revision$
@@ -50,7 +51,7 @@
 // do this by default, uncomment this if required.
 //
 // Example
-header( "Content-Type: text/html; charset=koi8-r" );
+header( "Content-Type: text/html; charset=utf-8" );
 
 // You may need to change your locale here if your default one is incorrect for the
 // language described in this file, or if you have multiple languages supported.
@@ -71,60 +72,60 @@ header( "Content-Type: text/html; charset=koi8-r" );
 
 // Simple String Replacements
 $SLANG = array(
-    '24BitColour'          => '24 ������ ����',
-    '32BitColour'          => '32 ������ ����',          // Added - 2011-06-15
-    '8BitGrey'             => '256 �������� ������',
+    '24BitColour'          => '24 битный цвет',
+    '32BitColour'          => '32 битный цвет',          // Added - 2011-06-15
+    '8BitGrey'             => '256 оттенков серого',
     'Action'               => 'Action',
-    'Actual'               => '��������������',
+    'Actual'               => 'Действительный',
     'AddNewControl'        => 'Add New Control',
-    'AddNewMonitor'        => '�������� �������',
-    'AddNewUser'           => '�������� ������������',
-    'AddNewZone'           => '�������� ����',
-    'Alarm'                => '�������',
-    'AlarmBrFrames'        => '�����<br/>�������',
-    'AlarmFrame'           => '���� �������',
+    'AddNewMonitor'        => 'Добавить монитор',
+    'AddNewUser'           => 'Добавить пользователя',
+    'AddNewZone'           => 'Добавить зону',
+    'Alarm'                => 'Тревога',
+    'AlarmBrFrames'        => 'Кадры<br/>тревоги',
+    'AlarmFrame'           => 'Кадр тревоги',
     'AlarmFrameCount'      => 'Alarm Frame Count',
-    'AlarmLimits'          => '����.&nbsp;����&nbsp;����.',
+    'AlarmLimits'          => 'Гран.&nbsp;зоны&nbsp;трев.',
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
-    'AlarmPx'              => '���&nbsp;����.',
+    'AlarmPx'              => 'Пкс&nbsp;трев.',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
     'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
-    'Alert'                => '���������',
-    'All'                  => '���',
+    'Alert'                => 'Настороже',
+    'All'                  => 'Все',
     'AnalysisFPS'          => 'Analysis FPS',           // Added - 2015-07-22
     'AnalysisUpdateDelay'  => 'Analysis Update Delay',  // Added - 2015-07-23
-    'Apply'                => '���������',
-    'ApplyingStateChange'  => '��������� ������� ����������',
-    'ArchArchived'         => '������ � ������',
-    'ArchUnarchived'       => '������ �� � ������',
-    'Archive'              => '�����',
+    'Apply'                => 'Применить',
+    'ApplyingStateChange'  => 'Состояние сервиса изменяется',
+    'ArchArchived'         => 'Только в архиве',
+    'ArchUnarchived'       => 'Только не в архиве',
+    'Archive'              => 'Архив',
     'Archived'             => 'Archived',
     'Area'                 => 'Area',
     'AreaUnits'            => 'Area (px/%)',
-    'AttrAlarmFrames'      => '���-�� ������ �������',
-    'AttrArchiveStatus'    => '������ ���������',
-    'AttrAvgScore'         => '����. ������',
+    'AttrAlarmFrames'      => 'Кол-во кадров тревоги',
+    'AttrArchiveStatus'    => 'Статус архивации',
+    'AttrAvgScore'         => 'Сред. оценка',
     'AttrCause'            => 'Cause',
-    'AttrDate'             => '����',
-    'AttrDateTime'         => '����/�����',
+    'AttrDate'             => 'Дата',
+    'AttrDateTime'         => 'Дата/Время',
     'AttrDiskBlocks'       => 'Disk Blocks',
     'AttrDiskPercent'      => 'Disk Percent',
-    'AttrDuration'         => '������������',
-    'AttrFrames'           => '���-�� ������',
+    'AttrDuration'         => 'Длительность',
+    'AttrFrames'           => 'Кол-во кадров',
     'AttrId'               => 'Id',
-    'AttrMaxScore'         => '����. ������',
-    'AttrMonitorId'        => 'Id ��������',
-    'AttrMonitorName'      => '�������� ��������',
+    'AttrMaxScore'         => 'Макс. оценка',
+    'AttrMonitorId'        => 'Id Монитора',
+    'AttrMonitorName'      => 'Название Монитора',
     'AttrName'             => 'Name',
     'AttrNotes'            => 'Notes',
     'AttrSystemLoad'       => 'System Load',
-    'AttrTime'             => '�����',
-    'AttrTotalScore'       => '����. ������',
-    'AttrWeekday'          => '���� ������',
+    'AttrTime'             => 'Время',
+    'AttrTotalScore'       => 'Сумм. оценка',
+    'AttrWeekday'          => 'День недели',
     'Auto'                 => 'Auto',
     'AutoStopTimeout'      => 'Auto Stop Timeout',
     'Available'            => 'Available',              // Added - 2009-03-31
-    'AvgBrScore'           => '����.<br/>������',
+    'AvgBrScore'           => 'Сред.<br/>оценка',
     'Background'           => 'Background',
     'BackgroundFilter'     => 'Run filter in background',
     'BadAlarmFrameCount'   => 'Alarm frame count must be an integer of one or more',
@@ -157,14 +158,14 @@ $SLANG = array(
     'BadWarmupCount'       => 'Warmup frames must be an integer of zero or more',
     'BadWebColour'         => 'Web colour must be a valid web colour string',
     'BadWidth'             => 'Width must be set to a valid value',
-    'Bandwidth'            => '�����',
+    'Bandwidth'            => 'канал',
     'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
-    'BlobPx'               => '��� �������',
-    'BlobSizes'            => '������ ��������',
-    'Blobs'                => '���-�� ��������',
-    'Brightness'           => '�������',
+    'BlobPx'               => 'Пкс объекта',
+    'BlobSizes'            => 'Размер объектов',
+    'Blobs'                => 'Кол-во объектов',
+    'Brightness'           => 'Яркость',
     'Buffer'               => 'Buffer',                 // Added - 2015-04-18
-    'Buffers'              => '������',
+    'Buffers'              => 'Буферы',
     'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
@@ -204,35 +205,35 @@ $SLANG = array(
     'CanZoomAbs'           => 'Can Zoom Absolute',
     'CanZoomCon'           => 'Can Zoom Continuous',
     'CanZoomRel'           => 'Can Zoom Relative',
-    'Cancel'               => '��������',
-    'CancelForcedAlarm'    => '�������� ������������� �������',
-    'CaptureHeight'        => '������ �� Y',
+    'Cancel'               => 'Отменить',
+    'CancelForcedAlarm'    => 'Отменить форсированную тревогу',
+    'CaptureHeight'        => 'Размер по Y',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
-    'CapturePalette'       => '����� �������',
+    'CapturePalette'       => 'Режим захвата',
     'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
-    'CaptureWidth'         => '������ �� X',
+    'CaptureWidth'         => 'Размер по X',
     'Cause'                => 'Cause',
-    'CheckMethod'          => '����� �������� �������',
+    'CheckMethod'          => 'Метод проверки тревоги',
     'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
-    'ChooseFilter'         => '������� ������',
+    'ChooseFilter'         => 'Выбрать фильтр',
     'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
     'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
     'ChoosePreset'         => 'Choose Preset',
     'Clear'                => 'Clear',                  // Added - 2011-06-16
-    'Close'                => '�������',
-    'Colour'               => '����',
+    'Close'                => 'Закрыть',
+    'Colour'               => 'Цвет',
     'Command'              => 'Command',
     'Component'            => 'Component',              // Added - 2011-06-16
     'Config'               => 'Config',
-    'ConfiguredFor'        => '�������� ��',
+    'ConfiguredFor'        => 'Настроен на',
     'ConfirmDeleteEvents'  => 'Are you sure you wish to delete the selected events?',
-    'ConfirmPassword'      => '����������� ������',
-    'ConjAnd'              => '�',
-    'ConjOr'               => '���',
-    'Console'              => '������',
-    'ContactAdmin'         => '���������� ���������� � ������ ��������������.',
+    'ConfirmPassword'      => 'Подтвердите пароль',
+    'ConjAnd'              => 'и',
+    'ConjOr'               => 'или',
+    'Console'              => 'Сервер',
+    'ContactAdmin'         => 'Пожалуйста обратитесь к вашему администратору.',
     'Continue'             => 'Continue',
-    'Contrast'             => '��������',
+    'Contrast'             => 'Контраст',
     'Control'              => 'Control',
     'ControlAddress'       => 'Control Address',
     'ControlCap'           => 'Control Capability',
@@ -242,29 +243,29 @@ $SLANG = array(
     'Controllable'         => 'Controllable',
     'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
-    'CycleWatch'           => '����������� ��������',
+    'CycleWatch'           => 'Циклический просмотр',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
-    'Day'                  => '����',
+    'Day'                  => 'День',
     'Debug'                => 'Debug',
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
     'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
     'Delay'                => 'Delay',                  // Added - 2015-04-18
-    'Delete'               => '�������',
-    'DeleteAndNext'        => '������� &amp; ����.',
-    'DeleteAndPrev'        => '������� &amp; ����.',
-    'DeleteSavedFilter'    => '������� ����������� ������',
-    'Description'          => '��������',
+    'Delete'               => 'Удалить',
+    'DeleteAndNext'        => 'Удалить &amp; след.',
+    'DeleteAndPrev'        => 'Удалить &amp; пред.',
+    'DeleteSavedFilter'    => 'Удалить сохраненный фильтр',
+    'Description'          => 'Описание',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
     'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
-    'DeviceChannel'        => '�����',
-    'DeviceFormat'         => '������',
-    'DeviceNumber'         => '����� ����������',
+    'DeviceChannel'        => 'Канал',
+    'DeviceFormat'         => 'Формат',
+    'DeviceNumber'         => 'Номер устройства',
     'DevicePath'           => 'Device Path',
     'Devices'              => 'Devices',
-    'Dimensions'           => '�������',
+    'Dimensions'           => 'Размеры',
     'DisableAlarms'        => 'Disable Alarms',
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
@@ -281,23 +282,23 @@ $SLANG = array(
     'DonateYes'            => 'Yes, I\'d like to donate now',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
-    'Duration'             => '������������',
-    'Edit'                 => '��������������',
+    'Duration'             => 'Длительность',
+    'Edit'                 => 'Редактирование',
     'Email'                => 'Email',
     'EnableAlarms'         => 'Enable Alarms',
-    'Enabled'              => '��������',
-    'EnterNewFilterName'   => '������� ����� �������� �������',
-    'Error'                => '������',
-    'ErrorBrackets'        => '������: ���������� ����������� � ����������� ������ ������ ���� ����������',
-    'ErrorValidValue'      => '������: ��������� ��� ��� ����� ����� �������������� ��������',
-    'Etc'                  => '� �.�.',
-    'Event'                => '�������',
-    'EventFilter'          => '������ �������',
+    'Enabled'              => 'разрешен',
+    'EnterNewFilterName'   => 'Введите новое название фильтра',
+    'Error'                => 'Ошибка',
+    'ErrorBrackets'        => 'Ошибка: количество открывающих и закрывающих скобок должно быть одинаковым',
+    'ErrorValidValue'      => 'Ошибка: проверьте что все термы имеют действительное значение',
+    'Etc'                  => 'и т.д.',
+    'Event'                => 'Событие',
+    'EventFilter'          => 'Фильтр событий',
     'EventId'              => 'Event Id',
     'EventName'            => 'Event Name',
     'EventPrefix'          => 'Event Prefix',
-    'Events'               => '�������',
-    'Exclude'              => '���������',
+    'Events'               => 'События',
+    'Exclude'              => 'Исключить',
     'Execute'              => 'Execute',
     'Export'               => 'Export',
     'ExportDetails'        => 'Export Event Details',
@@ -313,8 +314,8 @@ $SLANG = array(
     'ExportSucceeded'      => 'Export Succeeded',       // Added - 2009-02-08
     'ExportVideoFiles'     => 'Export Video Files (if present)',
     'Exporting'            => 'Exporting',
-    'FPS'                  => '�/c',
-    'FPSReportInterval'    => '������ ���������� ��������� ��������',
+    'FPS'                  => 'к/c',
+    'FPSReportInterval'    => 'Период обновления индикации скорости',
     'FTP'                  => 'FTP',
     'Far'                  => 'Far',
     'FastForward'          => 'Fast Forward',
@@ -328,12 +329,12 @@ $SLANG = array(
     'FilterExecuteEvents'  => 'Execute command on all matches',
     'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Message details of all matches',
-    'FilterPx'             => '��� �������',
+    'FilterPx'             => 'Пкс фильтра',
     'FilterUnset'          => 'You must specify a filter width and height',
     'FilterUploadEvents'   => 'Upload all matches',
     'FilterVideoEvents'    => 'Create video for all matches',
     'Filters'              => 'Filters',
-    'First'                => '������',
+    'First'                => 'Первый',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
@@ -343,21 +344,21 @@ $SLANG = array(
     'FnNone'                => 'None',            // Added 2013.08.16.
     'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
-    'ForceAlarm'           => '�������� �������',
+    'ForceAlarm'           => 'Включить тревогу',
     'Format'               => 'Format',
-    'Frame'                => '����',
-    'FrameId'              => 'Id �����',
-    'FrameRate'            => '��������',
-    'FrameSkip'            => '���������� �����',
-    'Frames'               => '�����',
-    'Func'                 => '����.',
-    'Function'             => '�������',
+    'Frame'                => 'Кадр',
+    'FrameId'              => 'Id кадра',
+    'FrameRate'            => 'Скорость',
+    'FrameSkip'            => 'Пропускать кадры',
+    'Frames'               => 'кадры',
+    'Func'                 => 'Функ.',
+    'Function'             => 'Функция',
     'Gain'                 => 'Gain',
     'General'              => 'General',
-    'GenerateVideo'        => '������������ �����',
-    'GeneratingVideo'      => '������������ �����',
-    'GoToZoneMinder'       => '������� �� ZoneMinder.com',
-    'Grey'                 => '�/�',
+    'GenerateVideo'        => 'Генерировать видео',
+    'GeneratingVideo'      => 'Генерируется видео',
+    'GoToZoneMinder'       => 'Перейти на ZoneMinder.com',
+    'Grey'                 => 'ч/б',
     'Group'                => 'Group',
     'Groups'               => 'Groups',
     'HasFocusSpeed'        => 'Has Focus Speed',
@@ -371,25 +372,25 @@ $SLANG = array(
     'HasTurboTilt'         => 'Has Turbo Tilt',
     'HasWhiteSpeed'        => 'Has White Bal. Speed',
     'HasZoomSpeed'         => 'Has Zoom Speed',
-    'High'                 => '�������',
-    'HighBW'               => '������� �����',
+    'High'                 => 'широкий',
+    'HighBW'               => 'Широкий канал',
     'Home'                 => 'Home',
-    'Hour'                 => '���',
-    'Hue'                  => '�������',
+    'Hour'                 => 'Час',
+    'Hue'                  => 'Оттенок',
     'Id'                   => 'Id',
     'Idle'                 => 'Idle',
-    'Ignore'               => '������������',
-    'Image'                => '�����������',
-    'ImageBufferSize'      => '������ ������ �����������',
+    'Ignore'               => 'Игнорировать',
+    'Image'                => 'Изображение',
+    'ImageBufferSize'      => 'Размер буфера изображения',
     'Images'               => 'Images',
     'In'                   => 'In',
-    'Include'              => '��������',
-    'Inverted'             => '�������������',
+    'Include'              => 'Включить',
+    'Inverted'             => 'Инвертировать',
     'Iris'                 => 'Iris',
     'KeyString'            => 'Key String',
     'Label'                => 'Label',
-    'Language'             => '����',
-    'Last'                 => '���������',
+    'Language'             => 'Язык',
+    'Last'                 => 'Последний',
     'Layout'               => 'Layout',                 // Added - 2009-02-08
     'Level'                => 'Level',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
@@ -399,23 +400,23 @@ $SLANG = array(
     'LinkedMonitors'       => 'Linked Monitors',
     'List'                 => 'List',
     'Load'                 => 'Load',
-    'Local'                => '���������',
+    'Local'                => 'Локальный',
     'Log'                  => 'Log',                    // Added - 2011-06-16
-    'LoggedInAs'           => '������������',
+    'LoggedInAs'           => 'Пользователь',
     'Logging'              => 'Logging',                // Added - 2011-06-16
-    'LoggingIn'            => '���� � �������',
-    'Login'                => '�����',
-    'Logout'               => '�����',
+    'LoggingIn'            => 'Вход в систему',
+    'Login'                => 'Войти',
+    'Logout'               => 'Выйти',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
-    'Low'                  => '�����',
-    'LowBW'                => '����� �����',
+    'Low'                  => 'узкий',
+    'LowBW'                => 'Узкий канал',
     'Main'                 => 'Main',
     'Man'                  => 'Man',
     'Manual'               => 'Manual',
-    'Mark'                 => '�����',
-    'Max'                  => '����.',
+    'Mark'                 => 'Метка',
+    'Max'                  => 'Макс.',
     'MaxBandwidth'         => 'Max Bandwidth',
-    'MaxBrScore'           => '����.<br/>������',
+    'MaxBrScore'           => 'Макс.<br/>оценка',
     'MaxFocusRange'        => 'Max Focus Range',
     'MaxFocusSpeed'        => 'Max Focus Speed',
     'MaxFocusStep'         => 'Max Focus Step',
@@ -437,16 +438,16 @@ $SLANG = array(
     'MaxZoomRange'         => 'Max Zoom Range',
     'MaxZoomSpeed'         => 'Max Zoom Speed',
     'MaxZoomStep'          => 'Max Zoom Step',
-    'MaximumFPS'           => '����������� �������� ������ (�/�)',
-    'Medium'               => '�������',
-    'MediumBW'             => '������� �����',
+    'MaximumFPS'           => 'Ограничение скорости записи (к/с)',
+    'Medium'               => 'средний',
+    'MediumBW'             => 'Обычный канал',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',
-    'MinBlobAreaLtMax'     => '����������� ������� ������� ������ ���� ������ ��� ������������ ������� �������',
+    'MinBlobAreaLtMax'     => 'Минимальная площадь объекта должна быть меньше чем максимальная площадь объекта',
     'MinBlobAreaUnset'     => 'You must specify the minimum blob pixel count',
     'MinBlobLtMinFilter'   => 'Minimum blob area should be less than or equal to minimum filter area',
-    'MinBlobsLtMax'        => '����������� ����� �������� ������ ���� ������ ��� ������������ ����� ��������',
+    'MinBlobsLtMax'        => 'Минимальное число объектов должно быть меньше чем максимальное число объектов',
     'MinBlobsUnset'        => 'You must specify the minimum blob count',
     'MinFilterAreaLtMax'   => 'Minimum filter area should be less than maximum',
     'MinFilterAreaUnset'   => 'You must specify the minimum filter pixel count',
@@ -463,7 +464,7 @@ $SLANG = array(
     'MinPanRange'          => 'Min Pan Range',
     'MinPanSpeed'          => 'Min Pan Speed',
     'MinPanStep'           => 'Min Pan Step',
-    'MinPixelThresLtMax'   => '������ ����� ���-�� �������� ������ ���� ���� �������� ������ ���-�� ��������',
+    'MinPixelThresLtMax'   => 'Нижний порог кол-ва пикселей должен быть ниже верхнего порога кол-ва пикселей',
     'MinPixelThresUnset'   => 'You must specify a minimum pixel threshold',
     'MinTiltRange'         => 'Min Tilt Range',
     'MinTiltSpeed'         => 'Min Tilt Speed',
@@ -474,17 +475,17 @@ $SLANG = array(
     'MinZoomRange'         => 'Min Zoom Range',
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
-    'Misc'                 => '������',
+    'Misc'                 => 'Разное',
     'Mode'                 => 'Mode',                   // Added - 2015-04-18
-    'Monitor'              => '�������',
-    'MonitorIds'           => 'Id&nbsp;���������',
+    'Monitor'              => 'Монитор',
+    'MonitorIds'           => 'Id&nbsp;Мониторов',
     'MonitorPreset'        => 'Monitor Preset',
     'MonitorPresetIntro'   => 'Select an appropriate preset from the list below.<br><br>Please note that this may overwrite any values you already have configured for this monitor.<br><br>',
     'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
     'MonitorProbeIntro'    => 'The list below shows detected analog and network cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2009-03-31
-    'Monitors'             => '��������',
+    'Monitors'             => 'Мониторы',
     'Montage'              => 'Montage',
-    'Month'                => '�����',
+    'Month'                => 'Месяц',
     'More'                 => 'More',                   // Added - 2011-06-16
     'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
@@ -493,30 +494,30 @@ $SLANG = array(
     'Mtg3widgrx'           => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
     'Mtg4widgrd'           => '4-wide grid',              // Added 2013.08.15.
     'MtgDefault'           => 'Default',              // Added 2013.08.15.
-    'MustBeGe'             => '������ ���� ������ ��� �����',
-    'MustBeLe'             => '������ ���� ������ ��� �����',
-    'MustConfirmPassword'  => '�� ������ ����������� ������',
-    'MustSupplyPassword'   => '�� ������ ������ ������',
-    'MustSupplyUsername'   => '�� ������ ������ ��� ������������',
-    'Name'                 => '���',
+    'MustBeGe'             => 'должно быть больше или равно',
+    'MustBeLe'             => 'должно быть меньше или равно',
+    'MustConfirmPassword'  => 'Вы должны подтвердить пароль',
+    'MustSupplyPassword'   => 'Вы должны ввести пароль',
+    'MustSupplyUsername'   => 'Вы должны ввести имя пользователя',
+    'Name'                 => 'Имя',
     'Near'                 => 'Near',
-    'Network'              => '����',
-    'New'                  => '���.',
+    'Network'              => 'Сеть',
+    'New'                  => 'Нов.',
     'NewGroup'             => 'New Group',
     'NewLabel'             => 'New Label',
-    'NewPassword'          => '����� ������',
-    'NewState'             => '����� ���������',
-    'NewUser'              => '����� ������������',
-    'Next'                 => '����.',
-    'No'                   => '���',
+    'NewPassword'          => 'Новый пароль',
+    'NewState'             => 'Новое состояние',
+    'NewUser'              => 'Новый пользователь',
+    'Next'                 => 'След.',
+    'No'                   => 'Нет',
     'NoDetectedCameras'    => 'No Detected Cameras',    // Added - 2009-03-31
-    'NoFramesRecorded'     => '��� ������� �� ������� ������',
+    'NoFramesRecorded'     => 'Это событие не содежит кадров',
     'NoGroup'              => 'No Group',
-    'NoSavedFilters'       => '��� ����������� ��������',
-    'NoStatisticsRecorded' => '���������� �� ����� �������/����� �� ��������',
-    'None'                 => '�����������',
-    'NoneAvailable'        => '�� ��������',
-    'Normal'               => '����������',
+    'NoSavedFilters'       => 'нет сохраненных фильтров',
+    'NoStatisticsRecorded' => 'Статистика по этому событию/кадру не записана',
+    'None'                 => 'отсутствует',
+    'NoneAvailable'        => 'не доступны',
+    'Normal'               => 'Нормальная',
     'Notes'                => 'Notes',
     'NumPresets'           => 'Num Presets',
     'Off'                  => 'Off',
@@ -524,106 +525,106 @@ $SLANG = array(
     'OnvifCredentialsIntro'=> 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>', // Added - 2015-04-18
     'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
     'OnvifProbeIntro'      => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
-    'OpEq'                 => '�����',
-    'OpGt'                 => '������',
-    'OpGtEq'               => '������ ���� �����',
-    'OpIn'                 => '� ������',
-    'OpLt'                 => '������',
-    'OpLtEq'               => '������ ��� �����',
-    'OpMatches'            => '���������',
-    'OpNe'                 => '�� �����',
-    'OpNotIn'              => '�� � ������',
-    'OpNotMatches'         => '�� ���������',
+    'OpEq'                 => 'равно',
+    'OpGt'                 => 'больше',
+    'OpGtEq'               => 'больше либо равно',
+    'OpIn'                 => 'в списке',
+    'OpLt'                 => 'меньше',
+    'OpLtEq'               => 'меньше или равно',
+    'OpMatches'            => 'совпадает',
+    'OpNe'                 => 'не равно',
+    'OpNotIn'              => 'не в списке',
+    'OpNotMatches'         => 'не совпадает',
     'Open'                 => 'Open',
     'OptionHelp'           => 'OptionHelp',
-    'OptionRestartWarning' => '��� ��������� ����������� ������ ����� ����������� ���������.',
-    'Options'              => '�����',
-    'OrEnterNewName'       => '��� ������� ����� ���',
+    'OptionRestartWarning' => 'Эти изменения подействуют только после перезапуска программы.',
+    'Options'              => 'Опции',
+    'OrEnterNewName'       => 'или введите новое имя',
     'Order'                => 'Order',
-    'Orientation'          => '����������',
+    'Orientation'          => 'Ориентация',
     'Out'                  => 'Out',
-    'OverwriteExisting'    => '������������ ������������',
-    'Paged'                => '�� ���������',
+    'OverwriteExisting'    => 'Перезаписать существующее',
+    'Paged'                => 'По страницам',
     'Pan'                  => 'Pan',
     'PanLeft'              => 'Pan Left',
     'PanRight'             => 'Pan Right',
     'PanTilt'              => 'Pan/Tilt',
-    'Parameter'            => '�������',
-    'Password'             => '������',
-    'PasswordsDifferent'   => '������ �� ���������',
-    'Paths'                => '����',
+    'Parameter'            => 'Парамер',
+    'Password'             => 'Пароль',
+    'PasswordsDifferent'   => 'Пароли не совпадают',
+    'Paths'                => 'Пути',
     'Pause'                => 'Pause',
     'Phone'                => 'Phone',
-    'PhoneBW'              => '���������� �����',
+    'PhoneBW'              => 'Телефонная линия',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
     'PixelDiff'            => 'Pixel Diff',
-    'Pixels'               => '� ��������',
+    'Pixels'               => 'в пикселях',
     'Play'                 => 'Play',
     'PlayAll'              => 'Play All',
-    'PleaseWait'           => '���������� ���������',
+    'PleaseWait'           => 'Пожалуйста подождите',
     'Plugins'              => 'Plugins',
     'Point'                => 'Point',
-    'PostEventImageBuffer' => '����� ����� �������',
-    'PreEventImageBuffer'  => '����� �� �������',
+    'PostEventImageBuffer' => 'Буфер после события',
+    'PreEventImageBuffer'  => 'Буфер до события',
     'PreserveAspect'       => 'Preserve Aspect Ratio',
     'Preset'               => 'Preset',
     'Presets'              => 'Presets',
-    'Prev'                 => '����.',
+    'Prev'                 => 'Пред.',
     'Probe'                => 'Probe',                  // Added - 2009-03-31
     'ProfileProbe'         => 'Stream Probe',           // Added - 2015-04-18
     'ProfileProbeIntro'    => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>', // Added - 2015-04-18
     'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
-    'Rate'                 => '��������',
-    'Real'                 => '��������',
+    'Rate'                 => 'Скорость',
+    'Real'                 => 'Реальная',
     'Record'               => 'Record',
-    'RefImageBlendPct'     => '������������ �������� �����, %',
-    'Refresh'              => '��������',
-    'Remote'               => '���������',
-    'RemoteHostName'       => '��� ���������� �����',
-    'RemoteHostPath'       => '���� �� ��������� �����',
-    'RemoteHostPort'       => '��������� ����',
+    'RefImageBlendPct'     => 'Прозрачность опорного кадра, %',
+    'Refresh'              => 'Обновить',
+    'Remote'               => 'Удаленный',
+    'RemoteHostName'       => 'Имя удаленного хоста',
+    'RemoteHostPath'       => 'Путь на удаленном хосте',
+    'RemoteHostPort'       => 'удаленный порт',
     'RemoteHostSubPath'    => 'Remote Host SubPath',    // Added - 2009-02-08
-    'RemoteImageColours'   => '��������� �� ��������� �����',
+    'RemoteImageColours'   => 'Цветность на удаленном хосте',
     'RemoteMethod'         => 'Remote Method',          // Added - 2009-02-08
     'RemoteProtocol'       => 'Remote Protocol',        // Added - 2009-02-08
-    'Rename'               => '�������������',
+    'Rename'               => 'Переименовать',
     'Replay'               => 'Replay',
     'ReplayAll'            => 'All Events',
     'ReplayGapless'        => 'Gapless Events',
     'ReplaySingle'         => 'Single Event',
     'Reset'                => 'Reset',
-    'ResetEventCounts'     => '�������� ������� �������',
-    'Restart'              => '�������������',
-    'Restarting'           => '���������������',
-    'RestrictedCameraIds'  => 'Id ����������� �����',
+    'ResetEventCounts'     => 'Обнулить счетчик событий',
+    'Restart'              => 'Перезапустить',
+    'Restarting'           => 'Перезапускается',
+    'RestrictedCameraIds'  => 'Id запрещенных камер',
     'RestrictedMonitors'   => 'Restricted Monitors',
     'ReturnDelay'          => 'Return Delay',
     'ReturnLocation'       => 'Return Location',
     'Rewind'               => 'Rewind',
-    'RotateLeft'           => '��������� �����',
-    'RotateRight'          => '��������� ������',
+    'RotateLeft'           => 'Повернуть влево',
+    'RotateRight'          => 'Повернуть вправо',
     'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
-    'RunMode'              => '����� ������',
-    'RunState'             => '���������',
-    'Running'              => '�����������',
-    'Save'                 => '���������',
-    'SaveAs'               => '��������� ���',
-    'SaveFilter'           => '��������� ������',
-    'Scale'                => '�������',
-    'Score'                => '������',
-    'Secs'                 => '���.',
-    'Sectionlength'        => '����� ������ (� ������)',
+    'RunMode'              => 'Режим работы',
+    'RunState'             => 'Состояние',
+    'Running'              => 'Выполняется',
+    'Save'                 => 'Сохранить',
+    'SaveAs'               => 'Сохранить как',
+    'SaveFilter'           => 'Сохранить фильтр',
+    'Scale'                => 'Масштаб',
+    'Score'                => 'Оценка',
+    'Secs'                 => 'Сек.',
+    'Sectionlength'        => 'Длина секции (в кадрах)',
     'Select'               => 'Select',
     'SelectFormat'         => 'Select Format',          // Added - 2011-06-17
     'SelectLog'            => 'Select Log',             // Added - 2011-06-17
     'SelectMonitors'       => 'Select Monitors',
     'SelfIntersecting'     => 'Polygon edges must not intersect',
     'Set'                  => 'Set',
-    'SetNewBandwidth'      => '��������� ����� ������ ������',
+    'SetNewBandwidth'      => 'Установка новой ширина канала',
     'SetPreset'            => 'Set Preset',
-    'Settings'             => '���������',
-    'ShowFilterWindow'     => '�������� ���� �������',
+    'Settings'             => 'Настройки',
+    'ShowFilterWindow'     => 'Показать окно фильтра',
     'ShowTimeline'         => 'Show Timeline',
     'SignalCheckColour'    => 'Signal Check Colour',
     'Size'                 => 'Size',
@@ -632,19 +633,19 @@ $SLANG = array(
     'SortAsc'              => 'Asc',
     'SortBy'               => 'Sort by',
     'SortDesc'             => 'Desc',
-    'Source'               => '��������',
+    'Source'               => 'Источник',
     'SourceColours'        => 'Source Colours',         // Added - 2009-02-08
     'SourcePath'           => 'Source Path',            // Added - 2009-02-08
-    'SourceType'           => '��� ���������',
+    'SourceType'           => 'Тип источника',
     'Speed'                => 'Speed',
     'SpeedHigh'            => 'High Speed',
     'SpeedLow'             => 'Low Speed',
     'SpeedMedium'          => 'Medium Speed',
     'SpeedTurbo'           => 'Turbo Speed',
-    'Start'                => '���������',
-    'State'                => '���������',
-    'Stats'                => '����������',
-    'Status'               => '������',
+    'Start'                => 'Запустить',
+    'State'                => 'Состояние',
+    'Stats'                => 'Статистика',
+    'Status'               => 'Статус',
     'Step'                 => 'Step',
     'StepBack'             => 'Step Back',
     'StepForward'          => 'Step Forward',
@@ -652,84 +653,84 @@ $SLANG = array(
     'StepMedium'           => 'Medium Step',
     'StepNone'             => 'No Step',
     'StepSmall'            => 'Small Step',
-    'Stills'               => '����-�����',
-    'Stop'                 => '����������',
-    'Stopped'              => '����������',
-    'Stream'               => '�����',
+    'Stills'               => 'Стоп-кадры',
+    'Stop'                 => 'Остановить',
+    'Stopped'              => 'Остановлен',
+    'Stream'               => 'Поток',
     'StreamReplayBuffer'   => 'Stream Replay Image Buffer',
     'Submit'               => 'Submit',
-    'System'               => '�������',
+    'System'               => 'Система',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
     'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
-    'Time'                 => '�����',
-    'TimeDelta'            => '������������� �����',
-    'TimeStamp'            => '����� �������',
+    'Time'                 => 'Время',
+    'TimeDelta'            => 'Относительное время',
+    'TimeStamp'            => 'Метка времени',
     'Timeline'             => 'Timeline',
     'TimelineTip1'         => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
     'TimelineTip2'         => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
     'TimelineTip3'         => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
     'TimelineTip4'         => 'Use the controls below to zoom out or navigate back and forward through the time range.',              // Added 2013.08.15.
-    'Timestamp'            => '����� �������',
-    'TimestampLabelFormat' => '������ �����',
-    'TimestampLabelX'      => 'X-���������� �����',
-    'TimestampLabelY'      => 'Y-���������� �����',
+    'Timestamp'            => 'Метка времени',
+    'TimestampLabelFormat' => 'Формат метки',
+    'TimestampLabelX'      => 'X-координата метки',
+    'TimestampLabelY'      => 'Y-координата метки',
     'Today'                => 'Today',
-    'Tools'                => '�����������',
+    'Tools'                => 'Инструменты',
     'Total'                => 'Total',                  // Added - 2011-06-16
-    'TotalBrScore'         => '����.<br/>������',
+    'TotalBrScore'         => 'Сумм.<br/>оценка',
     'TrackDelay'           => 'Track Delay',
     'TrackMotion'          => 'Track Motion',
-    'Triggers'             => '��������',
+    'Triggers'             => 'Триггеры',
     'TurboPanSpeed'        => 'Turbo Pan Speed',
     'TurboTiltSpeed'       => 'Turbo Tilt Speed',
-    'Type'                 => '���',
-    'Unarchive'            => '��.&nbsp;��&nbsp;������',
+    'Type'                 => 'Тип',
+    'Unarchive'            => 'Уд.&nbsp;из&nbsp;архива',
     'Undefined'            => 'Undefined',              // Added - 2009-02-08
-    'Units'                => '��. ���������',
+    'Units'                => 'Ед. измерения',
     'Unknown'              => 'Unknown',
     'Update'               => 'Update',
-    'UpdateAvailable'      => '�������� ���������� ZoneMinder',
-    'UpdateNotNecessary'   => '���������� �� ���������',
+    'UpdateAvailable'      => 'Доступно обновление ZoneMinder',
+    'UpdateNotNecessary'   => 'Обновление не требуется',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UseFilter'            => '������������ ������',
-    'UseFilterExprsPost'   => '&nbsp;���������&nbsp;���&nbsp;�������', // This is used at the end of the phrase 'use N filter expressions'
-    'UseFilterExprsPre'    => '�����.&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UseFilter'            => 'Использовать фильтр',
+    'UseFilterExprsPost'   => '&nbsp;выражений&nbsp;для&nbsp;фильтра', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'    => 'Испол.&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
     'UsedPlugins'	   => 'Used Plugins',
-    'User'                 => '������������',
-    'Username'             => '��� ������������',
-    'Users'                => '������������',
+    'User'                 => 'Пользователь',
+    'Username'             => 'Имя пользователя',
+    'Users'                => 'Пользователи',
     'V4L'                  => 'V4L',                    // Added - 2015-04-18
     'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
     'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
-    'Value'                => '��������',
-    'Version'              => '������',
-    'VersionIgnore'        => '������������ ��� ������',
-    'VersionRemindDay'     => '��������� ����� ����',
-    'VersionRemindHour'    => '��������� ����� ���',
-    'VersionRemindNever'   => '�� �������� � ����� �������',
-    'VersionRemindWeek'    => '��������� ����� ������',
-    'Video'                => '�����',
+    'Value'                => 'Значение',
+    'Version'              => 'Версия',
+    'VersionIgnore'        => 'Игнорировать эту версию',
+    'VersionRemindDay'     => 'Напомнить через день',
+    'VersionRemindHour'    => 'Напомнить через час',
+    'VersionRemindNever'   => 'Не говорить о новых версиях',
+    'VersionRemindWeek'    => 'Напомнить через неделю',
+    'Video'                => 'Видео',
     'VideoFormat'          => 'Video Format',
-    'VideoGenFailed'       => '������ ��������� �����!',
+    'VideoGenFailed'       => 'Ошибка генерации видео!',
     'VideoGenFiles'        => 'Existing Video Files',
     'VideoGenNoFiles'      => 'No Video Files Found',
-    'VideoGenParms'        => '��������� ��������� �����',
+    'VideoGenParms'        => 'Параметры генерации видео',
     'VideoGenSucceeded'    => 'Video Generation Succeeded!',
-    'VideoSize'            => '������ �����������',
-    'View'                 => '��������',
-    'ViewAll'              => '�����. ���',
+    'VideoSize'            => 'Размер изображения',
+    'View'                 => 'Просмотр',
+    'ViewAll'              => 'Просм. все',
     'ViewEvent'            => 'View Event',
-    'ViewPaged'            => '�����. �����������',
+    'ViewPaged'            => 'Просм. постранично',
     'Wake'                 => 'Wake',
-    'WarmupFrames'         => '����� ���������',
+    'WarmupFrames'         => 'Кадры разогрева',
     'Watch'                => 'Watch',
-    'Web'                  => '���������',
+    'Web'                  => 'Интерфейс',
     'WebColour'            => 'Web Colour',
-    'Week'                 => '������',
+    'Week'                 => 'Неделя',
     'White'                => 'White',
     'WhiteBalance'         => 'White Balance',
     'Wide'                 => 'Wide',
@@ -739,10 +740,10 @@ $SLANG = array(
     'X10InputAlarmString'  => 'X10 Input Alarm String',
     'X10OutputAlarmString' => 'X10 Output Alarm String',
     'Y'                    => 'Y',
-    'Yes'                  => '��',
-    'YouNoPerms'           => '� ��� �� ���������� ���� ��� ������� � ����� �������.',
-    'Zone'                 => '����',
-    'ZoneAlarmColour'      => '���� ������� (Red/Green/Blue)',
+    'Yes'                  => 'Да',
+    'YouNoPerms'           => 'У вас не достаточно прав для доступа к этому ресурсу.',
+    'Zone'                 => 'Зона',
+    'ZoneAlarmColour'      => 'Цвет тревоги (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
     'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
@@ -753,7 +754,7 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'Zones'                => '����',
+    'Zones'                => 'Зоны',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
     'ZoomOut'              => 'Zoom Out',
@@ -761,13 +762,13 @@ $SLANG = array(
 
 // Complex replacements with formatting and/or placements, must be passed through sprintf
 $CLANG = array(
-    'CurrentLogin'         => '������� ������������: \'%1$s\'',
+    'CurrentLogin'         => 'Текущий пользователь: \'%1$s\'',
     'EventCount'           => '%1$s %2$s', // For example '37 Events' (from Vlang below)
-    'LastEvents'           => '��������� %1$s %2$s', // For example 'Last 37 Events' (from Vlang below)
-    'LatestRelease'        => '��������� ������: v%1$s, � ��� �����������: v%2$s.',
+    'LastEvents'           => 'Последние %1$s %2$s', // For example 'Last 37 Events' (from Vlang below)
+    'LatestRelease'        => 'Последняя версия: v%1$s, у Вас установлена: v%2$s.',
     'MonitorCount'         => '%1$s %2$s', // For example '4 Monitors' (from Vlang below)
-    'MonitorFunction'      => '������� �������� %1$s',
-    'RunningRecentVer'     => '� ��� ����������� �������� ������ ZoneMinder, v%s.', 
+    'MonitorFunction'      => 'Функция монитора %1$s',
+    'RunningRecentVer'     => 'У вас установлена новейшая версия ZoneMinder, v%s.', 
     'VersionMismatch'      => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
 );
 
@@ -807,8 +808,8 @@ $CLANG = array(
 
 // Variable arrays expressing plurality, see the zmVlang description above
 $VLANG = array(
-    'Event'                => array( 1=>'�������', 2=>'�������', 3=>'�������' ),
-    'Monitor'              => array( 1=>'���������', 2=>'�������', 3=>'��������' ),
+    'Event'                => array( 1=>'Событий', 2=>'Событие', 3=>'События' ),
+    'Monitor'              => array( 1=>'Мониторов', 2=>'Монитор', 3=>'Монитора' ),
 );
 
 // You will need to choose or write a function that can correlate the plurality string arrays

From 983b47f6dc0e0d5655730b27b7614f8cda2c3f60 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Thu, 31 Dec 2015 09:09:57 -0500
Subject: [PATCH 143/362] Add Server columns

---
 web/skins/classic/views/log.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index 06e3d9a68..93b2c0b39 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -54,6 +54,7 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
     <div id="content">
       <div id="filters"><?php echo translate('FilterLog') ?> -
         <?php echo translate('Component') ?> <select id="filter[Component]" onchange="filterLog(this)"><option value="">-----</option></select>
+        <?php echo translate('Server') ?> <select id="filter[Server]" onchange="filterLog(this)"><option value="">-----</option></select>
         <?php echo translate('Pid') ?> <select id="filter[Pid]" onchange="filterLog(this)"><option value="">-----</option></select>
         <?php echo translate('Level') ?> <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select>
         <?php echo translate('File') ?> <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select>
@@ -67,6 +68,7 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
             <tr>
               <th><?php echo translate('DateTime') ?></th>
               <th class="table-th-nosort"><?php echo translate('Component') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Server') ?></th>
               <th class="table-th-nosort"><?php echo translate('Pid') ?></th>
               <th class="table-th-nosort"><?php echo translate('Level') ?></th>
               <th class="table-th-nosort"><?php echo translate('Message') ?></th>

From 31ba0221edd22aeed2664a6b10bee105452d0851 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Thu, 31 Dec 2015 10:13:03 -0500
Subject: [PATCH 144/362] Add Server to filters and log results

---
 web/skins/classic/views/js/log.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index e804d18f8..011c4beb0 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -22,7 +22,7 @@ var logTimeout = maxSampleTime;
 var firstLoad = true;
 var initialDisplayLimit = 200;
 var sortReversed = false;
-var filterFields = [ 'Component', 'Pid', 'Level', 'File', 'Line'];
+var filterFields = [ 'Component', 'Server', 'Pid', 'Level', 'File', 'Line'];
 var options = {};
 
 function buildFetchParms( parms )
@@ -68,7 +68,7 @@ function logResponse( respObj )
                             maxLogTime = log.TimeKey;
                         if ( !minLogTime || log.TimeKey < minLogTime )
                             minLogTime = log.TimeKey;
-                        var row = logTable.push( [ { content: log.DateTime, properties: { style: 'white-space: nowrap' }}, log.Component, log.Pid, log.Code, log.Message, log.File, log.Line ] );
+                        var row = logTable.push( [ { content: log.DateTime, properties: { style: 'white-space: nowrap' }}, log.Component, log.Server, log.Pid, log.Code, log.Message, log.File, log.Line ] );
                         delete log.Message;
                         row.tr.store( 'log', log );
                         if ( log.Level <= -3 )

From bfe4175fdf0f233bc3eb0a25ed93f3051f5dbc52 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Thu, 31 Dec 2015 10:13:25 -0500
Subject: [PATCH 145/362] Add Server to filters and log results

---
 web/ajax/log.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index 3decbd124..c01fd8dae 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -38,7 +38,7 @@ switch ( $_REQUEST['task'] )
         $sortField = isset($_POST['sortField'])?$_POST['sortField']:'TimeKey';
         $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc':'desc';
 
-        $filterFields = array( 'Component', 'Pid', 'Level', 'File', 'Line' );
+        $filterFields = array( 'Component', 'ServerId', 'Pid', 'Level', 'File', 'Line' );
 
         $total = dbFetchOne( "SELECT count(*) AS Total FROM Logs", 'Total' );
         $sql = 'SELECT * FROM Logs';
@@ -136,6 +136,13 @@ switch ( $_REQUEST['task'] )
         $sortField = isset($_POST['sortField'])?$_POST['sortField']:'TimeKey';
         $sortOrder = isset($_POST['sortOrder'])?$_POST['sortOrder']:'asc';
 
+		$servers = Server::find_all();
+		$servers_by_Id = array();
+		# There is probably a better way to do this.
+		foreach ( $servers as $server ) {
+			$servers_by_Id[$server->Id()] = $server;
+		}
+
         $sql = "select * from Logs";
         $where = array();
 		$values = array();
@@ -212,10 +219,20 @@ switch ( $_REQUEST['task'] )
             }
             case 'tsv' :
             {
-                fprintf( $exportFP, translate('DateTime')."\t".translate('Component')."\t".translate('Pid')."\t".translate('Level')."\t".translate('Message')."\t".translate('File')."\t".translate('Line')."\n" );
+				# This line doesn't need fprintf, it could use fwrite
+                fprintf( $exportFP, join( "\t",
+					translate('DateTime'),
+					translate('Component'),
+					translate('Server'),
+					translate('Pid'),
+					translate('Level'),
+					translate('Message'),
+					translate('File'),
+					translate('Line')
+					   )."\n" );
                 foreach ( $logs as $log )
                 {
-                    fprintf( $exportFP, "%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+                    fprintf( $exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $servers_by_Id[$log['ServerId']]->Name(),$log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
                 }
                 break;
             }
@@ -265,7 +282,7 @@ tr.log-dbg td {
     <p>'.count($logs).' '.translate('Logs').'</p>
     <table>
       <tbody>
-        <tr><th>'.translate('DateTime').'</th><th>'.translate('Component').'</th><th>'.translate('Pid').'</th><th>'.translate('Level').'</th><th>'.translate('Message').'</th><th>'.translate('File').'</th><th>'.translate('Line').'</th></tr>
+        <tr><th>'.translate('DateTime').'</th><th>'.translate('Component').'</th><th>'.translate('Server').'</th><th>'.translate('Pid').'</th><th>'.translate('Level').'</th><th>'.translate('Message').'</th><th>'.translate('File').'</th><th>'.translate('Line').'</th></tr>
 ' );
                 foreach ( $logs as $log )
                 {
@@ -275,7 +292,7 @@ tr.log-dbg td {
                     elseif ( $classLevel > Logger::DEBUG )
                         $classLevel = Logger::DEBUG;
                     $logClass = 'log-'.strtolower(Logger::$codes[$classLevel]);
-                    fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+                    fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $servers_by_Id[$log['ServerId']]->Name(), $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
                 }
                 fwrite( $exportFP, 
 '      </tbody>
@@ -298,7 +315,7 @@ tr.log-dbg td {
   </filter>' );
                 fwrite( $exportFP, 
 '  <columns>
-    <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</column><column field="pid">'.translate('Pid').'</column><column field="level">'.translate('Level').'</column><column field="message">'.translate('Message').'</column><column field="file">'.translate('File').'</column><column field="line">'.translate('Line').'</column>
+    <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</column><column field="'.translate('Server').'</column><column field="pid">'.translate('Pid').'</column><column field="level">'.translate('Level').'</column><column field="message">'.translate('Message').'</column><column field="file">'.translate('File').'</column><column field="line">'.translate('Line').'</column>
   </columns>
   <logs count="'.count($logs).'">
 ' );
@@ -308,12 +325,13 @@ tr.log-dbg td {
 "    <log>
       <datetime>%s</datetime>
       <component>%s</component>
+      <server>%s</server>
       <pid>%d</pid>
       <level>%s</level>
       <message><![CDATA[%s]]></message>
       <file>%s</file>
       <line>%d</line>
-    </log>\n", $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], utf8_decode( $log['Message'] ), $log['File'], $log['Line'] );
+    </log>\n", $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], utf8_decode( $log['Message'] ), $log['File'], $log['Line'] );
                 }
                 fwrite( $exportFP, 
 '  </logs>

From 12ee147bc767296b25e474b06b56c208e6106a5f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Thu, 31 Dec 2015 10:13:48 -0500
Subject: [PATCH 146/362] Add a find_all function to return an array of Server
 objects

---
 web/includes/Server.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 79dbb7ddb..d254227ca 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,6 +1,7 @@
 <?php
 require_once( 'database.php' );
 class Server {
+
     public function __construct( $IdOrRow = NULL ) {
 		$row = NULL;
 		if ( $IdOrRow ) {
@@ -22,6 +23,15 @@ class Server {
 			$this->{'Hostname'} = '';
 		}
     }
+	public static function find_all() {
+		$servers = array();
+		$result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+		$results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+		foreach ( $results as $row => $server_obj ) {
+			$servers[] = $server_obj;
+		}
+		return $servers;
+	}
 
 	public function Url() {
 		return ZM_BASE_PROTOCOL . '://'. $this->Hostname();

From 8e25b80252f45e8d796d29b24e3b29da4c410ad1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Thu, 31 Dec 2015 10:14:20 -0500
Subject: [PATCH 147/362] bump version due to db change adding ServerId to Logs

---
 CMakeLists.txt            |  2 +-
 configure.ac              |  2 +-
 db/zm_create.sql.in       |  1 +
 db/zm_update-1.28.110.sql | 21 +++++++++++++++++++++
 version                   |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 db/zm_update-1.28.110.sql

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b07156919..61f77f6a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.28.109")
+set(zoneminder_VERSION "1.28.110")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
diff --git a/configure.ac b/configure.ac
index b9d4ef2ee..72753c94c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-AC_INIT(zm,1.28.109,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.28.110,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 53bfa1fa8..8239566df 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -269,6 +269,7 @@ DROP TABLE IF EXISTS `Logs`;
 CREATE TABLE `Logs` (
   `TimeKey` decimal(16,6) NOT NULL,
   `Component` varchar(32) NOT NULL,
+  `ServerId` int(10) unsigned,
   `Pid` smallint(6) DEFAULT NULL,
   `Level` tinyint(3) NOT NULL,
   `Code` char(3) NOT NULL,
diff --git a/db/zm_update-1.28.110.sql b/db/zm_update-1.28.110.sql
new file mode 100644
index 000000000..a9fe04633
--- /dev/null
+++ b/db/zm_update-1.28.110.sql
@@ -0,0 +1,21 @@
+--
+-- This updates a 1.28.106 database to 1.28.107
+--
+
+--
+-- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key
+-- Used primarially for compatibility with CakePHP
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Logs'
+	AND table_schema = DATABASE()
+	AND column_name = 'ServerId'
+	) > 0,
+"SELECT 'Column ServerId already exists in Logs'",
+"ALTER TABLE `Logs` ADD COLUMN `ServerId`  int(10) unsigned AFTER Component"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/version b/version
index a960d2a6d..03a4bf6e8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.28.109
+1.28.110

From fa8574c3d1a8b888645cc2dad9d54e7c5168a051 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 31 Dec 2015 10:24:34 -0600
Subject: [PATCH 148/362] Modify network topology, consistency changes

---
 .../images/zm-multiserver.png                 | Bin 42301 -> 67643 bytes
 .../images/zm-multiserver.xml                 |   2 +-
 docs/installationguide/multiserver.rst        |   8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/installationguide/images/zm-multiserver.png b/docs/installationguide/images/zm-multiserver.png
index 894665c33efe79d1424158a6765325d856808e87..b2b564f0253f8df4b67ba8ac5ece8fc58e474aa3 100644
GIT binary patch
literal 67643
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
U{;s9*J@iLGRz;@lm2uGj0$xVJz5oCK

literal 42301
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
ZJ{~+2I;rK$dYJ_9*HsJS+AHqy{{oqlOb`G7

diff --git a/docs/installationguide/images/zm-multiserver.xml b/docs/installationguide/images/zm-multiserver.xml
index ac66909a8..fc6c3b52b 100644
--- a/docs/installationguide/images/zm-multiserver.xml
+++ b/docs/installationguide/images/zm-multiserver.xml
@@ -1 +1 @@
-<mxfile type="device" userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9" version="5.2.7.2" editor="www.draw.io"><diagram>7V3dk6I4EP9r5vGmRBSdx3Vmd+9h92qr5uq+XraiMsoNEgsyX/fXbwe6IQngoCDgHr4oTROg+5df56MTr+zb3evnkO23X/na9a/Go/XrlX13NR5b9syGLyl5SyQ39iwRbEJvjUqZ4N77z0XhCKVP3tqNNEXBuS+8vS5c8SBwV0KTsTDkL7raA/f1u+7Zhu6YCe5XzM9L//TWYptI52Mnk//qepst3dlybpIzS7Z63IT8KcD7XY3th/iTnN4xKit+UfsjGDHkHIqRv3avt64vDUk2SqzxqeRs+pChG+CDHL7gBr0SiTd6UXcN742HPBRbvuEB8z9m0kX8Mq4sYQRHW7Hz4acFP91XT/wlxddTPPobleTvb27o7VzhhiQLRPiWqFtWfIEUyCus67g0eZi/aP1BehMOAx7IpwHJJw9eKjn/ryvEG6KHPQkOouwlvnC+x0eNBAsFlbTyWRR5KxJjcVItsY40SamBURTxp3CFWhPEJws3LmpNY7SjEz67HN4pfAOd0PWZ8J714hlidZPq4aXwwExeRQp77gUiUkr+JgWgQNVuMk1KxEpn43EKB0PftueH9OFH8gR0pLxKJoohVoLPEdbmc+KNzhzA2+hGhVt60rxCAwnCTUWIAcgMRhkm5cNUxWRzYIu92DXYprbBPSbYiDuL9WuDDQ3zzPwnfON/wIVfPcBSCPJ7N3yWPww4PvBA3HKfSwwAVY9GjnN7C84BXeFBOPjge5sAzgnptlT6hS1d/xuPPOFxeXbJheA7UPCNEytwpcTXgmE5qUDB9QNgR3mG2/gTYy/kj65yxpnPrYUNZzYhW3tQEp1DsJL4zgshJiZPEEjspYVRLAOnLqIt20sr7F7huv32OnDFCw8fo+soMRU8GBiH6irCR1rAJQSUADaPRLqA+ID4Zo7HL1mIvUHRVo2udF0ReBUAHcTHDQKk49g3npmxLz2+yOCHJNB98EuRQ+CavsNHs4P6DQQ/sla3wQ9oV8HbLxANSwF3EQGwCHB1A2BVDsF7DzGmvzFmbLaBW40x2MTpOMZM0/5UEmLKa/xFhBg0aqMhpqpHrRHo9oDFpwDrn4rGi5zaFo3jvQca7y+N2zOsd53QOI5VdkzjM53GL5rD0aLddxOmUxwDrdhNmCSPecZuQgtjshUCDNS3nyq+FAGurfiC9x7iS3/jy3RkDH23Gl/w3h3Hl7kxFHXRAQZN2lEnoYWxxQocrk1zXD6FF7m0k6kOByrKMVMdk7lOLk1PdWDpQ3zpb3xx0OWdxJfZeeJLJTLqmDPOMlh02vyoMdk1xvmG8sn4g/q1SaNg1GOgiEoUsXoKPfH2fcV2bshSZDY6E2oV0APhQaUHzO+pxQ50qy7YIZuV0sczD7VVuueU3gxemJMb0I05zCkONkyL9etzSr6nO3BKV5xigqNVTjnPXPdxnGJLx1Xr/3TPKefor57EKTZYSeOI95IGydfF+vU5Jd+7GTilK04xwdEqp+CtL7oXo9DTpHqT50ROwRT05jklP8Jhdm5oxIOKSJ4Br8p8fjQ5GUlacOPDIy80ElesX5+c0MQDOfWBnAxwtEpO55kiPjIp5HLaO+SH7ts7koaPohRI0D0npZBlBkrpAaWY4GiVUjC2/A9Hbe0Sr9RtpWBVzVopaOJ3Wimn1GKaNBhqcfe12Jzcb7MW06ROpw2DmZbzX7rgrft6j5WkB2lhjg6Z90ZWJ46eFtb0yCpZZuCTPvCJAY5W+aQPI6tzWx+66C+hYDJl94RiJgCMnfdyRvSEZ0O/PqGgZQZC6QGhmOBolVDOs6DlyEw1fQeIfg9d9GZ/B8dY4vpeSsmEEk3PlFJClhk4pQ+cYoCjTU6ZdTh0ke0qcymdnt5M/VrYxqjaRrEnRqen6TbKMPXboxQ1Axxt8ok16sdCan0FHjRbqiXUl69taGopxYlbJ5xj0e2JGfXGZkAIrvJVeDoYDf3azEOWUZjnfgvGXF+NHR8stVh7z/BzI3/eMcGWLHKVTPtEB26iqA3MVTn//nskeBhvyNd8Hv5YX+7pWNhUUVjMoiQXPREfhbX2C8nnR/4B+xpyEP2WmCCHkh47a/kEpjjlHgbycT9Ee7FXSFTum7iEohRiXZAMCREiyxkWmpvTu9SMVgAypmyXpuNcQr467WBVGBDSG4QYs0lTikVtIMSpMK8otxuVIUN9cUoqyL847pjKlnQ5qh4xSW4MKzgW0pzKqbSRq8apJKxVZ/IpWBSqR2nlGUJv9aVv0Z6tvGDze9y4lH3o4ytQgtI8YNpY7EbdlEM1RHFDNecu0l18i1ipGDYFti91bSkYtmwd9w4kka1ZtE27M6YfPR7Nrj2ozNG13Nw49mQtX1GDSa/b1E5XPDlB+6qepI5gvU7feRJ+j949S5/sKl0WfxldvqKc4E66fNOJ3hKf4oacVfPuDP36G69Y/dgQ1NicuOoYQ18X7VsWbdfevx2KMQZV3qFY128AcfnG3Fe+9ABY49GtL2P60HKp0HKJ265yiKXplj5UPa1dS3Pm2lhBQTuG8tBrRT+rjb35r0ezKlsUV90+8kIYqSjLrK29oNK7K5X+zo0eZYUdj8CBL9AQLxhlJD4YhhZPZIm9xFnju8sakyItU0R+/+EcFHRGeNl6wr2HDp48+wIG0n2m+wbtrzoSRY2MouizSTTsoBhuRkZSDeecYDk4zP5TJQnU2b/U2B9/AA==</diagram></mxfile>
\ No newline at end of file
+<mxfile type="dropbox" userAgent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0" version="5.2.7.3" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
index 512184baa..a59244629 100644
--- a/docs/installationguide/multiserver.rst
+++ b/docs/installationguide/multiserver.rst
@@ -8,11 +8,11 @@ It is possible to run multiple ZoneMinder servers and manage them from a single
 New installs
 ------------
 
-1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder servers.
+1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder Servers.
 
-2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database server.
+2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server.
 
-3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder servers to the machine targeted as the Database server.
+3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder Servers to the machine targeted as the Database Server.
 
 4. Install mysql/mariadb server onto the Database Server.
 
@@ -37,7 +37,7 @@ Additionally, you must also edit /usr/share/zoneminder/www/api/app/Config/databa
 
 8. All ZoneMinders Servers must share a common events folder. This can be done in any manner supported by the underlying operating system. From the Storage Server, share/export a folder to be used for ZoneMinder events.
 
-9. From each ZoneMinder Server, mount the shared events folder on the Storage Server to the events folder on the local ZoneMinder server.
+9. From each ZoneMinder Server, mount the shared events folder on the Storage Server to the events folder on the local ZoneMinder Server.
 
 NOTE: The location of this folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
 

From ea99b2a62a958821b96f9f4a958a60ae58a9651f Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Fri, 1 Jan 2016 09:20:11 -0600
Subject: [PATCH 149/362] Move design notes out of the image. Assign Red and
 Green colors to Storage & dB Servers in the diagram.

---
 .../images/zm-multiserver.png                 | Bin 67643 -> 38971 bytes
 .../images/zm-multiserver.xml                 |   2 +-
 docs/installationguide/multiserver.rst        |  11 +++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/installationguide/images/zm-multiserver.png b/docs/installationguide/images/zm-multiserver.png
index b2b564f0253f8df4b67ba8ac5ece8fc58e474aa3..360b612a8cf96216773000742f00450f5d7f650a 100644
GIT binary patch
literal 38971
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

literal 67643
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
U{;s9*J@iLGRz;@lm2uGj0$xVJz5oCK

diff --git a/docs/installationguide/images/zm-multiserver.xml b/docs/installationguide/images/zm-multiserver.xml
index fc6c3b52b..c829e1a94 100644
--- a/docs/installationguide/images/zm-multiserver.xml
+++ b/docs/installationguide/images/zm-multiserver.xml
@@ -1 +1 @@
-<mxfile type="dropbox" userAgent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0" version="5.2.7.3" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file
+<mxfile type="dropbox" userAgent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0" version="5.2.7.3" editor="www.draw.io"><diagram>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</diagram></mxfile>
\ No newline at end of file
diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
index a59244629..aa6139551 100644
--- a/docs/installationguide/multiserver.rst
+++ b/docs/installationguide/multiserver.rst
@@ -5,6 +5,17 @@ It is possible to run multiple ZoneMinder servers and manage them from a single
 
 .. image:: images/zm-multiserver.png
 
+Topology Design Notes
+---------------------
+
+1. Device symbols represent separate logical functions, not necessarily separate hardware. For example, the Database Server and a ZoneMinder Server, can reside on the same physical hardware.
+
+2. Configure each ZoneMinder Server to use the same, remote Database Server (Green).
+
+3. The Storage Server (Red) represents shared storage, accessible by all ZoneMinder Servers, mounted under each server’s events folder.
+
+4. Create at least two networks for best performance. Dedicate a Storage LAN for communication with the Storage and Database Servers. Make use of multipath and jumbo frames if possible. Keep all other traffic off the Storage LAN! Dedicate the second LAN, called the Video LAN in the diagram, for all other traffic.
+
 New installs
 ------------
 

From 94ce84af40255852b64bcdb4efc3a4535bf43a28 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Fri, 1 Jan 2016 10:15:36 -0600
Subject: [PATCH 150/362] Bump version to 1.29.0

---
 configure.ac            | 2 +-
 db/zm_update-1.29.0.sql | 5 +++++
 version                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/zm_update-1.29.0.sql

diff --git a/configure.ac b/configure.ac
index 72753c94c..b10dd44d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-AC_INIT(zm,1.28.110,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.29.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
diff --git a/db/zm_update-1.29.0.sql b/db/zm_update-1.29.0.sql
new file mode 100644
index 000000000..5d17651a3
--- /dev/null
+++ b/db/zm_update-1.29.0.sql
@@ -0,0 +1,5 @@
+--
+-- This updates a 1.28.110 database to 1.29.0
+--
+-- No changes required
+--
diff --git a/version b/version
index 03a4bf6e8..5e57fb895 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.28.110
+1.29.0

From 99b65f01916ee170eee742c6e53a2522595c7cbb Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Fri, 1 Jan 2016 13:39:48 -0600
Subject: [PATCH 151/362] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61f77f6a8..5c5b79cce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.28.110")
+set(zoneminder_VERSION "1.29.0")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 

From ec7504f9258dbae4ccd5050e5cc8168486fbff77 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 1 Jan 2016 16:33:28 -0500
Subject: [PATCH 152/362] Translate ServerId to Server in Log record before
 sending back

---
 web/ajax/log.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index c01fd8dae..1ddb91ab2 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -31,6 +31,13 @@ switch ( $_REQUEST['task'] )
         if ( !canView( 'System' ) )
             ajaxError( 'Insufficient permissions to view log entries' );
 
+		$servers = Server::find_all();
+		$servers_by_Id = array();
+		# There is probably a better way to do this.
+		foreach ( $servers as $server ) {
+			$servers_by_Id[$server->Id()] = $server;
+		}
+
         $minTime = isset($_POST['minTime'])?$_POST['minTime']:NULL;
         $maxTime = isset($_POST['maxTime'])?$_POST['maxTime']:NULL;
         $limit = isset($_POST['limit'])?$_POST['limit']:100;
@@ -66,6 +73,7 @@ switch ( $_REQUEST['task'] )
         $logs = array();
         foreach ( dbFetchAll( $sql, NULL, $values ) as $log ) {
             $log['DateTime'] = preg_replace( '/^\d+/', strftime( "%Y-%m-%d %H:%M:%S", intval($log['TimeKey']) ), $log['TimeKey'] );
+			$log['Server'] = $log['ServerId'] ? $servers_by_Id[$log['ServerId']]->Name() : '';
             $logs[] = $log;
         }
         $options = array();

From 468f997e4c5404af1d3893f511b27d64800cf6f9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 1 Jan 2016 16:36:29 -0500
Subject: [PATCH 153/362] Soft error, with logging when the filter element
 doesn't exist

---
 web/skins/classic/views/js/log.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index 011c4beb0..8288916dd 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -244,6 +244,12 @@ function updateFilterSelectors()
         function( values, key )
         {
             var selector = $('filter['+key+']');
+			if ( ! selector ) {
+				if ( window.console && window.console.log ) {
+					window.console.log("No selector foudn for " + key );
+				}
+				continue;
+			}
             selector.options.length = 1;
             if ( key == 'Level' )
             {

From cf7e1688722c49ae11a50c1d2181124b8e7a94de Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 1 Jan 2016 17:10:37 -0500
Subject: [PATCH 154/362] Fix populating the server filter and then fix
 filtering by server.  Also introduce robustness and consolel ogging when a
 filter doesn't exist

---
 web/ajax/log.php                  |  6 ++++++
 web/skins/classic/views/js/log.js | 21 ++++++++++++++++++---
 web/skins/classic/views/log.php   |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index 1ddb91ab2..1e565424c 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -104,6 +104,12 @@ switch ( $_REQUEST['task'] )
                     else
                         $options[$field][$value] = "DB".$value;
             }
+            elseif ( $field == 'ServerId' )
+            {
+                foreach( dbFetchAll( $sql, $field, array_values($fieldValues) ) as $value )
+                        $options['ServerId'][$value] = $value ? $servers_by_Id[$value]->Name() : '';
+				
+            }
             else
             {
                 foreach( dbFetchAll( $sql, $field, array_values( $fieldValues ) ) as $value )
diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index 8288916dd..e6f7fa30e 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -22,7 +22,7 @@ var logTimeout = maxSampleTime;
 var firstLoad = true;
 var initialDisplayLimit = 200;
 var sortReversed = false;
-var filterFields = [ 'Component', 'Server', 'Pid', 'Level', 'File', 'Line'];
+var filterFields = [ 'Component', 'ServerId', 'Pid', 'Level', 'File', 'Line'];
 var options = {};
 
 function buildFetchParms( parms )
@@ -163,6 +163,12 @@ function filterLog()
         function( field )
         {
             var selector = $('filter['+field+']');
+			if ( ! selector ) {
+				if ( window.console && window.console.log ) {
+					window.console.log("No selector found for " + field );
+				}
+				return;
+			}
             var value = selector.get('value');
             if ( value )
                 filter[field] = value;
@@ -246,9 +252,9 @@ function updateFilterSelectors()
             var selector = $('filter['+key+']');
 			if ( ! selector ) {
 				if ( window.console && window.console.log ) {
-					window.console.log("No selector foudn for " + key );
+					window.console.log("No selector found for " + key );
 				}
-				continue;
+				return;
 			}
             selector.options.length = 1;
             if ( key == 'Level' )
@@ -259,6 +265,15 @@ function updateFilterSelectors()
                         selector.options[selector.options.length] = new Option( value, label );
                     }
                 );
+            } 
+            else if ( key == 'ServerId' )
+            {
+				Object.each(values,
+                    function( value, label )
+                    {   
+                        selector.options[selector.options.length] = new Option( value, label );
+                    }
+                );
             }
             else
             {
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index 93b2c0b39..50ba58d42 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -54,7 +54,7 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
     <div id="content">
       <div id="filters"><?php echo translate('FilterLog') ?> -
         <?php echo translate('Component') ?> <select id="filter[Component]" onchange="filterLog(this)"><option value="">-----</option></select>
-        <?php echo translate('Server') ?> <select id="filter[Server]" onchange="filterLog(this)"><option value="">-----</option></select>
+        <?php echo translate('Server') ?> <select id="filter[ServerId]" onchange="filterLog(this)"><option value="">-----</option></select>
         <?php echo translate('Pid') ?> <select id="filter[Pid]" onchange="filterLog(this)"><option value="">-----</option></select>
         <?php echo translate('Level') ?> <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select>
         <?php echo translate('File') ?> <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select>

From 54bff42fa07dbecddfea37efedf089394a0ab2c7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 1 Jan 2016 21:27:30 -0500
Subject: [PATCH 155/362] Remove warnings when no server set

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 1 +
 scripts/zmpkg.pl.in                            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 3998f650d..c3bc792aa 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -114,6 +114,7 @@ BEGIN
 			my $result = $sth->fetchrow_hashref();
 			$Config{ZM_SERVER_ID} = $$result{Id};
 		}
+		$Config{ZM_SERVER_ID} = undef;
 	}
 }
 
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index be563118b..183f8084c 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -226,7 +226,7 @@ if ( $command =~ /^(?:start|restart)$/ )
         zmMemTidy();
         runCommand( "zmdc.pl startup" );
 
-		Info( "Starting up services for server $Config{ZM_SERVER_ID}\n" );
+		Info( "Starting up services" . ( $Config{ZM_SERVER_ID} ? " for server $Config{ZM_SERVER_ID}\n" : "\n" ) );
         my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
         my $sth = $dbh->prepare_cached( $sql )
             or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );

From 0799f10ad27691e203f8a2d2bd2087a60d77122a Mon Sep 17 00:00:00 2001
From: Steve Gilvarry <SteveGilvarry@users.noreply.github.com>
Date: Sat, 2 Jan 2016 22:22:16 +1100
Subject: [PATCH 156/362] Update to current 1.29.0-rc1 changes

This will still need to be run for the final release as already seeing
1 unreleased change against master that I edited out of this to match
1.29.0-rc1 release
---
 CHANGELOG.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3296540eb..6e3944002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,25 @@
 # Change Log
 
-## [1.29.0](https://github.com/ZoneMinder/ZoneMinder/tree/1.29.0) (2015-11-20)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...1.29.0)
+## [v1.29.0-rc1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc1) (2016-01-01)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...v1.29.0-rc1)
 
 **Merged pull requests:**
 
+- Bump version to 1.29.0 [\#1213](https://github.com/ZoneMinder/ZoneMinder/pull/1213) ([knnniggett](https://github.com/knnniggett))
+- Missing rtd theme [\#1202](https://github.com/ZoneMinder/ZoneMinder/pull/1202) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Skip directories that have non-digits in them [\#1201](https://github.com/ZoneMinder/ZoneMinder/pull/1201) ([connortechnology](https://github.com/connortechnology))
+- updated mobile app info [\#1200](https://github.com/ZoneMinder/ZoneMinder/pull/1200) ([pliablepixels](https://github.com/pliablepixels))
+- Api more security [\#1196](https://github.com/ZoneMinder/ZoneMinder/pull/1196) ([pliablepixels](https://github.com/pliablepixels))
+- Documentation [\#1194](https://github.com/ZoneMinder/ZoneMinder/pull/1194) ([pliablepixels](https://github.com/pliablepixels))
+- Documentation updated for ubuntu [\#1193](https://github.com/ZoneMinder/ZoneMinder/pull/1193) ([pliablepixels](https://github.com/pliablepixels))
+- Fixes \#1179 Libvlc Live555 Segmentation Fault [\#1190](https://github.com/ZoneMinder/ZoneMinder/pull/1190) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Add code to detect the change in REALM from older to newer firmware [\#1184](https://github.com/ZoneMinder/ZoneMinder/pull/1184) ([connortechnology](https://github.com/connortechnology))
+- add a 1/8th scale option, which is useful for 1920x1080 streams [\#1182](https://github.com/ZoneMinder/ZoneMinder/pull/1182) ([connortechnology](https://github.com/connortechnology))
+- Zms socket lock [\#1180](https://github.com/ZoneMinder/ZoneMinder/pull/1180) ([connortechnology](https://github.com/connortechnology))
+- Check for the presence of CrudControllerTrait.php instead of .git [\#1178](https://github.com/ZoneMinder/ZoneMinder/pull/1178) ([knnniggett](https://github.com/knnniggett))
+- Partial fix for \#1167 [\#1176](https://github.com/ZoneMinder/ZoneMinder/pull/1176) ([SteveGilvarry](https://github.com/SteveGilvarry))
+- Error on missing submodules [\#1173](https://github.com/ZoneMinder/ZoneMinder/pull/1173) ([knnniggett](https://github.com/knnniggett))
+- fix mem alloc fault in zm\_monitor.cpp [\#1168](https://github.com/ZoneMinder/ZoneMinder/pull/1168) ([knnniggett](https://github.com/knnniggett))
 - compat for php 5.4 [\#1164](https://github.com/ZoneMinder/ZoneMinder/pull/1164) ([abishai](https://github.com/abishai))
 - remove comment at end of line [\#1157](https://github.com/ZoneMinder/ZoneMinder/pull/1157) ([connortechnology](https://github.com/connortechnology))
 - Reorder RTSPDescribe to avoid -wreorder warnings [\#1147](https://github.com/ZoneMinder/ZoneMinder/pull/1147) ([SteveGilvarry](https://github.com/SteveGilvarry))
@@ -50,9 +65,11 @@
 - enable/disable RTSP Describe Header [\#1045](https://github.com/ZoneMinder/ZoneMinder/pull/1045) ([knnniggett](https://github.com/knnniggett))
 - Add Documentation for Privacy zones [\#1044](https://github.com/ZoneMinder/ZoneMinder/pull/1044) ([schrorg](https://github.com/schrorg))
 - added note about potential Perl and PHP time translation conflict wit… [\#1043](https://github.com/ZoneMinder/ZoneMinder/pull/1043) ([pliablepixels](https://github.com/pliablepixels))
+- Multi server [\#1040](https://github.com/ZoneMinder/ZoneMinder/pull/1040) ([connortechnology](https://github.com/connortechnology))
 - 1038 fixing state mgmt 1030 is active fix [\#1039](https://github.com/ZoneMinder/ZoneMinder/pull/1039) ([pliablepixels](https://github.com/pliablepixels))
 - Grey color for disabled buttons [\#1037](https://github.com/ZoneMinder/ZoneMinder/pull/1037) ([pliablepixels](https://github.com/pliablepixels))
 - Update filterevents.rst [\#1035](https://github.com/ZoneMinder/ZoneMinder/pull/1035) ([tikismoke](https://github.com/tikismoke))
+- add warning and help text for maxfps fields [\#1033](https://github.com/ZoneMinder/ZoneMinder/pull/1033) ([knnniggett](https://github.com/knnniggett))
 - update doc [\#1032](https://github.com/ZoneMinder/ZoneMinder/pull/1032) ([tikismoke](https://github.com/tikismoke))
 - Remove full path from Logger filename [\#1029](https://github.com/ZoneMinder/ZoneMinder/pull/1029) ([knnniggett](https://github.com/knnniggett))
 - Typo in README.md [\#1027](https://github.com/ZoneMinder/ZoneMinder/pull/1027) ([tikismoke](https://github.com/tikismoke))

From a93f78b7e606cef3526a1b6bf6cae1b8bdd21685 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 2 Jan 2016 10:35:52 -0600
Subject: [PATCH 157/362] Bump rpm specfiles to 1.29.0

---
 distros/fedora/zoneminder.f22.spec | 2 +-
 distros/redhat/zoneminder.el6.spec | 2 +-
 distros/redhat/zoneminder.el7.spec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
index 8e98f3693..2396a868b 100644
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@@ -10,7 +10,7 @@
 %define _without_x10 1
 
 Name: zoneminder
-Version: 1.28.1
+Version: 1.29.0
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 890d7bece..97623addf 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -4,7 +4,7 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.28.1
+Version:    1.29.0
 Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index 6ed7510b0..60406b477 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -6,7 +6,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.28.1
+Version: 1.29.0
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons

From bd71c4999dc417529e81277c80648affa4ce29d8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Sat, 2 Jan 2016 14:36:37 -0500
Subject: [PATCH 158/362] test for Server in servers_by_Id as well as just
 having a value for ServerId.  Fixup export as well.

---
 web/ajax/log.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index 1e565424c..a250c952d 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -73,7 +73,7 @@ switch ( $_REQUEST['task'] )
         $logs = array();
         foreach ( dbFetchAll( $sql, NULL, $values ) as $log ) {
             $log['DateTime'] = preg_replace( '/^\d+/', strftime( "%Y-%m-%d %H:%M:%S", intval($log['TimeKey']) ), $log['TimeKey'] );
-			$log['Server'] = $log['ServerId'] ? $servers_by_Id[$log['ServerId']]->Name() : '';
+			$log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
             $logs[] = $log;
         }
         $options = array();
@@ -107,7 +107,7 @@ switch ( $_REQUEST['task'] )
             elseif ( $field == 'ServerId' )
             {
                 foreach( dbFetchAll( $sql, $field, array_values($fieldValues) ) as $value )
-                        $options['ServerId'][$value] = $value ? $servers_by_Id[$value]->Name() : '';
+                        $options['ServerId'][$value] = ( $value and isset($servers_by_Id[$value]) ) ? $servers_by_Id[$value]->Name() : '';
 				
             }
             else
@@ -216,6 +216,7 @@ switch ( $_REQUEST['task'] )
         foreach ( dbFetchAll( $sql, NULL, $values ) as $log )
         {
             $log['DateTime'] = preg_replace( '/^\d+/', strftime( "%Y-%m-%d %H:%M:%S", intval($log['TimeKey']) ), $log['TimeKey'] );
+			$log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
             $logs[] = $log;
         }
         switch( $format )
@@ -246,7 +247,7 @@ switch ( $_REQUEST['task'] )
 					   )."\n" );
                 foreach ( $logs as $log )
                 {
-                    fprintf( $exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $servers_by_Id[$log['ServerId']]->Name(),$log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+					fprintf( $exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
                 }
                 break;
             }
@@ -306,7 +307,7 @@ tr.log-dbg td {
                     elseif ( $classLevel > Logger::DEBUG )
                         $classLevel = Logger::DEBUG;
                     $logClass = 'log-'.strtolower(Logger::$codes[$classLevel]);
-                    fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $servers_by_Id[$log['ServerId']]->Name(), $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
+                    fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
                 }
                 fwrite( $exportFP, 
 '      </tbody>

From c639822d6289aa679f48ebe38f8333df78789afc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Sun, 3 Jan 2016 11:55:53 -0500
Subject: [PATCH 159/362] When Server is not set, us ZM_BASE_PATH

---
 web/includes/Server.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index d254227ca..4ef6710db 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -34,7 +34,11 @@ class Server {
 	}
 
 	public function Url() {
-		return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
+		if ( $this->Id() ) {
+			return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
+		} else {
+			return ZM_BASE_PATH;
+		}
 	}
 	public function Hostname() {
 		if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) {

From d25653089698372d265283bfed093fb950c0aebb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 4 Jan 2016 09:36:45 -0500
Subject: [PATCH 160/362] return early if no servers are defined instead of
 logging a warning

---
 web/includes/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index e14eb369d..bc7218ad4 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -99,6 +99,10 @@ function CORSHeaders() {
 
 		# The following is left for future reference/use.
 		$valid = false;
+		$servers = dbFetchAll( 'SELECT * FROM Servers' );
+		if ( ! sizeof($servers) ) {
+			return;
+		}
 		foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
 			$Server = new Server( $row );
 			if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {

From f72260733c430e0ae95d530ce2029e0d06792d26 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 4 Jan 2016 09:38:24 -0500
Subject: [PATCH 161/362] Only do CORSHeaders if there is more than 1 server

---
 web/includes/functions.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index bc7218ad4..30b183385 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -100,7 +100,8 @@ function CORSHeaders() {
 		# The following is left for future reference/use.
 		$valid = false;
 		$servers = dbFetchAll( 'SELECT * FROM Servers' );
-		if ( ! sizeof($servers) ) {
+		if ( sizeof($servers) <= 1 ) {
+			# Only need CORSHeaders in the event that there are multiple servers in use.
 			return;
 		}
 		foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {

From 1432c6ae1f79811416dfc04681b77176454a47c9 Mon Sep 17 00:00:00 2001
From: Simpler1 <kevin.bezold@gmail.com>
Date: Mon, 4 Jan 2016 12:30:46 -0500
Subject: [PATCH 162/362] Added profiles for Wanscam-HW0025 and IPCC-7210W

---
 .../lib/ZoneMinder/Control/IPCC7210W.pm       | 377 +++++++++++++++++
 .../lib/ZoneMinder/Control/WanscamHW0025.pm   | 399 ++++++++++++++++++
 2 files changed, 776 insertions(+)
 create mode 100755 scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
 create mode 100755 scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
new file mode 100755
index 000000000..cd21316d3
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCC7210W.pm
@@ -0,0 +1,377 @@
+# ==========================================================================
+#
+# ZoneMinder IPCC-7210W IP Control Protocol Module, $Date: 2015-11-18$, $Revision: 0001$
+# Modified for use with IPCC-7210W on Nov 2015
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the 
+# IPCC-7210W IP camera control protocol
+#
+package ZoneMinder::Control::IPCC-7210W;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# IPCC-7210W IP Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{ 
+	my $class = shift;
+	my $id = shift;
+	my $self = ZoneMinder::Control->new( $id );
+	bless( $self, $class );
+	srand( time() );
+	return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
+}
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub close
+{ 
+	my $self = shift;
+	$self->{state} = 'closed';
+}
+
+sub printMsg
+{
+	my $self = shift;
+	my $msg = shift;
+	my $msg_len = length($msg);
+ 
+	Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+
+    my $result = undef;
+
+    printMsg( $cmd, "Tx" );
+
+    #print( "http://$address/$cmd\n" );
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+	  Info( "http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+        Error( "Error check failed: '".$res->status_line()."'" );
+    }
+
+    return( $result );
+}
+
+
+sub cameraReset
+{
+	my $self = shift;
+	Debug( "Camera Reset" );
+	my $cmd = "reboot.cgi?";
+	$self->sendCmd( $cmd );
+}
+
+
+#Up Arrow
+sub moveConUp
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Up" );
+	my $cmd = "decoder_control.cgi?command=0&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Down Arrow
+sub moveConDown
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Down" );
+	my $cmd = "decoder_control.cgi?command=2&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Left Arrow
+sub moveConLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Left" );
+	my $cmd = "decoder_control.cgi?command=4&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Right Arrow
+sub moveConRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Right" );
+	my $cmd = "decoder_control.cgi?command=6&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Diagonally Up Right Arrow
+sub moveConUpRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Up Right" );
+	my $cmd = "decoder_control.cgi?command=91&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Diagonally Down Right Arrow
+sub moveConDownRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Down Right" );
+	my $cmd = "decoder_control.cgi?command=93&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Diagonally Up Left Arrow
+sub moveConUpLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Up Left" );
+	my $cmd = "decoder_control.cgi?command=90&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Diagonally Down Left Arrow
+sub moveConDownLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Down Left" );
+	my $cmd = "decoder_control.cgi?command=92&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+#Stop
+sub moveStop
+{
+	my $self = shift;
+	Debug( "Move Stop" );
+	my $cmd = "decoder_control.cgi?command=1&onestep=1&";
+	$self->sendCmd( $cmd );
+}
+
+#Move Camera to Home Position
+sub presetHome
+{
+	my $self = shift;
+	Debug( "Home Preset" );
+	my $cmd = "decoder_control.cgi?command=25&onestep=0&";
+	$self->sendCmd( $cmd );
+}
+
+# zoom out
+sub zoomRelTele
+{
+    my $self = shift;
+    Debug( "Zoom Tele" );
+    my $cmd = "camera_control.cgi?param=17&value=1&";
+    $self->sendCmd( $cmd );
+}
+
+#zoom in
+sub zoomRelWide
+{
+    my $self = shift;
+    Debug( "Zoom Wide" );
+    my $cmd = "camera_control.cgi?param=18&value=1&";
+    $self->sendCmd( $cmd );
+}
+
+
+#Set preset
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+	my $presetCmd = 30 + (($preset-1)*2);
+    Debug( "Set Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&onestep=0&sit=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+
+#Goto preset
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $presetCmd = 31 + (($preset-1)*2);
+    Debug( "Goto Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&onestep=0&sit=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+
+#Turn IR on
+sub wake
+{
+	my $self = shift;
+	Debug( "Wake - IR on" );
+	my $cmd = "camera_control.cgi?param=14&value=1&";
+	$self->sendCmd( $cmd );
+}
+
+#Turn IR off
+sub sleep
+{
+	my $self = shift;
+	Debug( "Sleep - IR off" );
+	my $cmd = "camera_control.cgi?param=14&value=0&";
+	$self->sendCmd( $cmd );
+}
+1;
+__END__
+
+
+
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::IPCC-7210W - Perl extension for IPCC-7210W PTZ control
+
+=head1 SYNOPSIS
+
+ use ZoneMinder::Control::IPCC
+
+=head1 DESCRIPTION
+
+This script provides Pan/Tilt/Zoom control for IPCC-7210W camera.
+
+=head1 SEE ALSO
+
+ZoneMinder::Control::Wanscam
+
+=head1 AUTHOR
+
+
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm
new file mode 100755
index 000000000..3dd9c2cc5
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/WanscamHW0025.pm
@@ -0,0 +1,399 @@
+# ==========================================================================
+#
+# ZoneMinder Wanscam HW0025 IP Control Protocol Module, $Date: 2009-11-25 09:20:00 +0000 (Wed, 04 Nov 2009) $, $Revision: 0001 $
+# Copyright (C) 2001-2015 Florian Neumair
+# Modified for use with Foscam FI8918W IP Camera by Dave Harris
+# Modified Feb 2011 by Howard Durdle (http://durdl.es/x) to:
+#      fix horizontal panning, add presets and IR on/off
+#      use Control Device field to pass username and password
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Wanscam HW0025 IP camera control
+# protocol
+#
+# Known working Devices:
+# * Wanscam HW0025
+# * IPCC-7210W
+#
+package ZoneMinder::Control::WanscamHW0025;
+ 
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+ 
+# ==========================================================================
+#
+# Wanscam HW0025 IP Control Protocol
+#
+# ==========================================================================
+ 
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+ 
+sub new
+{ 
+	my $class = shift;
+	my $id = shift;
+	my $self = ZoneMinder::Control->new( $id );
+	bless( $self, $class );
+	srand( time() );
+	return $self;
+}
+ 
+our $AUTOLOAD;
+ 
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
+}
+ 
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+ 
+sub close
+{ 
+	my $self = shift;
+	$self->{state} = 'closed';
+}
+ 
+sub printMsg
+{
+	my $self = shift;
+	my $msg = shift;
+	my $msg_len = length($msg);
+ 
+	Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+
+    my $result = undef;
+
+    printMsg( $cmd, "Tx" );
+
+    #print( "http://$address/$cmd\n" );
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+	Info( "http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+        Error( "Error check failed: '".$res->status_line()."'" );
+    }
+
+    return( $result );
+}
+
+ 
+sub cameraReset
+{
+	my $self = shift;
+	Debug( "Camera Reset" );
+	my $cmd = "reboot.cgi?";
+	$self->sendCmd( $cmd );
+}
+ 
+#Up Arrow
+sub moveConUp
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Up" );
+	my $cmd = "decoder_control.cgi?command=0&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Down Arrow
+sub moveConDown
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Down" );
+	my $cmd = "decoder_control.cgi?command=2&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Left Arrow
+sub moveConLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Left" );
+	my $cmd = "decoder_control.cgi?command=4&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Right Arrow
+sub moveConRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Right" );
+	my $cmd = "decoder_control.cgi?command=6&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Diagonally Up Right Arrow
+sub moveConUpRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Up Right" );
+	my $cmd = "decoder_control.cgi?command=91&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Diagonally Down Right Arrow
+sub moveConDownRight
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Down Right" );
+	my $cmd = "decoder_control.cgi?command=93&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Diagonally Up Left Arrow
+sub moveConUpLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Up Left" );
+	my $cmd = "decoder_control.cgi?command=90&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Diagonally Down Left Arrow
+sub moveConDownLeft
+{
+	my $self = shift;
+	my $params = shift;
+	Debug( "Move Diagonally Down Left" );
+	my $cmd = "decoder_control.cgi?command=92&onestep=1&";
+	$self->sendCmd( $cmd );
+	my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+ 
+#Stop
+sub moveStop
+{
+	my $self = shift;
+	Debug( "Move Stop" );
+	my $cmd = "decoder_control.cgi?command=1&onestep=1&";
+	$self->sendCmd( $cmd );
+}
+ 
+#Move Camera to Home Position
+sub presetHome
+{
+	my $self = shift;
+	Debug( "Home Preset" );
+	my $cmd = "decoder_control.cgi?command=25&onestep=0&";
+	$self->sendCmd( $cmd );
+}
+
+# zoom out
+sub zoomRelTele
+{
+    my $self = shift;
+    Debug( "Zoom Tele" );
+    my $cmd = "camera_control.cgi?param=17&value=1&";
+    $self->sendCmd( $cmd );
+}
+
+#zoom in
+sub zoomRelWide
+{
+    my $self = shift;
+    Debug( "Zoom Wide" );
+    my $cmd = "camera_control.cgi?param=18&value=1&";
+    $self->sendCmd( $cmd );
+}
+
+ 
+#Set preset
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+	my $presetCmd = 30 + (($preset-1)*2);
+    Debug( "Set Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&onestep=0&sit=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+ 
+#Goto preset
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $presetCmd = 31 + (($preset-1)*2);
+    Debug( "Goto Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&onestep=0&sit=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+ 
+#Turn IR on
+sub wake
+{
+	my $self = shift;
+	Debug( "Wake - IR on" );
+	my $cmd = "camera_control.cgi?param=14&value=1&";
+	$self->sendCmd( $cmd );
+}
+ 
+#Turn IR off
+sub sleep
+{
+	my $self = shift;
+	Debug( "Sleep - IR off" );
+	my $cmd = "camera_control.cgi?param=14&value=0&";
+	$self->sendCmd( $cmd );
+}
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Control::Wanscam
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, <philip.coombes@zoneminder.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut

From 45fc689203b9051cc95574956b0802c11b13b092 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 4 Jan 2016 13:15:50 -0500
Subject: [PATCH 163/362] implement Width and Height functions, and test for
 image rotation and output opposite dimension. Fixes #1220

---
 web/includes/Monitor.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 8aa7f4dc9..6b983018e 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -80,5 +80,17 @@ class Monitor {
 
 		return( $streamSrc );
 	} // end function etStreamSrc
+	public function Width() {
+		if ( $this->Orientation() == '90' or $this->Orientation() == '270' ) {
+			return $this->{'Height'};
+		}
+		return $this->{'Width'};
+	}
+	public function Height() {
+		if ( $this->Orientation() == '90' or $this->Orientation() == '270' ) {
+			return $this->{'Width'};
+		}
+		return $this->{'Height'};
+	}
 }
 ?>

From f5db14d8237c770a2f7b1d412d63a7813bd0949f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@localhost.localdomain>
Date: Mon, 4 Jan 2016 13:46:05 -0500
Subject: [PATCH 164/362] return empty for the non multi-server case

---
 web/includes/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 4ef6710db..e8402809c 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -37,7 +37,7 @@ class Server {
 		if ( $this->Id() ) {
 			return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
 		} else {
-			return ZM_BASE_PATH;
+			return '';
 		}
 	}
 	public function Hostname() {

From 273ab6c5c629cee23d32967c9a3851c02b6f8ff3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 4 Jan 2016 14:51:24 -0500
Subject: [PATCH 165/362] Only show Server column when more than 1 Servers are
 defined

---
 web/skins/classic/views/console.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 49d154d2c..8f30070e0 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -19,6 +19,7 @@
 //
 
 require_once('includes/Server.php');
+$servers = Server::find_all();
 
 $eventCounts = array(
     array(
@@ -237,7 +238,9 @@ else
           <tr>
             <th class="colName"><?php echo translate('Name') ?></th>
             <th class="colFunction"><?php echo translate('Function') ?></th>
+<?php if ( count($servers) > 1 ) { ?>
 			<th class="colServer"><?php echo translate('Server') ?></th>
+<?php } ?>
             <th class="colSource"><?php echo translate('Source') ?></th>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ )
@@ -261,7 +264,7 @@ if ( canEdit('Monitors') )
         </thead>
         <tfoot>
           <tr>
-            <td class="colLeftButtons" colspan="4">
+            <td class="colLeftButtons" colspan="<?php echo count($servers) > 1 ? 4 : 3 ?>">
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
               <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
@@ -308,10 +311,12 @@ foreach( $displayMonitors as $monitor )
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
             <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
+<?php if ( count($servers) > 1 ) { ?>
 			<td class="colServer"><?php 
 $Server = new Server( $monitor['ServerId'] );
 echo $Server->Name();
  ?></td>
+<?php } ?>
 <?php if ( $monitor['Type'] == "Local" ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>

From 44f3b99d24bd69942f313356ced44ca4f5b1add8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@localhost.localdomain>
Date: Mon, 4 Jan 2016 14:59:04 -0500
Subject: [PATCH 166/362] change logic to show server column if any servers are
 defined.  Reason is that once you have setup 1, you want to know which
 cameras have not been assigned a server yet

---
 web/skins/classic/views/console.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 8f30070e0..1029e9562 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -238,7 +238,7 @@ else
           <tr>
             <th class="colName"><?php echo translate('Name') ?></th>
             <th class="colFunction"><?php echo translate('Function') ?></th>
-<?php if ( count($servers) > 1 ) { ?>
+<?php if ( count($servers) ) { ?>
 			<th class="colServer"><?php echo translate('Server') ?></th>
 <?php } ?>
             <th class="colSource"><?php echo translate('Source') ?></th>
@@ -264,7 +264,7 @@ if ( canEdit('Monitors') )
         </thead>
         <tfoot>
           <tr>
-            <td class="colLeftButtons" colspan="<?php echo count($servers) > 1 ? 4 : 3 ?>">
+            <td class="colLeftButtons" colspan="<?php echo count($servers) ? 4 : 3 ?>">
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
               <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
@@ -311,7 +311,7 @@ foreach( $displayMonitors as $monitor )
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
             <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
-<?php if ( count($servers) > 1 ) { ?>
+<?php if ( count($servers) ) { ?>
 			<td class="colServer"><?php 
 $Server = new Server( $monitor['ServerId'] );
 echo $Server->Name();

From 0d5d43251fb8ef7adcb0e050b4f323a0381911f2 Mon Sep 17 00:00:00 2001
From: Simpler1 <kevin.bezold@gmail.com>
Date: Mon, 4 Jan 2016 15:51:11 -0500
Subject: [PATCH 167/362] Added lines to db/zm_create.sql.in for two cameras

---
 db/zm_create.sql.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 8239566df..f6d1de4b2 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -589,6 +589,8 @@ INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,0,0,0,
 INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Libvlc','IPCC7210W', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
 
 
 

From f0486e5b5e4dd6a0e560fefc5d7b93a30d0af701 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Jan 2016 22:07:07 -0500
Subject: [PATCH 168/362] fix dumb mistake, undefing ZM_SERVBER_ID after
 setting it.

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index c3bc792aa..0c5a82a30 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -104,6 +104,7 @@ BEGIN
     #$dbh->disconnect();
 
 	if ( ! exists $Config{ZM_SERVER_ID} ) {
+		$Config{ZM_SERVER_ID} = undef;
 		$sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
 		if ( $Config{ZM_SERVER_NAME} ) {
 			$res = $sth->execute( $Config{ZM_SERVER_NAME} );
@@ -114,7 +115,6 @@ BEGIN
 			my $result = $sth->fetchrow_hashref();
 			$Config{ZM_SERVER_ID} = $$result{Id};
 		}
-		$Config{ZM_SERVER_ID} = undef;
 	}
 }
 

From 41a8249ed958319e2867c039c0821ee16e7d805a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 5 Jan 2016 09:04:04 -0500
Subject: [PATCH 169/362] update my package building script

---
 utils/do_debian_package.sh | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index b7a97a0a6..3d9332e3c 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -2,17 +2,27 @@
 DATE=`date -R`
 DISTRO=$1
 SNAPSHOT=$2
+if [ "$SNAPSHOT" == "stable" ]; then
+SNAPSHOT="";
+fi;
+
 TYPE=$3
 if [ "$TYPE" == "" ]; then
 TYPE="source";
 fi;
+BRANCH=$4
 
 if [ ! -d 'zoneminder_release' ]; then 
-git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder_release
+	git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder_release
+fi;
+if [ "$BRANCH" != "" ]; then
+	cd zoneminder_release
+	git checkout $BRANCH
+	cd ../
 fi;
 VERSION=`cat zoneminder_release/version`
 if [ $VERSION == "" ]; then
-exit 1;
+	exit 1;
 fi;
 echo "Doing $TYPE release zoneminder_$VERSION-$DISTRO-$SNAPSHOT";
 mv zoneminder_release zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
@@ -20,9 +30,9 @@ cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
 git submodule init
 git submodule update --init --recursive
 if [ $DISTRO == "trusty" ]; then 
-cp -r distros/ubuntu1204_cmake debian
+ln -sf distros/ubuntu1204_cmake debian
 else
-cp -r distros/ubuntu1504_cmake debian
+ln -sf distros/ubuntu1504_cmake debian
 fi;
 
 cat <<EOF > debian/changelog
@@ -33,15 +43,19 @@ zoneminder ($VERSION-$DISTRO-$SNAPSHOT) $DISTRO; urgency=medium
  -- Isaac Connor <iconnor@connortechnology.com>  $DATE
 
 EOF
-rm -rf .git
-rm .gitignore
-cd ../
-tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
-cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+#rm -rf .git
+#rm .gitignore
+#cd ../
+#tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+#cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
 if [ $TYPE == "binary" ]; then
-debuild -k52C7377E
+	debuild
 else
-debuild -S -sa -k52C7377E
+	debuild -S -sa
 fi;
+
 cd ../
+echo "about to delete zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig. Hit enter to continue."
+read delete
 rm -fr zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+

From 3066f66f259b9b440ded5474d6d06260e14e4ab3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 5 Jan 2016 13:21:54 -0500
Subject: [PATCH 170/362] add sphinx-rtd-theme

---
 distros/ubuntu1504_cmake/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control
index c2098f179..65e11fac9 100644
--- a/distros/ubuntu1504_cmake/control
+++ b/distros/ubuntu1504_cmake/control
@@ -104,7 +104,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
 Suggests: www-browser
 Description: ZoneMinder documentation
  ZoneMinder is intended for use in single or multi-camera video security

From d96757ba131936293ed1cb18d9ef6b0d7fd04b77 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Wed, 6 Jan 2016 12:46:01 -0600
Subject: [PATCH 171/362] update changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e3944002..f1b145106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.29.0-rc2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc2) (2016-01-05)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc1...v1.29.0-rc2)
+
+**Merged pull requests:**
+
+- Multi server [\#1223](https://github.com/ZoneMinder/ZoneMinder/pull/1223) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1222](https://github.com/ZoneMinder/ZoneMinder/pull/1222) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1217](https://github.com/ZoneMinder/ZoneMinder/pull/1217) ([connortechnology](https://github.com/connortechnology))
+- Multi server [\#1215](https://github.com/ZoneMinder/ZoneMinder/pull/1215) ([connortechnology](https://github.com/connortechnology))
+- Change log updates [\#1172](https://github.com/ZoneMinder/ZoneMinder/pull/1172) ([SteveGilvarry](https://github.com/SteveGilvarry))
+
 ## [v1.29.0-rc1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc1) (2016-01-01)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...v1.29.0-rc1)
 

From 53bd342f85155d4936c3a1249873672f9121ac43 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 09:46:14 -0500
Subject: [PATCH 172/362] remove Google open Sans external import

---
 web/skins/classic/css/flat/skin.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css
index 6a871c416..3a7ee575e 100644
--- a/web/skins/classic/css/flat/skin.css
+++ b/web/skins/classic/css/flat/skin.css
@@ -21,8 +21,6 @@
  * Primary look and feel styles
  */
 
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:200,200italic,300,300italic,400,400italic,600,600italic,700");
-
 body {
     font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif;
     font-size: 16px;

From 5ce26ac4df10e90f58c931c69aced6a2fd39a15b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 09:59:03 -0500
Subject: [PATCH 173/362] Change logrotate defaults to daily/rotate 7, which
 works better with logcheck

---
 distros/ubuntu1504_cmake/zoneminder.logrotate | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/distros/ubuntu1504_cmake/zoneminder.logrotate b/distros/ubuntu1504_cmake/zoneminder.logrotate
index ac7ce0795..18fc6b0a0 100644
--- a/distros/ubuntu1504_cmake/zoneminder.logrotate
+++ b/distros/ubuntu1504_cmake/zoneminder.logrotate
@@ -1,10 +1,10 @@
-/var/log/zm/*log {
+/var/log/zm/*.log {
     missingok
     notifempty
     sharedscripts
     postrotate
         /usr/bin/zmpkg.pl logrot >>/dev/null 2>&1 || :
     endscript
-    weekly
-    rotate 3
+    daily
+    rotate 7
 }

From d13829c6f3355f408fa6c832e91b685b54a4112a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:06 -0500
Subject: [PATCH 174/362] Add Hostname to list of servers, since we have the
 space for it.

---
 web/skins/classic/views/options.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 290790962..9c3b4a418 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -221,6 +221,7 @@ elseif ( $tab == "users" )
           <thead>
             <tr>
               <th class="colName"><?php echo translate('name') ?></th>
+              <th class="colHostname"><?php echo translate('Hostname') ?></th>
               <th class="colMark"><?php echo translate('Mark') ?></th>
 			</tr>
           </thead>
@@ -228,6 +229,7 @@ elseif ( $tab == "users" )
 <?php foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) { ?>
             <tr>
               <td class="colName"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Name']), $canEdit ) ?></td>
+              <td class="colHostname"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Hostname']), $canEdit ) ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
 			</tr>
 <?php } #end foreach Server ?>

From 99dfaa97fa7ab157ec21972b0e4fc21ee04cd732 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:21 -0500
Subject: [PATCH 175/362] User Name instead of ServerName and Hostname instead
 of ServerHostname

---
 web/skins/classic/views/server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index fd22bf367..83df0501e 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -52,11 +52,11 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo translate('ServerName') ?></th>
+              <th scope="row"><?php echo translate('Name') ?></th>
               <td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('ServerHostname') ?></th>
+              <th scope="row"><?php echo translate('Hostname') ?></th>
               <td><input type="text" name="newServer[Hostname]" value="<?php echo $newServer['Hostname'] ?>"/></td>
             </tr>
           </tbody>

From d48ec1cfbe8a251f55158e3feba0f6381efceaff Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:41 -0500
Subject: [PATCH 176/362] Add AddNewServer and Hostname entries

---
 web/lang/en_gb.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 9003e466f..d11cec179 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -87,6 +87,7 @@ $SLANG = array(
     'Actual'                => 'Actual',
     'AddNewControl'         => 'Add New Control',
     'AddNewMonitor'         => 'Add New Monitor',
+    'AddNewServer'          => 'Add New Server',
     'AddNewUser'            => 'Add New User',
     'AddNewZone'            => 'Add New Zone',
     'Alarm'                 => 'Alarm',
@@ -385,6 +386,7 @@ $SLANG = array(
     'HighBW'                => 'High&nbsp;B/W',
     'High'                  => 'High',
     'Home'                  => 'Home',
+    'Hostname'				=> 'Hostname',
     'Hour'                  => 'Hour',
     'Hue'                   => 'Hue',
     'Id'                    => 'Id',

From 2d86e7713d029c4ca939cd84823d3f3954f018b4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 12:14:01 -0500
Subject: [PATCH 177/362] increase height of logout popup to fit content

---
 web/skins/classic/js/dark.js | 2 +-
 web/skins/classic/js/flat.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/js/dark.js b/web/skins/classic/js/dark.js
index f8867feda..e99980f61 100644
--- a/web/skins/classic/js/dark.js
+++ b/web/skins/classic/js/dark.js
@@ -47,7 +47,7 @@ var popupSizes = {
     'image':        { 'addWidth': 48, 'addHeight': 80 },
     'log':          { 'width': 1080, 'height': 720 },
     'login':        { 'width': 720, 'height': 480 },
-    'logout':       { 'width': 260, 'height': 100 },
+    'logout':       { 'width': 260, 'height': 150 },
     'monitor':      { 'width': 525, 'height': 700 },
     'monitorpreset':{ 'width': 440, 'height': 200 },
     'monitorprobe': { 'width': 500, 'height': 240 },
diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js
index 9b04ca16d..8b821f816 100644
--- a/web/skins/classic/js/flat.js
+++ b/web/skins/classic/js/flat.js
@@ -47,7 +47,7 @@ var popupSizes = {
     'image':        { 'addWidth': 48, 'addHeight': 80 },
     'log':          { 'width': 1080, 'height': 720 },
     'login':        { 'width': 720, 'height': 480 },
-    'logout':       { 'width': 260, 'height': 100 },
+    'logout':       { 'width': 260, 'height': 150 },
     'monitor':      { 'width': 550, 'height': 700 },
     'monitorpreset':{ 'width': 440, 'height': 200 },
     'monitorprobe': { 'width': 500, 'height': 240 },

From 47d4331d62340e9abbd8028d0a9ce9ce1e04f99f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sun, 10 Jan 2016 20:58:45 -0500
Subject: [PATCH 178/362] Add Hostname Column to create script, to match update

---
 db/zm_create.sql.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 8239566df..044fec234 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -413,6 +413,7 @@ INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');
 DROP TABLE IF EXISTS `Servers`;
 CREATE TABLE `Servers` (
   `Id` int(10) unsigned NOT NULL auto_increment,
+  `Hostname` TEXT,
   `Name` varchar(64) NOT NULL default '',
   `State_Id`	int(10) unsigned,
   PRIMARY KEY (`Id`)

From 4520902dd24181b621725341bfc35446ddc62fd6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 14 Jan 2016 09:37:41 -0500
Subject: [PATCH 179/362] use trim on values when saving.

---
 web/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 30b183385..14a8d778e 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -792,7 +792,7 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false )
             {
                 if ( !isset($values[$key]) || ($values[$key] != $value) )
                 {
-                    $changes[$key] = "$key = ".dbEscape($value);
+                    $changes[$key] = "$key = ".dbEscape(trim($value));
                 }
                 break;
             }

From 66c66106f51a01ae03cce92efbda33afdefa9380 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Fri, 15 Jan 2016 20:31:31 -0600
Subject: [PATCH 180/362] Process off+time delay condition

---
 scripts/zmtrigger.pl.in | 85 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 44 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 2d0afb13c..55166a492 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -504,22 +504,11 @@ sub handleMessage
         Info( "Set monitor to $state\n" );
         if ( $delay )
         {
-            my $action_time = time()+$delay;
             my $action_text = $id."|".( ($state eq "enable")
                                         ? "disable"
                                         : "enable"
-                                      )
-            ;
-            my $action_array = $actions{$action_time};
-            if ( !$action_array )
-            {
-                $action_array = $actions{$action_time} = [];
-            }
-            push( @$action_array, { connection=>$connection,
-                                    message=>$action_text
-                                  }
-            );
-            Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
+                                      );
+             handleDelay($delay, $connection, $action_text);
         }
     }
     elsif ( $action =~ /^(on|off)(?:[ \+](\d+))?$/ )
@@ -534,43 +523,33 @@ sub handleMessage
             zmTriggerEventOn( $monitor, $score, $cause, $text );
             zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
             Info( "Trigger '$trigger' '$cause'\n" );
+            if ( $delay )
+            {
+                 my $action_text = $id."|cancel";
+                 handleDelay($delay, $connection, $action_text);
+            }
         }
         elsif ( $trigger eq "off" )
         {
-            my $last_event = zmGetLastEvent( $monitor );
-            zmTriggerEventOff( $monitor );
-            zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
-            Info( "Trigger '$trigger'\n" );
-            # Wait til it's finished
-            while( zmInAlarm( $monitor )
-                   && ($last_event == zmGetLastEvent( $monitor ))
-            )
+            if ( $delay ) 
             {
-                # Tenth of a second
-                usleep( 100000 );
-            }
+                 my $action_text = $id."|off|0|".$cause."|".$text;
+                 handleDelay($delay, $connection, $action_text);
+            } else {
+                my $last_event = zmGetLastEvent( $monitor );
+                zmTriggerEventOff( $monitor );
+                zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
+                Info( "Trigger '$trigger'\n" );
+                # Wait til it's finished
+                while( zmInAlarm( $monitor )
+                       && ($last_event == zmGetLastEvent( $monitor ))
+                )
+                {
+                    # Tenth of a second
+                    usleep( 100000 );
+                }
             zmTriggerEventCancel( $monitor );
-        }
-        else
-        {
-            Info( "Trigger '$trigger'\n" );
-            zmTriggerEventCancel( $monitor );
-        }
-        if ( $delay )
-        {
-            my $action_time = time()+$delay;
-            #my $action_text = $id."|cancel|0|".$cause."|".$text;
-            my $action_text = $id."|cancel";
-            my $action_array = $actions{$action_time};
-            if ( !$action_array )
-            {
-                $action_array = $actions{$action_time} = [];
             }
-            push( @$action_array, { connection=>$connection,
-                                    message=>$action_text
-                                  }
-            );
-            Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
         }
     }
     elsif( $action eq "cancel" )
@@ -590,5 +569,23 @@ sub handleMessage
     }
 } # end sub handleMessage
 
+sub handleDelay
+{
+    my $delay = shift;
+    my $connection = shift;
+    my $action_text = shift;
+    
+    my $action_time = time()+$delay;
+    my $action_array = $actions{$action_time};
+    if ( !$action_array )
+    {
+        $action_array = $actions{$action_time} = [];
+    }
+    push( @$action_array, { connection=>$connection,
+                            message=>$action_text
+                          }
+    );
+    Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
+}
 1;
 __END__

From e9c9caf2016a038d37dd7100d32936a06eacb6b1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 18 Jan 2016 21:39:33 -0500
Subject: [PATCH 181/362] Add a local build type

---
 utils/do_debian_package.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 3d9332e3c..286b1a1e5 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -51,7 +51,11 @@ EOF
 if [ $TYPE == "binary" ]; then
 	debuild
 else
-	debuild -S -sa
+	if [ $TYPE == "local" ]; then
+		debuild -i -us -uc -b
+	else 
+		debuild -S -sa
+	fi;
 fi;
 
 cd ../

From e2b00bbe1faec7634a714fcb5c1d2b520e0c2850 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 19 Jan 2016 08:05:40 -0600
Subject: [PATCH 182/362] use local user @ hostname.local for author

---
 utils/do_debian_package.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 286b1a1e5..e6cfd4cd5 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -35,12 +35,18 @@ else
 ln -sf distros/ubuntu1504_cmake debian
 fi;
 
+if [ $TYPE == "local"  ] ; then
+    AUTHOR="`whoami` <`whoami`@`hostname`.local>"
+else
+    AUTHOR="Isaac Connor <iconnor@connortechnology.com>"
+fi
+
 cat <<EOF > debian/changelog
 zoneminder ($VERSION-$DISTRO-$SNAPSHOT) $DISTRO; urgency=medium
 
   * 
 
- -- Isaac Connor <iconnor@connortechnology.com>  $DATE
+ -- $AUTHOR  $DATE
 
 EOF
 #rm -rf .git

From a17bde0784e25e3e13b9ece8e0f22c25f30497d9 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 19 Jan 2016 10:13:36 -0600
Subject: [PATCH 183/362] update hostname logic

---
 utils/do_debian_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index e6cfd4cd5..05d5e40f6 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -35,10 +35,10 @@ else
 ln -sf distros/ubuntu1504_cmake debian
 fi;
 
-if [ $TYPE == "local"  ] ; then
+if [ -z `hostname -d` ] ; then
     AUTHOR="`whoami` <`whoami`@`hostname`.local>"
 else
-    AUTHOR="Isaac Connor <iconnor@connortechnology.com>"
+    AUTHOR="`whoami` <`whoami`@`hostname`>"
 fi
 
 cat <<EOF > debian/changelog

From 22ef473202572651d273e7601c8bf518740ca0da Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 19 Jan 2016 10:22:51 -0600
Subject: [PATCH 184/362] Use the full name

---
 utils/do_debian_package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 05d5e40f6..566642e1a 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -36,9 +36,9 @@ ln -sf distros/ubuntu1504_cmake debian
 fi;
 
 if [ -z `hostname -d` ] ; then
-    AUTHOR="`whoami` <`whoami`@`hostname`.local>"
+    AUTHOR="`getent passwd $USER | cut -d ':' -f 5 | cut -d ',' -f 1` <`whoami`@`hostname`.local>"
 else
-    AUTHOR="`whoami` <`whoami`@`hostname`>"
+    AUTHOR="`getent passwd $USER | cut -d ':' -f 5 | cut -d ',' -f 1` <`whoami`@`hostname`>"
 fi
 
 cat <<EOF > debian/changelog

From 8dd35d605743b6ececc19f6503b76825b6a7e9e7 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 20 Jan 2016 16:09:12 -0500
Subject: [PATCH 185/362] modifications for general users

---
 utils/do_debian_package.sh | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 286b1a1e5..45ff51564 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -1,22 +1,39 @@
 #!/bin/bash
+
+if [ "$1" == "clean" ]; then
+
+read -p "Do you really want to delete existing packages? [y/N]"
+[[ $REPLY == [yY] ]] && { rm -fr zoneminder*.build zoneminder*.changes zoneminder*.deb; echo "Existing package files deleted";  } || { echo "Packages have NOT been deleted"; }
+exit;
+
+fi
+
+
 DATE=`date -R`
 DISTRO=$1
 SNAPSHOT=$2
 if [ "$SNAPSHOT" == "stable" ]; then
-SNAPSHOT="";
+$SNAPSHOT="";
 fi;
 
+
 TYPE=$3
 if [ "$TYPE" == "" ]; then
 TYPE="source";
 fi;
 BRANCH=$4
 
+
 if [ ! -d 'zoneminder_release' ]; then 
 	git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder_release
 fi;
 if [ "$BRANCH" != "" ]; then
 	cd zoneminder_release
+	if [ "$BRANCH" == "stable" ]; then
+		BRANCH=$(git describe --tags $(git rev-list --tags --max-count=1));
+		echo "Latest stable branch is $BRANCH";
+		
+	fi
 	git checkout $BRANCH
 	cd ../
 fi;
@@ -59,7 +76,10 @@ else
 fi;
 
 cd ../
-echo "about to delete zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig. Hit enter to continue."
-read delete
-rm -fr zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+
+read -p "Do you want to keep the checked out version of Zoneminder (incase you want to modify it later) [y/N]"
+[[ $REPLY == [yY] ]] && { mv zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig zoneminder_release; echo "The checked out copy is preserved in zoneminder_release"; } || { rm -fr zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig; echo "The checked out copy has been deleted"; }
+echo "Done!"
+
+
 

From 0ade8abd6acbe0c69a64955375a9bee30ba69653 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 20 Jan 2016 16:11:35 -0500
Subject: [PATCH 186/362] typo

---
 utils/do_debian_package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 45ff51564..2ce506421 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -13,7 +13,7 @@ DATE=`date -R`
 DISTRO=$1
 SNAPSHOT=$2
 if [ "$SNAPSHOT" == "stable" ]; then
-$SNAPSHOT="";
+SNAPSHOT="";
 fi;
 
 

From 0ef6d55e8ffad1f169ae661f06a1f46c1dce38ac Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Fri, 22 Jan 2016 09:39:19 -0500
Subject: [PATCH 187/362] resolves #1231 - ubuntu package from source
 instructions added

---
 docs/installationguide/ubuntu.rst | 210 +++++++++---------------------
 1 file changed, 63 insertions(+), 147 deletions(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 1d5412077..57f1a9646 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -286,192 +286,108 @@ Harder Way: Build Package From Source
 -------------------------------------------
 (These instructions assume installation from source on a ubuntu 15.x+ system)
 
-**Step 1:** First make sure you have the needed tools
+**Step 1:** Grab the package installer script
+
+::
+
+	wget https://raw.githubusercontent.com/ZoneMinder/ZoneMinder/master/utils/do_debian_package.sh
+	chmod a+x do_debian_package.sh
+
+
+**Step 2:** Install some core dependencies
 
 ::
 
 	sudo apt-get update
-	sudo apt-get install cmake git
 
-**Step 2:** Next up make sure you have all the dependencies
+	sudo apt-get install git cmake pbuilder debhelper sphinx-common apache2-dev dh-linktree dh-systemd libavcodec-ffmpeg-dev libavformat-ffmpeg-dev libswscale-ffmpeg-dev libavutil-ffmpeg-dev libavdevice-ffmpeg-dev libbz2-dev libdate-manip-perl libdbd-mysql-perl libgcrypt-dev libcurl4-gnutls-dev libgnutls-openssl-dev libjpeg-dev libmysqlclient-dev libpcre3-dev libphp-serialization-perl libpolkit-gobject-1-dev libsys-mmap-perl libv4l-dev libvlc-dev libjs-mootools mysql-server apache2 libapache2-mod-php5 gdebi
+
+
+**Step 3** Create the package
+
+To build the latest master snapshot:
 
 ::
 
-	sudo apt-get install apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2 libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch policykit-1 libpolkit-gobject-1-dev  libextutils-pkgconfig-perl libcurl3 libvlc-dev libcurl4-openssl-dev  curl php5-gd
+	./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`  `date +%Y%m%d`01 local master
 
-(you are asked for the mysql root password when installing mysql server - put in a password that you'd like). 
 
-**Step 3:** Download ZoneMinder source code and compile+install:
+To build the latest stable release:
 
 ::
 
-	git clone https://github.com/ZoneMinder/ZoneMinder.git
-	cd ZoneMinder/
-	git submodule init
-	git submodule update
-	cmake .
-	make
-	sudo make install
+	./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`  `date +%Y%m%d`01 local stable 
 
-**Step 4:** Now make sure your symlinks to events and images are set correctly:
+
+Note that the ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`` part simply extracts your distribution name - like "vivid", "trusty" etc. You can always replace it by your distro name if you know it. As far as the script goes, it checks if your distro is "trusty" in which case it pulls in pre-systemd release configurations and if its not "trusty" it assumes its based on systemd and pulls in systemd related config files. 
+
+(At the end the script will ask if you want to retain the checked out version of zoneminder. If you are a developer and are making local changes, make sure you select "y" so that the next time you do the build process mentioned here, it keeps your changes. Selecting any other value than "y" or "Y" will delete the checked out code and only retain the package)
+
+This should now create a bunch of .deb files
+
+**Step 4:** Install the package
 
 ::
 
-	sudo ./zmlinkcontent.sh
+	sudo gdebi zoneminder_<version>_<arch>.deb
+	(example sudo gdebi zoneminder_1.29.0-vivid-2016012001_amd64.deb)
 
-**Step 5:** Now lets make sure ZM has DB permissions to write to the DB:
+
+**This will report DB errors - ignore - you need to configure the DB and some other stuff**
+
+**Step 5:** Post install configuration
 
 ::
 
+	sudo mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
 	mysql -uroot -p -e "grant select,insert,update,delete,create,alter,index,lock tables on zm.* to 'zmuser'@localhost identified by 'zmpass';"
 
-**Step 6:** Now lets create the DB & its tables that ZM needs
-
-::
-
-	mysql -uroot -p <db/zm_create.sql 
-
-
-**Step 7:** Now we need to make sure Ubuntu 15 is able to start/stop zoneminder via systemd:
-
-::
-
-	sudo cp distros/ubuntu1504_cmake/zoneminder.service /lib/systemd/system
-
-edit **/lib/systemd/system/zoneminder.service** file
-* rename **/usr/bin/zmpkg** to **/usr/local/bin/zmpkg** everywhere 
-
-(The step above is needed because when you compile from source, it installs to /usr/local/instead of /usr/)
-
-**Step 8:** Now lets make sure systemd recognizes this file
-
-::
-
-	sudo systemctl daemon-reload
-	sudo systemctl enable zoneminder.service
-
-**Step 9:** Now lets work on Zoneminder's apache configuration:
-
-::
-
-	sudo cp distros/ubuntu1504_cmake/conf/apache2/zoneminder.conf /etc/apache2/conf-available/
+	sudo a2enmod cgi rewrite
 	sudo a2enconf zoneminder
-	sudo a2enmod cgi
-	sudo a2enmod rewrite 
-	sudo service apache2 reload
 
 
-**Step 10:** Edit /etc/apache2/conf-available/zoneminder.conf and change **all** occurrences of:
 
-* **/usr/lib/zoneminder/cgi-bin** to **/usr/local/libexec/zoneminder/cgi-bin**
-* **/usr/share/zoneminder** to **/usr/local/share/zoneminder**
+**Step 6:** Fix PHP TimeZone
 
-After editing your /etc/apache2/conf-available/zoneminder.conf should look like:
+``sudo vi /etc/php5/apache2/php.ini`` 
+
+Look for [Date] and inside it you will see a date.timezone that is commented. remove the comment and specific your timezone. Please make sure the timezone is valid (see http://php.net/manual/en/timezones.php)
+
+Example:
+
+``date.timezone = America/New_York``
+
+**Step 7:** Fix some key permission issues and make sure API works
 
 ::
 
-	ScriptAlias /zm/cgi-bin "/usr/local/libexec/zoneminder/cgi-bin"
-	<Directory "/usr/local/libexec/zoneminder/cgi-bin">
-	    Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-	    AllowOverride All
-	    Require all granted
-	</Directory>
+	sudo chown www-data /etc/zm/zm.conf
+	sudo chown -R www-data /usr/share/zoneminder/www/api/
 
-	Alias /zm /usr/local/share/zoneminder/www
-	<Directory /usr/local/share/zoneminder/www>
-	  php_flag register_globals off
-	  Options Indexes FollowSymLinks
-	  <IfModule mod_dir.c>
-	    DirectoryIndex index.php
-	  </IfModule>
-	</Directory>
 
-	<Directory /usr/local/share/zoneminder/www/api>
-	    AllowOverride All
-	</Directory>
-
-**Step 11:** Now lets make sure ZM can read/write to the zoneminder directory:
+**Step 8:**  Restart all services
 
 ::
 
-	sudo chown -R www-data:www-data /usr/local/share/zoneminder/
+	sudo service apache2 restart
+	sudo service zoneminder restart
 
-
-**Step 12:** Make sure you can view Monitor View
-
-1. Open up ZM, configure your monitors and verify you can view Monitor feeds
-2. If not, open up ZM console in your browser, go to ``Options->Path`` and make sure ``PATH_ZMS`` is set to ``/zm/cgi-bin/nph-zms`` and restart ZM
-
-**Step 13**: Edit Timezone in PHP
-
-vi /etc/php5/apache2/php.ini
-Look for [Date] and inside it you will see a date.timezone
-that is commented. remove the comment and specific your timezone.
-Please make sure the timezone is valid (see http://php.net/manual/en/timezones.php)
-
-In my case:
+Check if ZM is running properly
 
 ::
 
-	date.timezone = America/New_York
-
-**Step 14:** Finally, lets make a config change to apache (needed for htaccess overrides to work for APIs)
-Edit  /etc/apache2/apache2.conf and add this:
-
-::
-
-	<Directory /usr/local/share>
-		AllowOverride All
-		Require all granted
-	</Directory>
-
-Restart apache
-
-::
-
-	sudo service apache2 reload
-
-You are done. Lets proceed to make sure everything works:
-
-Making sure ZM and APIs work:
-
-1. open up a browser and go to ``http://localhost/zm`` - should bring up ZM
-2. (OPTIONAL - just for peace of mind) open up a tab and go to ``http://localhost/zm/api`` - should bring up a screen showing CakePHP version with some green color boxes. Green is good. If you see red, or you don't see green, there may be a problem (should not happen). Ignore any warnings in yellow saying "DebugKit" not installed. You don't need it
-3. open up a tab in the same browser and go to ``http://localhost/zm/api/host/getVersion.json``
-
-If it responds with something like:
-
-::
-
-	{
-	    "version": "1.28.107",
-	    "apiversion": "1.28.107.1"
-	}
-
-Then your APIs are working
-
-Make sure ZM and APIs work with security:
-1. Enable OPT_AUTH in ZM
-2. Log out of ZM in browser
-3. Open a NEW tab in the SAME BROWSER (important) and go to ``http://localhost/zm/api/host/getVersion.json`` - should give you "Unauthorized" along with a lot more of text
-4. Go to another tab in the SAME BROWSER (important) and log into ZM
-5. Repeat step 3 and it should give you the ZM and API version
-
-**Congrats** your installation is complete
- 
-Suggested changes to MySQL (Optional but recommended)
-------------------------------------------------------
-For most of you Zoneminder will run just fine with the default MySQL settings. There are a couple of settings that may, in time, provide beneficial especially if you have a number of cameras and many events with a lot of files. One setting we recommend is the "innodb_file_per_table" This will be a default setting in MySQL 5.6 but should be added in MySQL 5.5 which comes with Ubuntu 14.04. A description can be found here: http://dev.mysql.com/doc/refman/5.5/en/innodb-multiple-tablespaces.html
-
-To add "innodb_file_per_table" edit the my.cnf file:
-
-``vi /etc/mysql/my.cnf``
-Under [mysqld] add
-``innodb_file_per_table``
-
-Save and exit.
-
-Restart MySQL
-``service mysql restart``
+	sudo service zoneminder status
+
+
+**Step 9:** Make sure streaming works - set PATH_ZMS
+
+open up ZM console in your browser, go to Options->Path and make sure ``PATH_ZMS`` is set to ``/zm/cgi-bin/nph-zms`` and restart ZM
+
+
+**Step 10:** Make sure everything works
+
+* point your browser to http://yourzmip/zm - you should see ZM console running
+*  point your browser to http://yourzmip/zm/api/host/getVersion.json - you should see an API version
+* Configure your monitors and make sure its all a-ok
 
 

From 8753ee98e5ef789ab59290a8cd37134af1d9ee10 Mon Sep 17 00:00:00 2001
From: Brandon Odegard <bodegard@users.noreply.github.com>
Date: Fri, 22 Jan 2016 10:46:46 -0600
Subject: [PATCH 188/362] Corrected update version comment to 1.28.109

Corrected version comment to indicate an update from 1.28.108 to 1.28.109
---
 db/zm_update-1.28.109.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.28.109.sql b/db/zm_update-1.28.109.sql
index be6dca9f1..dfbacdf5b 100644
--- a/db/zm_update-1.28.109.sql
+++ b/db/zm_update-1.28.109.sql
@@ -1,5 +1,5 @@
 --
--- This updates a 1.28.106 database to 1.28.107
+-- This updates a 1.28.108 database to 1.28.109
 --
 
 --

From 029c1efa319da56a6a99ed3163d0d12be29e351f Mon Sep 17 00:00:00 2001
From: Brandon Odegard <bodegard@users.noreply.github.com>
Date: Fri, 22 Jan 2016 10:48:47 -0600
Subject: [PATCH 189/362] Corrected update version comment to 1.28.110

Corrected version comment to indicate database update from 1.28.109 to 1.28.110
---
 db/zm_update-1.28.110.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.28.110.sql b/db/zm_update-1.28.110.sql
index a9fe04633..7a573bbf3 100644
--- a/db/zm_update-1.28.110.sql
+++ b/db/zm_update-1.28.110.sql
@@ -1,5 +1,5 @@
 --
--- This updates a 1.28.106 database to 1.28.107
+-- This updates a 1.28.109 database to 1.28.110
 --
 
 --

From 9c72579c2e8b28823473b32690d21fb6b711c56e Mon Sep 17 00:00:00 2001
From: Brandon Odegard <bodegard@users.noreply.github.com>
Date: Fri, 22 Jan 2016 12:12:39 -0600
Subject: [PATCH 190/362] Corrected typo in function info

---
 scripts/zmupdate.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 969c72cb6..3143b2d50 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -23,7 +23,7 @@
 
 =head1 NAME
 
-zmupdate.pl - check and upgrade Zoneminer database
+zmupdate.pl - check and upgrade ZoneMinder database
 
 =head1 SYNOPSIS
 

From 1ca9ace84d38c4765392cbcc703a9b55d42e64fb Mon Sep 17 00:00:00 2001
From: Brandon Odegard <brandon.odegard@gmail.com>
Date: Fri, 22 Jan 2016 13:31:02 -0600
Subject: [PATCH 191/362] Fixed missing semicolons

---
 web/skins/classic/css/classic/export.css | 2 +-
 web/skins/classic/css/dark/export.css    | 2 +-
 web/skins/classic/css/flat/export.css    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/css/classic/export.css b/web/skins/classic/css/classic/export.css
index b9b542d5b..757b49057 100644
--- a/web/skins/classic/css/classic/export.css
+++ b/web/skins/classic/css/classic/export.css
@@ -1,7 +1,7 @@
 body {
   font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:10px;
-  font-weight: normal
+  font-weight: normal;
   color: #333333;
 }
 
diff --git a/web/skins/classic/css/dark/export.css b/web/skins/classic/css/dark/export.css
index b9b542d5b..757b49057 100644
--- a/web/skins/classic/css/dark/export.css
+++ b/web/skins/classic/css/dark/export.css
@@ -1,7 +1,7 @@
 body {
   font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:10px;
-  font-weight: normal
+  font-weight: normal;
   color: #333333;
 }
 
diff --git a/web/skins/classic/css/flat/export.css b/web/skins/classic/css/flat/export.css
index b9b542d5b..757b49057 100644
--- a/web/skins/classic/css/flat/export.css
+++ b/web/skins/classic/css/flat/export.css
@@ -1,7 +1,7 @@
 body {
   font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:10px;
-  font-weight: normal
+  font-weight: normal;
   color: #333333;
 }
 

From 54a11175ff0540e2e9cca28a93632703c47ad620 Mon Sep 17 00:00:00 2001
From: Brandon Odegard <brandon.odegard@gmail.com>
Date: Fri, 22 Jan 2016 13:56:41 -0600
Subject: [PATCH 192/362] Reduce default size of body font in Flat skin

---
 web/skins/classic/css/flat/skin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css
index 6a871c416..8b20f6276 100644
--- a/web/skins/classic/css/flat/skin.css
+++ b/web/skins/classic/css/flat/skin.css
@@ -25,7 +25,7 @@
 
 body {
     font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif;
-    font-size: 16px;
+    font-size: 13px;
     color: #333333;
     font-weight: 300;
     text-align: center;

From 680ab0236cb8523c8ff307832180a9743fd237fb Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Sun, 24 Jan 2016 07:47:25 -0500
Subject: [PATCH 193/362] updated ubuntu instructions

---
 docs/installationguide/ubuntu.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 57f1a9646..54df8529a 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -1,5 +1,5 @@
-Ubuntu
-======
+Ubuntu Instruction
+===================
 
 .. contents::
 

From fa168027b31e51af34d768eeb7aa62554ce294f3 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 24 Jan 2016 07:45:04 -0600
Subject: [PATCH 194/362] Fix PelcoP checksum calculation

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
index c8fafe023..794393644 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
@@ -133,8 +133,10 @@ sub sendCmd
 
     my $result = undef;
 
+    # Pelco P protocol checksum is created by XOR'ing the first seven bytes in the message
+    # including the first byte, the STX sync packet
     my $checksum = 0x00;
-    for ( my $i = 1; $i < int(@$cmd); $i++ )
+    for ( my $i = 0; $i < int(@$cmd); $i++ )
     {
         $checksum ^= $cmd->[$i];
     }

From f7bc8c7f0d942890e75949136aee8dec86328eeb Mon Sep 17 00:00:00 2001
From: tikismoke <webmaster@tikijs.dyndns.org>
Date: Tue, 26 Jan 2016 20:14:49 +0100
Subject: [PATCH 195/362] Update gettingstarted.rst

Correct MODECT by NODECT if using zmTrigger
---
 docs/userguide/gettingstarted.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 2bc3dcd7f..c766e4f15 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -67,7 +67,7 @@ own empty screen.
 * **D**: This is the core of ZoneMinder - recording events. It gives you a count of how many events were recorded over the hour, day, week, month.
 * **E**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
 * **F**: This is the "source" column that tells you the type of the camera - if its an IP camera, a USB camera or more. In this example, they are all IP cameras. Note the color red on item F ? Well that means there is something wrong with that camera. No wonder the log also shows red. Good indication for you to tap on logs and investigate
-* **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Modect = Don't record till an externa entity via zmtrigger tells Zoneminder to (this is advanced usage).
+* **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Nodect = Don't record till an externa entity via zmtrigger tells Zoneminder to (this is advanced usage).
 * **H**: If you click on these links you can view a "Montage" of all your configured monitors or cycle through each one
 
 

From 3a0b28f168e0fce81fd13fe0d86d373da08b6a84 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 26 Jan 2016 20:53:34 -0500
Subject: [PATCH 196/362] Add Debug/Info lines reporting multi-server status

---
 src/zm_config.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 5521b5a14..8d293906c 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -115,6 +115,7 @@ void zmLoadConfig()
 	if ( ! staticConfig.SERVER_ID ) {
 		if ( ! staticConfig.SERVER_NAME.empty() ) {
 
+			Debug( 1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str() );
 			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
 			if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
 				staticConfig.SERVER_ID = atoi(dbrow[0]);
@@ -124,6 +125,7 @@ void zmLoadConfig()
 
 		} // end if has SERVER_NAME
 	} else if ( staticConfig.SERVER_NAME.empty() ) {
+		Debug( 1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID );
 		std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
 		
 		if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
@@ -133,6 +135,11 @@ void zmLoadConfig()
 		}
 	
 	}	
+	if ( ! staticConfig.SERVER_ID ) {
+		Info( "No Server ID or Name specified in config.  Not using Multi-Server Mode." );
+	} else {
+		Info( "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID );
+	}
 }
 
 StaticConfig staticConfig;

From 902065a6c1361f4b2bc233c638dbe71079d3578a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 26 Jan 2016 20:59:07 -0500
Subject: [PATCH 197/362] Add Debug for sql used to load local monitors

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 78d32fd7e..023985fab 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2055,9 +2055,9 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
         sql += "'";
     }
     if ( staticConfig.SERVER_ID ) {
-Debug( 1, "Server ID %d", staticConfig.SERVER_ID );
         sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
+	Debug( 1, "Loading Local Monitors with %s", sql.c_str() );
 
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result ) {

From f275498790c5f303a01a09761e622dee86369afe Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 26 Jan 2016 21:00:32 -0500
Subject: [PATCH 198/362] Add Debug for sql used to load other than local
 monitors

---
 src/zm_monitor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 023985fab..b95b1b43c 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2237,6 +2237,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
         sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
     }
 
+	Debug( 1, "Loading Remote Monitors with %s", sql.c_str() );
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
@@ -2415,6 +2416,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
     if ( staticConfig.SERVER_ID ) {
         sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
+	Debug( 1, "Loading File Monitors with %s", sql.c_str() );
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( !result )
     {
@@ -2557,6 +2559,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
     if ( staticConfig.SERVER_ID ) {
         sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
     }
+	Debug( 1, "Loading FFMPEG Monitors with %s", sql.c_str() );
     MYSQL_RES *result = zmDbFetch( sql.c_str() );
     if ( ! result ) {
         Error( "Cannot load FfmpegMonitors" );

From 47b2cdbb962ca28aeb1904cf8e38d591ad7a9b15 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Fri, 29 Jan 2016 09:58:50 -0500
Subject: [PATCH 199/362] added CMD_QUIT to kill zms via command

---
 src/zm_event.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 5cf99de81..1f1fb0f0b 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -1088,6 +1088,11 @@ void EventStream::processCommand( const CmdMsg *msg )
             Debug( 1, "Got QUERY command, sending STATUS" );
             break;
         }
+	case CMD_QUIT :
+        {
+           Info ("User initiated exit - CMD_QUIT");
+           break;
+        }
         default :
         {
             // Do nothing, for now
@@ -1125,6 +1130,9 @@ void EventStream::processCommand( const CmdMsg *msg )
             exit( -1 );
         }
     }
+    // quit after sending a status, if this was a quit request
+    if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
+        exit(0);
 
     updateFrameRate( (double)event_data->frame_count/event_data->duration );
 }

From 38bca6b95d24f71ff915d2a0035b23cf23503f67 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Fri, 29 Jan 2016 09:58:57 -0500
Subject: [PATCH 200/362] added CMD_QUIT to kill zms via command

---
 src/zm_monitor.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index b95b1b43c..20b8b7802 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3922,6 +3922,11 @@ void MonitorStream::processCommand( const CmdMsg *msg )
             Debug( 1, "Got SCALE command, to %d", scale );
             break;
         }
+	case CMD_QUIT :
+	{
+	   Info ("User initiated exit - CMD_QUIT");
+	   break;
+	}
         case CMD_QUERY :
         {
             Debug( 1, "Got QUERY command, sending STATUS" );
@@ -3987,6 +3992,10 @@ void MonitorStream::processCommand( const CmdMsg *msg )
         }
     }
 
+    // quit after sending a status, if this was a quit request
+    if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
+	exit(0);
+
     updateFrameRate( monitor->GetFPS() );
 }
 

From 904f584fcbe4813ec5ba18e1e600c016337a1b19 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Fri, 29 Jan 2016 10:00:02 -0500
Subject: [PATCH 201/362] CMD_QUIT definition

---
 src/zm_stream.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_stream.h b/src/zm_stream.h
index 9936688a8..4f6442725 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -57,7 +57,7 @@ protected:
     } DataMsg;
 
     typedef enum { MSG_CMD=1, MSG_DATA_WATCH, MSG_DATA_EVENT } MsgType;
-    typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUERY=99 } MsgCommand;
+    typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUIT, CMD_QUERY=99 } MsgCommand;
 
 protected:
     Monitor *monitor;

From fa503274202fc4f9f481dd296f0c6464c4968666 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Fri, 29 Jan 2016 21:24:50 -0600
Subject: [PATCH 202/362] Update zoneminder.f23.spec

---
 distros/fedora/zoneminder.f23.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec
index da19c80ee..8115a3f58 100644
--- a/distros/fedora/zoneminder.f23.spec
+++ b/distros/fedora/zoneminder.f23.spec
@@ -65,7 +65,7 @@ too much degradation of performance.
 %setup -q -n ZoneMinder-%{version}
 
 # Change the following default values
-./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms
+./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
 ./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload

From a990b231644438208ef96e2330cde38592e16700 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Fri, 29 Jan 2016 21:25:34 -0600
Subject: [PATCH 203/362] Update zoneminder.f22.spec

---
 distros/fedora/zoneminder.f22.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
index 2396a868b..2169bb256 100644
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@@ -65,7 +65,7 @@ too much degradation of performance.
 %setup -q -n ZoneMinder-%{version}
 
 # Change the following default values
-./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms
+./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
 ./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload

From b99e7b6500af82ed5bb616b8850760c7eb43ccce Mon Sep 17 00:00:00 2001
From: Sander Alberink <sander@vanbreda.nl>
Date: Mon, 1 Feb 2016 12:34:09 +0100
Subject: [PATCH 204/362] Prepare for new Apache 2.4 behviour in Trusty

---
 utils/docker/apache-vhost | 3 +--
 utils/docker/phpdate.ini  | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 utils/docker/phpdate.ini

diff --git a/utils/docker/apache-vhost b/utils/docker/apache-vhost
index 622e4b5e4..5f59c01b2 100644
--- a/utils/docker/apache-vhost
+++ b/utils/docker/apache-vhost
@@ -6,8 +6,7 @@
         <Directory "/usr/lib/cgi-bin">
                 AllowOverride None
                 Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                Order allow,deny
-                Allow from all
+		require all granted
         </Directory>
 
 </VirtualHost>
diff --git a/utils/docker/phpdate.ini b/utils/docker/phpdate.ini
new file mode 100644
index 000000000..50f2cca0f
--- /dev/null
+++ b/utils/docker/phpdate.ini
@@ -0,0 +1,5 @@
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = Europe/Amsterdam
+

From baa305c0ed90fe23a4185b624a1272d1486bb4b6 Mon Sep 17 00:00:00 2001
From: Sander Alberink <sander@vanbreda.nl>
Date: Mon, 1 Feb 2016 12:35:45 +0100
Subject: [PATCH 205/362] Increase shared memory available in docker to ensure
 H.264 cameras can work

Also enable CGI module, as zoneminder needs this for monitors
---
 utils/docker/start.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/docker/start.sh b/utils/docker/start.sh
index 76ad3dcbb..e5730c279 100644
--- a/utils/docker/start.sh
+++ b/utils/docker/start.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Prepare proper amount of shared memory
+umount /dev/shm
+mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=2048M tmpfs /dev/shm
+
 # Start MySQL
 /usr/bin/mysqld_safe & 
 
@@ -27,6 +31,9 @@ mysql -u root < db/zm_create.sql
 # Add the ZoneMinder DB user
 mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zm'@'localhost' identified by 'zm'"
 
+# Activate CGI
+a2enmod cgi
+
 # Restart apache
 service apache2 restart
 

From bd3e79015bf61ffd282d18f204fac3d6a2fcac9e Mon Sep 17 00:00:00 2001
From: Sander Alberink <sander@vanbreda.nl>
Date: Mon, 1 Feb 2016 12:39:43 +0100
Subject: [PATCH 206/362] Fix Dockerfile

- migrate to Ubuntu Trusty Tahr, which is the latest LTS release
- add a user that is allowed to login via SSH
- Fix apache configuration
---
 Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 382330a09..fd41464fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # ZoneMinder
 
-FROM ubuntu:precise
+FROM ubuntu:trusty
 MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>
 
 # Let the container know that there is no tty
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev \
 	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \
 	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
-	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore5 vlc-data libcurl4-openssl-dev \
+	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \
 	libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \
 	libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \
 	libmime-lite-perl dh-autoreconf dpatch
@@ -47,11 +47,16 @@ RUN chmod 755 /tmp/start.sh
 RUN mkdir /var/run/sshd
 
 # Adding apache virtual hosts file
-ADD utils/docker/apache-vhost /etc/apache2/sites-enabled/000-default
+ADD utils/docker/apache-vhost /etc/apache2/sites-available/000-default.conf
+ADD utils/docker/phpdate.ini /etc/php5/apache2/conf.d/25-phpdate.ini
 
 # Set the root passwd
 RUN echo 'root:root' | chpasswd
 
+# Add a user we can actually login with
+RUN useradd -m -s /bin/bash -G sudo zoneminder
+RUN echo 'zoneminder:zoneminder' | chpasswd
+
 # Expose ssh and http ports
 EXPOSE 80
 EXPOSE 22

From 5a8989b1685c005757a23dcc3640d2fe11c6ff4c Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 2 Feb 2016 11:47:55 -0600
Subject: [PATCH 207/362] Minor RPM packaging changes

---
 distros/fedora/README.Fedora       | 14 +++++---------
 distros/fedora/zoneminder.f22.spec |  2 +-
 distros/fedora/zoneminder.f23.spec |  2 +-
 distros/redhat/README.CentOS       | 11 +++--------
 distros/redhat/README.Centos7      | 14 +++++---------
 distros/redhat/zoneminder.el6.spec |  2 +-
 distros/redhat/zoneminder.el7.spec |  2 +-
 7 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora
index 85088d868..0f88a9a16 100644
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@@ -44,12 +44,10 @@ New installs
    set during the previous step, you will need to create the ZoneMinder
    database and configure a database account for ZoneMinder to use:
 
-     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -u root -p
-        mysql> grant all
-               on zm.* to 'zmuser'@localhost identified by 'zmpass';
-        mysql> exit;
-     mysqladmin -u root -p reload
+     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
+     mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
    anything that suits your envinroment.
@@ -125,9 +123,7 @@ Upgrades
    have increased. Verify the zmuser database account has been granted all
    permission to the ZoneMinder database:
 
-     mysql -u root -p
-         mysql> show grants for zmuser@localhost;
-         mysql> exit;
+     mysql -uroot -p -e "show grants for zmuser@localhost;"
 
    See step 2 of the Installation section to add missing permissions.
    
diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
index 2169bb256..9beef6319 100644
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@@ -138,7 +138,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
+%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc
 %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec
index 8115a3f58..14b653117 100644
--- a/distros/fedora/zoneminder.f23.spec
+++ b/distros/fedora/zoneminder.f23.spec
@@ -138,7 +138,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/jscalendar-doc
+%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc
 %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS
index e6e53bbc6..f0e627c90 100644
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@@ -30,12 +30,9 @@ New installs
    will need to create the ZoneMinder database and configure a database
    account for ZoneMinder to use:
 
-     mysql -uroot -p
-	mysql> create database zm;
-	mysql> grant all
-                on zm.* to 'zmuser'@localhost identified by 'zmpass';
-	mysql> exit;
      mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
@@ -117,9 +114,7 @@ New installs
    have increased. Verify the zmuser database account has been granted all
    permission to the ZoneMinder database:
 
-     mysql -u root -p
-         mysql> show grants for zmuser@localhost;
-         mysql> exit;
+     mysql -uroot -p -e "show grants for zmuser@localhost;"
 
    See step 2 of the Installation section to add missing permissions.
 
diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7
index 451f4290b..f4566b01c 100644
--- a/distros/redhat/README.Centos7
+++ b/distros/redhat/README.Centos7
@@ -32,12 +32,10 @@ New installs
    will need to create the ZoneMinder database and configure a database
    account for ZoneMinder to use:
 
-     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -u root -p
-        mysql> grant all
-               on zm.* to 'zmuser'@localhost identified by 'zmpass';
-        mysql> exit;
-     mysqladmin -u root -p reload
+     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
+     mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
    anything that suits your envinroment.
@@ -112,9 +110,7 @@ Upgrades
    have increased. Verify the zmuser database account has been granted all
    permission to the ZoneMinder database:
 
-     mysql -u root -p
-         mysql> show grants for zmuser@localhost;
-         mysql> exit;
+     mysql -uroot -p -e "show grants for zmuser@localhost;"
 
    See step 2 of the Installation section to add missing permissions.
 
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 97623addf..82406d431 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -130,7 +130,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/jscalendar-doc
+%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.CentOS distros/redhat/README.https distros/redhat/jscalendar-doc
 %doc distros/redhat/local_zoneminder.te
 %config %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index 60406b477..c350553b3 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -137,7 +137,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/jscalendar-doc
+%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/README.https distros/redhat/jscalendar-doc
 %doc distros/redhat/local_zoneminder.te
 %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf

From 6de2ab504c71217fa3797b9d041199795c3ca804 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 3 Feb 2016 12:40:30 -0600
Subject: [PATCH 208/362] Explain ZM_SERVER_HOST in multiserver documentation

---
 docs/installationguide/multiserver.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
index aa6139551..e9ebefac2 100644
--- a/docs/installationguide/multiserver.rst
+++ b/docs/installationguide/multiserver.rst
@@ -21,7 +21,7 @@ New installs
 
 1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder Servers.
 
-2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server.
+2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server. Find the ZM_SERVER_HOST and enter a name for this ZoneMinder server. Use a name easily recognizable by you. This name is not used by ZoneMinder for dns or any other form of network conectivity.
 
 3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder Servers to the machine targeted as the Database Server.
 
@@ -34,9 +34,7 @@ New installs
 ::
 
   mysql -u root -p < zm_create.sql
-  mysql -u root -p
-    mysql> grant all on zm.* to 'zmuser'@'%' identified by 'zmpass';
-    mysql> exit;
+  mysql -uroot -p -e "grant all on zm.* to 'zmuser'@localhost identified by 'zmpass';"
   mysqladmin -u root -p reload
 
 The database account credentials, zmuser/zmpass, are arbitrary. Set them to anything that suits your environment.
@@ -52,6 +50,6 @@ Additionally, you must also edit /usr/share/zoneminder/www/api/app/Config/databa
 
 NOTE: The location of this folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
 
-10. Open your browser and point it to the web console on any of the ZoneMinder Servers (they will all be the same). Open Options, click the Servers tab,and populate this screen with all of your ZoneMinder Servers.
+10. Open your browser and point it to the web console on any of the ZoneMinder Servers (they will all be the same). Open Options, click the Servers tab,and populate this screen with all of your ZoneMinder Servers. Each server has a field for its name and its hostname. The name is what you used for ZM_SERVER_HOST in step 2. The hostname is the network name or ip address ZoneMinder should use.
 
 11. When creating a new Monitor, remember to select the server the camera will be assigned to from the Server drop down box.

From 7a98acc868d4e357e5f75d46ef0a8e8f3c2d1a82 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 3 Feb 2016 13:21:10 -0600
Subject: [PATCH 209/362] update changelog to 1.29.0 release

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1b145106..ddf9320cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.29.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0) (2016-02-03)
+[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc2...v1.29.0)
+
+**Merged pull requests:**
+
+- 1253 zms quit cmd [\#1254](https://github.com/ZoneMinder/ZoneMinder/pull/1254) ([pliablepixels](https://github.com/pliablepixels))
+- Add Debug/Info lines reporting multi-server status [\#1252](https://github.com/ZoneMinder/ZoneMinder/pull/1252) ([connortechnology](https://github.com/connortechnology))
+- Do debian package mods [\#1244](https://github.com/ZoneMinder/ZoneMinder/pull/1244) ([pliablepixels](https://github.com/pliablepixels))
+- zmtrigger - process off+time delay condition [\#1240](https://github.com/ZoneMinder/ZoneMinder/pull/1240) ([knnniggett](https://github.com/knnniggett))
+- Multi server [\#1233](https://github.com/ZoneMinder/ZoneMinder/pull/1233) ([connortechnology](https://github.com/connortechnology))
+- remove Google open Sans external import [\#1232](https://github.com/ZoneMinder/ZoneMinder/pull/1232) ([connortechnology](https://github.com/connortechnology))
+- PTZ - Added autostop to Down command on FI8918W [\#1189](https://github.com/ZoneMinder/ZoneMinder/pull/1189) ([marcolino7](https://github.com/marcolino7))
+
 ## [v1.29.0-rc2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc2) (2016-01-05)
 [Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc1...v1.29.0-rc2)
 

From b0c5aa511a9d8cb1128738f48f0c113973a6de72 Mon Sep 17 00:00:00 2001
From: Sander Alberink <sander@vanbreda.nl>
Date: Fri, 5 Feb 2016 14:02:20 +0100
Subject: [PATCH 210/362] Migrate to cmake for building.

Also ensure that content is properly symlinked.
---
 Dockerfile            | 13 ++++++++++---
 utils/docker/start.sh |  5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fd41464fe..46b3dac5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
 	libpolkit-gobject-1-dev build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev \
 	libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
-	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev \
+	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \
 	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \
 	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
 	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \
@@ -25,10 +25,11 @@ ADD . /ZoneMinder
 WORKDIR /ZoneMinder
 
 # Setup the ZoneMinder build environment
-RUN aclocal && autoheader && automake --force-missing --add-missing && autoconf
+#RUN aclocal && autoheader && automake --force-missing --add-missing && autoconf
 
 # Configure ZoneMinder
-RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
+#RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes --enable-onvif ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
+RUN cmake .
 
 # Build ZoneMinder
 RUN make
@@ -36,6 +37,9 @@ RUN make
 # Install ZoneMinder
 RUN make install
 
+# ensure writable folders
+RUN ./zmlinkcontent.sh
+
 # Adding the start script
 ADD utils/docker/start.sh /tmp/start.sh
 
@@ -43,6 +47,9 @@ ADD utils/docker/start.sh /tmp/start.sh
 # TODO - Files ADD'ed have 755 already...why do we need this?
 RUN chmod 755 /tmp/start.sh
 
+# give files in /usr/local/share/zoneminder/
+RUN chown -R www-data:www-data /usr/local/share/zoneminder/
+
 # Creating SSH privledge escalation dir
 RUN mkdir /var/run/sshd
 
diff --git a/utils/docker/start.sh b/utils/docker/start.sh
index e5730c279..4b6c0e379 100644
--- a/utils/docker/start.sh
+++ b/utils/docker/start.sh
@@ -29,11 +29,14 @@ done
 mysql -u root < db/zm_create.sql
 
 # Add the ZoneMinder DB user
-mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zm'@'localhost' identified by 'zm'"
+mysql -u root -e "grant insert,select,update,delete,lock tables,alter on zm.* to 'zmuser'@'localhost' identified by 'zmpass';"
 
 # Activate CGI
 a2enmod cgi
 
+# Activate modrewrite
+a2enmod rewrite
+
 # Restart apache
 service apache2 restart
 

From e01547cbe497794ade2e3f9e9abc9eb3d98bc386 Mon Sep 17 00:00:00 2001
From: Sander Alberink <sander@vanbreda.nl>
Date: Fri, 5 Feb 2016 14:08:43 +0100
Subject: [PATCH 211/362] Update timezone to GMT, reduce SHM requirement to
 512M

Increase the SHM to 2048 if you need to support H.264 cameras
---
 utils/docker/phpdate.ini | 2 +-
 utils/docker/start.sh    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/docker/phpdate.ini b/utils/docker/phpdate.ini
index 50f2cca0f..d35b47361 100644
--- a/utils/docker/phpdate.ini
+++ b/utils/docker/phpdate.ini
@@ -1,5 +1,5 @@
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-date.timezone = Europe/Amsterdam
+date.timezone = GMT
 
diff --git a/utils/docker/start.sh b/utils/docker/start.sh
index 4b6c0e379..0772f7b9b 100644
--- a/utils/docker/start.sh
+++ b/utils/docker/start.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 # Prepare proper amount of shared memory
+# For H.264 cameras it may be necessary to increase the amout of shared memory
+# to 2048 megabytes.
 umount /dev/shm
-mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=2048M tmpfs /dev/shm
+mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=512M tmpfs /dev/shm
 
 # Start MySQL
 /usr/bin/mysqld_safe & 

From 8a537029ea7a5bd4c91294fd458694393785812f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Sat, 6 Feb 2016 14:08:28 -0600
Subject: [PATCH 212/362] Initial commit to add zmtelemetry.pl

---
 .../lib/ZoneMinder/ConfigData.pm.in           |  17 ++
 scripts/zmdc.pl.in                            |   3 +-
 scripts/zmpkg.pl.in                           |   4 +
 scripts/zmtelemetry.pl.in                     | 161 ++++++++++++++++++
 4 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 scripts/zmtelemetry.pl.in

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 198ff2194..ffe063b60 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2746,6 +2746,23 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         type        => $types{boolean},
         category    => "system",
     },
+    {
+        name        => "ZM_TELEMETRY_DATA",
+        default     => "yes",
+        description => "Send usage information to ZoneMinder",
+        help        => qqq("
+            Enable collection of usage information of the local system and send
+            it to the ZoneMinder development team. This data will be used to
+            determine things like who and where our customers are, how big their
+            systems are, the underlying hardware and operating system, etc.
+            This is being done for the sole purpoase of creating a better
+            product for our target audience. This script is intended to be
+            completely transparent to the end user, and can be disabled from
+            the web console under Options.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
     {
         name        => "ZM_UPDATE_CHECK_PROXY",
         default     => "",
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 5e2fb47c7..4d36385ef 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -87,7 +87,8 @@ my @daemons = (
     'zmx10.pl',
     'zmwatch.pl',
     'zmupdate.pl',
-    'zmtrack.pl'
+    'zmtrack.pl',
+    'zmtelemetry.pl',
 );
 
 my $command = shift @ARGV;
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 183f8084c..53e29a8da 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -285,6 +285,10 @@ if ( $command =~ /^(?:start|restart)$/ )
         {
             runCommand( "zmdc.pl start zmupdate.pl -c" );
         }
+        if ( $Config{ZM_TELEMETRY_DATA} )
+        {
+            runCommand( "zmdc.pl start zmtelemetry.pl" );
+        }
     }
     else
     {
diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
new file mode 100644
index 000000000..7b3b376a4
--- /dev/null
+++ b/scripts/zmtelemetry.pl.in
@@ -0,0 +1,161 @@
+#!/usr/bin/perl -w
+#
+# ==========================================================================
+#
+# ZoneMinder Update Script, $Date$, $Revision$
+# Copyright (C) 2001-2008 Philip Coombes
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+
+=head1 NAME
+
+zmtelemetry.pl - Send usage information to the ZoneMinder development team
+
+=head1 SYNOPSIS
+
+ zmtelemetry.pl
+
+=head1 DESCRIPTION
+
+This script collects usage information of the local system and sends it to the
+ZoneMinder development team. This data will be used to determine things like
+who and where our customers are, how big their systems are, the underlying
+hardware and operating system, etc. This is being done for the sole purpoase of
+creating a better product for our target audience. This script is intended to
+be completely transparent to the end user, and can be disabled from the web
+console under Options.
+
+=head1 OPTIONS
+
+none currently
+
+=cut
+use strict;
+use bytes;
+
+@EXTRA_PERL_LIB@
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+use DBI;
+use Getopt::Long;
+use autouse 'Pod::Usage'=>qw(pod2usage);
+
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
+$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
+delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+
+use constant CHECK_INTERVAL => (14*24*60*60); # Interval between version checks
+
+# Setting these as contants for now. 
+# Alternatively, we can put these in the dB and then retrieve using the Config hash.
+use constant ZM_TELEMETRY_SERVER_NAME => "telemetry.zoneminder.com";
+use constant ZM_TELEMETRY_SERVER_PORT => "80";
+
+if ( $Config{ZM_TELEMETRY_DATA} )
+{
+    print( "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+
+    my $lastCheck = $Config{ZM_TELEMETRY_LAST_CHECK};
+
+    while( 1 )
+    {
+        my $now = time();
+        if ( ($now-$lastCheck) > CHECK_INTERVAL) )
+        {
+            Info( "Colleting data to send to ZoneMinder Telemetry server\n" );
+
+            # This is where we gather our data. The following is just an oversimplified example.
+            # Modify accordingly.
+
+            # We should keep *BSD systems in mind when calling system commands
+            my $result = runSysCmd("uname -a")."\n";
+            my $result .= "ZM_DYN_CURR_VERSION: ".Config{ZM_DYN_CURR_VERSION};
+
+            Info( "Sending data to ZoneMinder Telemetry server\n" );
+
+            if ( sendData($result) ) {
+                $lastCheck = $now;
+
+                my $lc_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_CHECK'";
+                my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
+                my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
+            }
+        }
+        sleep( 3600 );
+    }
+    print( "Update agent exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+}
+
+# Find, verify, then run the supplied system command
+sub runSysCmd {
+    my $msg = shift;
+    my @arguments = split(/ /,$msg);
+    chomp($arguments[0]);
+    my $path  = qx( which $arguments[0] );
+
+    my $status = $? >> 8;
+    my $result = "";
+    if ( !$path || $status ) {
+        Warning( "Cannot find the $arguments[0] executable." );
+    } else {
+        chomp($path);
+        $arguments[0] = $path;
+        my $cmd = join(" ",@arguments);
+        my $result = qx( $cmd );
+    }
+    return chomp($result);
+}
+
+# Upload message data to ZoneMinder telemetry server
+sub sendData {
+    my $msg = shift;
+
+    use LWP::UserAgent;
+
+    my $ua = LWP::UserAgent->new;
+    my $server_endpoint = "http://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/";
+
+    if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
+        $ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} );
+    }
+
+    # set custom HTTP request header fields
+    my $req = HTTP::Request->new(POST => $server_endpoint);
+    # We can set some things in the header if we need to
+    #$req->header('content-type' => 'content here');
+    #$req->header('Host' => '192.168.1.83:8899');
+    $req->header('content-length' => length($msg));
+    #$req->header('accept-encoding' => 'gzip, deflate');
+    $req->header('connection' => 'Close');
+ 
+    $req->content($msg);
+ 
+    my $resp = $ua->request($req);
+    my success = 0;
+    if ($resp->is_success) {
+        my $message = $resp->decoded_content;
+        Info("Telemetry data successfully uploaded.");
+        Debug("Telemetry server upload success response message: $message\n");
+        $success = 1;
+    } else {
+        Warning("Telemetry server returned HTTP POST error code: ", $resp->code, "\n";
+        Debug("Telemetry server upload failure response message: ", $resp->message, "\n";
+    }
+    return $success;
+}
+

From e0ee05e05c34024b660ff595bf7c3f01e2d5edf6 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Sat, 6 Feb 2016 14:10:42 -0600
Subject: [PATCH 213/362] add zmtelemetry to cmake

---
 scripts/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e9dd6ddd3..fb549861b 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -16,6 +16,7 @@ configure_file(zmvideo.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" @ONLY)
 configure_file(zmwatch.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" @ONLY)
 configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
 configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
+configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
 if(NOT ZM_NO_X10)
 	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
 endif(NOT ZM_NO_X10)
@@ -31,7 +32,7 @@ FOREACH(PERLSCRIPT ${perlscripts})
 ENDFOREACH(PERLSCRIPT ${perlscripts})
 
 # Install the perl scripts
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmfilter.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmpkg.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrack.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtrigger.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmupdate.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(NOT ZM_NO_X10)

From 4ad31695bae09b2143fe150954bb03501145bb52 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Sat, 6 Feb 2016 14:25:00 -0600
Subject: [PATCH 214/362] fix typo in cmakefile

---
 scripts/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index fb549861b..cec664d6a 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -16,7 +16,7 @@ configure_file(zmvideo.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" @ONLY)
 configure_file(zmwatch.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" @ONLY)
 configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
 configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
-configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
+configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl.in" @ONLY)
 if(NOT ZM_NO_X10)
 	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
 endif(NOT ZM_NO_X10)

From f607e3a6fa05c03b645a70346c008e5450167f3c Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Sat, 6 Feb 2016 14:50:02 -0600
Subject: [PATCH 215/362] zmtelemetry - the typo of my typo is my friend

---
 scripts/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index cec664d6a..37f93fd12 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -16,7 +16,7 @@ configure_file(zmvideo.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmvideo.pl" @ONLY)
 configure_file(zmwatch.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmwatch.pl" @ONLY)
 configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
 configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
-configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl.in" @ONLY)
+configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" @ONLY)
 if(NOT ZM_NO_X10)
 	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
 endif(NOT ZM_NO_X10)

From 5bcc41403876d04cc09e595867abf133132a7954 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Mon, 8 Feb 2016 20:41:36 +1100
Subject: [PATCH 216/362] codespell: misc. spelling corrections

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
---
 CHANGELOG.md                                         | 2 +-
 Dockerfile                                           | 2 +-
 INSTALL                                              | 2 +-
 README.md                                            | 2 +-
 distros/fedora/CMakeLists.txt                        | 2 +-
 distros/opensuse/CMakeLists.txt                      | 2 +-
 distros/opensuse/README.OpenSuse                     | 2 +-
 distros/redhat/CMakeLists.txt                        | 2 +-
 distros/ubuntu1204_cmake/changelog                   | 2 +-
 distros/ubuntu1504_cmake/changelog                   | 2 +-
 docs/faq.rst                                         | 6 +++---
 docs/index.rst                                       | 2 +-
 docs/userguide/definezone.rst                        | 2 +-
 docs/userguide/filterevents.rst                      | 2 +-
 docs/userguide/gettingstarted.rst                    | 2 +-
 docs/userguide/options/options_config.rst            | 4 ++--
 docs/userguide/options/options_system.rst            | 4 ++--
 docs/userguide/options/options_upload.rst            | 2 +-
 docs/userguide/options/options_x10.rst               | 2 +-
 docs/userguide/viewevents.rst                        | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in   | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm | 2 +-
 scripts/zmcamtool.pl.in                              | 6 +++---
 src/zm_remote_camera_http.cpp                        | 2 +-
 src/zmf.cpp                                          | 2 +-
 25 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddf9320cb..471066ac3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -352,7 +352,7 @@
 - Fix window sizes and input field sizes for flat skin [\#381](https://github.com/ZoneMinder/ZoneMinder/pull/381) ([m-bene](https://github.com/m-bene))
 - Fix reload loop on switching skins [\#380](https://github.com/ZoneMinder/ZoneMinder/pull/380) ([m-bene](https://github.com/m-bene))
 - Ability to skip frames in motion detection. [\#377](https://github.com/ZoneMinder/ZoneMinder/pull/377) ([Sune1337](https://github.com/Sune1337))
-- same dvr controlls in event as in monitor [\#375](https://github.com/ZoneMinder/ZoneMinder/pull/375) ([m-bene](https://github.com/m-bene))
+- same dvr controls in event as in monitor [\#375](https://github.com/ZoneMinder/ZoneMinder/pull/375) ([m-bene](https://github.com/m-bene))
 - do not quote column names in parse filter [\#374](https://github.com/ZoneMinder/ZoneMinder/pull/374) ([m-bene](https://github.com/m-bene))
 - Fix 'Undefined index: filter' php warnings for filter view when [\#373](https://github.com/ZoneMinder/ZoneMinder/pull/373) ([m-bene](https://github.com/m-bene))
 - Reduce window size to exclude task bar area [\#371](https://github.com/ZoneMinder/ZoneMinder/pull/371) ([m-bene](https://github.com/m-bene))
diff --git a/Dockerfile b/Dockerfile
index 46b3dac5b..26df17d2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,7 @@ RUN chmod 755 /tmp/start.sh
 # give files in /usr/local/share/zoneminder/
 RUN chown -R www-data:www-data /usr/local/share/zoneminder/
 
-# Creating SSH privledge escalation dir
+# Creating SSH privilege escalation dir
 RUN mkdir /var/run/sshd
 
 # Adding apache virtual hosts file
diff --git a/INSTALL b/INSTALL
index 35deec3c4..bcb7f78df 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ Important differences
 ---------------------
 * Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
 * Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
-* Unlike the autotools way, the cmake way does not modify the system in any way it shouldnt. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldn't. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
 
 Configuration
 -------------
diff --git a/README.md b/README.md
index 4aa63b1a6..fcd96bfd6 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ Now clone the ZoneMinder git repository:
 ```bash
 git clone https://github.com/ZoneMinder/ZoneMinder
 ```
-This will create a sub-folder called ZoneMinder, which will contain the latest developement.
+This will create a sub-folder called ZoneMinder, which will contain the latest development.
 
 We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
 ```bash
diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt
index f49d451f1..ba1b743ba 100644
--- a/distros/fedora/CMakeLists.txt
+++ b/distros/fedora/CMakeLists.txt
@@ -39,7 +39,7 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminde
 # Fedora requires cambozola as a separate package so just link to it
 install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
 
-# Install auxillary files required to run zoneminder on Fedora
+# Install auxiliary files required to run zoneminder on Fedora
 install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/distros/opensuse/CMakeLists.txt b/distros/opensuse/CMakeLists.txt
index d468c7287..10654f26d 100644
--- a/distros/opensuse/CMakeLists.txt
+++ b/distros/opensuse/CMakeLists.txt
@@ -38,7 +38,7 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../${zm_webdir}/temp \"\$E
 # Opensuse cambazola? requires cambozola as a separate package so just link to it
 #install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
 
-# Install auxillary files required to run zoneminder on OpenSuse
+# Install auxiliary files required to run zoneminder on OpenSuse
 install(FILES zoneminder.conf DESTINATION /etc/apache2/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.tmpfiles DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/distros/opensuse/README.OpenSuse b/distros/opensuse/README.OpenSuse
index 823ccd442..27103d960 100644
--- a/distros/opensuse/README.OpenSuse
+++ b/distros/opensuse/README.OpenSuse
@@ -138,7 +138,7 @@ Upgrades
    has select, insert, update, and delete permission.
    
 3. You will need to upgrade the ZoneMinder database as described in the
-   manual. Only if the previous step was succesful, may you run zmupdate like
+   manual. Only if the previous step was successful, may you run zmupdate like
    so (as root):
      
      /opt/zoneminder/bin/zmupdate.pl 
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 74aa5641f..849ef1073 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -57,7 +57,7 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminde
 # Link to Cambozola, which is now packaged in zmrepo
 install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
 
-# Install auxillary files required to run zoneminder on CentOS
+# Install auxiliary files required to run zoneminder on CentOS
 install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(ZM_TARGET_DISTRO STREQUAL "el7")
 	install(FILES zoneminder.el7.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/distros/ubuntu1204_cmake/changelog b/distros/ubuntu1204_cmake/changelog
index 124ba61d2..74cf1d0b8 100644
--- a/distros/ubuntu1204_cmake/changelog
+++ b/distros/ubuntu1204_cmake/changelog
@@ -525,7 +525,7 @@ zoneminder (1.22.3-7) unstable; urgency=low
 
 zoneminder (1.22.3-6) unstable; urgency=low
 
-  * Removed a similar bash only statment from zmpkg.pl
+  * Removed a similar bash only statement from zmpkg.pl
     (closes:414882)
 
  -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
diff --git a/distros/ubuntu1504_cmake/changelog b/distros/ubuntu1504_cmake/changelog
index 124ba61d2..74cf1d0b8 100644
--- a/distros/ubuntu1504_cmake/changelog
+++ b/distros/ubuntu1504_cmake/changelog
@@ -525,7 +525,7 @@ zoneminder (1.22.3-7) unstable; urgency=low
 
 zoneminder (1.22.3-6) unstable; urgency=low
 
-  * Removed a similar bash only statment from zmpkg.pl
+  * Removed a similar bash only statement from zmpkg.pl
     (closes:414882)
 
  -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
diff --git a/docs/faq.rst b/docs/faq.rst
index 6c0bc227c..5aa736ee8 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -238,7 +238,7 @@ The second approach is to use diagnostic images which are saved copies of the in
 
 There are two kinds of diagnostic images which are and are written (and continuously overwritten) to the top level monitor event directory. If an event occurs then the files are additionally copied to the event directory and renamed with the appropriate frame number as a prefix.
 
-The first set are produced by the monitor on the image as a whole. The diag-r.jpg image is the current reference image against which all individual frames are compared and the diag-d.jpg image is the delta image highlighting the difference between the reference image and the last analysed image. In this images identicial pixels will be black and the more different a pixel is the whiter it will be. Viewing this image and determining the colour of the pixels is a good way of getting a feel for the pixel differences you might expect (often more than you think).
+The first set are produced by the monitor on the image as a whole. The diag-r.jpg image is the current reference image against which all individual frames are compared and the diag-d.jpg image is the delta image highlighting the difference between the reference image and the last analysed image. In this images identical pixels will be black and the more different a pixel is the whiter it will be. Viewing this image and determining the colour of the pixels is a good way of getting a feel for the pixel differences you might expect (often more than you think).
 
 The second set of diag images are labelled as diag-<zoneid>-<stage>.jpg where zoneid is the id of the zone in question (Smile) and the stage is where in the alarm check process the image is generated from. So if you have several zones you can expect to see multiple files. Also these files are only interested in what is happening in their zone only and will ignore anything else outside of the zone. The stages that each number represents are as follows,
 
@@ -617,14 +617,14 @@ How can I trouble shoot the hardware and/or software?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Here are some commands to get information about your hardware. Some commands are distribution dependent.
-* ``[[lspci]] -vv`` -- Returns lots of detailed info. Check for conflicting interrupts or port assignments. You can sometimes alter interrupts/ ports in bios. Try a different pci slot to get a clue if it is HW conflict (comand provided by the pciutils package).
+* ``[[lspci]] -vv`` -- Returns lots of detailed info. Check for conflicting interrupts or port assignments. You can sometimes alter interrupts/ ports in bios. Try a different pci slot to get a clue if it is HW conflict (command provided by the pciutils package).
 * ``[[scanpci]] -v``  -- Gives you information from your hardware EPROM
 * ``[[lsusb]] -vv`` -- Returns lots of detail about USB devices (camand provided by usbutils package).
 * ``[[dmesg]]`` -- Shows you how your hardware initialized (or didn't) on boot-up. You will get the most use of this.
 * ``[[v4l-info]]`` -- to see how driver is talking to card. look for unusual values.
 * ``[[modinfo bttv]]`` -- some bttv driver stats.
 * ``[[zmu]]  -m 0 -q -v`` -- Returns various information regarding a monitor configuration.
-* ``[[ipcs]] ``  -- Provides information on the ipc facilities for which the calling process has read acccess.
+* ``[[ipcs]] ``  -- Provides information on the ipc facilities for which the calling process has read access.
 * ``[[ipcrm]] ``  -- The ipcrm command can be used to remove an IPC object from the kernel.
 * ``cat /proc/interrupts``  -- This will dispaly what interrupts your hardware is using.
 
diff --git a/docs/index.rst b/docs/index.rst
index 46713b754..46da979cf 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ ZoneMinder Documentation
 Welcome to ZoneMinder's documentation, the following resources are available
 
 :doc:`installationguide/index`
-  Many distrubution repos only hold older versions of ZoneMinder, current versions contain many bug fixes and updated functionality. Instructions here for installing updated packages or compiling from source.
+  Many distribution repos only hold older versions of ZoneMinder, current versions contain many bug fixes and updated functionality. Instructions here for installing updated packages or compiling from source.
 
 :doc:`userguide/index`
   Guide to setting up ZoneMinder for the first time and detailed guides for using the ZoneMinder front end.
diff --git a/docs/userguide/definezone.rst b/docs/userguide/definezone.rst
index d3eaeb8c6..0cacd3b91 100644
--- a/docs/userguide/definezone.rst
+++ b/docs/userguide/definezone.rst
@@ -35,7 +35,7 @@ Type
     Suppresses the detection of motion within it.  This can be layered on top of any other zone type, preventing motion within the Inactive zone from being effective for any other zone type.  Use inactive zones to cover areas in which nothing notable will ever happen or where you get false alarms that don't relate to what you are trying to monitor.  Inactive zones may be overlaid on other zones to blank out areas, and are processed first (with the exception of Privacy zones, see below).  As a general practice, you should try and make zones abut each other instead of overlapping to avoid repeated duplicate processing of the same area.  
 
   * Privacy
-    Blackens the pixels within it. This can be used if you want to hide some regions in the image if the situation does not allow an other solution. This zone type is different to all the others in that it gets processed as soon as possible during capture (even before the timestamp gets into the image) and not in the analyzing process. So if you add, change or delete a Privacy zone, you don't see the changes in the image until the capture process gets restarted. This will be done automatically, but needs a few seconds.
+    Blackens the pixels within it. This can be used if you want to hide some regions in the image if the situation does not allow another solution. This zone type is different to all the others in that it gets processed as soon as possible during capture (even before the timestamp gets into the image) and not in the analyzing process. So if you add, change or delete a Privacy zone, you don't see the changes in the image until the capture process gets restarted. This will be done automatically, but needs a few seconds.
 
 Preset
   The preset chooser sets sensible default values based on computational needs (fast v. best) and sensitivity (low, medium, high.)  It is not required that you select a preset, and you can alter any of the parameters after choosing a preset.  For a small number of monitors with ZoneMinder running on modern equipment, Best, high sensitivity can be chosen as a good starting point.
diff --git a/docs/userguide/filterevents.rst b/docs/userguide/filterevents.rst
index 4d7a50fd5..bc0dcffe2 100644
--- a/docs/userguide/filterevents.rst
+++ b/docs/userguide/filterevents.rst
@@ -90,7 +90,7 @@ Saving filters
 .. image:: images/filter-save.png
     :width: 400px
 
-When saving filters, if you want the filter to run in the background make sure you select the "Run filter in background" option. When checked, ZoneMinder will make sure the filter is checked regularly. For example, if you want to be notified of new events by email, you sould make sure this is checked. Filters that are configured to run in the background have a "*" next to it.
+When saving filters, if you want the filter to run in the background make sure you select the "Run filter in background" option. When checked, ZoneMinder will make sure the filter is checked regularly. For example, if you want to be notified of new events by email, you should make sure this is checked. Filters that are configured to run in the background have a "*" next to it.
 
 For example:
 
diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 2bc3dcd7f..f9181a95f 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -65,7 +65,7 @@ own empty screen.
 * **B**: Click here to explore the various options of ZoneMinder and how to configure them. You already used this to enable authentication and change style above. Over time, you will find this to have many other things you will want to customize.
 * **C**: This link, when clicked, opens up a color coded log window of what is going on in Zoneminder and often gives you good insight into what is going wrong or right. Note that the color here is red - that is an indication that some error occurred in ZoneMinder. You should click it and investigate.
 * **D**: This is the core of ZoneMinder - recording events. It gives you a count of how many events were recorded over the hour, day, week, month.
-* **E**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
+* **E**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continuously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
 * **F**: This is the "source" column that tells you the type of the camera - if its an IP camera, a USB camera or more. In this example, they are all IP cameras. Note the color red on item F ? Well that means there is something wrong with that camera. No wonder the log also shows red. Good indication for you to tap on logs and investigate
 * **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Modect = Don't record till an externa entity via zmtrigger tells Zoneminder to (this is advanced usage).
 * **H**: If you click on these links you can view a "Montage" of all your configured monitors or cycle through each one
diff --git a/docs/userguide/options/options_config.rst b/docs/userguide/options/options_config.rst
index 7918361ba..0f419e2ab 100644
--- a/docs/userguide/options/options_config.rst
+++ b/docs/userguide/options/options_config.rst
@@ -25,9 +25,9 @@ FORCED_ALARM_SCORE - The 'zmu' utility can be used to force an alarm on a monito
 
 BULK_FRAME_INTERVAL - Traditionally ZoneMinder writes an entry into the Frames database table for each frame that is captured and saved. This works well in motion detection scenarios but when in a DVR situation ('Record' or 'Mocord' mode) this results in a huge number of frame writes and a lot of database and disk bandwidth for very little additional information. Setting this to a non-zero value will enabled ZoneMinder to group these non-alarm frames into one 'bulk' frame entry which saves a lot of bandwidth and space. The only disadvantage of this is that timing information for individual frames is lost but in constant frame rate situations this is usually not significant. This setting is ignored in Modect mode and individual frames are still written if an alarm occurs in Mocord mode also.
 
-EVENT_CLOSE_MODE - When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occuring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred.
+EVENT_CLOSE_MODE - When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occurring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred.
 
-CREATE_ANALYSIS_IMAGES - By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occured. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off.
+CREATE_ANALYSIS_IMAGES - By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occurred. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off.
 
 WEIGHTED_ALARM_CENTRES - ZoneMinder will always calculate the centre point of an alarm in a zone to give some indication of where on the screen it is. This can be used by the experimental motion tracking feature or your own custom extensions. In the alarmed or filtered pixels mode this is a simple midpoint between the extents of the detected pxiesl. However in the blob method this can instead be calculated using weighted pixel locations to give more accurate positioning for irregularly shaped blobs. This method, while more precise is also slower and so is turned off by default.
 
diff --git a/docs/userguide/options/options_system.rst b/docs/userguide/options/options_system.rst
index 83aa28bec..7df3d259a 100644
--- a/docs/userguide/options/options_system.rst
+++ b/docs/userguide/options/options_system.rst
@@ -25,9 +25,9 @@ FILTER_EXECUTE_INTERVAL - ZoneMinder allows you to save filters to the database
 
 MAX_RESTART_DELAY - The zmdc (zm daemon control) process controls when processeses are started or stopped and will attempt to restart any that fail. If a daemon fails frequently then a delay is introduced between each restart attempt. If the daemon stills fails then this delay is increased to prevent extra load being placed on the system by continual restarts. This option controls what this maximum delay is.
 
-WATCH_CHECK_INTERVAL - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinately). This option determines how often the daemons are checked.
+WATCH_CHECK_INTERVAL - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines how often the daemons are checked.
 
-WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinately). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.
+WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.
 
 RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. This is recommended for most systems however if you have a very large number of events the process of scanning the database and filesystem may take a long time and impact performance. In this case you may prefer to not have zmaudit running unconditionally and schedule occasional checks at other, more convenient, times.
 
diff --git a/docs/userguide/options/options_upload.rst b/docs/userguide/options/options_upload.rst
index 16e3f5588..da4baa076 100644
--- a/docs/userguide/options/options_upload.rst
+++ b/docs/userguide/options/options_upload.rst
@@ -19,7 +19,7 @@ UPLOAD_PORT - You can use filters to instruct ZoneMinder to upload events to a r
 
 UPLOAD_USER - You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the username that ZoneMinder should use to log in for transfer.
 
-UPLOAD_PASS - You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the password that ZoneMinder should use to log in for transfer. If you are using certicate based logins for SFTP servers you can leave this option blank.
+UPLOAD_PASS - You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the password that ZoneMinder should use to log in for transfer. If you are using certificate based logins for SFTP servers you can leave this option blank.
 
 UPLOAD_LOC_DIR - You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.
 
diff --git a/docs/userguide/options/options_x10.rst b/docs/userguide/options/options_x10.rst
index dc41d8dd6..0662ebe7e 100644
--- a/docs/userguide/options/options_x10.rst
+++ b/docs/userguide/options/options_x10.rst
@@ -5,7 +5,7 @@ Options - X10
 
 OPT_X10 - If you have an X10 Home Automation setup in your home you can use ZoneMinder to initiate or react to X10 signals if your computer has the appropriate interface controller. This option indicates whether X10 options will be available in the browser client.
 
-X10_DEVICE - If you have an X10 controller device (e.g. XM10U) connected to your computer this option details which port it is conected on, the default of /dev/ttyS0 maps to serial or com port 1.
+X10_DEVICE - If you have an X10 controller device (e.g. XM10U) connected to your computer this option details which port it is connected on, the default of /dev/ttyS0 maps to serial or com port 1.
 
 X10_HOUSE_CODE - X10 devices are grouped together by identifying them as all belonging to one House Code. This option details what that is. It should be a single letter between A and P.
 
diff --git a/docs/userguide/viewevents.rst b/docs/userguide/viewevents.rst
index 83fa3df76..70eea0032 100644
--- a/docs/userguide/viewevents.rst
+++ b/docs/userguide/viewevents.rst
@@ -20,7 +20,7 @@ Here is an example of viewing an event stream:
 * **A**: Administrative Event options on the event including viewing individual frames
 * **B**: The actual image stream
 * **C**: Navigation control
-* **D**: You can switch between watching a single event or Continous mode (where it advances to the next event after playback is complete)
+* **D**: You can switch between watching a single event or Continuous mode (where it advances to the next event after playback is complete)
 * **E**: Event progress bar - how much of the current event has been played back
 
 You will notice for the first time that alarm images now contain an overlay outlining the blobs that represent the alarmed area. This outline is in the colour defined for that zone and lets you see what it was that caused the alarm. Clicking on one of the thumbnails will take you to a full size window where you can see the image in all its detail and scroll through the various images that make up the event. If you have the ZM_RECORD_EVENT_STATS option on, you will be able to click the 'Stats' link here and get some analysis of the cause of the event. 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 198ff2194..703d47c30 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -1985,7 +1985,7 @@ our @options =
             You can use filters to instruct ZoneMinder to upload events to
             a remote server. This option indicates the password that
             ZoneMinder should use to log in for transfer. If you are using
-            certicate based logins for SFTP servers you can leave this
+            certificate based logins for SFTP servers you can leave this
             option blank.
         "),
         requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm
index 4a7bab230..739ff1175 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9831W.pm
@@ -155,7 +155,7 @@ sub reset
    #my $cmd = "setOSDSetting%26isEnableTimeStamp%3D0%26isEnableDevName%3D1%26dispPos%3D0%26isEnabledOSDMask%3D0";
    Info ("Sending reboot $cmd");
    $self->sendCmd( $cmd );
-   # Setup For Stream=0 Resolution=720p Bandwith=4M FPS=30 KeyFrameInterval/GOP=100 VBR=ON
+   # Setup For Stream=0 Resolution=720p Bandwidth=4M FPS=30 KeyFrameInterval/GOP=100 VBR=ON
    #$cmd = "setVideoStreamParam%26streamType%3D0%26resolution%3D0%26bitRate%3D4194304%26frameRate%3D30%26GOP%3D100%26isVBR%3D1";
    #$self->sendCmd( $cmd );
    # Setup For Infrared AUTO
diff --git a/scripts/zmcamtool.pl.in b/scripts/zmcamtool.pl.in
index eaa32edef..8d6a6321c 100644
--- a/scripts/zmcamtool.pl.in
+++ b/scripts/zmcamtool.pl.in
@@ -419,9 +419,9 @@ sub toPreset
         foreach (@data) {
             s/\b(?:\d{1,3}\.){3}\d{1,3}\b/<ip-address>/; # ip address
             s/<ip-address>:(6553[0-5]|655[0-2]\d|65[0-4]\d\d|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}|0)$/<ip-address>:<port>/; # tcpip port
-            s/\/\/.*:.*@/\/\/<username>:<pwd>@/; # user & pwd preceeding an ip address
-            s/(&|\?)(user|username)=\w\w*(&|\?)/$1$2=<username>$3/i; # username embeded in url
-            s/(&|\?)(pwd|password)=\w\w*(&|\?)/$1$2=<pwd>$3/i; # password embeded in url
+            s/\/\/.*:.*@/\/\/<username>:<pwd>@/; # user & pwd preceding an ip address
+            s/(&|\?)(user|username)=\w\w*(&|\?)/$1$2=<username>$3/i; # username embedded in url
+            s/(&|\?)(pwd|password)=\w\w*(&|\?)/$1$2=<pwd>$3/i; # password embedded in url
             s/\w\w*:\w\w*/<username>:<pwd>/; # user & pwd in their own field
             s/\/dev\/video\d\d*/\/dev\/video<?>/; # local video devices
         }
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index 440c24e05..006f80faf 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -199,7 +199,7 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, int bytes_expected )
             return( -1 );
         }
 
-		// There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unneccessarily.
+		// There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
 		if ( total_bytes_to_read > ZM_NETWORK_BUFSIZ ) {
 			total_bytes_to_read = ZM_NETWORK_BUFSIZ;
 			Debug(3, "Just getting 32K" );
diff --git a/src/zmf.cpp b/src/zmf.cpp
index 07149c4cc..7abe7a897 100644
--- a/src/zmf.cpp
+++ b/src/zmf.cpp
@@ -274,7 +274,7 @@ int main( int argc, char *argv[] )
 		Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
 		static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
 
-                // Read for pipe and loop until bytes expected have been read or an error occures
+                // Read for pipe and loop until bytes expected have been read or an error occurs
                 int bytes_read = 0;
                 do
 		{

From 0f63f4357d394d8a08b3fddbceba99783a355be1 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Mon, 8 Feb 2016 21:06:21 +1100
Subject: [PATCH 217/362] sphinx: fix warning "Title underline too short".

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
---
 docs/userguide/options/options_servers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/userguide/options/options_servers.rst b/docs/userguide/options/options_servers.rst
index 4736c305a..83e146871 100644
--- a/docs/userguide/options/options_servers.rst
+++ b/docs/userguide/options/options_servers.rst
@@ -1,5 +1,5 @@
 Options - Servers
----------------
+-----------------
 
 .. image:: images/Options_Servers.png
 

From a2ae29dfbe9da71b1f15ff6df0b9de7b080cf4e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 8 Feb 2016 09:47:52 -0500
Subject: [PATCH 218/362] Add php5-gd to depends

---
 distros/ubuntu1204_cmake/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu1204_cmake/control b/distros/ubuntu1204_cmake/control
index 4b4877562..fd7a53049 100644
--- a/distros/ubuntu1204_cmake/control
+++ b/distros/ubuntu1204_cmake/control
@@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
           ,libwww-perl
         ,mysql-client | virtual-mysql-client
         ,perl-modules
-        ,php5-mysql
+        ,php5-mysql, php5-gd
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip

From 308d98955e671570e34806e4ee44ad520369cacf Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 8 Feb 2016 14:05:06 -0600
Subject: [PATCH 219/362] By default, enable ONVIF discovery support

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c5b79cce..8327045d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,9 +133,9 @@ set(ZM_NO_CURL "OFF" CACHE BOOL
     "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
 set(ZM_NO_X10 "OFF" CACHE BOOL 
     "Set to ON to build ZoneMinder without X10 support. default: OFF")
-set(ZM_ONVIF "OFF" CACHE BOOL 
+set(ZM_ONVIF "ON" CACHE BOOL 
     "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not 
-    work with all cameras claiming to be ONVIF compliant. default: OFF")
+    work with all cameras claiming to be ONVIF compliant. default: ON")
 set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING 
 	"By default, ZoneMinder's Perl modules are installed into the Vendor folders, 
 	as defined by your installation of Perl. You can change that here. Consult Perl's 

From 609784f9023198aec771840be5bd39f144f3f245 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Tue, 9 Feb 2016 12:49:09 -0700
Subject: [PATCH 220/362] Update telemetry host, port and protocol

---
 scripts/zmtelemetry.pl.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 7b3b376a4..945c82156 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -63,8 +63,8 @@ use constant CHECK_INTERVAL => (14*24*60*60); # Interval between version checks
 
 # Setting these as contants for now. 
 # Alternatively, we can put these in the dB and then retrieve using the Config hash.
-use constant ZM_TELEMETRY_SERVER_NAME => "telemetry.zoneminder.com";
-use constant ZM_TELEMETRY_SERVER_PORT => "80";
+use constant ZM_TELEMETRY_SERVER_NAME => "38092a65757da3cb5f949b6b94aa8fc9.us-east-1.aws.found.io";
+use constant ZM_TELEMETRY_SERVER_PORT => "9243";
 
 if ( $Config{ZM_TELEMETRY_DATA} )
 {
@@ -128,7 +128,7 @@ sub sendData {
     use LWP::UserAgent;
 
     my $ua = LWP::UserAgent->new;
-    my $server_endpoint = "http://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/";
+    my $server_endpoint = "https://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/";
 
     if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
         $ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} );

From 7a9740b1a4563fdcfe4d333080318c738ecdcb85 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Tue, 9 Feb 2016 14:35:45 -0600
Subject: [PATCH 221/362] Update zmtelemetry.pl.in

---
 scripts/zmtelemetry.pl.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 945c82156..4a3a6efcf 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -128,19 +128,16 @@ sub sendData {
     use LWP::UserAgent;
 
     my $ua = LWP::UserAgent->new;
-    my $server_endpoint = "https://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/";
+    my $server_endpoint = "https://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/zmtelemetry/testing/";
 
     if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
-        $ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} );
+        $ua->proxy( "https", $Config{ZM_UPDATE_CHECK_PROXY} );
     }
 
     # set custom HTTP request header fields
     my $req = HTTP::Request->new(POST => $server_endpoint);
-    # We can set some things in the header if we need to
-    #$req->header('content-type' => 'content here');
-    #$req->header('Host' => '192.168.1.83:8899');
+    $req->header('content-type' => 'application/x-www-form-urlencoded');
     $req->header('content-length' => length($msg));
-    #$req->header('accept-encoding' => 'gzip, deflate');
     $req->header('connection' => 'Close');
  
     $req->content($msg);

From 226b77bb63169f0599fc916d6c7a5cfe02a0773b Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Wed, 10 Feb 2016 11:28:56 +0100
Subject: [PATCH 222/362] Added script to generate src/zm_bigfont.h

Also added a line to the header of src/zm_bigfont.h on how it is
generated.
---
 src/zm_bigfont.h    |  1 +
 utils/mk_bigfont.pl | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100755 utils/mk_bigfont.pl

diff --git a/src/zm_bigfont.h b/src/zm_bigfont.h
index a65e7c04a..b653a7f4f 100644
--- a/src/zm_bigfont.h
+++ b/src/zm_bigfont.h
@@ -2,6 +2,7 @@
 /*                                                         */
 /*       Font file generated by schrorg                    */
 /*       based on the font file generated by rthelen       */
+/*       using utils/mk_bigfont.pl                         */
 /*                                                         */
 /***********************************************************/
 
diff --git a/utils/mk_bigfont.pl b/utils/mk_bigfont.pl
new file mode 100755
index 000000000..536fab882
--- /dev/null
+++ b/utils/mk_bigfont.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $in_head = 1;
+
+open F, '<', '../src/zm_font.h';
+
+print <<EOHEAD;
+/***********************************************************/
+/*                                                         */
+/*       Font file generated by schrorg                    */
+/*       based on the font file generated by rthelen       */
+/*       using utils/mk_bigfont.pl                         */
+/*                                                         */
+/***********************************************************/
+EOHEAD
+
+while (my $line = <F>) {
+    $in_head-- if $line =~ /^$/ and $in_head;
+    next while $in_head;
+    unless ($line =~ /^\s+(0x..), \/\* (........)/) {
+        $line =~ s/static unsigned char fontdata/static unsigned int bigfontdata/;
+        print $line;
+        next;
+    }
+    my $code = $1;
+    my $bincode = $2;
+    $bincode = "$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8" if $bincode =~ /(.)(.)(.)(.)(.)(.)(.)(.)$/;
+    $bincode =~ s/ /1/g;
+    my $intcode = unpack("N", pack("B32", substr("0" x 32 . $bincode, -32)));
+    my $hexcode = sprintf("%#x", $intcode);
+    $hexcode =~ s/^0$/0x0/;
+    $bincode =~ s/1/ /g;
+    print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
+    print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
+}
+
+close F;

From 2b9693748b9b261f860a6963ee09d374aa470837 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Wed, 10 Feb 2016 16:22:34 +0100
Subject: [PATCH 223/362] Added README and removed WSDL files in onvif folder

---
 onvif/wsdl/b-2.xsd                          |  586 --
 onvif/wsdl/bf-2.xsd                         |   86 -
 onvif/wsdl/devicemgmt.wsdl                  | 3786 --------
 onvif/wsdl/media.wsdl                       | 3688 --------
 onvif/wsdl/onvif-local.xsd                  | 8578 -------------------
 onvif/wsdl/onvif.xsd                        | 8559 ------------------
 onvif/wsdl/ptz.wsdl                         | 1300 ---
 onvif/wsdl/soap-envelop.xsd                 |  126 -
 onvif/wsdl/t-1.xsd                          |  188 -
 onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd |  230 -
 onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl  |  137 -
 onvif/wsdl/wsdiscovery-udp.wsdl             |   36 -
 onvif/wsdl/wsdl.xsd                         |  314 -
 onvif/wsdl/wsdl11soap12.xsd                 |  143 -
 onvif/wsdl/xmlmime.xsd                      |   49 -
 onvif/wsdl/xop-include.xsd                  |   13 -
 16 files changed, 27819 deletions(-)
 delete mode 100644 onvif/wsdl/b-2.xsd
 delete mode 100644 onvif/wsdl/bf-2.xsd
 delete mode 100644 onvif/wsdl/devicemgmt.wsdl
 delete mode 100644 onvif/wsdl/media.wsdl
 delete mode 100644 onvif/wsdl/onvif-local.xsd
 delete mode 100644 onvif/wsdl/onvif.xsd
 delete mode 100644 onvif/wsdl/ptz.wsdl
 delete mode 100644 onvif/wsdl/soap-envelop.xsd
 delete mode 100644 onvif/wsdl/t-1.xsd
 delete mode 100644 onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd
 delete mode 100644 onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl
 delete mode 100644 onvif/wsdl/wsdiscovery-udp.wsdl
 delete mode 100644 onvif/wsdl/wsdl.xsd
 delete mode 100644 onvif/wsdl/wsdl11soap12.xsd
 delete mode 100644 onvif/wsdl/xmlmime.xsd
 delete mode 100644 onvif/wsdl/xop-include.xsd

diff --git a/onvif/wsdl/b-2.xsd b/onvif/wsdl/b-2.xsd
deleted file mode 100644
index 6af08aee9..000000000
--- a/onvif/wsdl/b-2.xsd
+++ /dev/null
@@ -1,586 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
--->
-
-<xsd:schema 
-  targetNamespace="http://docs.oasis-open.org/wsn/b-2"   
-  xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2"
-  xmlns:wsa="http://www.w3.org/2005/08/addressing"
-  xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
-  xmlns:wstop="http://docs.oasis-open.org/wsn/t-1"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  elementFormDefault="qualified"  attributeFormDefault="unqualified">
-
-<!-- ======================== Imports  ============================ -->
-  
-  <xsd:import namespace="http://www.w3.org/2005/08/addressing"
-              schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd" 
-  />
-
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
-              schemaLocation="file:wsdl/bf-2.xsd"/>
-<!--              schemaLocation="http://docs.oasis-open.org/wsrf/bf-2.xsd"  /> -->
-  <xsd:import namespace="http://docs.oasis-open.org/wsn/t-1"
-              schemaLocation="file:wsdl/t-1.xsd" 
-  />
-  
-<!-- ===================== Misc. Helper Types ===================== -->
-
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI" use="required" />
-    <xsd:anyAttribute/>
-  </xsd:complexType>
-
-  <xsd:complexType name="FilterType">
-    <xsd:sequence>
-<!-- extension for zonemider ONVIF -->
-      <xsd:element ref="wsnt:TopicExpression"        
-                   minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element ref="wsnt:MessageContent"        
-                   minOccurs="0" maxOccurs="unbounded" />
-<!-- end extension -->
-      <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="SubscriptionPolicyType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- =============== Resource Property Related  =================== -->
-<!-- ======== Resource Properties for NotificationProducer ======== -->
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean" default="true"/>
-  <xsd:element name="TopicExpressionDialect" type="xsd:anyURI"/>
-              
-  <xsd:element name="NotificationProducerRP">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:TopicExpression"        
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element ref="wsnt:FixedTopicSet"        
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element ref="wsnt:TopicExpressionDialect"
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element ref="wstop:TopicSet"
-                     minOccurs="0" maxOccurs="1" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ======== Resource Properties for SubscriptionManager ========= -->       
-  <xsd:element name="ConsumerReference" 
-               type="wsa:EndpointReferenceType" />
-  <xsd:element name="Filter" type="wsnt:FilterType" />
-  <xsd:element name="SubscriptionPolicy"                                                                                                                                                                   		      type="wsnt:SubscriptionPolicyType" />
-
-
-  <xsd:element name="CreationTime" type="xsd:dateTime" />
-  
-  <xsd:element name="SubscriptionManagerRP" >
-    <xsd:complexType>
-      <xsd:sequence>
-         <xsd:element ref="wsnt:ConsumerReference"        
-                      minOccurs="1" maxOccurs="1" />
-         <xsd:element ref="wsnt:Filter"
-                      minOccurs="0" maxOccurs="1" />
-         <xsd:element ref="wsnt:SubscriptionPolicy" 
-                      minOccurs="0" maxOccurs="1" />
-         <xsd:element ref="wsnt:CreationTime" 
-                      minOccurs="0" maxOccurs="1" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ================= Notification Metadata  ===================== -->
-  <xsd:element name="SubscriptionReference" 
-               type="wsa:EndpointReferenceType" />
-  <xsd:element name="Topic" 
-               type="wsnt:TopicExpressionType" />
-  <xsd:element name="ProducerReference" 
-               type="wsa:EndpointReferenceType" />
-
-<!-- ================== Message Helper Types  ===================== -->
-  <xsd:complexType name="NotificationMessageHolderType" >
-    <xsd:sequence>
-      <xsd:element ref="wsnt:SubscriptionReference" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element ref="wsnt:Topic" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element ref="wsnt:ProducerReference" 
-                   minOccurs="0" maxOccurs="1" />
-      <xsd:element name="Message">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax"
-                     minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="NotificationMessage"
-               type="wsnt:NotificationMessageHolderType"/>
-
-<!-- ========== Message Types for NotificationConsumer  =========== -->
-  <xsd:element name="Notify" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:NotificationMessage"
-                     minOccurs="1" maxOccurs="unbounded" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-<!-- ========== Message Types for NotificationProducer  =========== -->
-
-  <xsd:simpleType name="AbsoluteOrRelativeTimeType">
-    <xsd:union memberTypes="xsd:dateTime xsd:duration" />
-  </xsd:simpleType>
-
-  <xsd:element name="CurrentTime" type="xsd:dateTime" />
-
-  <xsd:element name="TerminationTime" 
-               nillable="true" type="xsd:dateTime" />
-
-  <xsd:element name="ProducerProperties"
-               type="wsnt:QueryExpressionType" />
-
-  <xsd:element name="MessageContent"
-               type="wsnt:QueryExpressionType" />
-
-  <xsd:element name="UseRaw"><xsd:complexType/></xsd:element>
-
-  <xsd:element name="Subscribe" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" 
-                     type="wsa:EndpointReferenceType"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:element name="Filter" 
-                     type="wsnt:FilterType" 
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element name="InitialTerminationTime" 
-                     type="wsnt:AbsoluteOrRelativeTimeType"
-                     nillable="true"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element name="SubscriptionPolicy"
-                     minOccurs="0" maxOccurs="1">
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:any namespace="##any" processContents="lax"
-                       minOccurs="0" maxOccurs="unbounded"/>
-            </xsd:sequence>
-          </xsd:complexType>
-        </xsd:element>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-        
-  <xsd:element name="SubscribeResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="SubscriptionReference" 
-                     type="wsa:EndpointReferenceType"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:element ref="wsnt:CurrentTime"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:element ref="wsnt:TerminationTime"
-                     minOccurs="0" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-                  
-  <xsd:element name="GetCurrentMessage">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="Topic" 
-                     type="wsnt:TopicExpressionType" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="GetCurrentMessageResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="SubscribeCreationFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="SubscribeCreationFailedFault" 
-               type="wsnt:SubscribeCreationFailedFaultType"/>
-
-  <xsd:complexType name="InvalidFilterFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="UnknownFilter" type="xsd:QName"
-                       minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidFilterFault"
-               type="wsnt:InvalidFilterFaultType"/>
-
-  <xsd:complexType name="TopicExpressionDialectUnknownFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="TopicExpressionDialectUnknownFault" 
-               type="wsnt:TopicExpressionDialectUnknownFaultType"/>
-
-  <xsd:complexType name="InvalidTopicExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidTopicExpressionFault" 
-               type="wsnt:InvalidTopicExpressionFaultType"/>
-
-  <xsd:complexType name="TopicNotSupportedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="TopicNotSupportedFault" 
-               type="wsnt:TopicNotSupportedFaultType"/>
-
-  <xsd:complexType name="MultipleTopicsSpecifiedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="MultipleTopicsSpecifiedFault" 
-               type="wsnt:MultipleTopicsSpecifiedFaultType"/>
-
-  <xsd:complexType name="InvalidProducerPropertiesExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidProducerPropertiesExpressionFault" 
-             type="wsnt:InvalidProducerPropertiesExpressionFaultType"/>
-
-  <xsd:complexType name="InvalidMessageContentExpressionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="InvalidMessageContentExpressionFault" 
-             type="wsnt:InvalidMessageContentExpressionFaultType"/>
-
-  <xsd:complexType name="UnrecognizedPolicyRequestFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-		<xsd:sequence>
-             <xsd:element name="UnrecognizedPolicy" type="xsd:QName"
-                           minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnrecognizedPolicyRequestFault" 
-             type="wsnt:UnrecognizedPolicyRequestFaultType"/>
-
-  <xsd:complexType name="UnsupportedPolicyRequestFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-		<xsd:sequence>
-             <xsd:element name="UnsupportedPolicy" type="xsd:QName"
-                           minOccurs="0" maxOccurs="unbounded"/>
-         </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnsupportedPolicyRequestFault" 
-             type="wsnt:UnsupportedPolicyRequestFaultType"/>
-
-  <xsd:complexType name="NotifyMessageNotSupportedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="NotifyMessageNotSupportedFault" 
-             type="wsnt:NotifyMessageNotSupportedFaultType"/>
-
-  <xsd:complexType name="UnacceptableInitialTerminationTimeFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
-          <xsd:element name="MaximumTime" type="xsd:dateTime"
-              minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnacceptableInitialTerminationTimeFault"
-              type="wsnt:UnacceptableInitialTerminationTimeFaultType"/>
-
-  <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="NoCurrentMessageOnTopicFault" 
-               type="wsnt:NoCurrentMessageOnTopicFaultType"/>
-
-<!-- ======== Message Types for PullPoint  ======================== -->
-  <xsd:element name="GetMessages">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="MaximumNumber" 
-                     type="xsd:nonNegativeInteger"
-                     minOccurs="0"/>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="GetMessagesResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:NotificationMessage" 
-                     minOccurs="0" maxOccurs="unbounded" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="DestroyPullPoint">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="DestroyPullPointResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToGetMessagesFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:element name="UnableToGetMessagesFault" 
-               type="wsnt:UnableToGetMessagesFaultType"/>
-
-<xsd:complexType name="UnableToDestroyPullPointFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:element name="UnableToDestroyPullPointFault" 
-               type="wsnt:UnableToDestroyPullPointFaultType"/>
-
-<!-- ======== Message Types for Create PullPoint  ================= -->
-  <xsd:element name="CreatePullPoint">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="CreatePullPointResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="PullPoint"
-                     type="wsa:EndpointReferenceType"/>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:anyAttribute/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToCreatePullPointFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnableToCreatePullPointFault" 
-               type="wsnt:UnableToCreatePullPointFaultType"/>
-
-<!-- ======== Message Types for Base SubscriptionManager  ========= -->
-  <xsd:element name="Renew">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" 
-                     type="wsnt:AbsoluteOrRelativeTimeType"
-                     nillable="true"
-                     minOccurs="1" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="RenewResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="wsnt:TerminationTime" 
-                      minOccurs="1" maxOccurs="1" />
-        <xsd:element ref="wsnt:CurrentTime" 
-                      minOccurs="0" maxOccurs="1" />
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnacceptableTerminationTimeFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType">
-        <xsd:sequence>
-          <xsd:element name="MinimumTime" type="xsd:dateTime"/>
-          <xsd:element name="MaximumTime" type="xsd:dateTime"
-              minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnacceptableTerminationTimeFault"
-              type="wsnt:UnacceptableTerminationTimeFaultType"/>
-
-  <xsd:element name="Unsubscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="UnsubscribeResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="UnableToDestroySubscriptionFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="UnableToDestroySubscriptionFault" 
-               type="wsnt:UnableToDestroySubscriptionFaultType"/>
-
-<!-- ====== Message Types for Pausable SubscriptionManager  ======= -->
-
-  <xsd:element name="PauseSubscription">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="PauseSubscriptionResponse" >
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="ResumeSubscription">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:element name="ResumeSubscriptionResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-  <xsd:complexType name="PauseFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="PauseFailedFault" 
-               type="wsnt:PauseFailedFaultType"/>
-
-  <xsd:complexType name="ResumeFailedFaultType">
-    <xsd:complexContent>
-      <xsd:extension base="wsrf-bf:BaseFaultType"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="ResumeFailedFault" 
-               type="wsnt:ResumeFailedFaultType"/>
-
-</xsd:schema>
diff --git a/onvif/wsdl/bf-2.xsd b/onvif/wsdl/bf-2.xsd
deleted file mode 100644
index 4efefea72..000000000
--- a/onvif/wsdl/bf-2.xsd
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-   OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2005). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. 
--->
-
-<xsd:schema 
-  xmlns="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:wsa="http://www.w3.org/2005/08/addressing"
-  xmlns:wsrf-bf=
-    "http://docs.oasis-open.org/wsrf/bf-2" 
-  elementFormDefault="qualified" attributeFormDefault="unqualified" 
-  targetNamespace=
-    "http://docs.oasis-open.org/wsrf/bf-2">
-  <xsd:import
-     namespace="http://www.w3.org/2005/08/addressing" 
-     schemaLocation=
-              "http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
-              
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" 
-              schemaLocation="http://www.w3.org/2001/xml.xsd">
-    <xsd:annotation>
-      <xsd:documentation>
-        Get access to the xml: attribute groups for xml:lang as declared on 'schema'
-        and 'documentation' below
-      </xsd:documentation> 
-    </xsd:annotation>
-  </xsd:import>
-<!-- ====================== BaseFault Types ======================= -->
-      
-  <xsd:element name="BaseFault" type="wsrf-bf:BaseFaultType"/>
-  
-  <xsd:complexType name="BaseFaultType">
-    <xsd:sequence>
-      <xsd:any namespace="##other" processContents="lax"
-              minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="Timestamp" type="xsd:dateTime" 
-               minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="Originator" type="wsa:EndpointReferenceType" 
-               minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="ErrorCode" 
-               minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:complexContent mixed="true">
-            <xsd:extension base="xsd:anyType">
-              <xsd:attribute name="dialect" type="xsd:anyURI"
-                         use="required"/>
-            </xsd:extension>
-          </xsd:complexContent>
-        </xsd:complexType>      
-      </xsd:element>
-
-      <xsd:element name="Description" 
-               minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/> 
-        <!--      <xsd:anyAttribute processContents="lax" />-->
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="FaultCause" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##other" processContents="lax" 
-                     minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType> 
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax"/>
- </xsd:complexType>
-</xsd:schema>
diff --git a/onvif/wsdl/devicemgmt.wsdl b/onvif/wsdl/devicemgmt.wsdl
deleted file mode 100644
index d7f7379c1..000000000
--- a/onvif/wsdl/devicemgmt.wsdl
+++ /dev/null
@@ -1,3786 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" targetNamespace="http://www.onvif.org/ver10/device/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver10/device/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tds="http://www.onvif.org/ver10/device/wsdl" elementFormDefault="qualified" version="2.4.2">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
-			<!--===============================-->
-			<xs:element name="GetServices">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IncludeCapability" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Indicates if the service capabilities (untyped) should be included in the response.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServicesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Service" type="tds:Service" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Each Service element contains information about one service.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Service">
-				<xs:sequence>
-					<xs:element name="Namespace" type="xs:anyURI">
-						<xs:annotation>
-							<xs:documentation>Namespace of the service being described. This parameter allows to match the service capabilities to the service. Note that only one set of capabilities is supported per namespace.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="XAddr" type="xs:anyURI">
-						<xs:annotation>
-							<xs:documentation>The transport addresses where the service can be reached. The scheme and IP part shall match the one used in the request (i.e. the GetServices request).</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Capabilities" minOccurs="0">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:any namespace="##any" processContents="lax">
-									<xs:annotation>
-										<xs:documentation>The placeholder for the service capabilities. The service capability element shall be returned here. For example for the device service that would be the tds:DeviceServiceCapabilities element (not complextype).</xs:documentation>
-									</xs:annotation>
-								</xs:any>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Version" type="tt:OnvifVersion">
-						<xs:annotation>
-							<xs:documentation>The version of the service (not the ONVIF core spec version).</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the device service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="DeviceServiceCapabilities">
-				<xs:sequence>
-					<xs:element name="Network" type="tds:NetworkCapabilities">
-						<xs:annotation>
-							<xs:documentation>Network capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Security" type="tds:SecurityCapabilities">
-						<xs:annotation>
-							<xs:documentation>Security capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="System" type="tds:SystemCapabilities">
-						<xs:annotation>
-							<xs:documentation>System capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Misc" type="tds:MiscCapabilities" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Capabilities that do not fit in any of the other categories.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="tds:DeviceServiceCapabilities"/>
-			<!--===============================-->
-			<xs:complexType name="NetworkCapabilities">
-				<xs:attribute name="IPFilter" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IP filtering.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="ZeroConfiguration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for zeroconf.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="IPVersion6" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IPv6.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DynDNS" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for dynamic DNS configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot11Configuration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IEEE 802.11 configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot1XConfigurations" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Indicates the maximum number of Dot1X configurations supported by the device</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HostnameFromDHCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of hostname from DHCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NTP" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of NTP servers supported by the devices SetNTP command.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DHCPv6" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for Stateful IPv6 DHCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:simpleType name="EAPMethodTypes">
-				<xs:list itemType="xs:int"/>
-			</xs:simpleType>
-			<xs:complexType name="SecurityCapabilities">
-				<xs:attribute name="TLS1.0" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.0.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="TLS1.1" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.1.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="TLS1.2" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for TLS 1.2.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="OnboardKeyGeneration" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for onboard key generation.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="AccessPolicyConfig" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for access policy configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DefaultAccessPolicy" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for the ONVIF default access policy.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Dot1X" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for IEEE 802.1X configuration.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RemoteUserHandling" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for remote user configuration. Used when accessing another device.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="X.509Token" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security X.509 token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SAMLToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security SAML token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="KerberosToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security Kerberos token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="UsernameToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security Username token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpDigest" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS over HTTP digest authenticated communication layer.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RELToken" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Security REL token.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SupportedEAPMethods" type="tds:EAPMethodTypes">
-					<xs:annotation>
-						<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="MaxUsers" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>The maximum number of users that the device supports.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="SystemCapabilities">
-				<xs:attribute name="DiscoveryResolve" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS Discovery resolve requests.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="DiscoveryBye" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for WS-Discovery Bye.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RemoteDiscovery" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for remote discovery.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SystemBackup" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for system backup through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="SystemLogging" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of system logging through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="FirmwareUpgrade" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for firmware upgrade through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpFirmwareUpgrade" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for system backup through MTOM.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSystemBackup" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for system backup through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSystemLogging" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieval of system logging through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="HttpSupportInformation" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for retrieving support information through HTTP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="MiscCapabilities">
-				<xs:attribute name="AuxiliaryCommands" type="tt:StringAttrList">
-					<xs:annotation>
-						<xs:documentation>Lists of commands supported by SendAuxiliaryCommand.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetDeviceInformation">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDeviceInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Manufacturer" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The manufactor of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Model" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The device model.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="FirmwareVersion" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The firmware version in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="SerialNumber" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The serial number of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="HardwareId" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>The hardware ID of the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSystemDateAndTime">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DateTimeType" type="tt:SetDateTimeType">
-							<xs:annotation>
-								<xs:documentation>Defines if the date and time is set via NTP or manually.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="DaylightSavings" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Automatically adjust Daylight savings if defined in TimeZone.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The time zone in POSIX 1003.1 format</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Date and time in UTC. If time is obtained via NTP, UTCDateTime has no meaning</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSystemDateAndTimeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemDateAndTime">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemDateAndTimeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemDateAndTime" type="tt:SystemDateTime">
-							<xs:annotation>
-								<xs:documentation>Contains information whether system date and time are set manually or by NTP, daylight savings is on or off, time zone in POSIX 1003.1 format and system date and time in UTC and also local system date and time.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSystemFactoryDefault">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FactoryDefault" type="tt:FactoryDefaultType">
-							<xs:annotation>
-								<xs:documentation>Specifies the factory default action type.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSystemFactoryDefaultResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="UpgradeSystemFirmware">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Firmware" type="tt:AttachmentData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="UpgradeSystemFirmwareResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Message" type="xs:string" minOccurs="0" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SystemReboot">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SystemRebootResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Message" type="xs:string">
-							<xs:annotation>
-								<xs:documentation>Contains the reboot message sent by the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RestoreSystem">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RestoreSystemResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemBackup">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemBackupResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="BackupFiles" type="tt:BackupFile" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemSupportInformation">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemSupportInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SupportInformation" type="tt:SupportInformation">
-							<xs:annotation>
-								<xs:documentation>Contains the arbitary device diagnostics information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemLog">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="LogType" type="tt:SystemLogType">
-							<xs:annotation>
-								<xs:documentation>Specifies the type of system log to get.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemLogResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemLog" type="tt:SystemLog">
-							<xs:annotation>
-								<xs:documentation>Contains the system log information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetScopes">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Scopes" type="tt:Scope" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URI definining the device scopes. Scope parameters can be of two types: fixed and configurable. Fixed parameters can not be altered.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Scopes" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of scope parameters that will replace all existing configurable scope parameters.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of new configurable scope parameters that will be added to the existing configurable scope.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveScopes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URIs that should be removed from the device scope.<br/>
-									Note that the response message always will match the request or an error will be returned. The use of the response is for that reason deprecated.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveScopesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ScopeItem" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of URIs that has been removed from the device scope</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRemoteDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRemoteDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRemoteDiscoveryMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteDiscoveryMode" type="tt:DiscoveryMode">
-							<xs:annotation>
-								<xs:documentation>
-									Indicator of discovery mode: Discoverable, NonDiscoverable.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRemoteDiscoveryModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDPAddresses">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDPAddressesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDPAddresses">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DPAddress" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDPAddressesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetEndpointReference">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetEndpointReferenceResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GUID" type="xs:string"/>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRemoteUser">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRemoteUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRemoteUser">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RemoteUser" type="tt:RemoteUser" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRemoteUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetUsers">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of the onvif users and following information is included in each entry: username and user level.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateUsers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Creates new device users and corresponding credentials. Each user entry includes: username, password and user level. Either all users are created successfully or a fault message MUST be returned without creating any user. If trying to create several users with exactly the same username the request is rejected and no users are created. If password is missing, then fault message Too weak password is returned.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteUsers">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Username" type="xs:string" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Deletes users on an device and there may exist users that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a fault message MUST be returned and no users be deleted. If a username exists multiple times in the request, then a fault message is returned.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteUsersResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetUser">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="User" type="tt:User" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Updates the credentials for one or several users on an device. Either all change requests are processed successfully or a fault message MUST be returned. If the request contains the same username multiple times, a fault message is returned. </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetUserResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetWsdlUrl">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetWsdlUrlResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="WsdlUrl" type="xs:anyURI"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCapabilities">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Category" type="tt:CapabilityCategory" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of categories to retrieve capability information on.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tt:Capabilities">
-							<xs:annotation>
-								<xs:documentation>
-									Capability information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetHostname">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetHostnameResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="HostnameInformation" type="tt:HostnameInformation">
-							<xs:annotation>
-								<xs:documentation>Contains the hostname information.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHostname">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="xs:token">
-							<xs:annotation>
-								<xs:documentation>The hostname to set.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHostnameResponse">
-				<xs:complexType>
-					<xs:sequence>
-				    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHostnameFromDHCP">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>True if the hostname shall be obtained via DHCP.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHostnameFromDHCPResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RebootNeeded" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not a reboot is required after configuration updates.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDNS">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DNSInformation" type="tt:DNSInformation">
-							<xs:annotation>
-								<xs:documentation>
-									DNS information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDNS">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicate if the DNS address is to be retrieved using DHCP.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									DNS search domain.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									DNS address(es) set manually.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNTP">
-				<xs:complexType>
-					<xs:sequence>
-				    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNTPResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NTPInformation" type="tt:NTPInformation">
-							<xs:annotation>
-								<xs:documentation>
-									NTP information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNTP">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="FromDHCP" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicate if NTP address information is to be retrieved using DHCP.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Manual NTP settings.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNTPResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDynamicDNS">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDynamicDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="DynamicDNSInformation" type="tt:DynamicDNSInformation">
-							<xs:annotation>
-								<xs:documentation>
-									Dynamic DNS information.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDynamicDNS">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Type" type="tt:DynamicDNSType">
-							<xs:annotation>
-								<xs:documentation>
-									Dynamic DNS type.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Name" type="tt:DNSName" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									DNS name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="TTL" type="xs:duration" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									DNS record time to live.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDynamicDNSResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkInterfaces">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkInterfacesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkInterfaces" type="tt:NetworkInterface" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of network interfaces.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkInterfaces">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>
-									Symbolic network interface name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="NetworkInterface" type="tt:NetworkInterfaceSetConfiguration">
-							<xs:annotation>
-								<xs:documentation>
-									Network interface name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkInterfacesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RebootNeeded" type="xs:boolean" minOccurs="1" maxOccurs="1">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not a reboot is required after configuration updates.
-									If a device responds with RebootNeeded set to false, the device can be reached
-									via the new IP address without further action. A client should be aware that a device
-									may not be responsive for a short period of time until it signals availability at
-									the new address via the discovery Hello messages.
-									If a device responds with RebootNeeded set to true, it will be further available under
-									its previous IP address. The settings will only be activated when the device is
-									rebooted via the SystemReboot command.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkProtocols">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkProtocolsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains an array of defined protocols supported by the device. There are three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be retrieved for each protocol: port and enable/disable.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkProtocols">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkProtocols" type="tt:NetworkProtocol" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Configures one or more defined network protocols supported by the device. There are currently three protocols defined; HTTP, HTTPS and RTSP. The following parameters can be set for each protocol: port and enable/disable.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkProtocolsResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNetworkDefaultGateway">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNetworkDefaultGatewayResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NetworkGateway" type="tt:NetworkGateway">
-							<xs:annotation>
-								<xs:documentation>Gets the default IPv4 and IPv6 gateway settings from the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetNetworkDefaultGateway">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Sets IPv4 gateway address used as default setting.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Sets IPv6 gateway address used as default setting.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetNetworkDefaultGatewayResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetZeroConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetZeroConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ZeroConfiguration" type="tt:NetworkZeroConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the zero-configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetZeroConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Unique identifier referencing the physical interface.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Specifies if the zero-configuration should be enabled or not.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetZeroConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveIPAddressFilter">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="IPAddressFilter" type="tt:IPAddressFilter"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveIPAddressFilterResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAccessPolicy">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAccessPolicyResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PolicyFile" type="tt:BinaryData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAccessPolicy">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PolicyFile" type="tt:BinaryData"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAccessPolicyResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateCertificate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate id.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Subject" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Identification of the entity associated with the public-key.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ValidNotBefore" type="xs:dateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate validity start date.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ValidNotAfter" type="xs:dateTime" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Certificate expiry start date.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateCertificateResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NvtCertificate" type="tt:Certificate">
-							<xs:annotation>
-								<xs:documentation>
-									base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificates">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NvtCertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Id and base64 encoded DER representation of all available certificates.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificatesStatus">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificatesStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates if a certificate is used in an optional HTTPS configuration of the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetCertificatesStatus">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateStatus" type="tt:CertificateStatus" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates if a certificate is to be used in an optional HTTPS configuration of the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetCertificatesStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteCertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									List of ids of certificates to delete.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPkcs10Request">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token">
-							<xs:annotation>
-								<xs:documentation>
-									List of ids of certificates to delete.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Subject" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									Relative Dinstinguished Name(RDN) CommonName(CN).
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Attributes" type="tt:BinaryData" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>
-									Optional base64 encoded DER attributes.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPkcs10RequestResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Pkcs10Request" type="tt:BinaryData">
-							<xs:annotation>
-								<xs:documentation>
-									base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NVTCertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>
-									Optional id and base64 encoded DER representation of certificate.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetClientCertificateMode">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetClientCertificateModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not client certificates are required by device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetClientCertificateMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Enabled" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>
-									Indicates whether or not client certificates are required by device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetClientCertificateModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCACertificates">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCACertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCertificateWithPrivateKey">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateWithPrivateKey" type="tt:CertificateWithPrivateKey" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCertificateWithPrivateKeyResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCertificateInformation">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateID" type="xs:token" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCertificateInformationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CertificateInformation" type="tt:CertificateInformation" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="LoadCACertificates">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="CACertificate" type="tt:Certificate" minOccurs="1" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="LoadCACertificatesResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot1XConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-			</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot1XConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfiguration" type="tt:Dot1XConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteDot1XConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteDot1XConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetRelayOutputs">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetRelayOutputsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputs" type="tt:RelayOutput" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRelayOutputSettings">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputToken" type="tt:ReferenceToken"/>
-						<xs:element name="Properties" type="tt:RelayOutputSettings"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRelayOutputSettingsResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetRelayOutputState">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="RelayOutputToken" type="tt:ReferenceToken" minOccurs="1" maxOccurs="1"/>
-						<xs:element name="LogicalState" type="tt:RelayLogicalState" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetRelayOutputStateResponse">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SendAuxiliaryCommand">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryCommand" type="tt:AuxiliaryData" minOccurs="1" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SendAuxiliaryCommandResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryCommandResponse" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="1"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot11Capabilities">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot11CapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tt:Dot11Capabilities"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetDot11Status">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetDot11StatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Status" type="tt:Dot11Status"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ScanAvailableDot11Networks">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="InterfaceToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ScanAvailableDot11NetworksResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Networks" type="tt:Dot11AvailableNetworks" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSystemUris">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSystemUrisResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="SystemLogUris" type="tt:SystemLogUriList" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="SupportInfoUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="SystemBackupUri" type="xs:anyURI" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="Extension" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartFirmwareUpgrade">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartFirmwareUpgradeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="UploadUri" type="xs:anyURI"/>
-						<xs:element name="UploadDelay" type="xs:duration"/>
-						<xs:element name="ExpectedDownTime" type="xs:duration"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartSystemRestore">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartSystemRestoreResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="UploadUri" type="xs:anyURI"/>
-						<xs:element name="ExpectedDownTime" type="xs:duration"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServicesRequest">
-		<wsdl:part name="parameters" element="tds:GetServices"/>
-	</wsdl:message>
-	<wsdl:message name="GetServicesResponse">
-		<wsdl:part name="parameters" element="tds:GetServicesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDeviceInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetDeviceInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetDeviceInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetDeviceInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemDateAndTimeRequest">
-		<wsdl:part name="parameters" element="tds:SetSystemDateAndTime"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemDateAndTimeResponse">
-		<wsdl:part name="parameters" element="tds:SetSystemDateAndTimeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemDateAndTimeRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemDateAndTime"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemDateAndTimeResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemDateAndTimeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemFactoryDefaultRequest">
-		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefault"/>
-	</wsdl:message>
-	<wsdl:message name="SetSystemFactoryDefaultResponse">
-		<wsdl:part name="parameters" element="tds:SetSystemFactoryDefaultResponse"/>
-	</wsdl:message>
-	<wsdl:message name="UpgradeSystemFirmwareRequest">
-		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmware"/>
-	</wsdl:message>
-	<wsdl:message name="UpgradeSystemFirmwareResponse">
-		<wsdl:part name="parameters" element="tds:UpgradeSystemFirmwareResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SystemRebootRequest">
-		<wsdl:part name="parameters" element="tds:SystemReboot"/>
-	</wsdl:message>
-	<wsdl:message name="SystemRebootResponse">
-		<wsdl:part name="parameters" element="tds:SystemRebootResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemBackupRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemBackup"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemBackupResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemBackupResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RestoreSystemRequest">
-		<wsdl:part name="parameters" element="tds:RestoreSystem"/>
-	</wsdl:message>
-	<wsdl:message name="RestoreSystemResponse">
-		<wsdl:part name="parameters" element="tds:RestoreSystemResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemSupportInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemSupportInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemSupportInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemSupportInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemLogRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemLog"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemLogResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemLogResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetScopesRequest">
-		<wsdl:part name="parameters" element="tds:GetScopes"/>
-	</wsdl:message>
-	<wsdl:message name="GetScopesResponse">
-		<wsdl:part name="parameters" element="tds:GetScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetScopesRequest">
-		<wsdl:part name="parameters" element="tds:SetScopes"/>
-	</wsdl:message>
-	<wsdl:message name="SetScopesResponse">
-		<wsdl:part name="parameters" element="tds:SetScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddScopesRequest">
-		<wsdl:part name="parameters" element="tds:AddScopes"/>
-	</wsdl:message>
-	<wsdl:message name="AddScopesResponse">
-		<wsdl:part name="parameters" element="tds:AddScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveScopesRequest">
-		<wsdl:part name="parameters" element="tds:RemoveScopes"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveScopesResponse">
-		<wsdl:part name="parameters" element="tds:RemoveScopesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:GetDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:GetDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:SetDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:SetDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:GetRemoteDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteDiscoveryModeRequest">
-		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteDiscoveryModeResponse">
-		<wsdl:part name="parameters" element="tds:SetRemoteDiscoveryModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDPAddressesRequest">
-		<wsdl:part name="parameters" element="tds:GetDPAddresses"/>
-	</wsdl:message>
-	<wsdl:message name="GetDPAddressesResponse">
-		<wsdl:part name="parameters" element="tds:GetDPAddressesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDPAddressesRequest">
-		<wsdl:part name="parameters" element="tds:SetDPAddresses"/>
-	</wsdl:message>
-	<wsdl:message name="SetDPAddressesResponse">
-		<wsdl:part name="parameters" element="tds:SetDPAddressesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetEndpointReferenceRequest">
-		<wsdl:part name="parameters" element="tds:GetEndpointReference"/>
-	</wsdl:message>
-	<wsdl:message name="GetEndpointReferenceResponse">
-		<wsdl:part name="parameters" element="tds:GetEndpointReferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteUserRequest">
-		<wsdl:part name="parameters" element="tds:GetRemoteUser"/>
-	</wsdl:message>
-	<wsdl:message name="GetRemoteUserResponse">
-		<wsdl:part name="parameters" element="tds:GetRemoteUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteUserRequest">
-		<wsdl:part name="parameters" element="tds:SetRemoteUser"/>
-	</wsdl:message>
-	<wsdl:message name="SetRemoteUserResponse">
-		<wsdl:part name="parameters" element="tds:SetRemoteUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetUsersRequest">
-		<wsdl:part name="parameters" element="tds:GetUsers"/>
-	</wsdl:message>
-	<wsdl:message name="GetUsersResponse">
-		<wsdl:part name="parameters" element="tds:GetUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateUsersRequest">
-		<wsdl:part name="parameters" element="tds:CreateUsers"/>
-	</wsdl:message>
-	<wsdl:message name="CreateUsersResponse">
-		<wsdl:part name="parameters" element="tds:CreateUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteUsersRequest">
-		<wsdl:part name="parameters" element="tds:DeleteUsers"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteUsersResponse">
-		<wsdl:part name="parameters" element="tds:DeleteUsersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetUserRequest">
-		<wsdl:part name="parameters" element="tds:SetUser"/>
-	</wsdl:message>
-	<wsdl:message name="SetUserResponse">
-		<wsdl:part name="parameters" element="tds:SetUserResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetWsdlUrlRequest">
-		<wsdl:part name="parameters" element="tds:GetWsdlUrl"/>
-	</wsdl:message>
-	<wsdl:message name="GetWsdlUrlResponse">
-		<wsdl:part name="parameters" element="tds:GetWsdlUrlResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetHostnameRequest">
-		<wsdl:part name="parameters" element="tds:GetHostname"/>
-	</wsdl:message>
-	<wsdl:message name="GetHostnameResponse">
-		<wsdl:part name="parameters" element="tds:GetHostnameResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameRequest">
-		<wsdl:part name="parameters" element="tds:SetHostname"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameResponse">
-		<wsdl:part name="parameters" element="tds:SetHostnameResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameFromDHCPRequest">
-		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCP"/>
-	</wsdl:message>
-	<wsdl:message name="SetHostnameFromDHCPResponse">
-		<wsdl:part name="parameters" element="tds:SetHostnameFromDHCPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDNSRequest">
-		<wsdl:part name="parameters" element="tds:GetDNS"/>
-	</wsdl:message>
-	<wsdl:message name="GetDNSResponse">
-		<wsdl:part name="parameters" element="tds:GetDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDNSRequest">
-		<wsdl:part name="parameters" element="tds:SetDNS"/>
-	</wsdl:message>
-	<wsdl:message name="SetDNSResponse">
-		<wsdl:part name="parameters" element="tds:SetDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNTPRequest">
-		<wsdl:part name="parameters" element="tds:GetNTP"/>
-	</wsdl:message>
-	<wsdl:message name="GetNTPResponse">
-		<wsdl:part name="parameters" element="tds:GetNTPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNTPRequest">
-		<wsdl:part name="parameters" element="tds:SetNTP"/>
-	</wsdl:message>
-	<wsdl:message name="SetNTPResponse">
-		<wsdl:part name="parameters" element="tds:SetNTPResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDynamicDNSRequest">
-		<wsdl:part name="parameters" element="tds:GetDynamicDNS"/>
-	</wsdl:message>
-	<wsdl:message name="GetDynamicDNSResponse">
-		<wsdl:part name="parameters" element="tds:GetDynamicDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDynamicDNSRequest">
-		<wsdl:part name="parameters" element="tds:SetDynamicDNS"/>
-	</wsdl:message>
-	<wsdl:message name="SetDynamicDNSResponse">
-		<wsdl:part name="parameters" element="tds:SetDynamicDNSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkInterfacesRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkInterfaces"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkInterfacesResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkInterfacesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkInterfacesRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkInterfaces"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkInterfacesResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkInterfacesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkProtocolsRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkProtocols"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkProtocolsResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkProtocolsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkProtocolsRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkProtocols"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkProtocolsResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkProtocolsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkDefaultGatewayRequest">
-		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGateway"/>
-	</wsdl:message>
-	<wsdl:message name="GetNetworkDefaultGatewayResponse">
-		<wsdl:part name="parameters" element="tds:GetNetworkDefaultGatewayResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkDefaultGatewayRequest">
-		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGateway"/>
-	</wsdl:message>
-	<wsdl:message name="SetNetworkDefaultGatewayResponse">
-		<wsdl:part name="parameters" element="tds:SetNetworkDefaultGatewayResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetZeroConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:GetZeroConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetZeroConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:GetZeroConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetZeroConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:SetZeroConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetZeroConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:SetZeroConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:GetIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="GetIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:GetIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:SetIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="SetIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:SetIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:AddIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="AddIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:AddIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveIPAddressFilterRequest">
-		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilter"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveIPAddressFilterResponse">
-		<wsdl:part name="parameters" element="tds:RemoveIPAddressFilterResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAccessPolicyRequest">
-		<wsdl:part name="parameters" element="tds:GetAccessPolicy"/>
-	</wsdl:message>
-	<wsdl:message name="GetAccessPolicyResponse">
-		<wsdl:part name="parameters" element="tds:GetAccessPolicyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAccessPolicyRequest">
-		<wsdl:part name="parameters" element="tds:SetAccessPolicy"/>
-	</wsdl:message>
-	<wsdl:message name="SetAccessPolicyResponse">
-		<wsdl:part name="parameters" element="tds:SetAccessPolicyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateCertificateRequest">
-		<wsdl:part name="parameters" element="tds:CreateCertificate"/>
-	</wsdl:message>
-	<wsdl:message name="CreateCertificateResponse">
-		<wsdl:part name="parameters" element="tds:CreateCertificateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesStatusRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificatesStatus"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificatesStatusResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificatesStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetCertificatesStatusRequest">
-		<wsdl:part name="parameters" element="tds:SetCertificatesStatus"/>
-	</wsdl:message>
-	<wsdl:message name="SetCertificatesStatusResponse">
-		<wsdl:part name="parameters" element="tds:SetCertificatesStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:DeleteCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:DeleteCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPkcs10RequestRequest">
-		<wsdl:part name="parameters" element="tds:GetPkcs10Request"/>
-	</wsdl:message>
-	<wsdl:message name="GetPkcs10RequestResponse">
-		<wsdl:part name="parameters" element="tds:GetPkcs10RequestResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificatesRequest">
-		<wsdl:part name="parameters" element="tds:LoadCertificates"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificatesResponse">
-		<wsdl:part name="parameters" element="tds:LoadCertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetClientCertificateModeRequest">
-		<wsdl:part name="parameters" element="tds:GetClientCertificateMode"/>
-	</wsdl:message>
-	<wsdl:message name="GetClientCertificateModeResponse">
-		<wsdl:part name="parameters" element="tds:GetClientCertificateModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetClientCertificateModeRequest">
-		<wsdl:part name="parameters" element="tds:SetClientCertificateMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetClientCertificateModeResponse">
-		<wsdl:part name="parameters" element="tds:SetClientCertificateModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetRelayOutputsRequest">
-		<wsdl:part name="parameters" element="tds:GetRelayOutputs"/>
-	</wsdl:message>
-	<wsdl:message name="GetRelayOutputsResponse">
-		<wsdl:part name="parameters" element="tds:GetRelayOutputsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputSettingsRequest">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputSettings"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputSettingsResponse">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputSettingsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputStateRequest">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputState"/>
-	</wsdl:message>
-	<wsdl:message name="SetRelayOutputStateResponse">
-		<wsdl:part name="parameters" element="tds:SetRelayOutputStateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandRequest">
-		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommand"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandResponse">
-		<wsdl:part name="parameters" element="tds:SendAuxiliaryCommandResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCACertificatesRequest">
-		<wsdl:part name="parameters" element="tds:GetCACertificates"/>
-	</wsdl:message>
-	<wsdl:message name="GetCACertificatesResponse">
-		<wsdl:part name="parameters" element="tds:GetCACertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificateWithPrivateKeyRequest">
-		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKey"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCertificateWithPrivateKeyResponse">
-		<wsdl:part name="parameters" element="tds:LoadCertificateWithPrivateKeyResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificateInformationRequest">
-		<wsdl:part name="parameters" element="tds:GetCertificateInformation"/>
-	</wsdl:message>
-	<wsdl:message name="GetCertificateInformationResponse">
-		<wsdl:part name="parameters" element="tds:GetCertificateInformationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCACertificatesRequest">
-		<wsdl:part name="parameters" element="tds:LoadCACertificates"/>
-	</wsdl:message>
-	<wsdl:message name="LoadCACertificatesResponse">
-		<wsdl:part name="parameters" element="tds:LoadCACertificatesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:CreateDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="CreateDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:CreateDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:SetDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:SetDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationsRequest">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot1XConfigurationsResponse">
-		<wsdl:part name="parameters" element="tds:GetDot1XConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteDot1XConfigurationRequest">
-		<wsdl:part name="parameters" element="tds:DeleteDot1XConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteDot1XConfigurationResponse">
-		<wsdl:part name="parameters" element="tds:DeleteDot1XConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11CapabilitiesRequest">
-		<wsdl:part name="parameters" element="tds:GetDot11Capabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11CapabilitiesResponse">
-		<wsdl:part name="parameters" element="tds:GetDot11CapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11StatusRequest">
-		<wsdl:part name="parameters" element="tds:GetDot11Status"/>
-	</wsdl:message>
-	<wsdl:message name="GetDot11StatusResponse">
-		<wsdl:part name="parameters" element="tds:GetDot11StatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ScanAvailableDot11NetworksRequest">
-		<wsdl:part name="parameters" element="tds:ScanAvailableDot11Networks"/>
-	</wsdl:message>
-	<wsdl:message name="ScanAvailableDot11NetworksResponse">
-		<wsdl:part name="parameters" element="tds:ScanAvailableDot11NetworksResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemUrisRequest">
-		<wsdl:part name="parameters" element="tds:GetSystemUris"/>
-	</wsdl:message>
-	<wsdl:message name="GetSystemUrisResponse">
-		<wsdl:part name="parameters" element="tds:GetSystemUrisResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartFirmwareUpgradeRequest">
-		<wsdl:part name="parameters" element="tds:StartFirmwareUpgrade"/>
-	</wsdl:message>
-	<wsdl:message name="StartFirmwareUpgradeResponse">
-		<wsdl:part name="parameters" element="tds:StartFirmwareUpgradeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartSystemRestoreRequest">
-		<wsdl:part name="parameters" element="tds:StartSystemRestore"/>
-	</wsdl:message>
-	<wsdl:message name="StartSystemRestoreResponse">
-		<wsdl:part name="parameters" element="tds:StartSystemRestoreResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="Device">
-		<wsdl:operation name="GetServices">
-			<wsdl:documentation>Returns information about services on the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetServicesRequest"/>
-			<wsdl:output message="tds:GetServicesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the device service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="tds:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="tds:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDeviceInformation">
-			<wsdl:documentation>This operation gets basic device information from the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetDeviceInformationRequest"/>
-			<wsdl:output message="tds:GetDeviceInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemDateAndTime">
-			<wsdl:documentation>This operation sets the device system date and time. The device shall support the
-				configuration of the daylight saving setting and of the manual system date and time (if
-				applicable) or indication of NTP time (if applicable) through the SetSystemDateAndTime
-				command. <br/>
-				If system time and date are set manually, the client shall include UTCDateTime in the request.<br/>
-				A TimeZone token which is not formed according to the rules of IEEE 1003.1 section 8.3 is considered as invalid timezone.<br/>
-				The DayLightSavings flag should be set to true to activate any DST settings of the TimeZone string. 
-				Clear the DayLightSavings flag if the DST portion of the TimeZone settings should be ignored.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetSystemDateAndTimeRequest"/>
-			<wsdl:output message="tds:SetSystemDateAndTimeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemDateAndTime">
-			<wsdl:documentation>This operation gets the device system date and time. The device shall support the return of
-				the daylight saving setting and of the manual system date and time (if applicable) or indication
-				of NTP time (if applicable) through the GetSystemDateAndTime command.<br/>
-				A device shall provide the UTCDateTime information.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemDateAndTimeRequest"/>
-			<wsdl:output message="tds:GetSystemDateAndTimeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemFactoryDefault">
-			<wsdl:documentation>This operation reloads the parameters on the device to their factory default values.</wsdl:documentation>
-			<wsdl:input message="tds:SetSystemFactoryDefaultRequest"/>
-			<wsdl:output message="tds:SetSystemFactoryDefaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="UpgradeSystemFirmware">
-			<wsdl:documentation>This operation upgrades a device firmware version. After a successful upgrade the response
-				message is sent before the device reboots. The device should support firmware upgrade
-				through the UpgradeSystemFirmware command. The exact format of the firmware data is
-				outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:UpgradeSystemFirmwareRequest"/>
-			<wsdl:output message="tds:UpgradeSystemFirmwareResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SystemReboot">
-			<wsdl:documentation>This operation reboots the device.</wsdl:documentation>
-			<wsdl:input message="tds:SystemRebootRequest"/>
-			<wsdl:output message="tds:SystemRebootResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RestoreSystem">
-			<wsdl:documentation>This operation restores the system backup configuration files(s) previously retrieved from a
-				device. The device should support restore of backup configuration file(s) through the
-				RestoreSystem command. The exact format of the backup configuration file(s) is outside the
-				scope of this standard. If the command is supported, it shall accept backup files returned by
-				the GetSystemBackup command.</wsdl:documentation>
-			<wsdl:input message="tds:RestoreSystemRequest"/>
-			<wsdl:output message="tds:RestoreSystemResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemBackup">
-			<wsdl:documentation>This operation is retrieves system backup configuration file(s) from a device. The device
-				should support return of back up configuration file(s) through the GetSystemBackup command.
-				The backup is returned with reference to a name and mime-type together with binary data.
-				The exact format of the backup configuration files is outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemBackupRequest"/>
-			<wsdl:output message="tds:GetSystemBackupResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemLog">
-			<wsdl:documentation>This operation gets a system log from the device. The exact format of the system logs is outside the scope of this standard.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemLogRequest"/>
-			<wsdl:output message="tds:GetSystemLogResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemSupportInformation">
-			<wsdl:documentation>This operation gets arbitary device diagnostics information from the device.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemSupportInformationRequest"/>
-			<wsdl:output message="tds:GetSystemSupportInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetScopes">
-			<wsdl:documentation>This operation requests the scope parameters of a device. The scope parameters are used in
-				the device discovery to match a probe message, see Section 7. The Scope parameters are of
-				two different types: <ul>
-					<li>Fixed</li>
-					<li>Configurable</li>
-				</ul>
-				Fixed scope parameters are permanent device characteristics and cannot be removed through the device management interface. 
-				The scope type is indicated in the scope list returned in the get scope parameters response. A device shall support 
-				retrieval of discovery scope parameters through the GetScopes command. As some scope parameters are mandatory, 
-				the device shall return a non-empty scope list in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetScopesRequest"/>
-			<wsdl:output message="tds:GetScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetScopes">
-			<wsdl:documentation>This operation sets the scope parameters of a device. The scope parameters are used in the
-				device discovery to match a probe message.
-				This operation replaces all existing configurable scope parameters (not fixed parameters). If
-				this shall be avoided, one should use the scope add command instead. The device shall
-				support configuration of discovery scope parameters through the SetScopes command.</wsdl:documentation>
-			<wsdl:input message="tds:SetScopesRequest"/>
-			<wsdl:output message="tds:SetScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddScopes">
-			<wsdl:documentation>This operation adds new configurable scope parameters to a device. The scope parameters
-				are used in the device discovery to match a probe message. The device shall
-				support addition of discovery scope parameters through the AddScopes command.</wsdl:documentation>
-			<wsdl:input message="tds:AddScopesRequest"/>
-			<wsdl:output message="tds:AddScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveScopes">
-			<wsdl:documentation>This operation deletes scope-configurable scope parameters from a device. The scope
-				parameters are used in the device discovery to match a probe message, see Section 7. The
-				device shall support deletion of discovery scope parameters through the RemoveScopes
-				command.
-				Table</wsdl:documentation>
-			<wsdl:input message="tds:RemoveScopesRequest"/>
-			<wsdl:output message="tds:RemoveScopesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDiscoveryMode">
-			<wsdl:documentation>This operation gets the discovery mode of a device. See Section 7.2 for the definition of the
-				different device discovery modes. The device shall support retrieval of the discovery mode
-				setting through the GetDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDiscoveryModeRequest"/>
-			<wsdl:output message="tds:GetDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDiscoveryMode">
-			<wsdl:documentation>This operation sets the discovery mode operation of a device. See Section 7.2 for the
-				definition of the different device discovery modes. The device shall support configuration of
-				the discovery mode setting through the SetDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDiscoveryModeRequest"/>
-			<wsdl:output message="tds:SetDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteDiscoveryMode">
-			<wsdl:documentation>This operation gets the remote discovery mode of a device. See Section 7.4 for the definition
-				of remote discovery extensions. A device that supports remote discovery shall support
-				retrieval of the remote discovery mode setting through the GetRemoteDiscoveryMode
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetRemoteDiscoveryModeRequest"/>
-			<wsdl:output message="tds:GetRemoteDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteDiscoveryMode">
-			<wsdl:documentation>This operation sets the remote discovery mode of operation of a device. See Section 7.4 for
-				the definition of remote discovery remote extensions. A device that supports remote discovery
-				shall support configuration of the discovery mode setting through the
-				SetRemoteDiscoveryMode command.</wsdl:documentation>
-			<wsdl:input message="tds:SetRemoteDiscoveryModeRequest"/>
-			<wsdl:output message="tds:SetRemoteDiscoveryModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDPAddresses">
-			<wsdl:documentation>This operation gets the remote DP address or addresses from a device. If the device supports
-				remote discovery, as specified in Section 7.4, the device shall support retrieval of the remote
-				DP address(es) through the GetDPAddresses command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDPAddressesRequest"/>
-			<wsdl:output message="tds:GetDPAddressesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDPAddresses">
-			<wsdl:documentation>This operation sets the remote DP address or addresses on a device. If the device supports
-				remote discovery, as specified in Section 7.4, the device shall support configuration of the
-				remote DP address(es) through the SetDPAddresses command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDPAddressesRequest"/>
-			<wsdl:output message="tds:SetDPAddressesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetEndpointReference">
-			<wsdl:documentation>A client can ask for the device service endpoint reference address property that can be used
-				to derive the password equivalent for remote user operation. The device shall support the
-				GetEndpointReference command returning the address property of the device service
-				endpoint reference.</wsdl:documentation>
-			<wsdl:input message="tds:GetEndpointReferenceRequest"/>
-			<wsdl:output message="tds:GetEndpointReferenceResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteUser">
-			<wsdl:documentation>This operation returns the configured remote user (if any). A device supporting remote user
-				handling shall support this operation. The user is only valid for the WS-UserToken profile or
-				as a HTTP / RTSP user.<br/>
-				The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.</wsdl:documentation>
-			<wsdl:input message="tds:GetRemoteUserRequest"/>
-			<wsdl:output message="tds:GetRemoteUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteUser">
-			<wsdl:documentation>This operation sets the remote user. A device supporting remote user handling shall support this
-				operation. The user is only valid for the WS-UserToken profile or as a HTTP / RTSP user.<br/>
-				The password that is set shall always be the original (not derived) password.<br/>
-				If UseDerivedPassword is set password derivation shall be done by the device when connecting to a
-				remote device.The algorithm to use for deriving the password is described in section 5.12.2.1 of the core specification.<br/>
-				To remove the remote user SetRemoteUser should be called without the RemoteUser parameter.</wsdl:documentation>
-			<wsdl:input message="tds:SetRemoteUserRequest"/>
-			<wsdl:output message="tds:SetRemoteUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetUsers">
-			<wsdl:documentation>This operation lists the registered users and corresponding credentials on a device. The
-				device shall support retrieval of registered device users and their credentials for the user
-				token through the GetUsers command.</wsdl:documentation>
-			<wsdl:input message="tds:GetUsersRequest"/>
-			<wsdl:output message="tds:GetUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateUsers">
-			<wsdl:documentation>This operation creates new device users and corresponding credentials on a device for authentication purposes. 
-				The device shall support creation of device users and their credentials through the CreateUsers
-				command. Either all users are created successfully or a fault message shall be returned
-				without creating any user.<br/>
-				ONVIF compliant devices are recommended to support password length of at least 28 bytes,
-				as clients may follow the password derivation mechanism which results in 'password
-				equivalent' of length 28 bytes, as described in section 3.1.2 of the ONVIF security white paper.</wsdl:documentation>
-			<wsdl:input message="tds:CreateUsersRequest"/>
-			<wsdl:output message="tds:CreateUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteUsers">
-			<wsdl:documentation>This operation deletes users on a device. The device shall support deletion of device users and their credentials 
-				through the DeleteUsers command. A device may have one or more fixed users
-				that cannot be deleted to ensure access to the unit. Either all users are deleted successfully or a
-				fault message shall be returned and no users be deleted.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteUsersRequest"/>
-			<wsdl:output message="tds:DeleteUsersResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetUser">
-			<wsdl:documentation>This operation updates the settings for one or several users on a device for authentication purposes.
-				The device shall support update of device users and their credentials through the SetUser command. 
-				Either all change requests are processed successfully or a fault message shall be returned and no change requests be processed.</wsdl:documentation>
-			<wsdl:input message="tds:SetUserRequest"/>
-			<wsdl:output message="tds:SetUserResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetWsdlUrl">
-			<wsdl:documentation>It is possible for an endpoint to request a URL that can be used to retrieve the complete
-				schema and WSDL definitions of a device. The command gives in return a URL entry point
-				where all the necessary product specific WSDL and schema definitions can be retrieved. The
-				device shall provide a URL for WSDL and schema download through the GetWsdlUrl command.</wsdl:documentation>
-			<wsdl:input message="tds:GetWsdlUrlRequest"/>
-			<wsdl:output message="tds:GetWsdlUrlResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCapabilities">
-			<wsdl:documentation>Any endpoint can ask for the capabilities of a device using the capability exchange request
-				response operation. The device shall indicate all its ONVIF compliant capabilities through the
-				GetCapabilities command.
-				The capability list includes references to the addresses (XAddr) of the service implementing
-				the interface operations in the category. Apart from the addresses, the
-				capabilities only reflect optional functions.</wsdl:documentation>
-			<wsdl:input message="tds:GetCapabilitiesRequest"/>
-			<wsdl:output message="tds:GetCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetHostname">
-			<wsdl:documentation>This operation is used by an endpoint to get the hostname from a device. The device shall
-				return its hostname configurations through the GetHostname command.</wsdl:documentation>
-			<wsdl:input message="tds:GetHostnameRequest"/>
-			<wsdl:output message="tds:GetHostnameResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostname">
-			<wsdl:documentation>This operation sets the hostname on a device. It shall be possible to set the device hostname
-				configurations through the SetHostname command.<br/>
-				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
-				other string shall be considered as invalid strings. 
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetHostnameRequest"/>
-			<wsdl:output message="tds:SetHostnameResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostnameFromDHCP">
-			<wsdl:documentation>This operation controls whether the hostname is set manually or retrieved via DHCP.</wsdl:documentation>
-			<wsdl:input message="tds:SetHostnameFromDHCPRequest"/>
-			<wsdl:output message="tds:SetHostnameFromDHCPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDNS">
-			<wsdl:documentation>This operation gets the DNS settings from a device. The device shall return its DNS
-				configurations through the GetDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDNSRequest"/>
-			<wsdl:output message="tds:GetDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDNS">
-			<wsdl:documentation>This operation sets the DNS settings on a device. It shall be possible to set the device DNS
-				configurations through the SetDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDNSRequest"/>
-			<wsdl:output message="tds:SetDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNTP">
-			<wsdl:documentation>This operation gets the NTP settings from a device. If the device supports NTP, it shall be
-				possible to get the NTP server settings through the GetNTP command.</wsdl:documentation>
-			<wsdl:input message="tds:GetNTPRequest"/>
-			<wsdl:output message="tds:GetNTPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNTP">
-			<wsdl:documentation>This operation sets the NTP settings on a device. If the device supports NTP, it shall be
-				possible to set the NTP server settings through the SetNTP command.<br/>
-				A device shall accept string formated according to RFC 1123 section 2.1 or alternatively to RFC 952, 
-				other string shall be considered as invalid strings. <br/>
-				Changes to the NTP server list will not affect the clock mode DateTimeType. Use SetSystemDateAndTime to activate NTP operation.
-			</wsdl:documentation>
-			<wsdl:input message="tds:SetNTPRequest"/>
-			<wsdl:output message="tds:SetNTPResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDynamicDNS">
-			<wsdl:documentation>This operation gets the dynamic DNS settings from a device. If the device supports dynamic
-				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to get the type, name
-				and TTL through the GetDynamicDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDynamicDNSRequest"/>
-			<wsdl:output message="tds:GetDynamicDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDynamicDNS">
-			<wsdl:documentation>This operation sets the dynamic DNS settings on a device. If the device supports dynamic
-				DNS as specified in [RFC 2136] and [RFC 4702], it shall be possible to set the type, name
-				and TTL through the SetDynamicDNS command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDynamicDNSRequest"/>
-			<wsdl:output message="tds:SetDynamicDNSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkInterfaces">
-			<wsdl:documentation>This operation gets the network interface configuration from a device. The device shall
-				support return of network interface configuration settings as defined by the NetworkInterface
-				type through the GetNetworkInterfaces command.</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkInterfacesRequest"/>
-			<wsdl:output message="tds:GetNetworkInterfacesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkInterfaces">
-			<wsdl:documentation>This operation sets the network interface configuration on a device. The device shall support
-				network configuration of supported network interfaces through the SetNetworkInterfaces
-				command.<br/>
-				For interoperability with a client unaware of the IEEE 802.11 extension a device shall retain
-				its IEEE 802.11 configuration if the IEEE 802.11 configuration element isn’t present in the
-				request.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkInterfacesRequest"/>
-			<wsdl:output message="tds:SetNetworkInterfacesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkProtocols">
-			<wsdl:documentation>This operation gets defined network protocols from a device. The device shall support the
-				GetNetworkProtocols command returning configured network protocols.</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkProtocolsRequest"/>
-			<wsdl:output message="tds:GetNetworkProtocolsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkProtocols">
-			<wsdl:documentation>This operation configures defined network protocols on a device. The device shall support
-				configuration of defined network protocols through the SetNetworkProtocols command.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkProtocolsRequest"/>
-			<wsdl:output message="tds:SetNetworkProtocolsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkDefaultGateway">
-			<wsdl:documentation>This operation gets the default gateway settings from a device. The device shall support the
-				GetNetworkDefaultGateway command returning configured default gateway address(es).</wsdl:documentation>
-			<wsdl:input message="tds:GetNetworkDefaultGatewayRequest"/>
-			<wsdl:output message="tds:GetNetworkDefaultGatewayResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkDefaultGateway">
-			<wsdl:documentation>This operation sets the default gateway settings on a device. The device shall support
-				configuration of default gateway through the SetNetworkDefaultGateway command.</wsdl:documentation>
-			<wsdl:input message="tds:SetNetworkDefaultGatewayRequest"/>
-			<wsdl:output message="tds:SetNetworkDefaultGatewayResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetZeroConfiguration">
-			<wsdl:documentation>This operation gets the zero-configuration from a device. If the device supports dynamic IP
-				configuration according to [RFC3927], it shall support the return of IPv4 zero configuration
-				address and status through the GetZeroConfiguration command.<br/>
-			Devices supporting zero configuration on more than one interface shall use the extension to list the additional interface settings.</wsdl:documentation>
-			<wsdl:input message="tds:GetZeroConfigurationRequest"/>
-			<wsdl:output message="tds:GetZeroConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetZeroConfiguration">
-			<wsdl:documentation>This operation sets the zero-configuration. Use GetCapalities to get if zero-zero-configuration is supported or not.</wsdl:documentation>
-			<wsdl:input message="tds:SetZeroConfigurationRequest"/>
-			<wsdl:output message="tds:SetZeroConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetIPAddressFilter">
-			<wsdl:documentation>This operation gets the IP address filter settings from a device. If the device supports device
-				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
-				device shall support the GetIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:GetIPAddressFilterRequest"/>
-			<wsdl:output message="tds:GetIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetIPAddressFilter">
-			<wsdl:documentation>This operation sets the IP address filter settings on a device. If the device supports device
-				access control based on IP filtering rules (denied or accepted ranges of IP addresses), the
-				device shall support configuration of IP filtering rules through the SetIPAddressFilter
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:SetIPAddressFilterRequest"/>
-			<wsdl:output message="tds:SetIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddIPAddressFilter">
-			<wsdl:documentation>This operation adds an IP filter address to a device. If the device supports device access
-				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
-				shall support adding of IP filtering addresses through the AddIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:AddIPAddressFilterRequest"/>
-			<wsdl:output message="tds:AddIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveIPAddressFilter">
-			<wsdl:documentation>This operation deletes an IP filter address from a device. If the device supports device access
-				control based on IP filtering rules (denied or accepted ranges of IP addresses), the device
-				shall support deletion of IP filtering addresses through the RemoveIPAddressFilter command.</wsdl:documentation>
-			<wsdl:input message="tds:RemoveIPAddressFilterRequest"/>
-			<wsdl:output message="tds:RemoveIPAddressFilterResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAccessPolicy">
-			<wsdl:documentation>Access to different services and sub-sets of services should be subject to access control. The
-				WS-Security framework gives the prerequisite for end-point authentication. Authorization
-				decisions can then be taken using an access security policy. This standard does not mandate
-				any particular policy description format or security policy but this is up to the device
-				manufacturer or system provider to choose policy and policy description format of choice.
-				However, an access policy (in arbitrary format) can be requested using this command. If the
-				device supports access policy settings based on WS-Security authentication, then the device
-				shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetAccessPolicyRequest"/>
-			<wsdl:output message="tds:GetAccessPolicyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAccessPolicy">
-			<wsdl:documentation>This command sets the device access security policy (for more details on the access security
-				policy see the Get command). If the device supports access policy settings
-				based on WS-Security authentication, then the device shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetAccessPolicyRequest"/>
-			<wsdl:output message="tds:SetAccessPolicyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateCertificate">
-			<wsdl:documentation>This operation generates a private/public key pair and also can create a self-signed device
-				certificate as a result of key pair generation. The certificate is created using a suitable
-				onboard key pair generation mechanism.<br/>
-				If a device supports onboard key pair generation, the device that supports TLS shall support
-				this certificate creation command. And also, if a device supports onboard key pair generation,
-				the device that support IEEE 802.1X shall support this command for the purpose of key pair
-				generation. Certificates and key pairs are identified using certificate IDs. These IDs are either
-				chosen by the certificate generation requester or by the device (in case that no ID value is
-				given).</wsdl:documentation>
-			<wsdl:input message="tds:CreateCertificateRequest"/>
-			<wsdl:output message="tds:CreateCertificateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificates">
-			<wsdl:documentation>This operation gets all device server certificates (including self-signed) for the purpose of TLS
-				authentication and all device client certificates for the purpose of IEEE 802.1X authentication.
-				This command lists only the TLS server certificates and IEEE 802.1X client certificates for the
-				device (neither trusted CA certificates nor trusted root certificates). The certificates are
-				returned as binary data. A device that supports TLS shall support this command and the
-				certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificatesRequest"/>
-			<wsdl:output message="tds:GetCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificatesStatus">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
-				(enabled/disabled) of the device TLS server certificates. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificatesStatusRequest"/>
-			<wsdl:output message="tds:GetCertificatesStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetCertificatesStatus">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status (enable/disable)
-				of the device TLS server certificates. A device that supports TLS shall support this command.
-				Typically only one device server certificate is allowed to be enabled at a time.</wsdl:documentation>
-			<wsdl:input message="tds:SetCertificatesStatusRequest"/>
-			<wsdl:output message="tds:SetCertificatesStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteCertificates">
-			<wsdl:documentation>This operation deletes a certificate or multiple certificates. The device MAY also delete a
-				private/public key pair which is coupled with the certificate to be deleted. The device that
-				support either TLS or IEEE 802.1X shall support the deletion of a certificate or multiple
-				certificates through this command. Either all certificates are deleted successfully or a fault
-				message shall be returned without deleting any certificate.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteCertificatesRequest"/>
-			<wsdl:output message="tds:DeleteCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPkcs10Request">
-			<wsdl:documentation>This operation requests a PKCS #10 certificate signature request from the device. The
-				returned information field shall be either formatted exactly as specified in [PKCS#10] or PEM
-				encoded [PKCS#10] format. In order for this command to work, the device must already have
-				a private/public key pair. This key pair should be referred by CertificateID as specified in the
-				input parameter description. This CertificateID refers to the key pair generated using
-				CreateCertificate command.<br/>
-				A device that support onboard key pair generation that supports either TLS or IEEE 802.1X
-				using client certificate shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetPkcs10RequestRequest"/>
-			<wsdl:output message="tds:GetPkcs10RequestResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificates">
-			<wsdl:documentation>TLS server certificate(s) or IEEE 802.1X client certificate(s) created using the PKCS#10
-				certificate request command can be loaded into the device using this command (see Section
-				8.4.13). The certificate ID in the request shall be present. The device may sort the received
-				certificate(s) based on the public key and subject information in the certificate(s).
-				The certificate ID in the request will be the ID value the client wish to have. The device is
-				supposed to scan the generated key pairs present in the device to identify which is the
-				correspondent key pair with the loaded certificate and then make the link between the
-				certificate and the key pair.<br/>
-				A device that supports onboard key pair generation that support either TLS or IEEE 802.1X
-				shall support this command.<br/>
-				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.<br/>
-				This command is applicable to any device type, although the parameter name is called for
-				historical reasons NVTCertificate.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCertificatesRequest"/>
-			<wsdl:output message="tds:LoadCertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetClientCertificateMode">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation gets the status
-				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetClientCertificateModeRequest"/>
-			<wsdl:output message="tds:GetClientCertificateModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetClientCertificateMode">
-			<wsdl:documentation>This operation is specific to TLS functionality. This operation sets the status
-				(enabled/disabled) of the device TLS client authentication. A device that supports TLS shall
-				support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetClientCertificateModeRequest"/>
-			<wsdl:output message="tds:SetClientCertificateModeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetRelayOutputs">
-			<wsdl:documentation>This operation gets a list of all available relay outputs and their settings.<br/>
-				This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:GetRelayOutputsRequest"/>
-			<wsdl:output message="tds:GetRelayOutputsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputSettings">
-			<wsdl:documentation>This operation sets the settings of a relay output.
-				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:SetRelayOutputSettingsRequest"/>
-			<wsdl:output message="tds:SetRelayOutputSettingsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputState">
-			<wsdl:documentation>This operation sets the state of a relay output.
-				<br/>This method has been depricated with version 2.0. Refer to the DeviceIO service.</wsdl:documentation>
-			<wsdl:input message="tds:SetRelayOutputStateRequest"/>
-			<wsdl:output message="tds:SetRelayOutputStateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<wsdl:documentation>Manage auxiliary commands supported by a device, such as controlling an Infrared (IR) lamp, 
-				a heater or a wiper or a thermometer that is connected to the device.<br/>
-				The supported commands can be retrieved via the AuxiliaryCommands capability.<br/>
-				Although the name of the auxiliary commands can be freely defined, commands starting with the prefix tt: are 
-				reserved to define frequently used commands and these reserved commands shall all share the "tt:command|parameter" syntax.
-				<ul>
-					<li>tt:Wiper|On – Request to start the wiper.</li>
-					<li>tt:Wiper|Off – Request to stop the wiper.</li>
-					<li>tt:Washer|On – Request to start the washer.</li>
-					<li>tt:Washer|Off – Request to stop the washer.</li>
-					<li>tt:WashingProcedure|On – Request to start the washing procedure.</li>
-					<li>tt: WashingProcedure |Off – Request to stop the washing procedure.</li>
-					<li>tt:IRLamp|On – Request to turn ON an IR illuminator attached to the unit.</li>
-					<li>tt:IRLamp|Off – Request to turn OFF an IR illuminator attached to the unit.</li>
-					<li>tt:IRLamp|Auto – Request to configure an IR illuminator attached to the unit so that it automatically turns ON and OFF.</li>
-				</ul>
-				A device that indicates auxiliary service capability shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SendAuxiliaryCommandRequest"/>
-			<wsdl:output message="tds:SendAuxiliaryCommandResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCACertificates">
-			<wsdl:documentation>CA certificates will be loaded into a device and be used for the sake of following two cases.
-				The one is for the purpose of TLS client authentication in TLS server function. The other one
-				is for the purpose of Authentication Server authentication in IEEE 802.1X function. This
-				operation gets all CA certificates loaded into a device. A device that supports either TLS client
-				authentication or IEEE 802.1X shall support this command and the returned certificates shall
-				be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding rules.</wsdl:documentation>
-			<wsdl:input message="tds:GetCACertificatesRequest"/>
-			<wsdl:output message="tds:GetCACertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificateWithPrivateKey">
-			<wsdl:documentation>There might be some cases that a Certificate Authority or some other equivalent creates a
-				certificate without having PKCS#10 certificate signing request. In such cases, the certificate
-				will be bundled in conjunction with its private key. This command will be used for such use
-				case scenarios. The certificate ID in the request is optionally set to the ID value the client
-				wish to have. If the certificate ID is not specified in the request, device can choose the ID
-				accordingly.<br/>
-				This operation imports a private/public key pair into the device.
-				The certificates shall be encoded using ASN.1 [X.681], [X.682], [X.683] DER [X.690] encoding
-				rules.<br/>
-				A device that does not support onboard key pair generation and support either TLS or IEEE
-				802.1X using client certificate shall support this command. A device that support onboard key
-				pair generation MAY support this command. The security policy of a device that supports this
-				operation should make sure that the private key is sufficiently protected.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCertificateWithPrivateKeyRequest"/>
-			<wsdl:output message="tds:LoadCertificateWithPrivateKeyResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificateInformation">
-			<wsdl:documentation>This operation requests the information of a certificate specified by certificate ID. The device
-				should respond with its “Issuer DN”, “Subject DN”, “Key usage”, "Extended key usage”, “Key
-				Length”, “Version”, “Serial Number”, “Signature Algorithm” and “Validity” data as the
-				information of the certificate, as long as the device can retrieve such information from the
-				specified certificate.<br/>
-				A device that supports either TLS or IEEE 802.1X should support this command.</wsdl:documentation>
-			<wsdl:input message="tds:GetCertificateInformationRequest"/>
-			<wsdl:output message="tds:GetCertificateInformationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCACertificates">
-			<wsdl:documentation>This command is used when it is necessary to load trusted CA certificates or trusted root
-				certificates for the purpose of verification for its counterpart i.e. client certificate verification in
-				TLS function or server certificate verification in IEEE 802.1X function.<br/>
-				A device that support either TLS or IEEE 802.1X shall support this command. As for the
-				supported certificate format, either DER format or PEM format is possible to be used. But a
-				device that support this command shall support at least DER format as supported format type.
-				The device may sort the received certificate(s) based on the public key and subject
-				information in the certificate(s). Either all CA certificates are loaded successfully or a fault
-				message shall be returned without loading any CA certificate.</wsdl:documentation>
-			<wsdl:input message="tds:LoadCACertificatesRequest"/>
-			<wsdl:output message="tds:LoadCACertificatesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateDot1XConfiguration">
-			<wsdl:documentation>This operation newly creates IEEE 802.1X configuration parameter set of the device. The
-				device shall support this command if it supports IEEE 802.1X. If the device receives this
-				request with already existing configuration token (Dot1XConfigurationToken) specification, the
-				device should respond with 'ter:ReferenceToken ' error to indicate there is some configuration
-				conflict.</wsdl:documentation>
-			<wsdl:input message="tds:CreateDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:CreateDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetDot1XConfiguration">
-			<wsdl:documentation>While the CreateDot1XConfiguration command is trying to create a new configuration
-				parameter set, this operation modifies existing IEEE 802.1X configuration parameter set of
-				the device. A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:SetDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:SetDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfiguration">
-			<wsdl:documentation>This operation gets one IEEE 802.1X configuration parameter set from the device by
-				specifying the configuration token (Dot1XConfigurationToken).<br/>
-				A device that supports IEEE 802.1X shall support this command.
-				Regardless of whether the 802.1X method in the retrieved configuration has a password or
-				not, the device shall not include the Password element in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:GetDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfigurations">
-			<wsdl:documentation>This operation gets all the existing IEEE 802.1X configuration parameter sets from the device.
-				The device shall respond with all the IEEE 802.1X configurations so that the client can get to
-				know how many IEEE 802.1X configurations are existing and how they are configured.<br/>
-				A device that support IEEE 802.1X shall support this command.<br/>
-				Regardless of whether the 802.1X method in the retrieved configuration has a password or
-				not, the device shall not include the Password element in the response.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot1XConfigurationsRequest"/>
-			<wsdl:output message="tds:GetDot1XConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteDot1XConfiguration">
-			<wsdl:documentation>This operation deletes an IEEE 802.1X configuration parameter set from the device. Which
-				configuration should be deleted is specified by the 'Dot1XConfigurationToken' in the request.
-				A device that support IEEE 802.1X shall support this command.</wsdl:documentation>
-			<wsdl:input message="tds:DeleteDot1XConfigurationRequest"/>
-			<wsdl:output message="tds:DeleteDot1XConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Capabilities">
-			<wsdl:documentation>This operation returns the IEEE802.11 capabilities. The device shall support
-				this operation.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot11CapabilitiesRequest"/>
-			<wsdl:output message="tds:GetDot11CapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Status">
-			<wsdl:documentation>This operation returns the status of a wireless network interface. The device shall support this
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetDot11StatusRequest"/>
-			<wsdl:output message="tds:GetDot11StatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ScanAvailableDot11Networks">
-			<wsdl:documentation>This operation returns a lists of the wireless networks in range of the device. A device should
-				support this operation.</wsdl:documentation>
-			<wsdl:input message="tds:ScanAvailableDot11NetworksRequest"/>
-			<wsdl:output message="tds:ScanAvailableDot11NetworksResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemUris">
-			<wsdl:documentation>This operation is used to retrieve URIs from which system information may be downloaded
-				using HTTP. URIs may be returned for the following system information:<br/>
-				System Logs. Multiple system logs may be returned, of different types. The exact format of
-				the system logs is outside the scope of this specification.<br/>
-				Support Information. This consists of arbitrary device diagnostics information from a device.
-				The exact format of the diagnostic information is outside the scope of this specification.<br/>
-				System Backup. The received file is a backup file that can be used to restore the current
-				device configuration at a later date. The exact format of the backup configuration file is
-				outside the scope of this specification.<br/>
-				If the device allows retrieval of system logs, support information or system backup data, it
-				should make them available via HTTP GET. If it does, it shall support the GetSystemUris
-				command.</wsdl:documentation>
-			<wsdl:input message="tds:GetSystemUrisRequest"/>
-			<wsdl:output message="tds:GetSystemUrisResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartFirmwareUpgrade">
-			<wsdl:documentation>This operation initiates a firmware upgrade using the HTTP POST mechanism. The response
-				to the command includes an HTTP URL to which the upgrade file may be uploaded. The
-				actual upgrade takes place as soon as the HTTP POST operation has completed. The device
-				should support firmware upgrade through the StartFirmwareUpgrade command. The exact
-				format of the firmware data is outside the scope of this specification.
-				Firmware upgrade over HTTP may be achieved using the following steps:<ol>
-					<li>Client calls StartFirmwareUpgrade.</li>
-					<li>Server responds with upload URI and optional delay value.</li>
-					<li>Client waits for delay duration if specified by server.</li>
-					<li>Client transmits the firmware image to the upload URI using HTTP POST.</li>
-					<li>Server reprograms itself using the uploaded image, then reboots.</li>
-				</ol>
-				If the firmware upgrade fails because the upgrade file was invalid, the HTTP POST response
-				shall be “415 Unsupported Media Type”. If the firmware upgrade fails due to an error at the
-				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
-				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
-			<wsdl:input message="tds:StartFirmwareUpgradeRequest"/>
-			<wsdl:output message="tds:StartFirmwareUpgradeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartSystemRestore">
-			<wsdl:documentation>This operation initiates a system restore from backed up configuration data using the HTTP
-				POST mechanism. The response to the command includes an HTTP URL to which the backup
-				file may be uploaded. The actual restore takes place as soon as the HTTP POST operation
-				has completed. Devices should support system restore through the StartSystemRestore
-				command. The exact format of the backup configuration data is outside the scope of this
-				specification.<br/>
-				System restore over HTTP may be achieved using the following steps:<ol>
-					<li>Client calls StartSystemRestore.</li>
-					<li>Server responds with upload URI.</li>
-					<li>Client transmits the configuration data to the upload URI using HTTP POST.</li>
-					<li>Server applies the uploaded configuration, then reboots if necessary.</li>
-				</ol>
-				If the system restore fails because the uploaded file was invalid, the HTTP POST response
-				shall be “415 Unsupported Media Type”. If the system restore fails due to an error at the
-				device, the HTTP POST response shall be “500 Internal Server Error”.<br/>
-				The value of the Content-Type header in the HTTP POST request shall be “application/octetstream”.</wsdl:documentation>
-			<wsdl:input message="tds:StartSystemRestoreRequest"/>
-			<wsdl:output message="tds:StartSystemRestoreResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="DeviceBinding" type="tds:Device">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="GetServices">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServices"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDeviceInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDeviceInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemDateAndTime">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemDateAndTime"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemDateAndTime">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemDateAndTime"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetSystemFactoryDefault">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetSystemFactoryDefault"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="UpgradeSystemFirmware">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/UpgradeSystemFirmware"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SystemReboot">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SystemReboot"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RestoreSystem">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RestoreSystem"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemBackup">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemBackup"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemLog">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemLog"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemSupportInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemSupportInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AddScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveScopes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveScopes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteDiscoveryMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteDiscoveryMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDPAddresses">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDPAddresses"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetEndpointReference">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetEndpointReference"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRemoteUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRemoteUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRemoteUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRemoteUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteUsers">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteUsers"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetUser">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetUser"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetWsdlUrl">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetWsdlUrl"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDPAddresses">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDPAddresses"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetHostname">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetHostname"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostname">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostname"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHostnameFromDHCP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetHostnameFromDHCP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNTP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNTP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNTP">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNTP"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDynamicDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDynamicDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDynamicDNS">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDynamicDNS"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkInterfaces">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkInterfaces"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkInterfaces">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkInterfaces"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkProtocols">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkProtocols"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkProtocols">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkProtocols"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNetworkDefaultGateway">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetNetworkDefaultGateway"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetNetworkDefaultGateway">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetNetworkDefaultGateway"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetZeroConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetZeroConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetZeroConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetZeroConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AddIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/AddIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveIPAddressFilter">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/RemoveIPAddressFilter"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAccessPolicy">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetAccessPolicy"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAccessPolicy">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetAccessPolicy"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateCertificate">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateCertificate"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificatesStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificatesStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetCertificatesStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetCertificatesStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPkcs10Request">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetPkcs10Request"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetClientCertificateMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetClientCertificateMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetClientCertificateMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetClientCertificateMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetRelayOutputs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetRelayOutputs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputSettings">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputSettings"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetRelayOutputState">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetRelayOutputState"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SendAuxiliaryCommand"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCACertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCACertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCertificateWithPrivateKey">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCertificateWithPrivateKey"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCertificateInformation">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetCertificateInformation"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="LoadCACertificates">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/LoadCACertificates"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/CreateDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/SetDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot1XConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot1XConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteDot1XConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/DeleteDot1XConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Capabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Capabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetDot11Status">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetDot11Status"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ScanAvailableDot11Networks">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/ScanAvailableDot11Networks"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetSystemUris">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/GetSystemUris"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="StartFirmwareUpgrade">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartFirmwareUpgrade"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="StartSystemRestore">
-			<soap:operation soapAction="http://www.onvif.org/ver10/device/wsdl/StartSystemRestore"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<!--===============================-->
-  <wsdl:service name="Device">
-    <wsdl:port name="DevicePort" binding="tds:DeviceBinding" >
-      <soap:address
-        location="http://www.examples.com/Device/" />
-    </wsdl:port>
-  </wsdl:service>
-	<!--===============================-->
-</wsdl:definitions>
diff --git a/onvif/wsdl/media.wsdl b/onvif/wsdl/media.wsdl
deleted file mode 100644
index de3fdb30d..000000000
--- a/onvif/wsdl/media.wsdl
+++ /dev/null
@@ -1,3688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:trt="http://www.onvif.org/ver10/media/wsdl" targetNamespace="http://www.onvif.org/ver10/media/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver10/media/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.4.1">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
-			<!--  Message Request/Responses elements  -->
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="trt:Capabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the media service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Capabilities">
-				<xs:sequence>
-					<xs:element name="ProfileCapabilities" type="trt:ProfileCapabilities">
-						<xs:annotation>
-							<xs:documentation>Media profile capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="StreamingCapabilities" type="trt:StreamingCapabilities">
-						<xs:annotation>
-							<xs:documentation>Streaming capabilities.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="SnapshotUri" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates if GetSnapshotUri is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Rotation" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not Rotation feature is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="VideoSourceMode" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates the support for changing video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="OSD" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates if OSD is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="trt:Capabilities"/>
-			<!--===============================-->
-			<xs:complexType name="ProfileCapabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="MaximumNumberOfProfiles" type="xs:int">
-					<xs:annotation>
-						<xs:documentation>Maximum number of profiles supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="StreamingCapabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="RTPMulticast" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP multicast.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RTP_TCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP over TCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="RTP_RTSP_TCP" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for RTP/RTSP/TCP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NonAggregateControl" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for non aggregate RTSP control.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="NoRTSPStreaming" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation> Indicates the device does not support live media streaming via RTSP.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:element name="GetVideoSources">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourcesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSources" type="tt:VideoSource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Video Sources</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSources">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourcesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AudioSources" type="tt:AudioSource" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Audio Sources</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputs">
-				<xs:complexType>
-					<xs:sequence>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AudioOutputs" type="tt:AudioOutput" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>List of existing Audio Outputs</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Name" type="tt:Name">
-							<xs:annotation>
-								<xs:documentation>friendly name of the profile to be created</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Token" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional token, specifying the unique identifier of the new profile. <br/>A device supports at least a token length of 12 characters and characters "A-Z" | "a-z" | "0-9" | "-.".</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profile" type="tt:Profile">
-							<xs:annotation>
-								<xs:documentation>returns the new created profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>this command requests a specific profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profile" type="tt:Profile">
-							<xs:annotation>
-								<xs:documentation>returns the requested media profile</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetProfiles">
-				<xs:complexType>
-					<xs:sequence>
-				
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetProfilesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Profiles" type="tt:Profile" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>lists all profiles that exist in the media service </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoEncoderConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoEncoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoSourceConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoSourceConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioEncoderConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioEncoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioSourceConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioSourceConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddPTZConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the PTZConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddPTZConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePTZConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-PTZConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePTZConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the VideoAnalyticsConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-VideoAnalyticsConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the MetadataConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-MetadataConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Reference to the profile where the configuration should be added</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the AudioOutputConfiguration to add</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a reference to the media profile from which the
-AudioOutputConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AddAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the profile where the configuration should be added.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the AudioDecoderConfiguration to add.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AddAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemoveAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a  reference to the media profile from which the AudioDecoderConfiguration shall be removed.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemoveAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-                    </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteProfile">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a  reference to the profile that should be deleted.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteProfileResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of video encoder configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of video source configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio encoder configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio source configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoAnalyticsConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoAnalyticsConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of VideoAnalytics configurations.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-      </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of metadata configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio output configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioDecoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of audio decoder configurations</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio source configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio encoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio encoder configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested video analytics configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested video analytics configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested metadata configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:MetadataConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested metadata configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio output configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio output configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested audio decoder configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested audio decoder configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video encoder configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video source configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioEncoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioEncoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioEncoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio encoder configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioSourceConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioSourceConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioSourceConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio source configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleVideoAnalyticsConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleVideoAnalyticsConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:VideoAnalyticsConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of video analytics configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleMetadataConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleMetadataConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:MetadataConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of metadata configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioOutputConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioOutputConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioOutputConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio output configurations that are compatible with the specified media profile.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleAudioDecoderConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleAudioDecoderConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configurations" type="tt:AudioDecoderConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Contains a list of audio decoder configurations that are compatible with the specified media profile. </xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="SetVideoEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video encoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video source configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioEncoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioEncoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio encoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioEncoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioSourceConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioSourceConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio source configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioSourceConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoAnalyticsConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:VideoAnalyticsConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified video analytics configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoAnalyticsConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetMetadataConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:MetadataConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified metadata configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetMetadataConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<!--===============================-->
-			<xs:element name="SetAudioOutputConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioOutputConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio output configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioOutputConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetAudioDecoderConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Configuration" type="tt:AudioDecoderConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified audio decoder configuration. The configuration shall exist in the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The ForcePersistence element is obsolete and should always be assumed to be true.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetAudioDecoderConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-				   </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoSourceConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional video source configurationToken that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:VideoSourceConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the video source configuration options. If a video source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetVideoEncoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional video encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoEncoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:VideoEncoderConfigurationOptions"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioSourceConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio source configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioSourceConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioSourceConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio source configuration options. If a audio source configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioEncoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio encoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioEncoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioEncoderConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio encoder configuration options. If a audio encoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetMetadataConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional metadata configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetMetadataConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:MetadataConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the metadata configuration options. If a metadata configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioOutputConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio output configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioOutputConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioOutputConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio output configuration options. If a audio output configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetAudioDecoderConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional audio decoder configuration token that specifies an existing configuration that the options are intended for.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Optional ProfileToken that specifies an existing media profile that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetAudioDecoderConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:AudioDecoderConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>This message contains the audio decoder configuration options. If a audio decoder configuration is specified, the options shall concern that particular configuration. If a media profile is specified, the options shall be compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstances">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the video source configuration</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="TotalNumber" type="xs:int">
-							<xs:annotation>
-								<xs:documentation>The minimum guaranteed total number of encoder instances (applications) per VideoSourceConfiguration. The device is able to deliver the TotalNumber of streams</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="JPEG" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Jpeg streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="H264" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many H264 streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="MPEG4" type="xs:int" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>If a device limits the number of instances for respective Video Codecs the response contains the information how many Mpeg4 streams can be set up at the same time per VideoSource.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetStreamUri">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="StreamSetup" type="tt:StreamSetup">
-							<xs:annotation>
-								<xs:documentation>Stream Setup that should be used with the uri</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the configuration of the content of the stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStreamUriResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MediaUri" type="tt:MediaUri">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StartMulticastStreaming">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StartMulticastStreamingResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="StopMulticastStreaming">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of the Profile that is used to define the multicast stream.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StopMulticastStreamingResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetSynchronizationPoint">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a Profile reference for which a Synchronization Point is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetSynchronizationPointResponse">
-				<xs:complexType>
-					<xs:sequence>
-          </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetSnapshotUri">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The ProfileToken element indicates the media profile to use and will define the source and dimensions of the snapshot.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetSnapshotUriResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="MediaUri" type="tt:MediaUri">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--================ Video Source Mode ===============-->
-			<xs:element name="GetVideoSourceModes">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVideoSourceModesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceModes" type="trt:VideoSourceMode" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Return the information for specified video source mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetVideoSourceMode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VideoSourceToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains a video source reference for which a video source mode is requested.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="VideoSourceModeToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Indicate video source mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetVideoSourceModeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Reboot" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>The response contains information about rebooting after returning response. When Reboot is set true, a device will reboot automatically after setting mode.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:simpleType name="EncodingTypes">
-				<xs:annotation>
-					<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
-				</xs:annotation>
-				<xs:list itemType="xs:string"/>
-			</xs:simpleType>
-			<!--===============================-->
-			<xs:complexType name="VideoSourceMode"> 
-				<xs:sequence>
-					<xs:element name="MaxFramerate" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Max frame rate in frames per second for this video source mode.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaxResolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Max horizontal and vertical resolution for this video source mode.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Encodings" type="trt:EncodingTypes">
-						<xs:annotation>
-							<xs:documentation>Indication which encodings are supported for this video source. The list may contain one or more enumeration values of tt:VideoEncoding.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Reboot" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>After setting the mode if a device starts to reboot this value is true. If a device change the mode without rebooting this value is false. If true, configured parameters may not be guaranteed by the device after rebooting.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Description" type="tt:Description" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Informative description of this video source mode. This field should be described in English.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="trt:VideoSourceModeExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-					<xs:annotation>
-						<xs:documentation>Indicate token for video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Enabled" type="xs:boolean"> 
-					<xs:annotation>
-						<xs:documentation>Indication of whether this mode is active. If active this value is true. In case of non-indication, it means as false. The value of true shall be had by only one video source mode.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<!--===============================-->
-			<xs:complexType name="VideoSourceModeExtension"> 
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:complexType>
-
-			<!--===============================-->
-			<!--============OSD Schema Begin================-->
-			<xs:element name="GetOSDs">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="1">
-							<xs:annotation>
-								<xs:documentation>Token of the Video Source Configuration, which has OSDs associated with are requested. If token not exist, request all available OSDs.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDs" type="tt:OSDConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>This element contains a list of requested OSDs.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>The GetOSD command fetches the OSD configuration if the OSD token is known.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>The requested OSD configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contains the modified OSD configuration.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetOSDOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Video Source Configuration Token that specifies an existing video source configuration that the options shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetOSDOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDOptions" type="tt:OSDConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation/>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreateOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSD" type="tt:OSDConfiguration">
-							<xs:annotation>
-								<xs:documentation>Contain the initial OSD configuration for create.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreateOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Returns Token of the newly created OSD</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="DeleteOSD">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="OSDToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>This element contains a reference to the OSD configuration that should be deleted.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="DeleteOSDResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--============OSD Schema End================-->
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameter" element="trt:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameter" element="trt:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourcesRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSources"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourcesResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourcesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourcesRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSources"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourcesResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourcesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputs"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateProfileRequest">
-		<wsdl:part name="parameters" element="trt:CreateProfile"/>
-	</wsdl:message>
-	<wsdl:message name="CreateProfileResponse">
-		<wsdl:part name="parameters" element="trt:CreateProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfileRequest">
-		<wsdl:part name="parameters" element="trt:GetProfile"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfileResponse">
-		<wsdl:part name="parameters" element="trt:GetProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfilesRequest">
-		<wsdl:part name="parameters" element="trt:GetProfiles"/>
-	</wsdl:message>
-	<wsdl:message name="GetProfilesResponse">
-		<wsdl:part name="parameters" element="trt:GetProfilesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddPTZConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddPTZConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddPTZConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddPTZConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePTZConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemovePTZConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePTZConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemovePTZConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="AddAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:AddAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="RemoveAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:RemoveAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteProfileRequest">
-		<wsdl:part name="parameters" element="trt:DeleteProfile"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteProfileResponse">
-		<wsdl:part name="parameters" element="trt:DeleteProfileResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioEncoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioSourceConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioSourceConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleVideoAnalyticsConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleMetadataConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleMetadataConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleMetadataConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioOutputConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioOutputConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsRequest">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleAudioDecoderConfigurationsResponse">
-		<wsdl:part name="parameters" element="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioSourceConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioSourceConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioSourceConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioSourceConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioEncoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioEncoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioEncoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoAnalyticsConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoAnalyticsConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoAnalyticsConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetMetadataConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetMetadataConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetMetadataConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetMetadataConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioOutputConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioOutputConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioOutputConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioOutputConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioDecoderConfigurationRequest">
-		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetAudioDecoderConfigurationResponse">
-		<wsdl:part name="parameters" element="trt:SetAudioDecoderConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoEncoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoEncoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioSourceConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioSourceConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioEncoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioEncoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetMetadataConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetMetadataConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioOutputConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioOutputConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetAudioDecoderConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetAudioDecoderConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesRequest">
-		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstances"/>
-	</wsdl:message>
-	<wsdl:message name="GetGuaranteedNumberOfVideoEncoderInstancesResponse">
-		<wsdl:part name="parameters" element="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetStreamUriRequest">
-		<wsdl:part name="parameters" element="trt:GetStreamUri"/>
-	</wsdl:message>
-	<wsdl:message name="GetStreamUriResponse">
-		<wsdl:part name="parameters" element="trt:GetStreamUriResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StartMulticastStreamingRequest">
-		<wsdl:part name="parameters" element="trt:StartMulticastStreaming"/>
-	</wsdl:message>
-	<wsdl:message name="StartMulticastStreamingResponse">
-		<wsdl:part name="parameters" element="trt:StartMulticastStreamingResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StopMulticastStreamingRequest">
-		<wsdl:part name="parameters" element="trt:StopMulticastStreaming"/>
-	</wsdl:message>
-	<wsdl:message name="StopMulticastStreamingResponse">
-		<wsdl:part name="parameters" element="trt:StopMulticastStreamingResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetSynchronizationPointRequest">
-		<wsdl:part name="parameters" element="trt:SetSynchronizationPoint"/>
-	</wsdl:message>
-	<wsdl:message name="SetSynchronizationPointResponse">
-		<wsdl:part name="parameters" element="trt:SetSynchronizationPointResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetSnapshotUriRequest">
-		<wsdl:part name="parameters" element="trt:GetSnapshotUri"/>
-	</wsdl:message>
-	<wsdl:message name="GetSnapshotUriResponse">
-		<wsdl:part name="parameters" element="trt:GetSnapshotUriResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceModesRequest">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceModes"/>
-	</wsdl:message>
-	<wsdl:message name="GetVideoSourceModesResponse">
-		<wsdl:part name="parameters" element="trt:GetVideoSourceModesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceModeRequest">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceMode"/>
-	</wsdl:message>
-	<wsdl:message name="SetVideoSourceModeResponse">
-		<wsdl:part name="parameters" element="trt:SetVideoSourceModeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDsRequest">
-		<wsdl:part name="parameters" element="trt:GetOSDs"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDsResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDRequest">
-		<wsdl:part name="parameters" element="trt:GetOSD"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDOptionsRequest">
-		<wsdl:part name="parameters" element="trt:GetOSDOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetOSDOptionsResponse">
-		<wsdl:part name="parameters" element="trt:GetOSDOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetOSDRequest">
-		<wsdl:part name="parameters" element="trt:SetOSD"/>
-	</wsdl:message>
-	<wsdl:message name="SetOSDResponse">
-		<wsdl:part name="parameters" element="trt:SetOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreateOSDRequest">
-		<wsdl:part name="parameters" element="trt:CreateOSD"/>
-	</wsdl:message>
-	<wsdl:message name="CreateOSDResponse">
-		<wsdl:part name="parameters" element="trt:CreateOSDResponse"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteOSDRequest">
-		<wsdl:part name="parameters" element="trt:DeleteOSD"/>
-	</wsdl:message>
-	<wsdl:message name="DeleteOSDResponse">
-		<wsdl:part name="parameters" element="trt:DeleteOSDResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="Media">
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the media service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="trt:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="trt:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSources">
-			<wsdl:documentation>This command lists all available physical video inputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourcesRequest"/>
-			<wsdl:output message="trt:GetVideoSourcesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSources">
-			<wsdl:documentation>This command lists all available physical audio inputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourcesRequest"/>
-			<wsdl:output message="trt:GetAudioSourcesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputs">
-			<wsdl:documentation>This command lists all available physical audio outputs of the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="CreateProfile">
-			<wsdl:documentation>This operation creates a new empty media profile. The media profile shall be created in the
-device and shall be persistent (remain after reboot). A created profile shall be deletable and a device shall set the “fixed” attribute to false in the
-returned Profile.</wsdl:documentation>
-			<wsdl:input message="trt:CreateProfileRequest"/>
-			<wsdl:output message="trt:CreateProfileResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetProfile">
-			<wsdl:documentation>If the profile token is already known, a profile can be fetched through the GetProfile command.</wsdl:documentation>
-			<wsdl:input message="trt:GetProfileRequest"/>
-			<wsdl:output message="trt:GetProfileResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetProfiles">
-			<wsdl:documentation>Any endpoint can ask for the existing media profiles of a device using the GetProfiles
-command. Pre-configured or dynamically configured profiles can be retrieved using this
-command. This command lists all configured profiles in a device. The client does not need to
-know the media profile in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetProfilesRequest"/>
-			<wsdl:output message="trt:GetProfilesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoEncoderConfiguration">
-			<wsdl:documentation>This operation adds a VideoEncoderConfiguration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
-support adding a compatible VideoEncoderConfiguration to a Profile containing a VideoSourceConfiguration and shall
-support streaming video data of such a profile.
-			</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoEncoderConfiguration">
-			<wsdl:documentation>This operation removes a VideoEncoderConfiguration from an existing media profile. If the
-media profile does not contain a VideoEncoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoSourceConfiguration">
-			<wsdl:documentation>This operation adds a VideoSourceConfiguration to an existing media profile. If such a
-configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoSourceConfiguration">
-			<wsdl:documentation>This operation removes a VideoSourceConfiguration from an existing media profile. If the
-media profile does not contain a VideoSourceConfiguration, the operation has no effect. The removal shall be persistent. Video source configurations should only be removed after removing a
-VideoEncoderConfiguration from the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioEncoderConfiguration">
-			<wsdl:documentation>This operation adds an AudioEncoderConfiguration to an existing media profile. If a 
-configuration exists in the media profile, it will be replaced. The change shall be persistent. A device shall
-support adding a compatible AudioEncoderConfiguration to a profile containing an AudioSourceConfiguration and shall
-support streaming audio data of such a profile.
-			</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioEncoderConfiguration">
-			<wsdl:documentation>This operation removes an AudioEncoderConfiguration from an existing media profile. If the
-media profile does not contain an AudioEncoderConfiguration, the operation has no effect.
-The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioSourceConfiguration">
-			<wsdl:documentation>This operation adds an AudioSourceConfiguration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioSourceConfiguration">
-			<wsdl:documentation>This operation removes an AudioSourceConfiguration from an existing media profile. If the
-media profile does not contain an AudioSourceConfiguration, the operation has no effect. The
-removal shall be persistent. Audio source configurations should only be removed after removing an
-AudioEncoderConfiguration from the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddPTZConfiguration">
-			<wsdl:documentation>This operation adds a PTZConfiguration to an existing media profile. If a configuration exists
-in the media profile, it will be replaced. The change shall be persistent. Adding a PTZConfiguration to a media profile means that streams using that media profile can
-contain PTZ status (in the metadata), and that the media profile can be used for controlling
-PTZ movement.</wsdl:documentation>
-			<wsdl:input message="trt:AddPTZConfigurationRequest"/>
-			<wsdl:output message="trt:AddPTZConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePTZConfiguration">
-			<wsdl:documentation>This operation removes a PTZConfiguration from an existing media profile. If the media profile
-does not contain a PTZConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemovePTZConfigurationRequest"/>
-			<wsdl:output message="trt:RemovePTZConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddVideoAnalyticsConfiguration">
-			<wsdl:documentation>This operation adds a VideoAnalytics configuration to an existing media profile. If a
-configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a VideoAnalyticsConfiguration to a media profile means that streams using that media
-profile can contain video analytics data (in the metadata) as defined by the submitted configuration reference. A profile containing only a video analytics configuration but no video source configuration is incomplete. Therefore, a client should first add a video source configuration to a profile before adding a video analytics configuration. The device can deny adding of a video analytics
-configuration before a video source configuration.</wsdl:documentation>
-			<wsdl:input message="trt:AddVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:AddVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
-			<wsdl:documentation>This operation removes a VideoAnalyticsConfiguration from an existing media profile. If the media profile does not contain a VideoAnalyticsConfiguration, the operation has no effect.
-The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddMetadataConfiguration">
-			<wsdl:documentation>This operation adds a Metadata configuration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent. Adding a MetadataConfiguration to a Profile means that streams using that profile contain metadata. Metadata can consist of events, PTZ status, and/or video analytics data.</wsdl:documentation>
-			<wsdl:input message="trt:AddMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:AddMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveMetadataConfiguration">
-			<wsdl:documentation>This operation removes a MetadataConfiguration from an existing media profile. If the media profile does not contain a MetadataConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioOutputConfiguration">
-			<wsdl:documentation>This operation adds an AudioOutputConfiguration to an existing media profile. If a configuration exists in the media profile, it will be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioOutputConfiguration">
-			<wsdl:documentation>This operation removes an AudioOutputConfiguration from an existing media profile. If the media profile does not contain an AudioOutputConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AddAudioDecoderConfiguration">
-			<wsdl:documentation>This operation adds an AudioDecoderConfiguration to an existing media profile. If a configuration exists in the media profile, it shall be replaced. The change shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:AddAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:AddAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemoveAudioDecoderConfiguration">
-			<wsdl:documentation>This operation removes an AudioDecoderConfiguration from an existing media profile. If the media profile does not contain an AudioDecoderConfiguration, the operation has no effect. The removal shall be persistent.</wsdl:documentation>
-			<wsdl:input message="trt:RemoveAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:RemoveAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteProfile">
-			<wsdl:documentation>This operation deletes a profile. This change shall always be persistent. Deletion of a profile is only possible for non-fixed profiles</wsdl:documentation>
-			<wsdl:input message="trt:DeleteProfileRequest"/>
-			<wsdl:output message="trt:DeleteProfileResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurations">
-			<wsdl:documentation>This operation lists all existing video source configurations for a device. The client need not know anything about the video source configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurations">
-			<wsdl:documentation>This operation lists all existing video encoder configurations of a device. This command lists all configured video encoder configurations in a device. The client need not know anything apriori about the video encoder configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurations">
-			<wsdl:documentation>This operation lists all existing audio source configurations of a device. This command lists all audio source configurations in a device. The client need not know anything apriori about the audio source configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurations">
-			<wsdl:documentation>This operation lists all existing device audio encoder configurations. The client need not know anything apriori about the audio encoder configurations in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfigurations">
-			<wsdl:documentation>This operation lists all video analytics configurations of a device. This command lists all configured video analytics in a device. The client need not know anything apriori about the video analytics in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoAnalyticsConfigurationsRequest"/>
-			<wsdl:output message="trt:GetVideoAnalyticsConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurations">
-			<wsdl:documentation>This operation lists all existing metadata configurations. The client need not know anything apriori about the metadata in order to use the command.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationsRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurations">
-			<wsdl:documentation>This command lists all existing AudioOutputConfigurations of a device. The NVC need not know anything apriori about the audio configurations to use this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurations">
-			<wsdl:documentation>This command lists all existing AudioDecoderConfigurations of a device. The NVC need not know anything apriori about the audio decoder configurations in order to
-use this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoSourceConfiguration">
-			<wsdl:documentation>If the video source configuration token is already known, the video source configuration can be fetched through the GetVideoSourceConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfiguration">
-			<wsdl:documentation>If the video encoder configuration token is already known, the encoder configuration can be fetched through the GetVideoEncoderConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfiguration">
-			<wsdl:documentation>The GetAudioSourceConfiguration command fetches the audio source configurations if the audio source configuration token is already known. An</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfiguration">
-			<wsdl:documentation>The GetAudioEncoderConfiguration command fetches the encoder configuration if the audio encoder configuration token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfiguration">
-			<wsdl:documentation>The GetVideoAnalyticsConfiguration command fetches the video analytics configuration if the video analytics token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:GetVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfiguration">
-			<wsdl:documentation>The GetMetadataConfiguration command fetches the metadata configuration if the metadata token is known.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfiguration">
-			<wsdl:documentation>If the audio output configuration token is already known, the output configuration can be fetched through the GetAudioOutputConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfiguration">
-			<wsdl:documentation>If the audio decoder configuration token is already known, the decoder configuration can be fetched through the GetAudioDecoderConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
-			<wsdl:documentation>This operation lists all the video encoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoEncoderConfiguration command on the media profile. The result will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
-			<wsdl:documentation>This operation requests all the video source configurations of the device that are compatible
-with a certain media profile. Each of the returned configurations shall be a valid input
-parameter for the AddVideoSourceConfiguration command on the media profile. The result
-will vary depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
-			<wsdl:documentation>This operation requests all audio encoder configurations of a device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioSourceConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioEncoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioEncoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
-			<wsdl:documentation>This operation requests all audio source configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioEncoderConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioSourceConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioSourceConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
-			<wsdl:documentation>This operation requests all video analytic configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddVideoAnalyticsConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleVideoAnalyticsConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleVideoAnalyticsConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleMetadataConfigurations">
-			<wsdl:documentation>This operation requests all the metadata configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddMetadataConfiguration command on the media profile. The result varies depending on the capabilities, configurations and settings in the device.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleMetadataConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleMetadataConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
-			<wsdl:documentation>This command lists all audio output configurations of a device that are compatible with a certain media profile. Each returned configuration shall be a valid input for the 
-AddAudioOutputConfiguration command.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioOutputConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioOutputConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
-			<wsdl:documentation>This operation lists all the audio decoder configurations of the device that are compatible with a certain media profile. Each of the returned configurations shall be a valid input parameter for the AddAudioDecoderConfiguration command on the media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetCompatibleAudioDecoderConfigurationsRequest"/>
-			<wsdl:output message="trt:GetCompatibleAudioDecoderConfigurationsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceConfiguration">
-			<wsdl:documentation>This operation modifies a video source configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoSourceConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoEncoderConfiguration">
-			<wsdl:documentation>This operation modifies a video encoder configuration. The ForcePersistence flag indicates if the changes shall remain after reboot of the device. Changes in the Multicast settings shall always be persistent. Running streams using this configuration may be immediately updated according to the new settings. The changes are not guaranteed to take effect unless the client requests a new stream URI and restarts any affected stream. NVC methods for changing a running stream are out of scope for this specification. <br/>SessionTimeout is provided as a hint for keeping rtsp session by a device. If necessary the device may adapt parameter values for SessionTimeout elements without returning an error. For the time between keep alive calls the client shall adhere to the timeout value signaled via RTSP.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioSourceConfiguration">
-			<wsdl:documentation>This operation modifies an audio source configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device. Running streams using this configuration
-may be immediately updated according to the new settings. The changes are not guaranteed
-to take effect unless the client requests a new stream URI and restarts any affected stream
-NVC methods for changing a running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioSourceConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioSourceConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioEncoderConfiguration">
-			<wsdl:documentation>This operation modifies an audio encoder configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device. Running streams using this configuration may be immediately updated
-according to the new settings. The changes are not guaranteed to take effect unless the client
-requests a new stream URI and restarts any affected streams. NVC methods for changing a
-running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioEncoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioEncoderConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoAnalyticsConfiguration">
-			<wsdl:documentation>A video analytics configuration is modified using this command. The ForcePersistence flag
-indicates if the changes shall remain after reboot of the device or not. Running streams using
-this configuration shall be immediately updated according to the new settings. Otherwise
-inconsistencies can occur between the scene description processed by the rule engine and
-the notifications produced by analytics engine and rule engine which reference the very same
-video analytics configuration token.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoAnalyticsConfigurationRequest"/>
-			<wsdl:output message="trt:SetVideoAnalyticsConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetMetadataConfiguration">
-			<wsdl:documentation>This operation modifies a metadata configuration. The ForcePersistence flag indicates if the
-changes shall remain after reboot of the device. Changes in the Multicast settings shall
-always be persistent. Running streams using this configuration may be updated immediately
-according to the new settings. The changes are not guaranteed to take effect unless the client
-requests a new stream URI and restarts any affected streams. NVC methods for changing a
-running stream are out of scope for this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetMetadataConfigurationRequest"/>
-			<wsdl:output message="trt:SetMetadataConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioOutputConfiguration">
-			<wsdl:documentation>This operation modifies an audio output configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioOutputConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioOutputConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioDecoderConfiguration">
-			<wsdl:documentation>This operation modifies an audio decoder configuration. The ForcePersistence flag indicates if
-the changes shall remain after reboot of the device.</wsdl:documentation>
-			<wsdl:input message="trt:SetAudioDecoderConfigurationRequest"/>
-			<wsdl:output message="trt:SetAudioDecoderConfigurationResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options  (supported values and ranges for video source configuration parameters) when the video source parameters are
-reconfigured If a video source configuration is specified, the options shall concern that
-particular configuration. If a media profile is specified, the options shall be compatible with
-that media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetVideoSourceConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for video encoder 
-				configuration parameters) when the video encoder parameters are reconfigured. <br/>
-				For JPEG, MPEG4 and H264 extension elements have been defined that provide additional information. A device must provide the 
-				XxxOption information for all encodings supported and should additionally provide the corresponding XxxOption2 information.<br/>
-				This response contains the available video encoder configuration options. If a video encoder configuration is specified, 
-				the options shall concern that particular configuration. If a media profile is specified, the options shall be 
-				compatible with that media profile. If no tokens are specified, the options shall be considered generic for the device.
-			</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoEncoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetVideoEncoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio source configuration parameters) when the audio source parameters are
-reconfigured. If an audio source configuration is specified, the options shall concern that
-particular configuration. If a media profile is specified, the options shall be compatible with
-that media profile.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioSourceConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioSourceConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options  (supported values and ranges for audio encoder configuration parameters) when the audio encoder parameters are
-reconfigured.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioEncoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioEncoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for metadata configuration parameters) for changing the metadata configuration.</wsdl:documentation>
-			<wsdl:input message="trt:GetMetadataConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetMetadataConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurationOptions">
-			<wsdl:documentation>This operation returns the available options (supported values and ranges for audio output configuration parameters) for configuring an audio output.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioOutputConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioOutputConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
-			<wsdl:documentation>This command list the audio decoding capabilities for a given profile and configuration of a
-device.</wsdl:documentation>
-			<wsdl:input message="trt:GetAudioDecoderConfigurationOptionsRequest"/>
-			<wsdl:output message="trt:GetAudioDecoderConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
-			<wsdl:documentation>The GetGuaranteedNumberOfVideoEncoderInstances command can be used to request the
-minimum number of guaranteed video encoder instances (applications) per Video Source
-Configuration.</wsdl:documentation>
-			<wsdl:input message="trt:GetGuaranteedNumberOfVideoEncoderInstancesRequest"/>
-			<wsdl:output message="trt:GetGuaranteedNumberOfVideoEncoderInstancesResponse"/>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetStreamUri">
-			<wsdl:documentation>This operation requests a URI that can be used to initiate a live media stream using RTSP as
-the control protocol. The returned URI shall remain valid indefinitely even if the profile is
-changed. The ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set
-accordingly (ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). <br/>
-				The correct syntax for the StreamSetup element for these media stream setups defined in 5.1.1 of the streaming specification are as follows:
-				<ol>
-					<li>RTP unicast over UDP: StreamType = "RTP_unicast", TransportProtocol = "UDP"</li>
-					<li>RTP over RTSP over HTTP over TCP: StreamType = "RTP_unicast", TransportProtocol = "HTTP"</li>
-					<li>RTP over RTSP over TCP: StreamType = "RTP_unicast", TransportProtocol = "RTSP"</li>
-				</ol>
-				<br/>
-If a multicast stream is requested the VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration element inside the corresponding 
-media profile must be configured with valid multicast settings.<br/>
-For full compatibility with other ONVIF services a device should not generate Uris longer than
-128 octets.</wsdl:documentation>
-			<wsdl:input message="trt:GetStreamUriRequest"/>
-			<wsdl:output message="trt:GetStreamUriResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StartMulticastStreaming">
-			<wsdl:documentation>This command starts multicast streaming using a specified media profile of a device.
-Streaming continues until StopMulticastStreaming is called for the same Profile. The
-streaming shall continue after a reboot of the device until a StopMulticastStreaming request is
-received. The multicast address, port and TTL are configured in the
-VideoEncoderConfiguration, AudioEncoderConfiguration and MetadataConfiguration
-respectively.</wsdl:documentation>
-			<wsdl:input message="trt:StartMulticastStreamingRequest"/>
-			<wsdl:output message="trt:StartMulticastStreamingResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="StopMulticastStreaming">
-			<wsdl:documentation>This command stop multicast streaming using a specified media profile of a device</wsdl:documentation>
-			<wsdl:input message="trt:StopMulticastStreamingRequest"/>
-			<wsdl:output message="trt:StopMulticastStreamingResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetSynchronizationPoint">
-			<wsdl:documentation>Synchronization points allow clients to decode and correctly use all data after the
-synchronization point.
-For example, if a video stream is configured with a large I-frame distance and a client loses a
-single packet, the client does not display video until the next I-frame is transmitted. In such
-cases, the client can request a Synchronization Point which enforces the device to add an I-Frame as soon as possible. Clients can request Synchronization Points for profiles. The device
-shall add synchronization points for all streams associated with this profile.
-Similarly, a synchronization point is used to get an update on full PTZ or event status through
-the metadata stream.
-If a video stream is associated with the profile, an I-frame shall be added to this video stream.
-If a PTZ metadata stream is associated to the profile,
-the PTZ position shall be repeated within the metadata stream.</wsdl:documentation>
-			<wsdl:input message="trt:SetSynchronizationPointRequest"/>
-			<wsdl:output message="trt:SetSynchronizationPointResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetSnapshotUri">
-			<wsdl:documentation>A client uses the GetSnapshotUri command to obtain a JPEG snapshot from the
-device. The returned URI shall remain valid indefinitely even if the profile is changed. The
-ValidUntilConnect, ValidUntilReboot and Timeout Parameter shall be set accordingly
-(ValidUntilConnect=false, ValidUntilReboot=false, timeout=PT0S). The URI can be used for
-acquiring a JPEG image through a HTTP GET operation. The image encoding will always be
-JPEG regardless of the encoding setting in the media profile. The Jpeg settings
-(like resolution or quality) may be taken from the profile if suitable. The provided
-image will be updated automatically and independent from calls to GetSnapshotUri.</wsdl:documentation>
-			<wsdl:input message="trt:GetSnapshotUriRequest"/>
-			<wsdl:output message="trt:GetSnapshotUriResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoSourceModes">
-			<wsdl:documentation>A device returns the information for current video source mode and settable video source modes of specified video source. A device that indicates a capability of  VideoSourceModes shall support this command.</wsdl:documentation>
-			<wsdl:input message="trt:GetVideoSourceModesRequest"/>
-			<wsdl:output message="trt:GetVideoSourceModesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoSourceMode">
-			<wsdl:documentation>SetVideoSourceMode changes the media profile structure relating to video source for the specified video source mode. A device that indicates a capability of VideoSourceModes shall support this command. The behavior after changing the mode is not defined in this specification.</wsdl:documentation>
-			<wsdl:input message="trt:SetVideoSourceModeRequest"/>
-			<wsdl:output message="trt:SetVideoSourceModeResponse"/>
-		</wsdl:operation>
-		<!--==============OSD Operation Begin=================-->
-		<wsdl:operation name="GetOSDs">
-			<wsdl:documentation>Get the OSDs.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDsRequest"/>
-			<wsdl:output message="trt:GetOSDsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSD">
-			<wsdl:documentation>Get the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDRequest"/>
-			<wsdl:output message="trt:GetOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSDOptions">
-			<wsdl:documentation>Get the OSD Options.</wsdl:documentation>
-			<wsdl:input message="trt:GetOSDOptionsRequest"/>
-			<wsdl:output message="trt:GetOSDOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetOSD">
-			<wsdl:documentation>Set the OSD</wsdl:documentation>
-			<wsdl:input message="trt:SetOSDRequest"/>
-			<wsdl:output message="trt:SetOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreateOSD">
-			<wsdl:documentation>Create the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:CreateOSDRequest"/>
-			<wsdl:output message="trt:CreateOSDResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteOSD">
-			<wsdl:documentation>Delete the OSD.</wsdl:documentation>
-			<wsdl:input message="trt:DeleteOSDRequest"/>
-			<wsdl:output message="trt:DeleteOSDResponse"/>
-		</wsdl:operation>
-		<!--==============OSD Operation End=================-->
-	</wsdl:portType>
-	<wsdl:binding name="MediaBinding" type="trt:Media">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSources">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSources/"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetAudioSources">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSources"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetAudioOutputs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="CreateProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateProfile"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetProfile/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetProfiles">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetProfiles"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddPTZConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddPTZConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="AddAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/AddAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemovePTZConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemovePTZConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="RemoveAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/RemoveAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="DeleteProfile">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteProfile"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetAudioSourceConfigurations/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetCompatibleVideoEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioEncoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioEncoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioSourceConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioSourceConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleVideoAnalyticsConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleVideoAnalyticsConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleMetadataConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleMetadataConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioOutputConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioOutputConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleAudioDecoderConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetCompatibleAudioDecoderConfigurations"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioSourceConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioSourceConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioEncoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioEncoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetVideoAnalyticsConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoAnalyticsConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetMetadataConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetMetadataConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioOutputConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioOutputConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetAudioDecoderConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetAudioDecoderConfiguration"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdlGetVideoSourceConfigurationOptions/"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetVideoEncoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoEncoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioSourceConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioSourceConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioEncoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioEncoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetMetadataConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetMetadataConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioOutputConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioOutputConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetAudioDecoderConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetAudioDecoderConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetGuaranteedNumberOfVideoEncoderInstances">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetGuaranteedNumberOfVideoEncoderInstances"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--===============================-->
-		<!--===============================-->
-		<wsdl:operation name="GetStreamUri">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetStreamUri"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="StartMulticastStreaming">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StartMulticastStreaming"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="StopMulticastStreaming">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/StopMulticastStreaming"/>
-			<wsdl:input>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetSynchronizationPoint">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetSynchronizationPoint"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetSnapshotUri">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetSnapshotUri"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="GetVideoSourceModes">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetVideoSourceModes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<wsdl:operation name="SetVideoSourceMode">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetVideoSourceMode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--===============================-->
-		<!--==============OSD Operation Begin=================-->
-		<wsdl:operation name="GetOSDs">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDs"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetOSDOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/GetOSDOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/SetOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreateOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/CreateOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="DeleteOSD">
-			<soap:operation soapAction="http://www.onvif.org/ver10/media/wsdl/DeleteOSD"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<!--==============OSD Operation End=================-->
-	</wsdl:binding>
-  <wsdl:service name="Media">
-    <wsdl:port name="MediaPort" binding="trt:MediaBinding" >
-      <soap:address
-        location="http://www.examples.com/Media/" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/onvif/wsdl/onvif-local.xsd b/onvif/wsdl/onvif-local.xsd
deleted file mode 100644
index 17f722d6e..000000000
--- a/onvif/wsdl/onvif-local.xsd
+++ /dev/null
@@ -1,8578 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<?xml-stylesheet type="text/xsl" href="onvif-schema-viewer.xsl"?>-->
-<!--
-Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<xs:schema xmlns:tt="http://www.onvif.org/ver10/schema" 
-           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-           xmlns:xmime="http://www.w3.org/2005/05/xmlmime" 
-           xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
-           xmlns:xop="http://www.w3.org/2004/08/xop/include" 
-           xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
-           targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="2.4.2">
-	<xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="http://www.w3.org/2005/05/xmlmime"/>
-	<xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/" schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
-<!--
-	<xs:import namespace="http://docs.oasis-open.org/wsn/b-2" schemaLocation="file:b-2.xsd"/>
--->
-	<xs:import namespace="http://www.w3.org/2004/08/xop/include" schemaLocation="http://www.w3.org/2004/08/xop/include"/>
-	<!--===============================-->
-	<!--         Generic Types         -->
-	<!--===============================-->
-	<xs:complexType name="DeviceEntity">
-		<xs:annotation>
-			<xs:documentation>Base class for physical entities like inputs and outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier referencing the physical entity.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReferenceToken">
-		<xs:annotation>
-			<xs:documentation>Unique identifier for a physical or logical resource.
-			Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class.
-			Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Name">
-		<xs:annotation>
-			<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangle">
-		<xs:annotation>
-			<xs:documentation>Rectangle defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="x" type="xs:int" use="required"/>
-		<xs:attribute name="y" type="xs:int" use="required"/>
-		<xs:attribute name="width" type="xs:int" use="required"/>
-		<xs:attribute name="height" type="xs:int" use="required"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangleRange">
-		<xs:annotation>
-			<xs:documentation>Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="XRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of X-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of Y-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WidthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of width.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HeightRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of height.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:int"/>
-			<xs:element name="Max" type="xs:int"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FloatRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:float"/>
-			<xs:element name="Max" type="xs:float"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DurationRange">
-		<xs:annotation>
-			<xs:documentation>Range of duration greater equal Min duration and less equal Max duration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:duration"/>
-			<xs:element name="Max" type="xs:duration"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntList">
-		<xs:annotation>
-			<xs:documentation>List of values.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Items" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IntAttrList">
-		<xs:list itemType="xs:int"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="FloatAttrList">
-		<xs:list itemType="xs:float"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="StringAttrList">
-		<xs:list itemType="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FloatList">
-		<xs:sequence>
-			<xs:element name="Items" type="xs:float" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnyHolder">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Generic Types       -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Media Related Types      -->
-	<!--===============================-->
-	<xs:complexType name="VideoSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Framerate" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Frame rate in frames per second.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Horizontal and vertical resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Imaging" type="tt:ImagingSettings" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional configuration of the image sensor.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoSourceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Imaging" type="tt:ImagingSettings20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the image sensor. To be used if imaging service 2.00 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Channels" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>number of available audio channels. (1: mono, 2: stereo) </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Profile">
-		<xs:annotation>
-			<xs:documentation>
-			A media profile consists of a set of media configurations. Media profiles are used by a client
-			to configure properties of a media stream from an NVT.<br/>
-			An NVT shall provide at least one media profile at boot. An NVT should provide “ready to use”
-			profiles for the most common media configurations that the device offers.<br/>
-			A profile consists of a set of interconnected configuration entities. Configurations are provided
-			by the NVT and can be either static or created dynamically by the NVT. For example, the
-			dynamic configurations can be created by the NVT depending on current available encoding
-			resources.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name of the profile.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the video analytics module and rule engine.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the pan tilt zoom unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the metadata stream.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extensions defined in ONVIF 2.0</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of the profile.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="fixed" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>A value of true signals that the profile cannot be deleted. Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio decoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration"/>
-	<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration"/>
-	<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration"/>
-	<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration"/>
-	<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-	<xs:element name="PTZConfiguration" type="tt:PTZConfiguration"/>
-	<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration"/>
-	<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration"/>
-	<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration"/>
-	<!--===============================-->
-	<xs:complexType name="ConfigurationEntity">
-		<xs:annotation>
-			<xs:documentation>Base type defining the common properties of a configuration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UseCount" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of internal references currently using this configuration. <br/>This parameter is read-only and cannot be changed by a set request. <br/>For example the value increases if the configuration is added to a media profile or attached to a PaneConfiguration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Token that uniquely refernces this configuration. Length up to 64 characters.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Reference to the physical input.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bounds" type="tt:IntRectangle">
-						<xs:annotation>
-							<xs:documentation>Rectangle specifying the Video capturing area. The capturing area shall not be larger than the whole Video source area.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension">
-		<xs:sequence>
-			<xs:element name="Rotate" type="tt:Rotate" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure rotation of captured image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rotate">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Degree" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to configure how much degree of clockwise rotation of image  for On mode. Omitting this parameter for On mode means 180 degree rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RotateMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="BoundsRange" type="tt:IntRectangleRange">
-				<xs:annotation>
-					<xs:documentation>Supported range for the capturing area.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of physical inputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Rotate" type="tt:RotateOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Rotate mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DegreeList" type="tt:IntList" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported degree value for rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:VideoEncoding">
-						<xs:annotation>
-							<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Configured video resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Quality" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RateControl" type="tt:VideoRateControl" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MPEG4" type="tt:Mpeg4Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure Mpeg4 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="H264" type="tt:H264Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure H.264 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related video stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="VideoEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="JPEG"/>
-			<xs:enumeration value="MPEG4"/>
-			<xs:enumeration value="H264"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Mpeg4Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="SP"/>
-			<xs:enumeration value="ASP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="H264Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Baseline"/>
-			<xs:enumeration value="Main"/>
-			<xs:enumeration value="Extended"/>
-			<xs:enumeration value="High"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="VideoResolution">
-		<xs:sequence>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoRateControl">
-		<xs:sequence>
-			<xs:element name="FrameRateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum output framerate in fps. If an EncodingInterval is provided the resulting encoded framerate will be reduced by the given factor.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingInterval" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Interval at which images are encoded and transmitted. (A value of 1 means that every frame is encoded, a value of 2 means that every 2nd frame is encoded ...)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Determines the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4Profile" type="tt:Mpeg4Profile">
-				<xs:annotation>
-					<xs:documentation>the Mpeg4 profile, either simple profile (SP) or advanced simple profile (ASP)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264Profile" type="tt:H264Profile">
-				<xs:annotation>
-					<xs:documentation>the H.264 profile, either baseline, main, extended or high</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="QualityRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="JPEG" type="tt:JpegOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="JPEG" type="tt:JpegOptions2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions2">
-		<xs:complexContent>
-			<xs:extension base="tt:JpegOptions">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4ProfilesSupported" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported MPEG-4 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:Mpeg4Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264ProfilesSupported" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:H264Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    AudioSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Audio Source the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="InputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the audio source the configuration can be used for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioSourceOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   AudioEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:AudioEncoding">
-						<xs:annotation>
-							<xs:documentation>Audio codec used for encoding the audio input (either G.711, G.726 or AAC)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bitrate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SampleRate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output sample rate in kHz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AudioEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="G711"/>
-			<xs:enumeration value="G726"/>
-			<xs:enumeration value="AAC"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Options" type="tt:AudioEncoderConfigurationOption" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>list of supported AudioEncoderConfigurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOption">
-		<xs:sequence>
-			<xs:element name="Encoding" type="tt:AudioEncoding">
-				<xs:annotation>
-					<xs:documentation>The enoding used for audio data (either G.711, G.726 or AAC)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  VideoAnalyticsConfiguration  -->
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration"/>
-					<xs:element name="RuleEngineConfiguration" type="tt:RuleEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    MetadataConfiguration      -->
-	<!--===============================-->
-	<xs:complexType name="MetadataConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="PTZStatus" type="tt:PTZFilter" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>optional element to configure which PTZ related data is to include in the metadata stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-<!--
-					<xs:element name="Events" type="tt:EventSubscription" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure the streaming of events. A client might be interested in receiving all, 
-								none or some of the events produced by the device:<ul>
-									<li>To get all events: Include the Events element but do not include a filter.</li>
-									<li>To get no events: Do not include the Events element.</li>
-									<li>To get only some events: Include the Events element and include a filter in the element.</li>
-								</ul>
-							</xs:documentation>
-						</xs:annotation>
-					</xs:element>
--->
-					<xs:element name="Analytics" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Defines whether the streamed metadata will include metadata from the analytics engines (video, cell motion, audio etc.)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration" minOccurs="0"/>
-					<xs:element name="Extension" type="tt:MetadataConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZFilter">
-		<xs:sequence>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ status (IDLE, MOVING or UNKNOWN)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ position</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventSubscription">
-		<xs:annotation>
-			<xs:documentation>Subcription handling in the same way as base notification subscription.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-<!--
-			<xs:element name="Filter" type="wsnt:FilterType" minOccurs="0"/>
--->
-			<xs:element name="Filter" type="xs:anyType" minOccurs="0"/>
-			<xs:element name="SubscriptionPolicy" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="PTZStatusFilterOptions" type="tt:PTZStatusFilterOptions"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptions">
-		<xs:sequence>
-			<xs:element name="PanTiltStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream pan or tilt status information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom status inforamtion.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PanTiltPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream the pan or tilt position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom position information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZStatusFilterOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutput            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Layout" type="tt:Layout"/>
-					<xs:element name="Resolution" type="tt:VideoResolution" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Resolution of the display in Pixel.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RefreshRate" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Refresh rate of the display in Hertz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AspectRatio" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Aspect ratio of the display as physical extent of width divided by height.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoOutputExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoOutputExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Video Output the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoDecoderConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="JpegDecOptions" type="tt:JpegDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Jpeg streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264DecOptions" type="tt:H264DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode H.264 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4DecOptions" type="tt:Mpeg4DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Mpeg4 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedH264Profiles" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H264 Profiles (either baseline, main, extended or high) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegDecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Jpeg Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedMpeg4Profiles" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Profiles (either SP or ASP) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputs            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the phsycial Audio output.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SendPrimacy" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-						An audio channel MAY support different types of audio transmission. While for full duplex
-						operation no special handling is required, in half duplex operation the transmission direction
-						needs to be switched.
-						The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-						direction is currently active. An NVC can switch between different modes by setting the
-						AudioOutputConfiguration.<br/>
-						The following modes for the Send-Primacy are defined:<ul>
-									<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Auto
-							It is up to the device how to deal with sending and receiving audio data.</li>
-								</ul>
-						Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="OutputLevel" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>Volume setting of the output. The applicable range is defined via the option AudioOutputOptions.OutputLevelRange.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="OutputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the physical Audio outputs (typically one).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SendPrimacyOptions" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				An <b>audio</b> channel MAY support different types of audio transmission. While for full duplex
-				operation no special handling is required, in half duplex operation the transmission direction
-				needs to be switched.
-				The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-				direction is currently active. An NVC can switch between different modes by setting the
-				AudioOutputConfiguration.<br/>
-				The following modes for the Send-Primacy are defined:<ul>
-							<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Auto
-						It is up to the device how to deal with sending and receiving audio data.</li>
-						</ul>
-				Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OutputLevelRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Minimum and maximum level range supported for this Output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfiguration           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfiguration">
-		<xs:annotation>
-			<xs:documentation>The Audio Decoder Configuration does not contain any that parameter to configure the
-decoding .A decoder shall decode every data it receives (according to its capabilities).</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfigurationOptions           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="AACDecOptions" type="tt:AACDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode AAC encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G711DecOptions" type="tt:G711DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G711 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G726DecOptions" type="tt:G726DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G726 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G711DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AACDecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G726DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          Streaming            -->
-	<!--===============================-->
-	<xs:complexType name="MulticastConfiguration">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPAddress">
-				<xs:annotation>
-					<xs:documentation>The multicast address (if this address is set to 0 no multicast streaming is enaled)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The RTP mutlicast destination port. A device may support RTCP. In this case the port value shall be even to allow the corresponding RTCP stream to be mapped to the next higher (odd) destination port number as defined in the RTSP specification.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>In case of IPv6 the TTL value is assumed as the hop limit. Note that for IPV6 and administratively scoped IPv4 multicast the primary use for hop limit / TTL is to prevent packets from (endlessly) circulating and not limiting scope. In these cases the address contains the scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Read only property signalling that streaming is persistant. Use the methods StartMulticastStreaming and StopMulticastStreaming to switch its state.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="StreamSetup">
-		<xs:sequence>
-			<xs:element name="Stream" type="tt:StreamType">
-				<xs:annotation>
-					<xs:documentation>Defines if a multicast or unicast stream is requested</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transport" type="tt:Transport"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="StreamType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="RTP-Unicast"/>
-			<xs:enumeration value="RTP-Multicast"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Transport">
-		<xs:sequence>
-			<xs:element name="Protocol" type="tt:TransportProtocol">
-				<xs:annotation>
-					<xs:documentation>Defines the network protocol for streaming, either UDP=RTP/UDP, RTSP=RTP/RTSP/TCP or HTTP=RTP/RTSP/HTTP/TCP </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-<!--
-			<xs:element name="Tunnel" type="tt:Transport" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to describe further tunnel options. This element is normally not needed </xs:documentation>
-				</xs:annotation>
-			</xs:element>
--->
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TransportProtocol">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="UDP"/>
-			<xs:enumeration value="TCP"/>
-			<xs:enumeration value="RTSP"/>
-			<xs:enumeration value="HTTP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaUri">
-		<xs:sequence>
-			<xs:element name="Uri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Stable Uri to be used for requesting the media stream</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterConnect" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is only valid until the connection is established. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterReboot" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is invalid after a reboot of the device. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Timeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Duration how long the Uri is valid. This parameter shall be set to PT0S to indicate that this stream URI is indefinitely valid even if the profile changes</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Media Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Discovery Related Types    -->
-	<!--===============================-->
-	<xs:simpleType name="ScopeDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fixed"/>
-			<xs:enumeration value="Configurable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Scope">
-		<xs:sequence>
-			<xs:element name="ScopeDef" type="tt:ScopeDefinition">
-				<xs:annotation>
-					<xs:documentation>Indicates if the scope is fixed or configurable.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ScopeItem" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Scope item URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DiscoveryMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Discoverable"/>
-			<xs:enumeration value="NonDiscoverable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<!-- End, Discovery Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--     Network Related Types     -->
-	<!--===============================-->
-	<xs:complexType name="NetworkInterface">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Enabled" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Info" type="tt:NetworkInterfaceInfo" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Network interface information</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Link" type="tt:NetworkInterfaceLink" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Link configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv4" type="tt:IPv4NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv6" type="tt:IPv6NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:NetworkInterfaceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Extension point prepared for future 802.3 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkInterfaceConfigPriority">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="31"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot3Configuration">
-		<xs:sequence>
-			<!-- Placeholder for 802.3 configuration -->
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceLink">
-		<xs:sequence>
-			<xs:element name="AdminSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Configured link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OperSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Current active link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes">
-				<xs:annotation>
-					<xs:documentation>Integer indicating interface type, for example: 6 is ethernet.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceConnectionSetting">
-		<xs:sequence>
-			<xs:element name="AutoNegotiation" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto negotiation on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Speed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Duplex" type="tt:Duplex">
-				<xs:annotation>
-					<xs:documentation>Duplex type, Half or Full.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Duplex">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Full"/>
-			<xs:enumeration value="Half"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IANA-IfTypes">
-		<xs:restriction base="xs:int">
-			<xs:annotation>
-				<xs:documentation>
-				For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceInfo">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network interface name, for example eth0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HwAddress" type="tt:HwAddress">
-				<xs:annotation>
-					<xs:documentation>Network interface MAC address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv6Configuration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv4Configuration">
-				<xs:annotation>
-					<xs:documentation>IPv4 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4Configuration">
-		<xs:sequence>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link local address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6Configuration">
-		<xs:sequence>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of link local IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromRA" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using router advertisment.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IPv6ConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6ConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6DHCPConfiguration">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Auto"/>
-			<xs:enumeration value="Stateful"/>
-			<xs:enumeration value="Stateless"/>
-			<xs:enumeration value="Off"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocol">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:NetworkProtocolType">
-				<xs:annotation>
-					<xs:documentation>Network protocol type string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the protocol is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The port that is used by the protocol.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkProtocolExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocolExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkProtocolType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="HTTP"/>
-			<xs:enumeration value="HTTPS"/>
-			<xs:enumeration value="RTSP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkHostType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-			<xs:enumeration value="DNS"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHost">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:NetworkHostType">
-				<xs:annotation>
-					<xs:documentation>Network host type: IPv4, IPv6 or DNS.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSname" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkHostExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHostExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddress">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the address is an IPv4 or IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv4Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv4Address">
-				<xs:annotation>
-					<xs:documentation>IPv4 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv4Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv6Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv6Address">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="HwAddress">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="DNSName">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the hostname is obtained from DHCP or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="xs:token" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates the hostname.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:HostnameInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DNS information is retrieved from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Search domain.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSFromDHCP" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of DNS addresses received from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered DNS addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if NTP information is to be retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPFromDHCP" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of NTP addresses retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered NTP addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NTPInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Domain">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPAddressFilterType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Allow"/>
-			<xs:enumeration value="Deny"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformation">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:DynamicDNSType">
-				<xs:annotation>
-					<xs:documentation>Dynamic DNS type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Time to live.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DynamicDNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DynamicDNSType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NoUpdate"/>
-			<xs:enumeration value="ClientUpdates"/>
-			<xs:enumeration value="ServerUpdates"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Link" type="tt:NetworkInterfaceConnectionSetting" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4" type="tt:IPv4NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6" type="tt:IPv6NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkGateway">
-		<xs:sequence>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv4 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv6 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfiguration">
-		<xs:sequence>
-			<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of network interface.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the zero-configuration is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Addresses" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The zero-configuration IPv4 address(es)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-<!--
-			<xs:element name="Additional" type="tt:NetworkZeroConfiguration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Optional array holding the configuration for the second and possibly further interfaces.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
--->
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilter">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPAddressFilterType"/>
-			<xs:element name="IPv4Address" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="IPv6Address" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IPAddressFilterExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilterExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Configuration">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="Mode" type="tt:Dot11StationMode"/>
-			<xs:element name="Alias" type="tt:Name"/>
-			<xs:element name="Priority" type="tt:NetworkInterfaceConfigPriority"/>
-			<xs:element name="Security" type="tt:Dot11SecurityConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SSIDType">
-		<xs:restriction base="xs:hexBinary">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11StationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Ad-hoc"/>
-			<xs:enumeration value="Infrastructure"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfiguration">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:Dot11SecurityMode"/>
-			<xs:element name="Algorithm" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="PSK" type="tt:Dot11PSKSet" minOccurs="0"/>
-			<xs:element name="Dot1X" type="tt:ReferenceToken" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11SecurityConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SecurityMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="WEP"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11Cipher">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="CCMP"/>
-			<xs:enumeration value="TKIP"/>
-			<xs:enumeration value="Any"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSK">
-		<xs:restriction base="xs:hexBinary">
-			<xs:length value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSKPassphrase">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[ -~]{8,63}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSet">
-		<xs:sequence>
-			<xs:element name="Key" type="tt:Dot11PSK" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 the RSNA PSK consists of 256 bits, or 64 octets when represented in hex<br/>
-					Either Key or Passphrase shall be given, if both are supplied Key shall be used by the device and Passphrase ignored.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Passphrase" type="tt:Dot11PSKPassphrase" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 a pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters and
-					each character in the pass-phrase must have an encoding in the range of 32 to 126 (decimal),inclusive.<br/>
-					If only Passpharse is supplied the Key shall be derived using the algorithm described in IEEE802.11-2007 section H.4
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:Dot11PSKSetExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSetExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Capabilities">
-		<xs:sequence>
-			<xs:element name="TKIP" type="xs:boolean"/>
-			<xs:element name="ScanAvailableNetworks" type="xs:boolean"/>
-			<xs:element name="MultipleConfiguration" type="xs:boolean"/>
-			<xs:element name="AdHocStationMode" type="xs:boolean"/>
-			<xs:element name="WEP" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SignalStrength">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Very Bad"/>
-			<xs:enumeration value="Bad"/>
-			<xs:enumeration value="Good"/>
-			<xs:enumeration value="Very Good"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Status">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="ActiveConfigAlias" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11AuthAndMangementSuite">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworks">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="AuthAndMangementSuite" type="tt:Dot11AuthAndMangementSuite" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>See IEEE802.11 7.3.2.25.2 for details.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11AvailableNetworksExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworksExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, network Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Capabilities Related Types  -->
-	<!--===============================-->
-	<xs:simpleType name="CapabilityCategory">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="All"/>
-			<xs:enumeration value="Analytics"/>
-			<xs:enumeration value="Device"/>
-			<xs:enumeration value="Events"/>
-			<xs:enumeration value="Imaging"/>
-			<xs:enumeration value="Media"/>
-			<xs:enumeration value="PTZ"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Capabilities">
-		<xs:sequence>
-			<xs:element name="Analytics" type="tt:AnalyticsCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Analytics capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Device" type="tt:DeviceCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Device capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Events" type="tt:EventCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Event capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Imaging" type="tt:ImagingCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Imaging capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Media" type="tt:MediaCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Media capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZ" type="tt:PTZCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>PTZ capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:CapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DeviceIO" type="tt:DeviceIOCapabilities" minOccurs="0"/>
-			<xs:element name="Display" type="tt:DisplayCapabilities" minOccurs="0"/>
-			<xs:element name="Recording" type="tt:RecordingCapabilities" minOccurs="0"/>
-			<xs:element name="Search" type="tt:SearchCapabilities" minOccurs="0"/>
-			<xs:element name="Replay" type="tt:ReplayCapabilities" minOccurs="0"/>
-			<xs:element name="Receiver" type="tt:ReceiverCapabilities" minOccurs="0"/>
-			<xs:element name="AnalyticsDevice" type="tt:AnalyticsDeviceCapabilities" minOccurs="0"/>
-			<xs:element name="Extensions" type="tt:CapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Analytics service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not rules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not modules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Device service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Network" type="tt:NetworkCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="System" type="tt:SystemCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>System capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IO" type="tt:IOCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>I/O capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Security" type="tt:SecurityCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Security capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DeviceCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Event service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSSubscriptionPolicySupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Subscription policy is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPullPointSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pull Point is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPausableSubscriptionManagerInterfaceSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pausable Subscription Manager Interface is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilities">
-		<xs:sequence>
-			<xs:element name="InputConnectors" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of input connectors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelayOutputs" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of relay outputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Auxiliary" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension2"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Media service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamingCapabilities" type="tt:RealTimeStreamingCapabilities">
-				<xs:annotation>
-					<xs:documentation>Streaming capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MediaCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="ProfileCapabilities" type="tt:ProfileCapabilities"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilities">
-		<xs:sequence>
-			<xs:element name="RTPMulticast" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP multicast is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP over TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP/RTSP/TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RealTimeStreamingCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileCapabilities">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfProfiles" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum number of profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilities">
-		<xs:sequence>
-			<xs:element name="IPFilter" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IP filtering is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZeroConfiguration" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not zeroconf is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPVersion6" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DynDNS" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not  is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11Configuration" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilities">
-		<xs:sequence>
-			<xs:element name="TLS1.1" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.1 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TLS1.2" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.2 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OnboardKeyGeneration" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not onboard key generation is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AccessPolicyConfig" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not access policy configuration is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="X.509Token" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security X.509 token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SAMLToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security SAML token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="KerberosToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security Kerberos token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RELToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security REL token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="TLS1.0" type="xs:boolean"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:element name="Dot1X" type="xs:boolean"/>
-			<xs:element name="SupportedEAPMethod" type="xs:int" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteUserHandling" type="xs:boolean"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilities">
-		<xs:sequence>
-			<xs:element name="DiscoveryResolve" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Discovery resolve requests are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DiscoveryBye" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Discovery Bye is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteDiscovery" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not remote discovery is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemBackup" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system backup is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemLogging" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system logging is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FirmwareUpgrade" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not firmware upgrade is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedVersions" type="tt:OnvifVersion" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates supported ONVIF version(s).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="HttpFirmwareUpgrade" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemBackup" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemLogging" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSupportInformation" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OnvifVersion">
-		<xs:sequence>
-			<xs:element name="Major" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Major version number.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minor" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Two digit minor version number (e.g. X.0.1 maps to "01" and X.2.1 maps to "21" where X stands for Major version number).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Imaging service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>PTZ service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceIOCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="VideoSources" type="xs:int"/>
-			<xs:element name="VideoOutputs" type="xs:int"/>
-			<xs:element name="AudioSources" type="xs:int"/>
-			<xs:element name="AudioOutputs" type="xs:int"/>
-			<xs:element name="RelayOutputs" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DisplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="FixedLayout" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indication that the SetLayout command supports only predefined layouts.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="ReceiverSource" type="xs:boolean"/>
-			<xs:element name="MediaProfileSource" type="xs:boolean"/>
-			<xs:element name="DynamicRecordings" type="xs:boolean"/>
-			<xs:element name="DynamicTracks" type="xs:boolean"/>
-			<xs:element name="MaxStringLength" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="MetadataSearch" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the replay service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the receiver service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_Multicast" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP multicast streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/TCP streams</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/RTSP/TCP streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedReceivers" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum number of receivers supported by the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRTSPURILength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum allowed length for RTSP URIs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="RuleSupport" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Obsolete property.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--End, Capabilities Related Types-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    System Related Types       -->
-	<!--===============================-->
-	<xs:simpleType name="SystemLogType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available system log modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="System">
-				<xs:annotation>
-					<xs:documentation>Indicates that a system log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Access">
-				<xs:annotation>
-					<xs:documentation>Indicates that a access log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemLog">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportInformation">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BinaryData">
-		<xs:sequence>
-			<xs:element name="Data" type="xs:base64Binary" nillable="false">
-				<xs:annotation>
-					<xs:documentation>base64 encoded binary data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AttachmentData">
-		<xs:sequence>
-			<xs:element ref="xop:Include"/>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BackupFile">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Data" type="tt:AttachmentData"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUriList">
-		<xs:sequence>
-			<xs:element name="SystemLog" type="tt:SystemLogUri" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUri">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:SystemLogType"/>
-			<xs:element name="Uri" type="xs:anyURI"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="FactoryDefaultType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available factory default modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Hard">
-				<xs:annotation>
-					<xs:documentation>Indicates that a hard factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Soft">
-				<xs:annotation>
-					<xs:documentation>Indicates that a soft factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="SetDateTimeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Manual">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set manually.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NTP">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set through NTP</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTime">
-		<xs:annotation>
-			<xs:documentation>General date time inforamtion returned by the GetSystemDateTime method.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="DateTimeType" type="tt:SetDateTimeType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the time is set manully or through NTP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DaylightSavings" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Informative indicator whether daylight savings is currently on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Timezone information in Posix format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Current system date and time in UTC format. This field is mandatory since version 2.0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LocalDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Date and time in local format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemDateTimeExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTimeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DateTime">
-		<xs:sequence>
-			<xs:element name="Time" type="tt:Time"/>
-			<xs:element name="Date" type="tt:Date"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Date">
-		<xs:sequence>
-			<xs:element name="Year" type="xs:int"/>
-			<xs:element name="Month" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 12.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Day" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 31.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Time">
-		<xs:sequence>
-			<xs:element name="Hour" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 23.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minute" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 59.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Second" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 61 (typically 59).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TimeZone">
-		<xs:annotation>
-			<xs:documentation>
-				The TZ format is specified by POSIX, please refer to POSIX 1003.1 section 8.3<br/>
-				Example: Europe, Paris TZ=CET-1CEST,M3.5.0/2,M10.5.0/3<br/>
-				CET = designation for standard time when daylight saving is not in force<br/>
-				-1 = offset in hours = negative so 1 hour east of Greenwich meridian<br/>
-				CEST = designation when daylight saving is in force ("Central European Summer Time")<br/>
-				, = no offset number between code and comma, so default to one hour ahead for daylight saving<br/>
-				M3.5.0 = when daylight saving starts = the last Sunday in March (the "5th" week means the last in the month)<br/>
-				/2, = the local time when the switch occurs = 2 a.m. in this case<br/>
-				M10.5.0 = when daylight saving ends = the last Sunday in October.<br/>
-				/3, = the local time when the switch occurs = 3 a.m. in this case<br/>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="TZ" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Posix timezone string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, System Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   RemoteUser Handling Types    -->
-	<!--===============================-->
-	<xs:complexType name="RemoteUser">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string"/>
-			<xs:element name="Password" type="xs:string" minOccurs="0"/>
-			<xs:element name="UseDerivedPassword" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, RemoteUser Handling Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   UserToken Handling Types    -->
-	<!--===============================-->
-	<xs:simpleType name="UserLevel">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Administrator"/>
-			<xs:enumeration value="Operator"/>
-			<xs:enumeration value="User"/>
-			<xs:enumeration value="Anonymous"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="User">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Username string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UserLevel" type="tt:UserLevel">
-				<xs:annotation>
-					<xs:documentation>User level string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:UserExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="UserExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!-- End, UserToken Handling Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Security Management Types   -->
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParameters">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Subject" type="xs:string" minOccurs="0"/>
-			<xs:element name="ValidNotBefore" type="xs:token" minOccurs="0"/>
-			<xs:element name="ValidNotAfter" type="xs:token" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateGenerationParametersExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParametersExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Certificate">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Certificate" type="tt:BinaryData">
-				<xs:annotation>
-					<xs:documentation>base64 encoded DER representation of certificate.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateStatus">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not a certificate is used in a HTTPS configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateWithPrivateKey">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Certificate" type="tt:BinaryData"/>
-			<xs:element name="PrivateKey" type="tt:BinaryData"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformation">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:element name="IssuerDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="SubjectDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="KeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="ExtendedKeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="KeyLength" type="xs:int" minOccurs="0"/>
-			<xs:element name="Version" type="xs:string" minOccurs="0"/>
-			<xs:element name="SerialNum" type="xs:string" minOccurs="0"/>
-			<xs:element name="SignatureAlgorithm" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Validity Range is from "NotBefore" to "NotAfter"; the corresponding DateTimeRange is from "From" to "Until"</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Validity" type="tt:DateTimeRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateUsage">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Critical" type="xs:boolean" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Security management Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start Dot1X related Types   -->
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfiguration">
-		<xs:sequence>
-			<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken"/>
-			<xs:element name="Identity" type="xs:string"/>
-			<xs:element name="AnonymousID" type="xs:string" minOccurs="0"/>
-			<xs:element name="EAPMethod" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>
-				EAP Method type as defined in <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.
-			</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CACertificateID" type="xs:token" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="EAPMethodConfiguration" type="tt:EAPMethodConfiguration" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot1XConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EAPMethodConfiguration">
-		<xs:sequence>
-			<xs:element name="TLSConfiguration" type="tt:TLSConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Confgiuration information for TLS Method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password for those EAP Methods that require a password. The password shall never be returned on a get method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EapMethodExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EapMethodExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TLSConfiguration">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GenericEapPwdConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Dot1X related Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start IO management Types   -->
-	<!--===============================-->
-	<xs:simpleType name="RelayLogicalState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="active"/>
-			<xs:enumeration value="inactive"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RelayIdleState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="closed"/>
-			<xs:enumeration value="open"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutputSettings">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RelayMode">
-				<xs:annotation>
-					<xs:documentation>
-					'Bistable' or 'Monostable'
-					<ul>
-							<li>Bistable – After setting the state, the relay remains in this state.</li>
-							<li>Monostable – After setting the state, the relay returns to its idle state after the specified time.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DelayTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Time after which the relay returns to its idle state if it is in monostable mode. If the Mode field is set to bistable mode the value of the parameter can be ignored.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IdleState" type="tt:RelayIdleState">
-				<xs:annotation>
-					<xs:documentation>
-			'open' or 'closed'
-			<ul>
-							<li>'open' means that the relay is open when the relay state is set to 'inactive' through the trigger command and closed when the state is set to 'active' through the same command.</li>
-							<li>'closed' means that the relay is closed when the relay state is set to 'inactive' through the trigger command and open when the state is set to 'active' through the same command.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RelayMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Monostable"/>
-			<xs:enumeration value="Bistable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Properties" type="tt:RelayOutputSettings"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DigitalInput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, IO management Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Start PTZ Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="PTZNode">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Name" type="tt:Name" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                A unique identifier that is used to reference PTZ Nodes.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SupportedPTZSpaces" type="tt:PTZSpaces">
-						<xs:annotation>
-							<xs:documentation>
-                A list of Coordinate Systems available for the PTZ Node. For each Coordinate System, the PTZ Node MUST specify its allowed range.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaximumNumberOfPresets" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>
-                All preset operations MUST be available for this PTZ Node if one preset is supported.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="HomeSupported" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>
-                A boolean operator specifying the availability of a home position. If set to true, the Home Position Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>
-                A list of supported Auxiliary commands. If the list is not empty, the Auxiliary Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZNodeExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="FixedHomePosition" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>
-      				Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command.
-      			</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SupportedPresetTour" type="tt:PTZPresetTourSupported" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Detail of supported Preset Tour feature.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZNodeExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupported">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfPresetTours" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Indicates number of preset tours that can be created. Required preset tour operations shall be available for this PTZ Node if one or more preset tour is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupportedExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="NodeToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>
-                A mandatory reference to the PTZ Node that the PTZ Configuration belongs to.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsolutePantTiltPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute Pan/Tilt movements, it shall specify one Absolute Pan/Tilt Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsoluteZoomPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute zoom movements, it shall specify one Absolute Zoom Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativePanTiltTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative Pan/Tilt movements, it shall specify one RelativePan/Tilt Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativeZoomTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative zoom movements, it shall specify one Relative Zoom Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousPanTiltVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous Pan/Tilt movements, it shall specify one Continuous Pan/Tilt Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousZoomVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous zoom movements, it shall specify one Continuous Zoom Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZSpeed" type="tt:PTZSpeed" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute or relative PTZ movements, it shall specify corresponding default Pan/Tilt and Zoom speeds.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZTimeout" type="xs:duration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous movements, it shall specify a default timeout, after which the movement stops.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PanTiltLimits" type="tt:PanTiltLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Pan/Tilt limits element should be present for a PTZ Node that supports an absolute Pan/Tilt. If the element is present it signals the support for configurable Pan/Tilt limits. If limits are enabled, the Pan/Tilt movements shall always stay within the specified range. The Pan/Tilt limits are disabled by setting the limits to –INF or +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ZoomLimits" type="tt:ZoomLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Zoom limits element should be present for a PTZ Node that supports absolute zoom. If the element is present it signals the supports for configurable Zoom limits. If limits are enabled the zoom movements shall always stay within the specified range. The Zoom limits are disabled by settings the limits to -INF and +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZConfigurationExtension" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure PT Control Direction related features.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirection">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlip" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for E-Flip.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:Reverse" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for reversing of PT Control Direction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlip">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable E-Flip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Reverse">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="EFlipMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReverseMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Spaces" type="tt:PTZSpaces">
-				<xs:annotation>
-					<xs:documentation>
-            A list of supported coordinate systems including their range limitations.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZTimeout" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>
-            A timeout Range within which Timeouts are accepted by the PTZ Node.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirectionOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for PT Direction Control.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptions">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlipOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for EFlip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:ReverseOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of EFlip mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EFlipOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of Reverse mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ReverseOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PanTiltLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space2DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of pan tilt limits.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ZoomLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space1DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of zoom limit
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpaces">
-		<xs:sequence>
-			<xs:element name="AbsolutePanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt Position space is provided by every PTZ node that supports absolute Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the PTZ unit normalized to the range -1 to 1 resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AbsoluteZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Position Space is provided by every PTZ node that supports absolute Zoom, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the Zoom normalized to the range 0 (wide) to 1 (tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativePanTiltTranslationSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt translation space is provided by every PTZ node that supports relative Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full positive and negative translation range of the PTZ unit normalized to the range -1 to 1, 
-			where positive translation would mean clockwise rotation or movement in right/up direction resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativeZoomTranslationSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Translation Space is provided by every PTZ node that supports relative Zoom, since it does not relate to a specific physical range. 
-			Instead, the corresponding absolute range should be defined as the full positive and negative translation range of the Zoom normalized to the range -1 to1, 
-			where a positive translation maps to a movement in TELE direction. The translation is signed to indicate direction (negative is to wide, positive is to tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension. This results in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousPanTiltVelocitySpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic Pan/Tilt velocity space shall be provided by every PTZ node, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as a range of the PTZ unit’s speed normalized to the range -1 to 1, where a positive velocity would map to clockwise 
-			rotation or movement in the right/up direction. A signed speed can be independently specified for the pan and tilt component resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousZoomVelocitySpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic zoom velocity space specifies a zoom factor velocity without knowing the underlying physical model. The range should be normalized from -1 to 1, 
-			where a positive velocity would map to TELE direction. A generic zoom velocity space description resembles the following.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Pan/Tilt movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. The speed of a combined Pan/Tilt 
-			movement is represented by a single non-negative scalar value.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Zoom movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. 
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZSpacesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpacesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space2DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of y-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space1DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector2D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="y" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-  				Pan/tilt coordinate space selector. The following options are defined:<ul>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector1D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-  				Pan/tilt coordinate space selector. The following options are defined:<ul style="">
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZVector">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt position. The x component corresponds to pan and the y component to tilt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpeed">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt speed. The x component corresponds to pan and the y component to tilt. If omitted in a request, the current (if any) PanTilt movement should not be affected. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom speed. If omitted in a request, the current (if any) Zoom movement should not be affected.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the absolute position of the PTZ unit together with the Space references. The default absolute spaces of the corresponding PTZ configuration MUST be referenced within the Position element.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:PTZMoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Indicates if the Pan/Tilt/Zoom device unit is currently moving, idle or in an unknown state.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            States a current PTZ error.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UtcTime" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the UTC time when this status was generated.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPreset">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position name.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPosition" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>
-        </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZMoveStatus">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AuxiliaryData">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="128"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="MoveStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IDLE"/>
-			<xs:enumeration value="MOVING"/>
-			<xs:enumeration value="UNKNOWN"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Touring"/>
-			<xs:enumeration value="Paused"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourDirection">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Forward"/>
-			<xs:enumeration value="Backward"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Start"/>
-			<xs:enumeration value="Stop"/>
-			<xs:enumeration value="Pause"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PresetTour">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Readable name of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="tt:PTZPresetTourStatus">
-				<xs:annotation>
-					<xs:documentation>Read only parameters to indicate the status of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto Start flag of the preset tour. True allows the preset tour to be activated always.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingCondition">
-				<xs:annotation>
-					<xs:documentation>Parameters to specify the detail behavior of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpot" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of detail of touring spots including preset positions.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of this preset tour.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpot">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetail">
-				<xs:annotation>
-					<xs:documentation>Detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify Pan/Tilt and Zoom speed on moving toward this tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify time duration of staying on this tour sport.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSpotExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetail">
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="PresetToken" type="tt:ReferenceToken">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with Preset Token defined in advance.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Home" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with the home position of this PTZ Node. "False" to this parameter shall be treated as an invalid argument.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="PTZPosition" type="tt:PTZVector">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with vector of PTZ node directly.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="TypeExtension" type="tt:PTZPresetTourTypeExtension"/>
-			</xs:choice>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourTypeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatus">
-		<xs:sequence>
-			<xs:element name="State" type="tt:PTZPresetTourState">
-				<xs:annotation>
-					<xs:documentation>Indicates state of this preset tour by Idle/Touring/Paused.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CurrentTourSpot" type="tt:PTZPresetTourSpot" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates a tour spot currently staying.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStatusExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatusExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingCondition">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how many times the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how long time duration the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to choose which direction the preset tour goes. Forward shall be chosen in case it is omitted.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourOptions">
-		<xs:sequence>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the AutoStart is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingConditionOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Starting Condition.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpotOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotOptions">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetailOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>Supported range of stay time for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptions">
-		<xs:sequence>
-			<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of available Preset Tokens for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Home" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An option to indicate Home postion for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Pan and Tilt for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Zoom for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourPresetDetailOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptions">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Duration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--     End, PTZ Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus">
-		<xs:sequence>
-			<xs:element name="FocusStatus" type="tt:FocusStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode"/>
-			<xs:element name="DefaultSpeed" type="xs:float"/>
-			<xs:element name="NearLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).
-If set to 0.0, infinity will be used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AutoFocusMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-					Exposure Mode
-					<ul>
-							<li>Auto – Enabled the exposure algorithm on the NVT.</li>
-							<li>Manual – Disabled exposure algorithm on the NVT.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="WideDynamicMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>
-				White dynamic range (on/off)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Optional level parameter (unitless)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="BacklightCompensationMode">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available backlight compenstation modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is disabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="ON">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposurePriority">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LowNoise"/>
-			<xs:enumeration value="FrameRate"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions"/>
-			<xs:element name="Brightness" type="tt:FloatRange"/>
-			<xs:element name="ColorSaturation" type="tt:FloatRange"/>
-			<xs:element name="Contrast" type="tt:FloatRange"/>
-			<xs:element name="Exposure" type="tt:ExposureOptions"/>
-			<xs:element name="Focus" type="tt:FocusOptions"/>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" maxOccurs="unbounded"/>
-			<xs:element name="Sharpness" type="tt:FloatRange"/>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions"/>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange"/>
-			<xs:element name="NearLimit" type="tt:FloatRange"/>
-			<xs:element name="FarLimit" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded"/>
-			<xs:element name="Priority" type="tt:ExposurePriority" maxOccurs="unbounded"/>
-			<xs:element name="MinExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MinGain" type="tt:FloatRange"/>
-			<xs:element name="MaxGain" type="tt:FloatRange"/>
-			<xs:element name="MinIris" type="tt:FloatRange"/>
-			<xs:element name="MaxIris" type="tt:FloatRange"/>
-			<xs:element name="ExposureTime" type="tt:FloatRange"/>
-			<xs:element name="Gain" type="tt:FloatRange"/>
-			<xs:element name="Iris" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded"/>
-			<xs:element name="YrGain" type="tt:FloatRange"/>
-			<xs:element name="YbGain" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusMove">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameter for the continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Position parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocus">
-		<xs:sequence>
-			<xs:element name="Distance" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Distance parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocus">
-		<xs:sequence>
-			<xs:element name="Speed" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the Continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0"/>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions" minOccurs="0"/>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocusOptions">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocusOptions">
-		<xs:sequence>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposureMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Enabled">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ENABLED"/>
-			<xs:enumeration value="DISABLED"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="WhiteBalanceMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>Auto whitebalancing mode (auto/manual).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Rgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Bgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  End, Imaging Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Version 2.0 Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20">
-		<xs:sequence>
-			<xs:element name="FocusStatus20" type="tt:FocusStatus20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings20">
-		<xs:annotation>
-			<xs:documentation>Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension20" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension20">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilization" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension202" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension202">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustment" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>An optional parameter applied to only auto mode to adjust timing of toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension203" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension203">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilization">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ImageStabilizationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustment">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Specifies which boundaries to automatically toggle Ir cut filter following parameters are applied to. Its options shall be chosen from tt:IrCutFilterAutoBoundaryType.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Adjusts boundary exposure level for toggling Ir cut filter to on/off specified with unitless normalized value from +1.0 to -1.0. Zero is default and -1.0 is the darkest adjustment (Unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Delay time of toggling Ir cut filter to on/off after crossing of the boundary exposure levels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterAutoBoundaryType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Common" />
-			<xs:enumeration value="ToOn" />
-			<xs:enumeration value="ToOff" />
-			<xs:enumeration value="Extended" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether WDR mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>Wide dynamic range mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether BLC mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure20">
-		<xs:annotation>
-			<xs:documentation>Type describing the exposure settings.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Backlight Compensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Brightness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Color Saturation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Contrast.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:ExposureOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Exposure.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of IrCutFilterModes.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Sharpness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WideDynamicRange.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WhiteBalance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilizationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension2">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustmentOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for adjustment of Ir cut filter auto mode.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension3" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension3">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Image Stabilization mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Valid range of the Image Stabilization.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptions">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of boundary types for adjustment of Ir cut filter auto mode. The opptions shall be chosen from tt:IrCutFilterAutoBoundaryType. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not boundary offset for toggling Ir cut filter is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTimeRange" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of delay time for toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentOptionsExtension" minOccurs="0" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				'ON' or 'OFF'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Level range of BacklightCompensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions20">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the absolute control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the relative control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the continuous control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions20">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>
-				'AUTO' or 'MANUAL'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Bgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:WhiteBalance20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode">
-				<xs:annotation>
-					<xs:documentation>
-			Mode of auto fucus.
-			<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="xs:float" minOccurs="0"/>
-			<xs:element name="NearLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusConfiguration20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Mode of WhiteBalance.
-				<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YrGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="YbGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:WhiteBalanceOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-					Mode of Auto Focus.
-					<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of DefaultSpeed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NearLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of NearLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of FarLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, Imaging Version 2.0 Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--  Event and Analytics Types    -->
-	<!--===============================-->
-	<xs:simpleType name="TopicNamespaceLocation">
-		<xs:restriction base="xs:anyURI"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PropertyOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initialized"/>
-			<xs:enumeration value="Deleted"/>
-			<xs:enumeration value="Changed"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:element name="Message">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Source" type="tt:ItemList" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Token value pairs that triggered this message. Typically only one item is present.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Key" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Data" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Extension" type="tt:MessageExtension" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
-			<xs:attribute name="PropertyOperation" type="tt:PropertyOperation"/>
-			<xs:anyAttribute processContents="lax"/>
-		</xs:complexType>
-	</xs:element>
-	<!--===============================-->
-	<xs:complexType name="MessageExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemList">
-		<xs:annotation>
-			<xs:documentation>
-			List of parameters according to the corresponding ItemListDescription.
-			Each item in the list shall have a unique name.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Value name pair as defined by the corresponding description.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Value" type="xs:anySimpleType" use="required">
-						<xs:annotation>
-							<xs:documentation>Item value. The type is defined in the corresponding description.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Complex value structure.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any">
-							<xs:annotation>
-								<xs:documentation>XML tree contiaing the element value as defined in the corresponding description.</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Message Description     -->
-	<!--===============================-->
-	<xs:complexType name="MessageDescription">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Set of tokens producing this message. The list may only contain SimpleItemDescription items.
-					The set of tokens identify the component within the WS-Endpoint, which is responsible for the producing the message.<br/>
-					For analytics events the token set shall include the VideoSourceConfigurationToken, the VideoAnalyticsConfigurationToken
-					and the name of the analytics module or rule.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Key" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes optional message payload parameters that may be used as key. E.g. object IDs of tracked objects are conveyed as key.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Data" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes the payload of the message.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:MessageDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="IsProperty" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Must be set to true when the described Message relates to a property. An alternative term of "property" is a "state" in contrast to a pure event, which contains relevant information for only a single point in time.<br/>Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MessageDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescription">
-		<xs:annotation>
-			<xs:documentation>
-			Describes a list of items. Each item in the list shall have a unique name.
-			The list is designed as linear structure without optional or unbounded elements.
-			Use ElementItems only when complex structures are inevitable.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Description of a simple item. The type must be of cathegory simpleType (xs:string, xs:integer, xs:float, ...).</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            Description of a complex type. The Type must reference a defined type.
-          </xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required">
-						<xs:annotation>
-							<xs:documentation>The type of the item. The Type must reference a defined type.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector">
-		<xs:attribute name="x" type="xs:float"/>
-		<xs:attribute name="y" type="xs:float"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rectangle">
-		<xs:attribute name="bottom" type="xs:float"/>
-		<xs:attribute name="top" type="xs:float"/>
-		<xs:attribute name="right" type="xs:float"/>
-		<xs:attribute name="left" type="xs:float"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Polygon">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="3" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polygon" type="tt:Polygon"/>
-	<!--===============================-->
-	<xs:complexType name="Polyline">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="2" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polyline" type="tt:Polyline"/>
-	<!--===============================-->
-	<xs:simpleType name="Direction">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Left"/>
-			<xs:enumeration value="Right"/>
-			<xs:enumeration value="Any"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Color">
-		<xs:attribute name="X" type="xs:float" use="required"/>
-		<xs:attribute name="Y" type="xs:float" use="required"/>
-		<xs:attribute name="Z" type="xs:float" use="required"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorCovariance">
-		<xs:attribute name="XX" type="xs:float" use="required"/>
-		<xs:attribute name="YY" type="xs:float" use="required"/>
-		<xs:attribute name="ZZ" type="xs:float" use="required"/>
-		<xs:attribute name="XY" type="xs:float"/>
-		<xs:attribute name="XZ" type="xs:float"/>
-		<xs:attribute name="YZ" type="xs:float"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Scene Description       -->
-	<!--===============================-->
-	<xs:complexType name="Appearance">
-		<xs:sequence>
-			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
-			<xs:element name="Shape" type="tt:ShapeDescriptor" minOccurs="0"/>
-			<xs:element name="Color" type="tt:ColorDescriptor" minOccurs="0"/>
-			<xs:element name="Class" type="tt:ClassDescriptor" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:AppearanceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AppearanceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ShapeDescriptor">
-		<xs:sequence>
-			<xs:element name="BoundingBox" type="tt:Rectangle"/>
-			<xs:element name="CenterOfGravity" type="tt:Vector"/>
-			<xs:element name="Polygon" type="tt:Polygon" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ShapeDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ShapeDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorDescriptor">
-		<xs:sequence>
-			<xs:element name="ColorCluster" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Color" type="tt:Color"/>
-						<xs:element name="Weight" type="xs:float" minOccurs="0"/>
-						<xs:element name="Covariance" type="tt:ColorCovariance" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ColorDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ClassType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Animal"/>
-			<xs:enumeration value="Face"/>
-			<xs:enumeration value="Human"/>
-			<xs:enumeration value="Vehical"/>
-			<xs:enumeration value="Other"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptor">
-		<xs:sequence>
-			<xs:element name="ClassCandidate" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Type" type="tt:ClassType"/>
-						<xs:element name="Likelihood" type="xs:float"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ClassDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="OtherTypes" type="tt:OtherType" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ClassDescriptorExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptorExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OtherType">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Object Class Type</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Likelihood" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>A likelihood/probability that the corresponding object belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Object">
-		<xs:complexContent>
-			<xs:extension base="tt:ObjectId">
-				<xs:sequence>
-					<xs:element name="Appearance" type="tt:Appearance" minOccurs="0"/>
-					<xs:element name="Behaviour" type="tt:Behaviour" minOccurs="0"/>
-					<xs:element name="Extension" type="tt:ObjectExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Transformation">
-		<xs:sequence>
-			<xs:element name="Translate" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Scale" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:TransformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TransformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Frame">
-		<xs:sequence>
-			<xs:element name="PTZStatus" type="tt:PTZStatus" minOccurs="0"/>
-			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
-			<xs:element name="Object" type="tt:Object" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ObjectTree" type="tt:ObjectTree" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:FrameExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FrameExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="MotionInCells" type="tt:MotionInCells" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:FrameExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FrameExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Merge">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
-			<xs:element name="to" type="tt:ObjectId"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Split">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId"/>
-			<xs:element name="to" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rename">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId"/>
-			<xs:element name="to" type="tt:ObjectId"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectId">
-		<xs:attribute name="ObjectId" type="xs:integer"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Behaviour">
-		<xs:sequence>
-			<xs:element name="Removed" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Idle" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:BehaviourExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BehaviourExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectTree">
-		<xs:sequence>
-			<xs:element name="Rename" type="tt:Rename" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Split" type="tt:Split" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Merge" type="tt:Merge" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Delete" type="tt:ObjectId" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ObjectTreeExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectTreeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionInCells">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Columns" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Rows" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Cells" type="xs:base64Binary" use="required">
-			<xs:annotation>
-				<xs:documentation>A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down.  If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    Analytics Configuration    -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:RuleEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Config">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemList">
-				<xs:annotation>
-					<xs:documentation>List of configuration parameters as defined in the correspding description.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>Name of the configuration.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Type" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescription">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemListDescription">
-				<xs:annotation>
-					<xs:documentation>
-						List describing the configuration parameters. The names of the parameters must be unique. If possible SimpleItems
-						should be used to transport the information to ease parsing of dynamically defined messages by a client
-						application.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Messages" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-						The analytics modules and rule engine produce Events, which must be listed within the Analytics Module Description. In order to do so
-						the structure of the Message is defined and consists of three groups: Source, Key, and Data. It is recommended to use SimpleItemDescriptions wherever applicable.
-						The name of all Items must be unique within all Items contained in any group of this Message.
-						Depending on the component multiple parameters or none may be needed to identify the component uniquely.
-					</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tt:MessageDescription">
-							<xs:sequence>
-								<xs:element name="ParentTopic" type="xs:string">
-									<xs:annotation>
-										<xs:documentation>
-											The ParentTopic labels the message (e.g. "nn:RuleEngine/LineCrossing"). The real message can extend the ParentTopic
-											by for example the name of the instaniated rule (e.g. "nn:RuleEngine/LineCrossing/corssMyFirstLine").
-											Even without knowing the complete topic name, the subscriber will be able to distiguish the
-											messages produced by different rule instances of the same type via the Source fields of the message.
-											There the name of the rule instance, which produced the message, must be listed.
-										</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ConfigDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>XML Type of the Configuration (e.g. "tt::LineDetector"). </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRules">
-		<xs:sequence>
-			<xs:element name="RuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the location of all schemas that are referenced in the rules.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of rules supported by the Video Analytics configuration..</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SupportedRulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModules">
-		<xs:sequence>
-			<xs:element name="AnalyticsModuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>It optionally contains a list of URLs that provide the location of schema files.
-        These schema files describe the types and elements used in the analytics module descriptions.
-        If the analytics module descriptions reference types or elements of the ONVIF schema file,
-        the ONVIF schema file MUST be explicitly listed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SupportedAnalyticsModulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolygonConfiguration">
-		<xs:sequence>
-			<xs:element name="Polygon" type="tt:Polygon">
-				<xs:annotation>
-					<xs:documentation>Contains Polygon configuration for rule parameters</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArray">
-		<xs:sequence>
-			<xs:element name="Segment" type="tt:Polyline" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Contains array of Polyline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PolylineArrayExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayConfiguration">
-		<xs:sequence>
-			<xs:element name="PolylineArray" type="tt:PolylineArray">
-				<xs:annotation>
-					<xs:documentation>Contains PolylineArray configuration data</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpression">
-		<xs:sequence>
-			<xs:element name="Expression" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Motion Expression data structure contains motion expression which is based on Scene Descriptor schema with XPATH syntax. The Type argument could allow introduction of different dialects </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:string"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpressionConfiguration">
-		<xs:sequence>
-			<xs:element name="MotionExpression" type="tt:MotionExpression">
-				<xs:annotation>
-					<xs:documentation>Contains Rule MotionExpression configuration</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CellLayout">
-		<xs:sequence>
-			<xs:element name="Transformation" type="tt:Transformation">
-				<xs:annotation>
-					<xs:documentation>Mapping of the cell grid to the Video frame. The cell grid is starting from the upper left corner and x dimension is going from left to right and the y dimension from up to down.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Columns" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Rows" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Event and Analytics Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Metadata Streaming Types    -->
-	<!--===============================-->
-	<xs:complexType name="MetadataStream">
-		<xs:sequence>
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element name="VideoAnalytics" type="tt:VideoAnalyticsStream"/>
-				<xs:element name="PTZ" type="tt:PTZStream"/>
-<!--
-				<xs:element name="Event" type="tt:EventStream"/>
--->
-				<xs:element name="Event" type="xs:anyType"/>
-				<xs:element name="Extension" type="tt:MetadataStreamExtension"/>
-			</xs:choice>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AudioAnalyticsStream" type="tt:AudioAnalyticsStream" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:MetadataStreamExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataStreamExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAnalyticsStream">
-		<xs:sequence>
-			<xs:element name="AudioDescriptor" type="tt:AudioDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AudioAnalyticsStreamExtension" minOccurs="0" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioDescriptor">
-		<xs:sequence>
-		<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="UtcTime" type="xs:dateTime" use="required">
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAnalyticsStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:element name="MetadataStream" type="tt:MetadataStream"/>
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="Frame" type="tt:Frame"/>
-			<xs:element name="Extension" type="tt:VideoAnalyticsStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="PTZStatus" type="tt:PTZStatus"/>
-			<xs:element name="Extension" type="tt:PTZStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-<!--
-	<xs:complexType name="EventStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="wsnt:NotificationMessage"/>
-			<xs:element name="Extension" type="tt:EventStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
--->
-	<!--===============================-->
-	<xs:complexType name="EventStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!-- End, Metadata Streaming Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Display Related Types  -->
-	<!--===============================-->
-	<xs:complexType name="PaneConfiguration">
-		<xs:annotation>
-			<xs:documentation>Configuration of the streaming and coding settings of a Video window.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneName" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional name of the pane configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioOutputToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio outputs, this element contains a pointer to the audio output that is associated with the pane. A client
-can retrieve the available audio outputs of a device using the GetAudioOutputs command of the DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio sources, this element contains a pointer to the audio source that is associated with this pane.
-The audio connection from a decoder device to the NVT is established using the backchannel mechanism. A client can retrieve the available audio sources of a device using the GetAudioSources command of the
-DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The configuration of the audio encoder including codec, bitrate
-and sample rate. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ReceiverToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>A pointer to a Receiver that has the necessary information to receive
-				data from a Transmitter. This Receiver can be connected and the network video decoder displays the received data on the specified outputs. A client can retrieve the available Receivers using the
-				GetReceivers command of the Receiver Service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>A unique identifier in the display device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayout">
-		<xs:annotation>
-			<xs:documentation>A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Pane" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Reference to the configuration of the streaming and coding parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Area" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>Describes the location and size of the area on the monitor. The area coordinate values are espressed in normalized units [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Layout">
-		<xs:annotation>
-			<xs:documentation>A layout describes a set of Video windows that are displayed simultaniously on a display. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayout" type="tt:PaneLayout" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of panes assembling the display layout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CodingCapabilities">
-		<xs:annotation>
-			<xs:documentation>This type contains the Audio and Video coding capabilities of a display service.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="AudioEncodingCapabilities" type="tt:AudioEncoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio encoding this section describes the supported codecs and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecodingCapabilities" type="tt:AudioDecoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio decoding this section describes the supported codecs and their settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoDecodingCapabilities" type="tt:VideoDecoderConfigurationOptions">
-				<xs:annotation>
-					<xs:documentation>This section describes the supported video codesc and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptions">
-		<xs:annotation>
-			<xs:documentation>The options supported for a display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayoutOptions" type="tt:PaneLayoutOptions" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the possible Pane Layouts of the Video Output</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayoutOptions">
-		<xs:annotation>
-			<xs:documentation>Description of a pane layout describing a complete display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Area" type="tt:Rectangle" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of areas assembling a layout. Coordinate values are in the range [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PaneOptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneOptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Display Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Receiver Types              -->
-	<!--===============================-->
-	<xs:complexType name="Receiver">
-		<xs:annotation>
-			<xs:documentation>
-			Description of a receiver, including its token and configuration.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:ReceiverConfiguration">
-				<xs:annotation>
-					<xs:documentation>Describes the configuration of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-			Describes the configuration of a receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReceiverMode">
-				<xs:annotation>
-					<xs:documentation>The following connection modes are defined:</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MediaUri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Details of the URI to which the receiver should connect.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamSetup" type="tt:StreamSetup">
-				<xs:annotation>
-					<xs:documentation>Stream connection parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverMode">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies a receiver connection mode.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AutoConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver connects on demand, as required by consumers of the media streams.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="AlwaysConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver attempts to maintain a persistent connection to the configured endpoint.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NeverConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver does not attempt to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverState">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies the current connection state of the receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NotConnected">
-				<xs:annotation>
-					<xs:documentation>The receiver is not connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connecting">
-				<xs:annotation>
-					<xs:documentation>The receiver is attempting to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connected">
-				<xs:annotation>
-					<xs:documentation>The receiver is connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverStateInformation">
-		<xs:annotation>
-			<xs:documentation>
-			Contains information about a receiver's current state.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="State" type="tt:ReceiverState">
-				<xs:annotation>
-					<xs:documentation>The connection state of the receiver may have one of the following states: </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreated" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the receiver was created automatically.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Receiver Types         					  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Storage Types         -->
-	<!--===============================-->
-	<xs:simpleType name="ReceiverReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SourceReference">
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:anyURI" use="optional" default="http://www.onvif.org/ver10/schema/Receiver"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Description">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DateTimeRange">
-		<xs:sequence>
-			<xs:element name="From" type="xs:dateTime"/>
-			<xs:element name="Until" type="xs:dateTime"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSummary">
-		<xs:sequence>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The earliest point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataUntil" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The most recent point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NumberRecordings" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The device contains this many recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScope">
-		<xs:annotation>
-			<xs:documentation>A structure for defining a limited scope when searching in recorded data.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="IncludedSources" type="tt:SourceReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of sources that are included in the scope. If this list is included, only data from one of these sources shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IncludedRecordings" type="tt:RecordingReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of recordings that are included in the scope. If this list is included, only data from one of these recordings shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformationFilter" type="tt:XPathExpression" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An xpath expression used to specify what recordings to search. Only those recordings with an RecordingInformation structure that matches the filter shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SearchScopeExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extension point</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScopeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-<!--
-	<xs:complexType name="EventFilter">
-		<xs:complexContent>
-			<xs:extension base="wsnt:FilterType">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
--->
-	<!--===============================-->
-	<xs:complexType name="PTZPositionFilter">
-		<xs:sequence>
-			<xs:element name="MinPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The lower boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The upper boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EnterOrExit" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, search for when entering the specified PTZ volume.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataFilter">
-		<xs:sequence>
-			<xs:element name="MetadataStreamFilter" type="tt:XPathExpression"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="XPathExpression">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FindRecordingResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformation" type="tt:RecordingInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A RecordingInformation structure for each found recording matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindEventResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindEventResult structure for each found event matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>The recording where this event was found. Empty string if no recording is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the track where this event was found. Empty string if no track is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the event occured.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-<!--
-			<xs:element name="Event" type="wsnt:NotificationMessageHolderType">
--->
-			<xs:element name="Event" type="xs:anyType">
-				<xs:annotation>
-					<xs:documentation>The description of the event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartStateEvent" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, indicates that the event is a virtual event generated for this particular search session to give the state of a property at the start time of the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindPTZPositionResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindPTZPositionResult structure for each found PTZ position matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the PTZ position was valid.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindMetadataResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindMetadataResult structure for each found set of Metadata matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the matching metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The point in time when the matching metadata occurs in the metadata track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="SearchState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Queued">
-				<xs:annotation>
-					<xs:documentation>The search is queued and not yet started.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Searching">
-				<xs:annotation>
-					<xs:documentation>The search is underway and not yet completed.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Completed">
-				<xs:annotation>
-					<xs:documentation>The search has been completed and no new results will be found.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>The state of the search is unknown. (This is not a valid response from GetSearchState.)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="JobToken">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference"/>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>
-					Information about the source of the recording. This gives a description of where the data in the recording comes from. Since a single
-					recording is intended to record related material, there is just one source. It is indicates the physical location or the
-					major data source for the recording. Currently the recordingconfiguration cannot describe each individual data source.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EarliestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="LatestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="Content" type="tt:Description"/>
-			<xs:element name="Track" type="tt:TrackInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingStatus" type="tt:RecordingStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSourceInformation">
-		<xs:annotation>
-			<xs:documentation>
-				A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SourceId" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-				Identifier for the source chosen by the client that creates the structure.
-				This identifier is opaque to the device. Clients may use any type of URI for this field. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>Informative user readable name of the source, e.g. "Camera23". A device shall support at least 20 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Location" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the physical location of the source, e.g. the coordinates on a map.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Address" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>URI provided by the service supplying data to be recorded. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initiated"/>
-			<xs:enumeration value="Recording"/>
-			<xs:enumeration value="Stopped"/>
-			<xs:enumeration value="Removing"/>
-			<xs:enumeration value="Removed"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="TrackInformation">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference"/>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track: "Video", "Audio" or "Metadata".
-					The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the contents of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The start date and time of the oldest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataTo" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The stop date and time of the newest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Video"/>
-			<xs:enumeration value="Audio"/>
-			<xs:enumeration value="Metadata"/>
-			<xs:enumeration value="Extended">
-				<xs:annotation>
-					<xs:documentation>Placeholder for future extension.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaAttributes">
-		<xs:annotation>
-			<xs:documentation>A set of media attributes valid for a recording at a point in time or for a time interval.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording that has these attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackAttributes" type="tt:TrackAttributes" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A set of attributes for each track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="From" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid from this point in time in the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Until" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid until this point in time in the recording. Can be equal to 'From' to indicate that the attributes are only known to be valid for this particular point in time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributes">
-		<xs:sequence>
-			<xs:element name="TrackInformation" type="tt:TrackInformation">
-				<xs:annotation>
-					<xs:documentation>The basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAttributes" type="tt:VideoAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is a video track, exactly one of this structure shall be present and contain the video attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioAttributes" type="tt:AudioAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an audio track, exactly one of this structure shall be present and contain the audio attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataAttributes" type="tt:MetadataAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an metadata track, exactly one of this structure shall be present and contain the metadata attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:TrackAttributesExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation/>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Average bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The width of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The height of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="tt:VideoEncoding">
-				<xs:annotation>
-					<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Framerate" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Average framerate in frames per second.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="tt:AudioEncoding">
-				<xs:annotation>
-					<xs:documentation>Audio codec used for encoding the audio (either G.711, G.726 or AAC)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Samplerate" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The sample rate in kHz.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataAttributes">
-		<xs:sequence>
-			<xs:element name="CanContainPTZ" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be PTZ data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainAnalytics" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be analytics data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainNotifications" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be notifications in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="PtzSpaces" type="tt:StringAttrList">
-			<xs:annotation>
-				<xs:documentation>List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingConfiguration">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>Information about the source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Content" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRetentionTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Sspecifies the maximum time that data in any track within the
-				recording shall be stored. The device shall delete any data older than the maximum retention
-				time. Such data shall not be accessible anymore. If the MaximumRetentionPeriod is set to 0,
-				the device shall not limit the retention time of stored data, except by resource constraints.
-				Whatever the value of MaximumRetentionTime, the device may automatically delete
-				recordings to free up storage space for new recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackConfiguration">
-		<xs:sequence>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track. It shall be equal to the strings “Video”,
-				“Audio” or “Metadata”. The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingsResponseItem">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Token of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:RecordingConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:GetTracksResponseList">
-				<xs:annotation>
-					<xs:documentation>List of tracks.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseList">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:GetTracksResponseItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Configuration of a track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseItem">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Token of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:TrackConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfiguration">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the recording to which this job shall store the received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mode" type="tt:RecordingJobMode">
-				<xs:annotation>
-					<xs:documentation>The mode of the job. If it is idle, nothing shall happen. If it is active, the device shall try
-				to obtain data from the receivers. A client shall use GetRecordingJobState to determine if data transfer is really taking place.<br/>
-				The only valid values for Mode shall be “Idle” and “Active”.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>This shall be a non-negative number. If there are multiple recording jobs that store data to
-				the same track, the device will only store the data for the recording job with the highest
-				priority. The priority is specified per recording job, but the device shall determine the priority
-				of each track individually. If there are two recording jobs with the same priority, the device
-				shall record the data corresponding to the recording job that was activated the latest.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Source" type="tt:RecordingJobSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobMode">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>This field shall be a reference to the source of the data. The type of the source
-				is determined by the attribute Type in the SourceToken structure. If Type is
-				http://www.onvif.org/ver10/schema/Receiver, the token is a ReceiverReference. In this case
-				the device shall receive the data over the network. If Type is
-				http://www.onvif.org/ver10/schema/Profile, the token identifies a media profile, instructing the
-				device to obtain data from a profile that exists on the local device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreateReceiver" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If this field is TRUE, and if the SourceToken is omitted, the device
-				shall create a receiver object (through the receiver service) and assign the
-				ReceiverReference to the SourceToken field. When retrieving the RecordingJobConfiguration
-				from the device, the AutoCreateReceiver field shall never be present.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobTrack" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of tracks associated with the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobSourceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>If the received RTSP stream contains multiple tracks of the same type, the
-						SourceTag differentiates between those Tracks. This field can be ignored in case of recording a local source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>The destination is the tracktoken of the track to which the device shall store the
-				received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identification of the recording that the recording job records to.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over the whole RecordingJobInformation structure.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sources" type="tt:RecordingJobStateSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobStateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobState">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over all substructures of RecordingJobStateSource.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobStateTracks">
-				<xs:annotation>
-					<xs:documentation>List of track items.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTracks">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:RecordingJobStateTrack" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Identifies the track of the data source that provides the data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Indicates the destination track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optionally holds an implementation defined string value that describes the error.
-				The string should be in the English language.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Provides the job state of the track. The valid
-				values of state shall be “Idle”, “Active” and “Error”. If state equals “Error”, the Error field may be filled in with an implementation defined value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingJobsResponseItem">
-		<xs:sequence>
-			<xs:element name="JobToken" type="tt:RecordingJobReference"/>
-			<xs:element name="JobConfiguration" type="tt:RecordingJobConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Replay Types         		  -->
-	<!--===============================-->
-	<xs:complexType name="ReplayConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-      Configuration parameters for the replay service.
-    </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SessionTimeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>The RTSP session timeout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Replay Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Analytics Device Types         -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngine">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsDeviceEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="EngineConfiguration" type="tt:EngineConfiguration" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EngineConfiguration">
-		<xs:sequence>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-			<xs:element name="AnalyticsEngineInputInfo" type="tt:AnalyticsEngineInputInfo"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfo">
-		<xs:sequence>
-			<xs:element name="InputInfo" type="tt:Config" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineInputInfoExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfoExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInput">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceIdentification" type="tt:SourceIdentification"/>
-					<xs:element name="VideoInput" type="tt:VideoEncoderConfiguration"/>
-					<xs:element name="MetadataInput" type="tt:MetadataInput"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentification">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Token" type="tt:ReferenceToken" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SourceIdentificationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentificationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInput">
-		<xs:sequence>
-			<xs:element name="MetadataConfig" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MetadataInputExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInputExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineControl">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="EngineToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine (AnalyticsEngine) being controlled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="EngineConfigToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine configuration (VideoAnalyticsConfiguration) in effect.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="InputToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the input (AnalyticsEngineInput) configuration applied.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ReceiverToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the receiver providing media input data. The order of ReceiverToken shall exactly match the order of InputToken.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0"/>
-					<xs:element name="Subscription" type="tt:Config"/>
-					<xs:element name="Mode" type="tt:ModeOfOperation"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ModeOfOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Active"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsStateInformation">
-		<xs:sequence>
-			<xs:element name="AnalyticsEngineControlToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Token of the control object whose status is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:AnalyticsState"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsState">
-		<xs:sequence>
-			<xs:element name="Error" type="xs:string" minOccurs="0"/>
-			<xs:element name="State" type="xs:string"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Analytics Device Types         -->
-	<!--===============================-->
-	<!--=========================================-->
-	<!--  Action event payload Types   -->
-	<!--=========================================-->
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayload">
-		<xs:annotation>
-			<xs:documentation>Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RequestInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Request Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Response Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Fault" type="soapenv:Fault" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Fault Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ActionEngineEventPayloadExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayloadExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Action event payload Types   -->
-	<!--=========================================-->
-        <!--=========================================-->
-	<!--  Begin, Audio event types               -->
-	<!--=========================================-->
-	<xs:simpleType name="AudioClassType">
-		<xs:annotation>
-		<xs:documentation>
-		  AudioClassType acceptable values are;
-		   gun_shot, scream, glass_breaking, tire_screech   
-		</xs:documentation>
-		</xs:annotation>
-	<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-
-	<xs:complexType name="AudioClassCandidate">
-	<xs:sequence>
-		<xs:element name="Type" type="tt:AudioClassType">
-			<xs:annotation>
-			<xs:documentation>Indicates audio class label</xs:documentation>
-			</xs:annotation>
-		</xs:element> 
- 		<xs:element name="Likelihood" type="xs:float">
-			<xs:annotation>
-			<xs:documentation>A likelihood/probability that the corresponding audio event belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
-			</xs:annotation>
-		</xs:element>  
-		<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-
-	<xs:complexType name="AudioClassDescriptor">
-	<xs:sequence>
-		<xs:element name="ClassCandidate" type="tt:AudioClassCandidate" minOccurs="0" maxOccurs="unbounded">
-			<xs:annotation>
-			<xs:documentation>Array of audio class label and class probability</xs:documentation>
-			</xs:annotation>
-		</xs:element>
-		<xs:element name="Extension" type="tt:AudioClassDescriptorExtension" minOccurs="0"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<xs:complexType name="AudioClassDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Audio event types                 -->
-	<!--=========================================-->	
-	<!--==================================-->
-	<!--  Begin, OSD Device Types         -->
-	<!--==================================-->
-	<xs:complexType name="OSDReference">
-		<xs:simpleContent>
-			<xs:extension base="tt:ReferenceToken">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="OSDType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Text"/>
-			<xs:enumeration value="Image"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>For OSD position type, following are the pre-defined: <ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Pos" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:OSDPosConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColor">
-		<xs:annotation>
-			<xs:documentation>The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:Color"/>
-		</xs:sequence>
-		<xs:attribute name="Transparent" type="xs:int" use="optional"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-						The following OSD Text Type are defined:<ul>
-							<li>Plain - The Plain type means the OSD is shown as a text string which defined in the "PlainText" item.</li>
-							<li>Date - The Date type means the OSD is shown as a date, format of which should be present in the "DateFormat" item.</li>
-							<li>Time - The Time type means the OSD is shown as a time, format of which should be present in the "TimeFormat" item.</li>
-							<li>DateAndTime - The DateAndTime type means the OSD is shown as date and time, format of which should be present in the "DateFormat" and the "TimeFormat" item.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD date formats. This element shall be present when the value of Type field has Date or DateAndTime. The following DateFormat are defined:<ul>
-							<li>M/d/yyyy - e.g. 3/6/2013</li>
-							<li>MM/dd/yyyy - e.g. 03/06/2013</li>
-							<li>dd/MM/yyyy - e.g. 06/03/2013</li>
-							<li>yyyy/MM/dd - e.g. 2013/03/06</li>
-							<li>yyyy-MM-dd - e.g. 2013-06-03</li>
-							<li>dddd, MMMM dd, yyyy - e.g. Wednesday, March 06, 2013</li>
-							<li>MMMM dd, yyyy - e.g. March 06, 2013</li>
-							<li>dd MMMM, yyyy - e.g. 06 March, 2013</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD time formats. This element shall be present when the value of Type field has Time or DateAndTime. The following TimeFormat are defined:<ul>
-							<li>h:mm:ss tt - e.g. 2:14:21 PM</li>
-							<li>hh:mm:ss tt - e.g. 02:14:21 PM</li>
-							<li>H:mm:ss - e.g. 14:14:21</li>
-							<li>HH:mm:ss - e.g. 14:14:21</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSize" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font size of the text in pt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Background color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PlainText" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The content of text to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfiguration">
-		<xs:sequence>
-			<xs:element name="ImgPath" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The URI of the image which to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorspaceRange">
-		<xs:sequence>
-			<xs:element name="X" type="tt:FloatRange"/>
-			<xs:element name="Y" type="tt:FloatRange"/>
-			<xs:element name="Z" type="tt:FloatRange"/>
-			<xs:element name="Colorspace" type="xs:anyURI"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color supported. Either list each color or define the range of color value. The following values are acceptable for Colourspace attribute.<ul><li>http://www.onvif.org/ver10/colorspace/YCbCr - YCbCr colourspace</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELUV - CIE LUV</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELAB - CIE 1976 (L*a*b*)</li>
-				<li>http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace</li></ul>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="ColorList" type="tt:Color" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>List the supported color.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="ColorspaceRange" type="tt:ColorspaceRange" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>Define the rang of color supported.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:choice>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color and its transparency.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:ColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional list of supported colors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transparent" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the transparent level. Larger means more tranparent.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDColorOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptions">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported OSD text type. When a device indicates the supported number relating to Text type in MaximumNumberOfOSDs, the type shall be presented.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSizeRange" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the font size value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported date format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported time format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported font color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported background color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptions">
-		<xs:sequence>
-			<xs:element name="ImagePath" type="xs:anyURI" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of avaiable uris of image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="VideoSourceConfigurationToken" type="tt:OSDReference">
-						<xs:annotation>
-							<xs:documentation>Reference to the video source configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Type" type="tt:OSDType">
-						<xs:annotation>
-							<xs:documentation>Type of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Position" type="tt:OSDPosConfiguration">
-						<xs:annotation>
-							<xs:documentation>Position configuration of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TextString" type="tt:OSDTextConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Text configuration of OSD. It shall be present when the value of Type field is Text.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Image" type="tt:OSDImgConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Image configuration of OSD. It shall be present when the value of Type field is Image</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:OSDConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MaximumNumberOfOSDs">
-		<xs:attribute name="Total" type="xs:int" use="required"/>
-		<xs:attribute name="Image" type="xs:int"/>
-		<xs:attribute name="PlainText" type="xs:int"/>
-		<xs:attribute name="Date" type="xs:int"/>
-		<xs:attribute name="Time" type="xs:int"/>
-		<xs:attribute name="DateAndTime" type="xs:int"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfOSDs" type="tt:MaximumNumberOfOSDs">
-				<xs:annotation>
-					<xs:documentation>The maximum number of OSD configurations supported for the specificate video source configuration. If a device limits the number of instances by OSDType, it should indicate the supported number via the related attribute.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Type" type="tt:OSDType" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List supported type of OSD configuration. When a device indicates the supported number for each types in MaximumNumberOfOSDs, related type shall be presented. A device shall return Option element relating to listed type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PositionOption" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List available OSD position type. Following are the pre-defined:<ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TextOption" type="tt:OSDTextOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD text configuration. This element shall be returned if the device is signaling the support for Text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ImageOption" type="tt:OSDImgOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD image configuration. This element shall be returned if the device is signaling the support for Image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, OSD Device Types                  -->
-	<!--=========================================-->
-</xs:schema>
diff --git a/onvif/wsdl/onvif.xsd b/onvif/wsdl/onvif.xsd
deleted file mode 100644
index 252204e2f..000000000
--- a/onvif/wsdl/onvif.xsd
+++ /dev/null
@@ -1,8559 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<?xml-stylesheet type="text/xsl" href="onvif-schema-viewer.xsl"?>-->
-<!--
-Copyright (c) 2008-2014 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<xs:schema xmlns:tt="http://www.onvif.org/ver10/schema" 
-           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-           xmlns:xmime="http://www.w3.org/2005/05/xmlmime" 
-           xmlns:wsnt="http://docs.oasis-open.org/wsn/b-2" 
-           xmlns:xop="http://www.w3.org/2004/08/xop/include" 
-           xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" 
-           targetNamespace="http://www.onvif.org/ver10/schema" elementFormDefault="qualified" version="2.4.2">
-	<xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="http://www.w3.org/2005/05/xmlmime"/>
-	<xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/" schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
-<!--
-	<xs:import namespace="http://docs.oasis-open.org/wsn/b-2" schemaLocation="file:b-2.xsd"/>
--->
-	<xs:import namespace="http://www.w3.org/2004/08/xop/include" schemaLocation="http://www.w3.org/2004/08/xop/include"/>
-	<!--===============================-->
-	<!--         Generic Types         -->
-	<!--===============================-->
-	<xs:complexType name="DeviceEntity">
-		<xs:annotation>
-			<xs:documentation>Base class for physical entities like inputs and outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier referencing the physical entity.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReferenceToken">
-		<xs:annotation>
-			<xs:documentation>Unique identifier for a physical or logical resource.
-			Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class.
-			Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Name">
-		<xs:annotation>
-			<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="64"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangle">
-		<xs:annotation>
-			<xs:documentation>Rectangle defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="x" type="xs:int" use="required"/>
-		<xs:attribute name="y" type="xs:int" use="required"/>
-		<xs:attribute name="width" type="xs:int" use="required"/>
-		<xs:attribute name="height" type="xs:int" use="required"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRectangleRange">
-		<xs:annotation>
-			<xs:documentation>Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="XRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of X-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of Y-axis.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WidthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of width.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HeightRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of height.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:int"/>
-			<xs:element name="Max" type="xs:int"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FloatRange">
-		<xs:annotation>
-			<xs:documentation>Range of values greater equal Min value and less equal Max value.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:float"/>
-			<xs:element name="Max" type="xs:float"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DurationRange">
-		<xs:annotation>
-			<xs:documentation>Range of duration greater equal Min duration and less equal Max duration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Min" type="xs:duration"/>
-			<xs:element name="Max" type="xs:duration"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IntList">
-		<xs:annotation>
-			<xs:documentation>List of values.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Items" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IntAttrList">
-		<xs:list itemType="xs:int"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="FloatAttrList">
-		<xs:list itemType="xs:float"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="StringAttrList">
-		<xs:list itemType="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FloatList">
-		<xs:sequence>
-			<xs:element name="Items" type="xs:float" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnyHolder">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Generic Types       -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Media Related Types      -->
-	<!--===============================-->
-	<xs:complexType name="VideoSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Framerate" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Frame rate in frames per second.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Horizontal and vertical resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Imaging" type="tt:ImagingSettings" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional configuration of the image sensor.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoSourceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Imaging" type="tt:ImagingSettings20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the image sensor. To be used if imaging service 2.00 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSource">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio input.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Channels" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>number of available audio channels. (1: mono, 2: stereo) </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Profile">
-		<xs:annotation>
-			<xs:documentation>
-			A media profile consists of a set of media configurations. Media profiles are used by a client
-			to configure properties of a media stream from an NVT.<br/>
-			An NVT shall provide at least one media profile at boot. An NVT should provide “ready to use”
-			profiles for the most common media configurations that the device offers.<br/>
-			A profile consists of a set of interconnected configuration entities. Configurations are provided
-			by the NVT and can be either static or created dynamically by the NVT. For example, the
-			dynamic configurations can be created by the NVT depending on current available encoding
-			resources.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name of the profile.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio input.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Video encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio encoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the video analytics module and rule engine.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the pan tilt zoom unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the metadata stream.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extensions defined in ONVIF 2.0</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of the profile.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="fixed" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>A value of true signals that the profile cannot be deleted. Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional configuration of the Audio decoder.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ProfileExtension2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:element name="VideoSourceConfiguration" type="tt:VideoSourceConfiguration"/>
-	<xs:element name="AudioSourceConfiguration" type="tt:AudioSourceConfiguration"/>
-	<xs:element name="VideoEncoderConfiguration" type="tt:VideoEncoderConfiguration"/>
-	<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration"/>
-	<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-	<xs:element name="PTZConfiguration" type="tt:PTZConfiguration"/>
-	<xs:element name="MetadataConfiguration" type="tt:MetadataConfiguration"/>
-	<xs:element name="AudioOutputConfiguration" type="tt:AudioOutputConfiguration"/>
-	<xs:element name="AudioDecoderConfiguration" type="tt:AudioDecoderConfiguration"/>
-	<!--===============================-->
-	<xs:complexType name="ConfigurationEntity">
-		<xs:annotation>
-			<xs:documentation>Base type defining the common properties of a configuration.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>User readable name. Length up to 64 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UseCount" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of internal references currently using this configuration. <br/>This parameter is read-only and cannot be changed by a set request. <br/>For example the value increases if the configuration is added to a media profile or attached to a PaneConfiguration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken" use="required">
-			<xs:annotation>
-				<xs:documentation>Token that uniquely refernces this configuration. Length up to 64 characters.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Reference to the physical input.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bounds" type="tt:IntRectangle">
-						<xs:annotation>
-							<xs:documentation>Rectangle specifying the Video capturing area. The capturing area shall not be larger than the whole Video source area.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension">
-		<xs:sequence>
-			<xs:element name="Rotate" type="tt:Rotate" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure rotation of captured image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rotate">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Degree" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to configure how much degree of clockwise rotation of image  for On mode. Omitting this parameter for On mode means 180 degree rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RotateMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="BoundsRange" type="tt:IntRectangleRange">
-				<xs:annotation>
-					<xs:documentation>Supported range for the capturing area.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoSourceTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of physical inputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Rotate" type="tt:RotateOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Rotation feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoSourceConfigurationOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoSourceConfigurationOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RotateMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Rotate mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DegreeList" type="tt:IntList" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported degree value for rotation.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RotateOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RotateOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   VideoEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:VideoEncoding">
-						<xs:annotation>
-							<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Resolution" type="tt:VideoResolution">
-						<xs:annotation>
-							<xs:documentation>Configured video resolution</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Quality" type="xs:float">
-						<xs:annotation>
-							<xs:documentation>Relative value for the video quantizers and the quality of the video. A high value within supported quality range means higher quality</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RateControl" type="tt:VideoRateControl" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure rate control related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MPEG4" type="tt:Mpeg4Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure Mpeg4 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="H264" type="tt:H264Configuration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure H.264 related parameters.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related video stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="VideoEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="JPEG"/>
-			<xs:enumeration value="MPEG4"/>
-			<xs:enumeration value="H264"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Mpeg4Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="SP"/>
-			<xs:enumeration value="ASP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="H264Profile">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Baseline"/>
-			<xs:enumeration value="Main"/>
-			<xs:enumeration value="Extended"/>
-			<xs:enumeration value="High"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="VideoResolution">
-		<xs:sequence>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the columns of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Number of the lines of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoRateControl">
-		<xs:sequence>
-			<xs:element name="FrameRateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum output framerate in fps. If an EncodingInterval is provided the resulting encoded framerate will be reduced by the given factor.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingInterval" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Interval at which images are encoded and transmitted. (A value of 1 means that every frame is encoded, a value of 2 means that every 2nd frame is encoded ...)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateLimit" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>the maximum output bitrate in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Determines the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4Profile" type="tt:Mpeg4Profile">
-				<xs:annotation>
-					<xs:documentation>the Mpeg4 profile, either simple profile (SP) or advanced simple profile (ASP)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Configuration">
-		<xs:sequence>
-			<xs:element name="GovLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Group of Video frames length. Determines typically the interval in which the I-Frames will be coded. An entry of 1 indicates I-Frames are continuously generated. An entry of 2 indicates that every 2nd image is an I-Frame, and 3 only every 3rd frame, etc. The frames in between are coded as P or B Frames.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264Profile" type="tt:H264Profile">
-				<xs:annotation>
-					<xs:documentation>the H.264 profile, either baseline, main, extended or high</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="QualityRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Range of the quality values. A high value means higher quality.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="JPEG" type="tt:JpegOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges (See also Extension element).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="JPEG" type="tt:JpegOptions2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional JPEG encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MPEG4" type="tt:Mpeg4Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional MPEG-4 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264" type="tt:H264Options2" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional H.264 encoder settings ranges.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoEncoderOptionsExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoEncoderOptionsExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegOptions2">
-		<xs:complexContent>
-			<xs:extension base="tt:JpegOptions">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4ProfilesSupported" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported MPEG-4 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:Mpeg4Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported image sizes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GovLengthRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported group of Video frames length. This value typically corresponds to the I-Frame distance.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FrameRateRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported frame rate in fps (frames per second).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EncodingIntervalRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported encoding interval range. The encoding interval corresponds to the number of frames devided by the encoded frames. An encoding interval value of "1" means that all frames are encoded.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264ProfilesSupported" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264Options2">
-		<xs:complexContent>
-			<xs:extension base="tt:H264Options">
-				<xs:sequence>
-					<xs:element name="BitrateRange" type="tt:IntRange">
-						<xs:annotation>
-							<xs:documentation>Supported range of encoded bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    AudioSourceConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Audio Source the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="InputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the audio source the configuration can be used for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioSourceOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioSourceOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   AudioEncoderConfiguration   -->
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="Encoding" type="tt:AudioEncoding">
-						<xs:annotation>
-							<xs:documentation>Audio codec used for encoding the audio input (either G.711, G.726 or AAC)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Bitrate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output bitrate in kbps.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SampleRate" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>The output sample rate in kHz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AudioEncoding">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="G711"/>
-			<xs:enumeration value="G726"/>
-			<xs:enumeration value="AAC"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Options" type="tt:AudioEncoderConfigurationOption" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>list of supported AudioEncoderConfigurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioEncoderConfigurationOption">
-		<xs:sequence>
-			<xs:element name="Encoding" type="tt:AudioEncoding">
-				<xs:annotation>
-					<xs:documentation>The enoding used for audio data (either G.711, G.726 or AAC)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BitrateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateList" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported Sample Rates in kHz for the specified Encoding</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  VideoAnalyticsConfiguration  -->
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration"/>
-					<xs:element name="RuleEngineConfiguration" type="tt:RuleEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    MetadataConfiguration      -->
-	<!--===============================-->
-	<xs:complexType name="MetadataConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="PTZStatus" type="tt:PTZFilter" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>optional element to configure which PTZ related data is to include in the metadata stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Events" type="tt:EventSubscription" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optional element to configure the streaming of events. A client might be interested in receiving all, 
-								none or some of the events produced by the device:<ul>
-									<li>To get all events: Include the Events element but do not include a filter.</li>
-									<li>To get no events: Do not include the Events element.</li>
-									<li>To get only some events: Include the Events element and include a filter in the element.</li>
-								</ul>
-							</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Analytics" type="xs:boolean" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Defines whether the streamed metadata will include metadata from the analytics engines (video, cell motion, audio etc.)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration">
-						<xs:annotation>
-							<xs:documentation>Defines the multicast settings that could be used for video streaming.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SessionTimeout" type="xs:duration">
-						<xs:annotation>
-							<xs:documentation>The rtsp session timeout for the related audio stream</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsEngineConfiguration" minOccurs="0"/>
-					<xs:element name="Extension" type="tt:MetadataConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZFilter">
-		<xs:sequence>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ status (IDLE, MOVING or UNKNOWN)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the metadata stream shall contain the PTZ position</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventSubscription">
-		<xs:annotation>
-			<xs:documentation>Subcription handling in the same way as base notification subscription.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Filter" type="wsnt:FilterType" minOccurs="0"/>
-			<xs:element name="SubscriptionPolicy" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="PTZStatusFilterOptions" type="tt:PTZStatusFilterOptions"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptions">
-		<xs:sequence>
-			<xs:element name="PanTiltStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream pan or tilt status information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomStatusSupported" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom status inforamtion.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PanTiltPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream the pan or tilt position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSupported" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>True if the device is able to stream zoom position information.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZStatusFilterOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatusFilterOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutput            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical video outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Layout" type="tt:Layout"/>
-					<xs:element name="Resolution" type="tt:VideoResolution" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Resolution of the display in Pixel.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="RefreshRate" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Refresh rate of the display in Hertz.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AspectRatio" type="xs:float" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Aspect ratio of the display as physical extent of width divided by height.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:VideoOutputExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoOutputExtension">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the Video Output the configuration applies to</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          VideoDecoderConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="JpegDecOptions" type="tt:JpegDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Jpeg streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="H264DecOptions" type="tt:H264DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode H.264 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mpeg4DecOptions" type="tt:Mpeg4DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode Mpeg4 streams this element describes the supported codecs and configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:VideoDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="H264DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H.264 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedH264Profiles" type="tt:H264Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported H264 Profiles (either baseline, main, extended or high) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported H.264 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="JpegDecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Jpeg Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Jpeg framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Mpeg4DecOptions">
-		<xs:sequence>
-			<xs:element name="ResolutionsAvailable" type="tt:VideoResolution" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Video Resolutions</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedMpeg4Profiles" type="tt:Mpeg4Profile" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported Mpeg4 Profiles (either SP or ASP) </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedInputBitrate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 bitrate range in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedFrameRate" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Supported Mpeg4 framerate range in fps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputs            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutput">
-		<xs:annotation>
-			<xs:documentation>Representation of a physical audio outputs.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfiguration            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="OutputToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the phsycial Audio output.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SendPrimacy" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-						An audio channel MAY support different types of audio transmission. While for full duplex
-						operation no special handling is required, in half duplex operation the transmission direction
-						needs to be switched.
-						The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-						direction is currently active. An NVC can switch between different modes by setting the
-						AudioOutputConfiguration.<br/>
-						The following modes for the Send-Primacy are defined:<ul>
-									<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-									<li>www.onvif.org/ver20/HalfDuplex/Auto
-							It is up to the device how to deal with sending and receiving audio data.</li>
-								</ul>
-						Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="OutputLevel" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>Volume setting of the output. The applicable range is defined via the option AudioOutputOptions.OutputLevelRange.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioOutputConfigurationOptions            -->
-	<!--===============================-->
-	<xs:complexType name="AudioOutputConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="OutputTokensAvailable" type="tt:ReferenceToken" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Tokens of the physical Audio outputs (typically one).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SendPrimacyOptions" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				An <b>audio</b> channel MAY support different types of audio transmission. While for full duplex
-				operation no special handling is required, in half duplex operation the transmission direction
-				needs to be switched.
-				The optional SendPrimacy parameter inside the AudioOutputConfiguration indicates which
-				direction is currently active. An NVC can switch between different modes by setting the
-				AudioOutputConfiguration.<br/>
-				The following modes for the Send-Primacy are defined:<ul>
-							<li>www.onvif.org/ver20/HalfDuplex/Server
-						The server is allowed to send audio data to the client. The client shall not send
-						audio data via the backchannel to the NVT in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Client
-						The client is allowed to send audio data via the backchannel to the server. The
-						NVT shall not send audio data to the client in this mode.</li>
-							<li>www.onvif.org/ver20/HalfDuplex/Auto
-						It is up to the device how to deal with sending and receiving audio data.</li>
-						</ul>
-				Acoustic echo cancellation is out of ONVIF scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OutputLevelRange" type="tt:IntRange">
-				<xs:annotation>
-					<xs:documentation>Minimum and maximum level range supported for this Output.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfiguration           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfiguration">
-		<xs:annotation>
-			<xs:documentation>The Audio Decoder Configuration does not contain any that parameter to configure the
-decoding .A decoder shall decode every data it receives (according to its capabilities).</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          AudioDecoderConfigurationOptions           -->
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="AACDecOptions" type="tt:AACDecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode AAC encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G711DecOptions" type="tt:G711DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G711 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="G726DecOptions" type="tt:G726DecOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device is able to decode G726 encoded audio this section describes the supported configurations</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AudioDecoderConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G711DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AACDecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="G726DecOptions">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported bitrates in kbps</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SampleRateRange" type="tt:IntList">
-				<xs:annotation>
-					<xs:documentation>List of supported sample rates in kHz</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioDecoderConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--          Streaming            -->
-	<!--===============================-->
-	<xs:complexType name="MulticastConfiguration">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPAddress">
-				<xs:annotation>
-					<xs:documentation>The multicast address (if this address is set to 0 no multicast streaming is enaled)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The RTP mutlicast destination port. A device may support RTCP. In this case the port value shall be even to allow the corresponding RTCP stream to be mapped to the next higher (odd) destination port number as defined in the RTSP specification.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>In case of IPv6 the TTL value is assumed as the hop limit. Note that for IPV6 and administratively scoped IPv4 multicast the primary use for hop limit / TTL is to prevent packets from (endlessly) circulating and not limiting scope. In these cases the address contains the scope.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Read only property signalling that streaming is persistant. Use the methods StartMulticastStreaming and StopMulticastStreaming to switch its state.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="StreamSetup">
-		<xs:sequence>
-			<xs:element name="Stream" type="tt:StreamType">
-				<xs:annotation>
-					<xs:documentation>Defines if a multicast or unicast stream is requested</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transport" type="tt:Transport"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="StreamType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="RTP-Unicast"/>
-			<xs:enumeration value="RTP-Multicast"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Transport">
-		<xs:sequence>
-			<xs:element name="Protocol" type="tt:TransportProtocol">
-				<xs:annotation>
-					<xs:documentation>Defines the network protocol for streaming, either UDP=RTP/UDP, RTSP=RTP/RTSP/TCP or HTTP=RTP/RTSP/HTTP/TCP </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tunnel" type="tt:Transport" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to describe further tunnel options. This element is normally not needed </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TransportProtocol">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="UDP"/>
-			<xs:enumeration value="TCP"/>
-			<xs:enumeration value="RTSP"/>
-			<xs:enumeration value="HTTP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaUri">
-		<xs:sequence>
-			<xs:element name="Uri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Stable Uri to be used for requesting the media stream</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterConnect" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is only valid until the connection is established. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InvalidAfterReboot" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the Uri is invalid after a reboot of the device. The value shall be set to "false".</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Timeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Duration how long the Uri is valid. This parameter shall be set to PT0S to indicate that this stream URI is indefinitely valid even if the profile changes</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Media Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Discovery Related Types    -->
-	<!--===============================-->
-	<xs:simpleType name="ScopeDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Fixed"/>
-			<xs:enumeration value="Configurable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Scope">
-		<xs:sequence>
-			<xs:element name="ScopeDef" type="tt:ScopeDefinition">
-				<xs:annotation>
-					<xs:documentation>Indicates if the scope is fixed or configurable.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ScopeItem" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Scope item URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DiscoveryMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Discoverable"/>
-			<xs:enumeration value="NonDiscoverable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<!-- End, Discovery Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--     Network Related Types     -->
-	<!--===============================-->
-	<xs:complexType name="NetworkInterface">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Enabled" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Info" type="tt:NetworkInterfaceInfo" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Network interface information</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Link" type="tt:NetworkInterfaceLink" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Link configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv4" type="tt:IPv4NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="IPv6" type="tt:IPv6NetworkInterface" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:NetworkInterfaceExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Extension point prepared for future 802.3 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkInterfaceConfigPriority">
-		<xs:restriction base="xs:integer">
-			<xs:minInclusive value="0"/>
-			<xs:maxInclusive value="31"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot3Configuration">
-		<xs:sequence>
-			<!-- Placeholder for 802.3 configuration -->
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceLink">
-		<xs:sequence>
-			<xs:element name="AdminSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Configured link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OperSettings" type="tt:NetworkInterfaceConnectionSetting">
-				<xs:annotation>
-					<xs:documentation>Current active link settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="InterfaceType" type="tt:IANA-IfTypes">
-				<xs:annotation>
-					<xs:documentation>Integer indicating interface type, for example: 6 is ethernet.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceConnectionSetting">
-		<xs:sequence>
-			<xs:element name="AutoNegotiation" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto negotiation on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Speed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Duplex" type="tt:Duplex">
-				<xs:annotation>
-					<xs:documentation>Duplex type, Half or Full.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Duplex">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Full"/>
-			<xs:enumeration value="Half"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IANA-IfTypes">
-		<xs:restriction base="xs:int">
-			<xs:annotation>
-				<xs:documentation>
-				For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceInfo">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network interface name, for example eth0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HwAddress" type="tt:HwAddress">
-				<xs:annotation>
-					<xs:documentation>Network interface MAC address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv6Configuration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterface">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Config" type="tt:IPv4Configuration">
-				<xs:annotation>
-					<xs:documentation>IPv4 configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4Configuration">
-		<xs:sequence>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link local address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6Configuration">
-		<xs:sequence>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LinkLocal" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of link local IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromDHCP" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FromRA" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of IPv6 addresses configured by using router advertisment.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IPv6ConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6ConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6DHCPConfiguration">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Auto"/>
-			<xs:enumeration value="Stateful"/>
-			<xs:enumeration value="Stateless"/>
-			<xs:enumeration value="Off"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocol">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:NetworkProtocolType">
-				<xs:annotation>
-					<xs:documentation>Network protocol type string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if the protocol is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Port" type="xs:int" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The port that is used by the protocol.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkProtocolExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkProtocolExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkProtocolType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="HTTP"/>
-			<xs:enumeration value="HTTPS"/>
-			<xs:enumeration value="RTSP"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="NetworkHostType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-			<xs:enumeration value="DNS"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHost">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:NetworkHostType">
-				<xs:annotation>
-					<xs:documentation>Network host type: IPv4, IPv6 or DNS.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSname" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkHostExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkHostExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddress">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the address is an IPv4 or IPv6 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 address.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv4Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv4Address">
-				<xs:annotation>
-					<xs:documentation>IPv4 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv4Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PrefixedIPv6Address">
-		<xs:sequence>
-			<xs:element name="Address" type="tt:IPv6Address">
-				<xs:annotation>
-					<xs:documentation>IPv6 address</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PrefixLength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Prefix/submask length</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IPv6Address">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="HwAddress">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IPv4"/>
-			<xs:enumeration value="IPv6"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="DNSName">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the hostname is obtained from DHCP or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="xs:token" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates the hostname.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:HostnameInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="HostnameInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DNS information is retrieved from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SearchDomain" type="xs:token" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Search domain.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSFromDHCP" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of DNS addresses received from DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DNSManual" type="tt:IPAddress" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered DNS addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformation">
-		<xs:sequence>
-			<xs:element name="FromDHCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates if NTP information is to be retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPFromDHCP" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of NTP addresses retrieved by using DHCP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NTPManual" type="tt:NetworkHost" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually entered NTP addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NTPInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NTPInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Domain">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IPAddressFilterType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Allow"/>
-			<xs:enumeration value="Deny"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformation">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:DynamicDNSType">
-				<xs:annotation>
-					<xs:documentation>Dynamic DNS type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:DNSName" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DNS name.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TTL" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Time to live.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DynamicDNSInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DynamicDNSInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="DynamicDNSType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NoUpdate"/>
-			<xs:enumeration value="ClientUpdates"/>
-			<xs:enumeration value="ServerUpdates"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not an interface is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Link" type="tt:NetworkInterfaceConnectionSetting" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Link configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MTU" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Maximum transmission unit.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv4" type="tt:IPv4NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv4 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6" type="tt:IPv6NetworkInterfaceSetConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>IPv6 network interface configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot3" type="tt:Dot3Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11" type="tt:Dot11Configuration" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:NetworkInterfaceSetConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv6NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AcceptRouterAdvert" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether router advertisment is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv6 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="tt:IPv6DHCPConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>DHCP configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPv4NetworkInterfaceSetConfiguration">
-		<xs:sequence>
-			<xs:element name="Enabled" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv4 is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Manual" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of manually added IPv4 addresses.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DHCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not DHCP is used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkGateway">
-		<xs:sequence>
-			<xs:element name="IPv4Address" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv4 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPv6Address" type="tt:IPv6Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>IPv6 address string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfiguration">
-		<xs:sequence>
-			<xs:element name="InterfaceToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of network interface.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Enabled" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the zero-configuration is enabled or not.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Addresses" type="tt:IPv4Address" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>The zero-configuration IPv4 address(es)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Additional" type="tt:NetworkZeroConfiguration" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Optional array holding the configuration for the second and possibly further interfaces.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkZeroConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkZeroConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilter">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:IPAddressFilterType"/>
-			<xs:element name="IPv4Address" type="tt:PrefixedIPv4Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="IPv6Address" type="tt:PrefixedIPv6Address" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IPAddressFilterExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IPAddressFilterExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Configuration">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="Mode" type="tt:Dot11StationMode"/>
-			<xs:element name="Alias" type="tt:Name"/>
-			<xs:element name="Priority" type="tt:NetworkInterfaceConfigPriority"/>
-			<xs:element name="Security" type="tt:Dot11SecurityConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SSIDType">
-		<xs:restriction base="xs:hexBinary">
-			<xs:minLength value="1"/>
-			<xs:maxLength value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11StationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Ad-hoc"/>
-			<xs:enumeration value="Infrastructure"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfiguration">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:Dot11SecurityMode"/>
-			<xs:element name="Algorithm" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="PSK" type="tt:Dot11PSKSet" minOccurs="0"/>
-			<xs:element name="Dot1X" type="tt:ReferenceToken" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11SecurityConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11SecurityConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SecurityMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="WEP"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11Cipher">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="CCMP"/>
-			<xs:enumeration value="TKIP"/>
-			<xs:enumeration value="Any"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSK">
-		<xs:restriction base="xs:hexBinary">
-			<xs:length value="32"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11PSKPassphrase">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[ -~]{8,63}"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSet">
-		<xs:sequence>
-			<xs:element name="Key" type="tt:Dot11PSK" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 the RSNA PSK consists of 256 bits, or 64 octets when represented in hex<br/>
-					Either Key or Passphrase shall be given, if both are supplied Key shall be used by the device and Passphrase ignored.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Passphrase" type="tt:Dot11PSKPassphrase" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					According to IEEE802.11-2007 H.4.1 a pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters and
-					each character in the pass-phrase must have an encoding in the range of 32 to 126 (decimal),inclusive.<br/>
-					If only Passpharse is supplied the Key shall be derived using the algorithm described in IEEE802.11-2007 section H.4
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:Dot11PSKSetExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11PSKSetExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkInterfaceSetConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Capabilities">
-		<xs:sequence>
-			<xs:element name="TKIP" type="xs:boolean"/>
-			<xs:element name="ScanAvailableNetworks" type="xs:boolean"/>
-			<xs:element name="MultipleConfiguration" type="xs:boolean"/>
-			<xs:element name="AdHocStationMode" type="xs:boolean"/>
-			<xs:element name="WEP" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11SignalStrength">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Very Bad"/>
-			<xs:enumeration value="Bad"/>
-			<xs:enumeration value="Good"/>
-			<xs:enumeration value="Very Good"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11Status">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="ActiveConfigAlias" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="Dot11AuthAndMangementSuite">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="None"/>
-			<xs:enumeration value="Dot1X"/>
-			<xs:enumeration value="PSK"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworks">
-		<xs:sequence>
-			<xs:element name="SSID" type="tt:Dot11SSIDType"/>
-			<xs:element name="BSSID" type="xs:string" minOccurs="0"/>
-			<xs:element name="AuthAndMangementSuite" type="tt:Dot11AuthAndMangementSuite" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>See IEEE802.11 7.3.2.25.2 for details.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PairCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="GroupCipher" type="tt:Dot11Cipher" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SignalStrength" type="tt:Dot11SignalStrength" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot11AvailableNetworksExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot11AvailableNetworksExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, network Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Capabilities Related Types  -->
-	<!--===============================-->
-	<xs:simpleType name="CapabilityCategory">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="All"/>
-			<xs:enumeration value="Analytics"/>
-			<xs:enumeration value="Device"/>
-			<xs:enumeration value="Events"/>
-			<xs:enumeration value="Imaging"/>
-			<xs:enumeration value="Media"/>
-			<xs:enumeration value="PTZ"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Capabilities">
-		<xs:sequence>
-			<xs:element name="Analytics" type="tt:AnalyticsCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Analytics capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Device" type="tt:DeviceCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Device capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Events" type="tt:EventCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Event capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Imaging" type="tt:ImagingCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Imaging capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Media" type="tt:MediaCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Media capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZ" type="tt:PTZCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>PTZ capabilities</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:CapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DeviceIO" type="tt:DeviceIOCapabilities" minOccurs="0"/>
-			<xs:element name="Display" type="tt:DisplayCapabilities" minOccurs="0"/>
-			<xs:element name="Recording" type="tt:RecordingCapabilities" minOccurs="0"/>
-			<xs:element name="Search" type="tt:SearchCapabilities" minOccurs="0"/>
-			<xs:element name="Replay" type="tt:ReplayCapabilities" minOccurs="0"/>
-			<xs:element name="Receiver" type="tt:ReceiverCapabilities" minOccurs="0"/>
-			<xs:element name="AnalyticsDevice" type="tt:AnalyticsDeviceCapabilities" minOccurs="0"/>
-			<xs:element name="Extensions" type="tt:CapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Analytics service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not rules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not modules are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Device service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Network" type="tt:NetworkCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Network capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="System" type="tt:SystemCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>System capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IO" type="tt:IOCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>I/O capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Security" type="tt:SecurityCapabilities" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Security capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:DeviceCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Event service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSSubscriptionPolicySupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Subscription policy is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPullPointSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pull Point is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WSPausableSubscriptionManagerInterfaceSupport" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Pausable Subscription Manager Interface is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilities">
-		<xs:sequence>
-			<xs:element name="InputConnectors" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of input connectors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelayOutputs" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Number of relay outputs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Auxiliary" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:IOCapabilitiesExtension2"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IOCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Media service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamingCapabilities" type="tt:RealTimeStreamingCapabilities">
-				<xs:annotation>
-					<xs:documentation>Streaming capabilities.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MediaCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MediaCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="ProfileCapabilities" type="tt:ProfileCapabilities"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilities">
-		<xs:sequence>
-			<xs:element name="RTPMulticast" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP multicast is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP over TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not RTP/RTSP/TCP is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RealTimeStreamingCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RealTimeStreamingCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ProfileCapabilities">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfProfiles" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Maximum number of profiles.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilities">
-		<xs:sequence>
-			<xs:element name="IPFilter" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IP filtering is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZeroConfiguration" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not zeroconf is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IPVersion6" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not IPv6 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DynDNS" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not  is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Dot11Configuration" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:NetworkCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="NetworkCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilities">
-		<xs:sequence>
-			<xs:element name="TLS1.1" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.1 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TLS1.2" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not TLS 1.2 is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="OnboardKeyGeneration" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not onboard key generation is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AccessPolicyConfig" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not access policy configuration is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="X.509Token" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security X.509 token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SAMLToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security SAML token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="KerberosToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security Kerberos token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RELToken" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Security REL token is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension">
-		<xs:sequence>
-			<xs:element name="TLS1.0" type="xs:boolean"/>
-			<xs:element name="Extension" type="tt:SecurityCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SecurityCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:element name="Dot1X" type="xs:boolean"/>
-			<xs:element name="SupportedEAPMethod" type="xs:int" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>EAP Methods supported by the device. The int values refer to the <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteUserHandling" type="xs:boolean"/>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilities">
-		<xs:sequence>
-			<xs:element name="DiscoveryResolve" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS Discovery resolve requests are supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DiscoveryBye" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not WS-Discovery Bye is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RemoteDiscovery" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not remote discovery is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemBackup" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system backup is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SystemLogging" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not system logging is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FirmwareUpgrade" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not firmware upgrade is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedVersions" type="tt:OnvifVersion" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates supported ONVIF version(s).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="HttpFirmwareUpgrade" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemBackup" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSystemLogging" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="HttpSupportInformation" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:SystemCapabilitiesExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemCapabilitiesExtension2">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OnvifVersion">
-		<xs:sequence>
-			<xs:element name="Major" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Major version number.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minor" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Two digit minor version number (e.g. X.0.1 maps to "01" and X.2.1 maps to "21" where X stands for Major version number).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Imaging service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>PTZ service URI.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DeviceIOCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="VideoSources" type="xs:int"/>
-			<xs:element name="VideoOutputs" type="xs:int"/>
-			<xs:element name="AudioSources" type="xs:int"/>
-			<xs:element name="AudioOutputs" type="xs:int"/>
-			<xs:element name="RelayOutputs" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DisplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="FixedLayout" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indication that the SetLayout command supports only predefined layouts.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="ReceiverSource" type="xs:boolean"/>
-			<xs:element name="MediaProfileSource" type="xs:boolean"/>
-			<xs:element name="DynamicRecordings" type="xs:boolean"/>
-			<xs:element name="DynamicTracks" type="xs:boolean"/>
-			<xs:element name="MaxStringLength" type="xs:int"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="MetadataSearch" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReplayCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the replay service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The address of the receiver service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_Multicast" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP multicast streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/TCP streams</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RTP_RTSP_TCP" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether the device can receive RTP/RTSP/TCP streams.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SupportedReceivers" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum number of receivers supported by the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRTSPURILength" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The maximum allowed length for RTSP URIs.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceCapabilities">
-		<xs:sequence>
-			<xs:element name="XAddr" type="xs:anyURI"/>
-			<xs:element name="RuleSupport" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Obsolete property.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--End, Capabilities Related Types-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    System Related Types       -->
-	<!--===============================-->
-	<xs:simpleType name="SystemLogType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available system log modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="System">
-				<xs:annotation>
-					<xs:documentation>Indicates that a system log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Access">
-				<xs:annotation>
-					<xs:documentation>Indicates that a access log is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemLog">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The log information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportInformation">
-		<xs:sequence>
-			<xs:element name="Binary" type="tt:AttachmentData" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as attachment data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="String" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The support information as character data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BinaryData">
-		<xs:sequence>
-			<xs:element name="Data" type="xs:base64Binary" nillable="false">
-				<xs:annotation>
-					<xs:documentation>base64 encoded binary data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AttachmentData">
-		<xs:sequence>
-			<xs:element ref="xop:Include"/>
-		</xs:sequence>
-		<xs:attribute ref="xmime:contentType" use="optional"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BackupFile">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Data" type="tt:AttachmentData"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUriList">
-		<xs:sequence>
-			<xs:element name="SystemLog" type="tt:SystemLogUri" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemLogUri">
-		<xs:sequence>
-			<xs:element name="Type" type="tt:SystemLogType"/>
-			<xs:element name="Uri" type="xs:anyURI"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="FactoryDefaultType">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available factory default modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Hard">
-				<xs:annotation>
-					<xs:documentation>Indicates that a hard factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Soft">
-				<xs:annotation>
-					<xs:documentation>Indicates that a soft factory default is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="SetDateTimeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Manual">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set manually.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NTP">
-				<xs:annotation>
-					<xs:documentation>Indicates that the date and time are set through NTP</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTime">
-		<xs:annotation>
-			<xs:documentation>General date time inforamtion returned by the GetSystemDateTime method.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="DateTimeType" type="tt:SetDateTimeType">
-				<xs:annotation>
-					<xs:documentation>Indicates if the time is set manully or through NTP.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DaylightSavings" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Informative indicator whether daylight savings is currently on/off.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeZone" type="tt:TimeZone" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Timezone information in Posix format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UTCDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Current system date and time in UTC format. This field is mandatory since version 2.0.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="LocalDateTime" type="tt:DateTime" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Date and time in local format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SystemDateTimeExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SystemDateTimeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DateTime">
-		<xs:sequence>
-			<xs:element name="Time" type="tt:Time"/>
-			<xs:element name="Date" type="tt:Date"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Date">
-		<xs:sequence>
-			<xs:element name="Year" type="xs:int"/>
-			<xs:element name="Month" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 12.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Day" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 1 to 31.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Time">
-		<xs:sequence>
-			<xs:element name="Hour" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 23.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Minute" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 59.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Second" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Range is 0 to 61 (typically 59).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TimeZone">
-		<xs:annotation>
-			<xs:documentation>
-				The TZ format is specified by POSIX, please refer to POSIX 1003.1 section 8.3<br/>
-				Example: Europe, Paris TZ=CET-1CEST,M3.5.0/2,M10.5.0/3<br/>
-				CET = designation for standard time when daylight saving is not in force<br/>
-				-1 = offset in hours = negative so 1 hour east of Greenwich meridian<br/>
-				CEST = designation when daylight saving is in force ("Central European Summer Time")<br/>
-				, = no offset number between code and comma, so default to one hour ahead for daylight saving<br/>
-				M3.5.0 = when daylight saving starts = the last Sunday in March (the "5th" week means the last in the month)<br/>
-				/2, = the local time when the switch occurs = 2 a.m. in this case<br/>
-				M10.5.0 = when daylight saving ends = the last Sunday in October.<br/>
-				/3, = the local time when the switch occurs = 3 a.m. in this case<br/>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="TZ" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Posix timezone string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, System Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   RemoteUser Handling Types    -->
-	<!--===============================-->
-	<xs:complexType name="RemoteUser">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string"/>
-			<xs:element name="Password" type="xs:string" minOccurs="0"/>
-			<xs:element name="UseDerivedPassword" type="xs:boolean"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, RemoteUser Handling Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   UserToken Handling Types    -->
-	<!--===============================-->
-	<xs:simpleType name="UserLevel">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Administrator"/>
-			<xs:enumeration value="Operator"/>
-			<xs:enumeration value="User"/>
-			<xs:enumeration value="Anonymous"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="User">
-		<xs:sequence>
-			<xs:element name="Username" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Username string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UserLevel" type="tt:UserLevel">
-				<xs:annotation>
-					<xs:documentation>User level string.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:UserExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="UserExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!-- End, UserToken Handling Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Security Management Types   -->
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParameters">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Subject" type="xs:string" minOccurs="0"/>
-			<xs:element name="ValidNotBefore" type="xs:token" minOccurs="0"/>
-			<xs:element name="ValidNotAfter" type="xs:token" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateGenerationParametersExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateGenerationParametersExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Certificate">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Certificate" type="tt:BinaryData">
-				<xs:annotation>
-					<xs:documentation>base64 encoded DER representation of certificate.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateStatus">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token">
-				<xs:annotation>
-					<xs:documentation>Certificate id.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not a certificate is used in a HTTPS configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateWithPrivateKey">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token" minOccurs="0"/>
-			<xs:element name="Certificate" type="tt:BinaryData"/>
-			<xs:element name="PrivateKey" type="tt:BinaryData"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformation">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:element name="IssuerDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="SubjectDN" type="xs:string" minOccurs="0"/>
-			<xs:element name="KeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="ExtendedKeyUsage" type="tt:CertificateUsage" minOccurs="0"/>
-			<xs:element name="KeyLength" type="xs:int" minOccurs="0"/>
-			<xs:element name="Version" type="xs:string" minOccurs="0"/>
-			<xs:element name="SerialNum" type="xs:string" minOccurs="0"/>
-			<xs:element name="SignatureAlgorithm" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Validity Range is from "NotBefore" to "NotAfter"; the corresponding DateTimeRange is from "From" to "Until"</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Validity" type="tt:DateTimeRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:CertificateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateUsage">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Critical" type="xs:boolean" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CertificateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Security management Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start Dot1X related Types   -->
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfiguration">
-		<xs:sequence>
-			<xs:element name="Dot1XConfigurationToken" type="tt:ReferenceToken"/>
-			<xs:element name="Identity" type="xs:string"/>
-			<xs:element name="AnonymousID" type="xs:string" minOccurs="0"/>
-			<xs:element name="EAPMethod" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>
-				EAP Method type as defined in <a href="http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml">IANA EAP Registry</a>.
-			</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CACertificateID" type="xs:token" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="EAPMethodConfiguration" type="tt:EAPMethodConfiguration" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:Dot1XConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Dot1XConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EAPMethodConfiguration">
-		<xs:sequence>
-			<xs:element name="TLSConfiguration" type="tt:TLSConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Confgiuration information for TLS Method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Password" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Password for those EAP Methods that require a password. The password shall never be returned on a get method.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EapMethodExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EapMethodExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TLSConfiguration">
-		<xs:sequence>
-			<xs:element name="CertificateID" type="xs:token"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GenericEapPwdConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Dot1X related Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Start IO management Types   -->
-	<!--===============================-->
-	<xs:simpleType name="RelayLogicalState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="active"/>
-			<xs:enumeration value="inactive"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RelayIdleState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="closed"/>
-			<xs:enumeration value="open"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutputSettings">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:RelayMode">
-				<xs:annotation>
-					<xs:documentation>
-					'Bistable' or 'Monostable'
-					<ul>
-							<li>Bistable – After setting the state, the relay remains in this state.</li>
-							<li>Monostable – After setting the state, the relay returns to its idle state after the specified time.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DelayTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Time after which the relay returns to its idle state if it is in monostable mode. If the Mode field is set to bistable mode the value of the parameter can be ignored.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IdleState" type="tt:RelayIdleState">
-				<xs:annotation>
-					<xs:documentation>
-			'open' or 'closed'
-			<ul>
-							<li>'open' means that the relay is open when the relay state is set to 'inactive' through the trigger command and closed when the state is set to 'active' through the same command.</li>
-							<li>'closed' means that the relay is closed when the relay state is set to 'inactive' through the trigger command and open when the state is set to 'active' through the same command.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RelayMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Monostable"/>
-			<xs:enumeration value="Bistable"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RelayOutput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Properties" type="tt:RelayOutputSettings"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="DigitalInput">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, IO management Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--    Start PTZ Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="PTZNode">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="Name" type="tt:Name" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                A unique identifier that is used to reference PTZ Nodes.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="SupportedPTZSpaces" type="tt:PTZSpaces">
-						<xs:annotation>
-							<xs:documentation>
-                A list of Coordinate Systems available for the PTZ Node. For each Coordinate System, the PTZ Node MUST specify its allowed range.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="MaximumNumberOfPresets" type="xs:int">
-						<xs:annotation>
-							<xs:documentation>
-                All preset operations MUST be available for this PTZ Node if one preset is supported.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="HomeSupported" type="xs:boolean">
-						<xs:annotation>
-							<xs:documentation>
-                A boolean operator specifying the availability of a home position. If set to true, the Home Position Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="AuxiliaryCommands" type="tt:AuxiliaryData" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>
-                A list of supported Auxiliary commands. If the list is not empty, the Auxiliary Operations MUST be available for this PTZ Node.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZNodeExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:attribute name="FixedHomePosition" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>
-      				Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command.
-      			</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="SupportedPresetTour" type="tt:PTZPresetTourSupported" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Detail of supported Preset Tour feature.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZNodeExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZNodeExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupported">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfPresetTours" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>Indicates number of preset tours that can be created. Required preset tour operations shall be available for this PTZ Node if one or more preset tour is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPresetTourOperation" type="tt:PTZPresetTourOperation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Indicates which preset tour operations are available for this PTZ Node.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSupportedExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSupportedExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="NodeToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>
-                A mandatory reference to the PTZ Node that the PTZ Configuration belongs to.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsolutePantTiltPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute Pan/Tilt movements, it shall specify one Absolute Pan/Tilt Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultAbsoluteZoomPositionSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute zoom movements, it shall specify one Absolute Zoom Position Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativePanTiltTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative Pan/Tilt movements, it shall specify one RelativePan/Tilt Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultRelativeZoomTranslationSpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports relative zoom movements, it shall specify one Relative Zoom Translation Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousPanTiltVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous Pan/Tilt movements, it shall specify one Continuous Pan/Tilt Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultContinuousZoomVelocitySpace" type="xs:anyURI" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous zoom movements, it shall specify one Continuous Zoom Velocity Space as default.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZSpeed" type="tt:PTZSpeed" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports absolute or relative PTZ movements, it shall specify corresponding default Pan/Tilt and Zoom speeds.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="DefaultPTZTimeout" type="xs:duration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                If the PTZ Node supports continuous movements, it shall specify a default timeout, after which the movement stops.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="PanTiltLimits" type="tt:PanTiltLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Pan/Tilt limits element should be present for a PTZ Node that supports an absolute Pan/Tilt. If the element is present it signals the support for configurable Pan/Tilt limits. If limits are enabled, the Pan/Tilt movements shall always stay within the specified range. The Pan/Tilt limits are disabled by setting the limits to –INF or +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ZoomLimits" type="tt:ZoomLimits" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-                The Zoom limits element should be present for a PTZ Node that supports absolute zoom. If the element is present it signals the supports for configurable Zoom limits. If limits are enabled the zoom movements shall always stay within the specified range. The Zoom limits are disabled by settings the limits to -INF and +INF.
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:PTZConfigurationExtension" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>
-              </xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure PT Control Direction related features.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirection">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlip" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for E-Flip.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:Reverse" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure related parameters for reversing of PT Control Direction.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlip">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable E-Flip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Reverse">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="EFlipMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReverseMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="Spaces" type="tt:PTZSpaces">
-				<xs:annotation>
-					<xs:documentation>
-            A list of supported coordinate systems including their range limitations.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZTimeout" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>
-            A timeout Range within which Timeouts are accepted by the PTZ Node.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PTControlDirection" type="tt:PTControlDirectionOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for PT Direction Control.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZConfigurationOptions2" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZConfigurationOptions2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptions">
-		<xs:sequence>
-			<xs:element name="EFlip" type="tt:EFlipOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for EFlip feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Reverse" type="tt:ReverseOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported options for Reverse feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTControlDirectionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTControlDirectionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:EFlipMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of EFlip mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:EFlipOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EFlipOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReverseMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Options of Reverse mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ReverseOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReverseOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PanTiltLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space2DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of pan tilt limits.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ZoomLimits">
-		<xs:sequence>
-			<xs:element name="Range" type="tt:Space1DDescription">
-				<xs:annotation>
-					<xs:documentation>
-            A range of zoom limit
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpaces">
-		<xs:sequence>
-			<xs:element name="AbsolutePanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt Position space is provided by every PTZ node that supports absolute Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the PTZ unit normalized to the range -1 to 1 resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AbsoluteZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Position Space is provided by every PTZ node that supports absolute Zoom, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full range of the Zoom normalized to the range 0 (wide) to 1 (tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativePanTiltTranslationSpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Pan/Tilt translation space is provided by every PTZ node that supports relative Pan/Tilt, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as the full positive and negative translation range of the PTZ unit normalized to the range -1 to 1, 
-			where positive translation would mean clockwise rotation or movement in right/up direction resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RelativeZoomTranslationSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The Generic Zoom Translation Space is provided by every PTZ node that supports relative Zoom, since it does not relate to a specific physical range. 
-			Instead, the corresponding absolute range should be defined as the full positive and negative translation range of the Zoom normalized to the range -1 to1, 
-			where a positive translation maps to a movement in TELE direction. The translation is signed to indicate direction (negative is to wide, positive is to tele). 
-			There is no assumption about how the generic zoom range is mapped to magnification, FOV or other physical zoom dimension. This results in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousPanTiltVelocitySpace" type="tt:Space2DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic Pan/Tilt velocity space shall be provided by every PTZ node, since it does not relate to a specific physical range. 
-			Instead, the range should be defined as a range of the PTZ unit’s speed normalized to the range -1 to 1, where a positive velocity would map to clockwise 
-			rotation or movement in the right/up direction. A signed speed can be independently specified for the pan and tilt component resulting in the following space description.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ContinuousZoomVelocitySpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The generic zoom velocity space specifies a zoom factor velocity without knowing the underlying physical model. The range should be normalized from -1 to 1, 
-			where a positive velocity would map to TELE direction. A generic zoom velocity space description resembles the following.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Pan/Tilt movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. The speed of a combined Pan/Tilt 
-			movement is represented by a single non-negative scalar value.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomSpeedSpace" type="tt:Space1DDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            The speed space specifies the speed for a Zoom movement when moving to an absolute position or to a relative translation. 
-			In contrast to the velocity spaces, speed spaces do not contain any directional information. 
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZSpacesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpacesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space2DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of y-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Space1DDescription">
-		<xs:sequence>
-			<xs:element name="URI" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-            A URI of coordinate systems.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="XRange" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-            A range of x-axis.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector2D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="y" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-  				Pan/tilt coordinate space selector. The following options are defined:<ul>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector1D">
-		<xs:attribute name="x" type="xs:float" use="required"/>
-		<xs:attribute name="space" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>
-  				Pan/tilt coordinate space selector. The following options are defined:<ul style="">
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/TranslationGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/VelocityGenericSpace</li>
-						<li> http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace</li>
-					</ul>
-				</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZVector">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt position. The x component corresponds to pan and the y component to tilt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZSpeed">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:Vector2D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Pan and tilt speed. The x component corresponds to pan and the y component to tilt. If omitted in a request, the current (if any) PanTilt movement should not be affected. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:Vector1D" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A zoom speed. If omitted in a request, the current (if any) Zoom movement should not be affected.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the absolute position of the PTZ unit together with the Space references. The default absolute spaces of the corresponding PTZ configuration MUST be referenced within the Position element.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:PTZMoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            Indicates if the Pan/Tilt/Zoom device unit is currently moving, idle or in an unknown state.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            States a current PTZ error.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="UtcTime" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>
-            Specifies the UTC time when this status was generated.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPreset">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position name.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTZPosition" type="tt:PTZVector" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-            A list of preset position.
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>
-        </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZMoveStatus">
-		<xs:sequence>
-			<xs:element name="PanTilt" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Zoom" type="tt:MoveStatus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-          </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AuxiliaryData">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="128"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="MoveStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="IDLE"/>
-			<xs:enumeration value="MOVING"/>
-			<xs:enumeration value="UNKNOWN"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Touring"/>
-			<xs:enumeration value="Paused"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourDirection">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Forward"/>
-			<xs:enumeration value="Backward"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PTZPresetTourOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Start"/>
-			<xs:enumeration value="Stop"/>
-			<xs:enumeration value="Pause"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="PresetTour">
-		<xs:sequence>
-			<xs:element name="Name" type="tt:Name" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Readable name of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Status" type="tt:PTZPresetTourStatus">
-				<xs:annotation>
-					<xs:documentation>Read only parameters to indicate the status of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Auto Start flag of the preset tour. True allows the preset tour to be activated always.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingCondition">
-				<xs:annotation>
-					<xs:documentation>Parameters to specify the detail behavior of the preset tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpot" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of detail of touring spots including preset positions.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="token" type="tt:ReferenceToken">
-			<xs:annotation>
-				<xs:documentation>Unique identifier of this preset tour.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpot">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetail">
-				<xs:annotation>
-					<xs:documentation>Detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify Pan/Tilt and Zoom speed on moving toward this tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify time duration of staying on this tour sport.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourSpotExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetail">
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="PresetToken" type="tt:ReferenceToken">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with Preset Token defined in advance.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Home" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with the home position of this PTZ Node. "False" to this parameter shall be treated as an invalid argument.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="PTZPosition" type="tt:PTZVector">
-					<xs:annotation>
-						<xs:documentation>Option to specify the preset position with vector of PTZ node directly.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="TypeExtension" type="tt:PTZPresetTourTypeExtension"/>
-			</xs:choice>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourTypeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatus">
-		<xs:sequence>
-			<xs:element name="State" type="tt:PTZPresetTourState">
-				<xs:annotation>
-					<xs:documentation>Indicates state of this preset tour by Idle/Touring/Paused.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CurrentTourSpot" type="tt:PTZPresetTourSpot" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates a tour spot currently staying.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStatusExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStatusExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingCondition">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how many times the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to specify how long time duration the preset tour is recurred.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional parameter to choose which direction the preset tour goes. Forward shall be chosen in case it is omitted.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourOptions">
-		<xs:sequence>
-			<xs:element name="AutoStart" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the AutoStart is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartingCondition" type="tt:PTZPresetTourStartingConditionOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Starting Condition.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TourSpot" type="tt:PTZPresetTourSpotOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for Preset Tour Spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourSpotOptions">
-		<xs:sequence>
-			<xs:element name="PresetDetail" type="tt:PTZPresetTourPresetDetailOptions">
-				<xs:annotation>
-					<xs:documentation>Supported options for detail definition of preset position of the tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StayTime" type="tt:DurationRange">
-				<xs:annotation>
-					<xs:documentation>Supported range of stay time for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptions">
-		<xs:sequence>
-			<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of available Preset Tokens for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Home" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An option to indicate Home postion for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PanTiltPositionSpace" type="tt:Space2DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Pan and Tilt for tour spots.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ZoomPositionSpace" type="tt:Space1DDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Zoom for a tour spot.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourPresetDetailOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourPresetDetailOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptions">
-		<xs:sequence>
-			<xs:element name="RecurringTime" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecurringDuration" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of Recurring Duration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Direction" type="tt:PTZPresetTourDirection" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options for Direction of Preset Tour.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PTZPresetTourStartingConditionOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPresetTourStartingConditionOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--     End, PTZ Related Types    -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus">
-		<xs:sequence>
-			<xs:element name="FocusStatus" type="tt:FocusStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode"/>
-			<xs:element name="DefaultSpeed" type="xs:float"/>
-			<xs:element name="NearLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).
-If set to 0.0, infinity will be used.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="AutoFocusMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-					Exposure Mode
-					<ul>
-							<li>Auto – Enabled the exposure algorithm on the NVT.</li>
-							<li>Manual – Disabled exposure algorithm on the NVT.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="WideDynamicMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>
-				White dynamic range (on/off)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Optional level parameter (unitless)
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="BacklightCompensationMode">
-		<xs:annotation>
-			<xs:documentation>Enumeration describing the available backlight compenstation modes.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is disabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="ON">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation is enabled.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposurePriority">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LowNoise"/>
-			<xs:enumeration value="FrameRate"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions"/>
-			<xs:element name="Brightness" type="tt:FloatRange"/>
-			<xs:element name="ColorSaturation" type="tt:FloatRange"/>
-			<xs:element name="Contrast" type="tt:FloatRange"/>
-			<xs:element name="Exposure" type="tt:ExposureOptions"/>
-			<xs:element name="Focus" type="tt:FocusOptions"/>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" maxOccurs="unbounded"/>
-			<xs:element name="Sharpness" type="tt:FloatRange"/>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions"/>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange"/>
-			<xs:element name="NearLimit" type="tt:FloatRange"/>
-			<xs:element name="FarLimit" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded"/>
-			<xs:element name="Priority" type="tt:ExposurePriority" maxOccurs="unbounded"/>
-			<xs:element name="MinExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange"/>
-			<xs:element name="MinGain" type="tt:FloatRange"/>
-			<xs:element name="MaxGain" type="tt:FloatRange"/>
-			<xs:element name="MinIris" type="tt:FloatRange"/>
-			<xs:element name="MaxIris" type="tt:FloatRange"/>
-			<xs:element name="ExposureTime" type="tt:FloatRange"/>
-			<xs:element name="Gain" type="tt:FloatRange"/>
-			<xs:element name="Iris" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded"/>
-			<xs:element name="YrGain" type="tt:FloatRange"/>
-			<xs:element name="YbGain" type="tt:FloatRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusMove">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameters for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocus" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Parameter for the continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocus">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Position parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the absolute focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocus">
-		<xs:sequence>
-			<xs:element name="Distance" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Distance parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the relative focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocus">
-		<xs:sequence>
-			<xs:element name="Speed" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Speed parameter for the Continuous focus control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0"/>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions" minOccurs="0"/>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AbsoluteFocusOptions">
-		<xs:sequence>
-			<xs:element name="Position" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ContinuousFocusOptions">
-		<xs:sequence>
-			<xs:element name="Speed" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ExposureMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Enabled">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ENABLED"/>
-			<xs:enumeration value="DISABLED"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="WhiteBalanceMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="MANUAL"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="AUTO"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>Auto whitebalancing mode (auto/manual).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Rgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Bgain (unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--  End, Imaging Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Imaging Version 2.0 Related Types    -->
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20">
-		<xs:sequence>
-			<xs:element name="FocusStatus20" type="tt:FocusStatus20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20">
-		<xs:sequence>
-			<xs:element name="Position" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus position.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MoveStatus" type="tt:MoveStatus">
-				<xs:annotation>
-					<xs:documentation>
-				Status of focus MoveStatus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Error status of focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusStatus20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusStatus20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettings20">
-		<xs:annotation>
-			<xs:documentation>Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensation20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Enabled/disabled BLC mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Image brightness (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Color saturation of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Contrast of the image (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:Exposure20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Exposure mode of the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusConfiguration20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Focus configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilter" type="tt:IrCutFilterMode" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Infrared Cutoff Filter settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Sharpness of the Video image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRange20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>WDR settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalance20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>White balance settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension20" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension20">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilization" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional element to configure Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension202" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension202">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustment" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>An optional parameter applied to only auto mode to adjust timing of toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingSettingsExtension203" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingSettingsExtension203">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilization">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode">
-				<xs:annotation>
-					<xs:documentation>Parameter to enable/disable Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ImageStabilizationMode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="OFF"/>
-			<xs:enumeration value="ON"/>
-			<xs:enumeration value="AUTO"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustment">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Specifies which boundaries to automatically toggle Ir cut filter following parameters are applied to. Its options shall be chosen from tt:IrCutFilterAutoBoundaryType.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Adjusts boundary exposure level for toggling Ir cut filter to on/off specified with unitless normalized value from +1.0 to -1.0. Zero is default and -1.0 is the darkest adjustment (Unitless).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTime" type="xs:duration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Delay time of toggling Ir cut filter to on/off after crossing of the boundary exposure levels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="IrCutFilterAutoBoundaryType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Common" />
-			<xs:enumeration value="ToOn" />
-			<xs:enumeration value="ToOff" />
-			<xs:enumeration value="Extended" />
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRange20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether WDR mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode">
-				<xs:annotation>
-					<xs:documentation>Wide dynamic range mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensation20">
-		<xs:annotation>
-			<xs:documentation>Type describing whether BLC mode is enabled or disabled (on/off).</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode">
-				<xs:annotation>
-					<xs:documentation>Backlight compensation mode (on/off).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional level parameter (unit unspecified).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Exposure20">
-		<xs:annotation>
-			<xs:documentation>Type describing the exposure settings.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Window" type="tt:Rectangle" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rectangular exposure mask.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of exposure time range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the sensor gain range that is allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Minimum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Maximum value of the iris range allowed to be used by the algorithm.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed exposure time used by the image sensor (&#956;s).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed gain used by the image sensor (dB).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				The fixed attenuation of input light affected by the iris (dB). 0dB maps to a fully opened iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20">
-		<xs:sequence>
-			<xs:element name="BacklightCompensation" type="tt:BacklightCompensationOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Backlight Compensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Brightness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Brightness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ColorSaturation" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Color Saturation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Contrast" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Contrast.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Exposure" type="tt:ExposureOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Exposure.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Focus" type="tt:FocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Focus.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IrCutFilterModes" type="tt:IrCutFilterMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of IrCutFilterModes.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sharpness" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of Sharpness.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WideDynamicRange" type="tt:WideDynamicRangeOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WideDynamicRange.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="WhiteBalance" type="tt:WhiteBalanceOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of WhiteBalance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ImageStabilization" type="tt:ImageStabilizationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for Image Stabilization feature.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension2">
-		<xs:sequence>
-			<xs:element name="IrCutFilterAutoAdjustment" type="tt:IrCutFilterAutoAdjustmentOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Options of parameters for adjustment of Ir cut filter auto mode.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImagingOptions20Extension3" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImagingOptions20Extension3">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptions">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ImageStabilizationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of Image Stabilization mode parameter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Valid range of the Image Stabilization.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ImageStabilizationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ImageStabilizationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptions">
-		<xs:sequence>
-			<xs:element name="BoundaryType" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Supported options of boundary types for adjustment of Ir cut filter auto mode. The opptions shall be chosen from tt:IrCutFilterAutoBoundaryType. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BoundaryOffset" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not boundary offset for toggling Ir cut filter is supported.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseTimeRange" type="tt:DurationRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Supported range of delay time for toggling Ir cut filter.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:IrCutFilterAutoAdjustmentOptionsExtension" minOccurs="0" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax" />
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="IrCutFilterAutoAdjustmentOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WideDynamicRangeOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WideDynamicMode" maxOccurs="unbounded"/>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BacklightCompensationOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:BacklightCompensationMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				'ON' or 'OFF'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Level" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Level range of BacklightCompensation.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ExposureOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ExposureMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Exposure Mode
-				<ul>
-							<li>Auto – Enabled the exposure algorithm on the device.</li>
-							<li>Manual – Disabled exposure algorithm on the device.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="tt:ExposurePriority" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				The exposure priority mode (low noise/framerate).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxGain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MinIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Minimum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxIris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Maximum Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ExposureTime" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the ExposureTime.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Gain" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Gain.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Iris" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid range of the Iris.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MoveOptions20">
-		<xs:sequence>
-			<xs:element name="Absolute" type="tt:AbsoluteFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the absolute control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Relative" type="tt:RelativeFocusOptions20" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the relative control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Continuous" type="tt:ContinuousFocusOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges for the continuous control.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RelativeFocusOptions20">
-		<xs:sequence>
-			<xs:element name="Distance" type="tt:FloatRange">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the distance.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Speed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Valid ranges of the speed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode">
-				<xs:annotation>
-					<xs:documentation>
-				'AUTO' or 'MANUAL'
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CrGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Rgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CbGain" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-				Bgain (unitless).
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:WhiteBalance20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalance20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20">
-		<xs:sequence>
-			<xs:element name="AutoFocusMode" type="tt:AutoFocusMode">
-				<xs:annotation>
-					<xs:documentation>
-			Mode of auto fucus.
-			<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="xs:float" minOccurs="0"/>
-			<xs:element name="NearLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus near limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="xs:float" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Parameter to set autofocus far limit (unit: meter).</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusConfiguration20Extension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusConfiguration20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20">
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:WhiteBalanceMode" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-				Mode of WhiteBalance.
-				<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="YrGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="YbGain" type="tt:FloatRange" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:WhiteBalanceOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="WhiteBalanceOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20">
-		<xs:sequence>
-			<xs:element name="AutoFocusModes" type="tt:AutoFocusMode" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-					Mode of Auto Focus.
-					<ul>
-							<li>AUTO</li>
-							<li>MANUAL</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DefaultSpeed" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of DefaultSpeed.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NearLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of NearLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FarLimit" type="tt:FloatRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-					Valid range of FarLimit.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:FocusOptions20Extension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FocusOptions20Extension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--===============================-->
-	<!--  End, Imaging Version 2.0 Related Types   -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--  Event and Analytics Types    -->
-	<!--===============================-->
-	<xs:simpleType name="TopicNamespaceLocation">
-		<xs:restriction base="xs:anyURI"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="PropertyOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initialized"/>
-			<xs:enumeration value="Deleted"/>
-			<xs:enumeration value="Changed"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:element name="Message">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Source" type="tt:ItemList" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Token value pairs that triggered this message. Typically only one item is present.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="Key" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Data" type="tt:ItemList" minOccurs="0"/>
-				<xs:element name="Extension" type="tt:MessageExtension" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
-			<xs:attribute name="PropertyOperation" type="tt:PropertyOperation"/>
-			<xs:anyAttribute processContents="lax"/>
-		</xs:complexType>
-	</xs:element>
-	<!--===============================-->
-	<xs:complexType name="MessageExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemList">
-		<xs:annotation>
-			<xs:documentation>
-			List of parameters according to the corresponding ItemListDescription.
-			Each item in the list shall have a unique name.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Value name pair as defined by the corresponding description.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Value" type="xs:anySimpleType" use="required">
-						<xs:annotation>
-							<xs:documentation>Item value. The type is defined in the corresponding description.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Complex value structure.</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any">
-							<xs:annotation>
-								<xs:documentation>XML tree contiaing the element value as defined in the corresponding description.</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Message Description     -->
-	<!--===============================-->
-	<xs:complexType name="MessageDescription">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Set of tokens producing this message. The list may only contain SimpleItemDescription items.
-					The set of tokens identify the component within the WS-Endpoint, which is responsible for the producing the message.<br/>
-					For analytics events the token set shall include the VideoSourceConfigurationToken, the VideoAnalyticsConfigurationToken
-					and the name of the analytics module or rule.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Key" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes optional message payload parameters that may be used as key. E.g. object IDs of tracked objects are conveyed as key.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Data" type="tt:ItemListDescription" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Describes the payload of the message.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:MessageDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="IsProperty" type="xs:boolean">
-			<xs:annotation>
-				<xs:documentation>Must be set to true when the described Message relates to a property. An alternative term of "property" is a "state" in contrast to a pure event, which contains relevant information for only a single point in time.<br/>Default is false.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MessageDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescription">
-		<xs:annotation>
-			<xs:documentation>
-			Describes a list of items. Each item in the list shall have a unique name.
-			The list is designed as linear structure without optional or unbounded elements.
-			Use ElementItems only when complex structures are inevitable.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SimpleItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Description of a simple item. The type must be of cathegory simpleType (xs:string, xs:integer, xs:float, ...).</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required"/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElementItemDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-            Description of a complex type. The Type must reference a defined type.
-          </xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:attribute name="Name" type="xs:string" use="required">
-						<xs:annotation>
-							<xs:documentation>Item name. Must be unique within a list.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-					<xs:attribute name="Type" type="xs:QName" use="required">
-						<xs:annotation>
-							<xs:documentation>The type of the item. The Type must reference a defined type.</xs:documentation>
-						</xs:annotation>
-					</xs:attribute>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ItemListDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ItemListDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Vector">
-		<xs:attribute name="x" type="xs:float"/>
-		<xs:attribute name="y" type="xs:float"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rectangle">
-		<xs:attribute name="bottom" type="xs:float"/>
-		<xs:attribute name="top" type="xs:float"/>
-		<xs:attribute name="right" type="xs:float"/>
-		<xs:attribute name="left" type="xs:float"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Polygon">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="3" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polygon" type="tt:Polygon"/>
-	<!--===============================-->
-	<xs:complexType name="Polyline">
-		<xs:sequence>
-			<xs:element name="Point" type="tt:Vector" minOccurs="2" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Polyline" type="tt:Polyline"/>
-	<!--===============================-->
-	<xs:simpleType name="Direction">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Left"/>
-			<xs:enumeration value="Right"/>
-			<xs:enumeration value="Any"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="Color">
-		<xs:attribute name="X" type="xs:float" use="required"/>
-		<xs:attribute name="Y" type="xs:float" use="required"/>
-		<xs:attribute name="Z" type="xs:float" use="required"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorCovariance">
-		<xs:attribute name="XX" type="xs:float" use="required"/>
-		<xs:attribute name="YY" type="xs:float" use="required"/>
-		<xs:attribute name="ZZ" type="xs:float" use="required"/>
-		<xs:attribute name="XY" type="xs:float"/>
-		<xs:attribute name="XZ" type="xs:float"/>
-		<xs:attribute name="YZ" type="xs:float"/>
-		<xs:attribute name="Colorspace" type="xs:anyURI"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--       Scene Description       -->
-	<!--===============================-->
-	<xs:complexType name="Appearance">
-		<xs:sequence>
-			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
-			<xs:element name="Shape" type="tt:ShapeDescriptor" minOccurs="0"/>
-			<xs:element name="Color" type="tt:ColorDescriptor" minOccurs="0"/>
-			<xs:element name="Class" type="tt:ClassDescriptor" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:AppearanceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AppearanceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ShapeDescriptor">
-		<xs:sequence>
-			<xs:element name="BoundingBox" type="tt:Rectangle"/>
-			<xs:element name="CenterOfGravity" type="tt:Vector"/>
-			<xs:element name="Polygon" type="tt:Polygon" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ShapeDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ShapeDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorDescriptor">
-		<xs:sequence>
-			<xs:element name="ColorCluster" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Color" type="tt:Color"/>
-						<xs:element name="Weight" type="xs:float" minOccurs="0"/>
-						<xs:element name="Covariance" type="tt:ColorCovariance" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ColorDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ClassType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Animal"/>
-			<xs:enumeration value="Face"/>
-			<xs:enumeration value="Human"/>
-			<xs:enumeration value="Vehical"/>
-			<xs:enumeration value="Other"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptor">
-		<xs:sequence>
-			<xs:element name="ClassCandidate" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Type" type="tt:ClassType"/>
-						<xs:element name="Likelihood" type="xs:float"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ClassDescriptorExtension" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="OtherTypes" type="tt:OtherType" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ClassDescriptorExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ClassDescriptorExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OtherType">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Object Class Type</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Likelihood" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>A likelihood/probability that the corresponding object belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Object">
-		<xs:complexContent>
-			<xs:extension base="tt:ObjectId">
-				<xs:sequence>
-					<xs:element name="Appearance" type="tt:Appearance" minOccurs="0"/>
-					<xs:element name="Behaviour" type="tt:Behaviour" minOccurs="0"/>
-					<xs:element name="Extension" type="tt:ObjectExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Transformation">
-		<xs:sequence>
-			<xs:element name="Translate" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Scale" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:TransformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TransformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Frame">
-		<xs:sequence>
-			<xs:element name="PTZStatus" type="tt:PTZStatus" minOccurs="0"/>
-			<xs:element name="Transformation" type="tt:Transformation" minOccurs="0"/>
-			<xs:element name="Object" type="tt:Object" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ObjectTree" type="tt:ObjectTree" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:FrameExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="UtcTime" type="xs:dateTime" use="required"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FrameExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="MotionInCells" type="tt:MotionInCells" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:FrameExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FrameExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Merge">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
-			<xs:element name="to" type="tt:ObjectId"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Split">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId"/>
-			<xs:element name="to" type="tt:ObjectId" minOccurs="2" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Rename">
-		<xs:sequence>
-			<xs:element name="from" type="tt:ObjectId"/>
-			<xs:element name="to" type="tt:ObjectId"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectId">
-		<xs:attribute name="ObjectId" type="xs:integer"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Behaviour">
-		<xs:sequence>
-			<xs:element name="Removed" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Idle" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:BehaviourExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="BehaviourExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectTree">
-		<xs:sequence>
-			<xs:element name="Rename" type="tt:Rename" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Split" type="tt:Split" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Merge" type="tt:Merge" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Delete" type="tt:ObjectId" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:ObjectTreeExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ObjectTreeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionInCells">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Columns" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Rows" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Cells" type="xs:base64Binary" use="required">
-			<xs:annotation>
-				<xs:documentation>A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down.  If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--    Analytics Configuration    -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="AnalyticsModule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="Rule" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:RuleEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RuleEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Config">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemList">
-				<xs:annotation>
-					<xs:documentation>List of configuration parameters as defined in the correspding description.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:string" use="required">
-			<xs:annotation>
-				<xs:documentation>Name of the configuration.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Type" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescription">
-		<xs:sequence>
-			<xs:element name="Parameters" type="tt:ItemListDescription">
-				<xs:annotation>
-					<xs:documentation>
-						List describing the configuration parameters. The names of the parameters must be unique. If possible SimpleItems
-						should be used to transport the information to ease parsing of dynamically defined messages by a client
-						application.
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Messages" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>
-						The analytics modules and rule engine produce Events, which must be listed within the Analytics Module Description. In order to do so
-						the structure of the Message is defined and consists of three groups: Source, Key, and Data. It is recommended to use SimpleItemDescriptions wherever applicable.
-						The name of all Items must be unique within all Items contained in any group of this Message.
-						Depending on the component multiple parameters or none may be needed to identify the component uniquely.
-					</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="tt:MessageDescription">
-							<xs:sequence>
-								<xs:element name="ParentTopic" type="xs:string">
-									<xs:annotation>
-										<xs:documentation>
-											The ParentTopic labels the message (e.g. "nn:RuleEngine/LineCrossing"). The real message can extend the ParentTopic
-											by for example the name of the instaniated rule (e.g. "nn:RuleEngine/LineCrossing/corssMyFirstLine").
-											Even without knowing the complete topic name, the subscriber will be able to distiguish the
-											messages produced by different rule instances of the same type via the Source fields of the message.
-											There the name of the rule instance, which produced the message, must be listed.
-										</xs:documentation>
-									</xs:annotation>
-								</xs:element>
-							</xs:sequence>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ConfigDescriptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Name" type="xs:QName" use="required">
-			<xs:annotation>
-				<xs:documentation>XML Type of the Configuration (e.g. "tt::LineDetector"). </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ConfigDescriptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRules">
-		<xs:sequence>
-			<xs:element name="RuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the location of all schemas that are referenced in the rules.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of rules supported by the Video Analytics configuration..</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SupportedRulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedRulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModules">
-		<xs:sequence>
-			<xs:element name="AnalyticsModuleContentSchemaLocation" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>It optionally contains a list of URLs that provide the location of schema files.
-        These schema files describe the types and elements used in the analytics module descriptions.
-        If the analytics module descriptions reference types or elements of the ONVIF schema file,
-        the ONVIF schema file MUST be explicitly listed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AnalyticsModuleDescription" type="tt:ConfigDescription" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SupportedAnalyticsModulesExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SupportedAnalyticsModulesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolygonConfiguration">
-		<xs:sequence>
-			<xs:element name="Polygon" type="tt:Polygon">
-				<xs:annotation>
-					<xs:documentation>Contains Polygon configuration for rule parameters</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArray">
-		<xs:sequence>
-			<xs:element name="Segment" type="tt:Polyline" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Contains array of Polyline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PolylineArrayExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PolylineArrayConfiguration">
-		<xs:sequence>
-			<xs:element name="PolylineArray" type="tt:PolylineArray">
-				<xs:annotation>
-					<xs:documentation>Contains PolylineArray configuration data</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpression">
-		<xs:sequence>
-			<xs:element name="Expression" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Motion Expression data structure contains motion expression which is based on Scene Descriptor schema with XPATH syntax. The Type argument could allow introduction of different dialects </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:string"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MotionExpressionConfiguration">
-		<xs:sequence>
-			<xs:element name="MotionExpression" type="tt:MotionExpression">
-				<xs:annotation>
-					<xs:documentation>Contains Rule MotionExpression configuration</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CellLayout">
-		<xs:sequence>
-			<xs:element name="Transformation" type="tt:Transformation">
-				<xs:annotation>
-					<xs:documentation>Mapping of the cell grid to the Video frame. The cell grid is starting from the upper left corner and x dimension is going from left to right and the y dimension from up to down.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Columns" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of columns of the cell grid (x dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="Rows" type="xs:integer" use="required">
-			<xs:annotation>
-				<xs:documentation>Number of rows of the cell grid (y dimension)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--End, Event and Analytics Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Metadata Streaming Types    -->
-	<!--===============================-->
-	<xs:complexType name="MetadataStream">
-		<xs:sequence>
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element name="VideoAnalytics" type="tt:VideoAnalyticsStream"/>
-				<xs:element name="PTZ" type="tt:PTZStream"/>
-				<xs:element name="Event" type="tt:EventStream"/>
-				<xs:element name="Extension" type="tt:MetadataStreamExtension"/>
-			</xs:choice>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AudioAnalyticsStream" type="tt:AudioAnalyticsStream" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:MetadataStreamExtension2" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataStreamExtension2">
-		<xs:sequence>
-			<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAnalyticsStream">
-		<xs:sequence>
-			<xs:element name="AudioDescriptor" type="tt:AudioDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AudioAnalyticsStreamExtension" minOccurs="0" />
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioDescriptor">
-		<xs:sequence>
-		<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="UtcTime" type="xs:dateTime" use="required">
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAnalyticsStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:element name="MetadataStream" type="tt:MetadataStream"/>
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="Frame" type="tt:Frame"/>
-			<xs:element name="Extension" type="tt:VideoAnalyticsStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoAnalyticsStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="PTZStatus" type="tt:PTZStatus"/>
-			<xs:element name="Extension" type="tt:PTZStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventStream">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="wsnt:NotificationMessage"/>
-			<xs:element name="Extension" type="tt:EventStreamExtension"/>
-		</xs:choice>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventStreamExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!-- End, Metadata Streaming Types -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--      Display Related Types  -->
-	<!--===============================-->
-	<xs:complexType name="PaneConfiguration">
-		<xs:annotation>
-			<xs:documentation>Configuration of the streaming and coding settings of a Video window.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneName" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional name of the pane configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioOutputToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio outputs, this element contains a pointer to the audio output that is associated with the pane. A client
-can retrieve the available audio outputs of a device using the GetAudioOutputs command of the DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioSourceToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device has audio sources, this element contains a pointer to the audio source that is associated with this pane.
-The audio connection from a decoder device to the NVT is established using the backchannel mechanism. A client can retrieve the available audio sources of a device using the GetAudioSources command of the
-DeviceIO service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioEncoderConfiguration" type="tt:AudioEncoderConfiguration" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The configuration of the audio encoder including codec, bitrate
-and sample rate. </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ReceiverToken" type="tt:ReferenceToken" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>A pointer to a Receiver that has the necessary information to receive
-				data from a Transmitter. This Receiver can be connected and the network video decoder displays the received data on the specified outputs. A client can retrieve the available Receivers using the
-				GetReceivers command of the Receiver Service.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>A unique identifier in the display device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayout">
-		<xs:annotation>
-			<xs:documentation>A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Pane" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Reference to the configuration of the streaming and coding parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Area" type="tt:Rectangle">
-				<xs:annotation>
-					<xs:documentation>Describes the location and size of the area on the monitor. The area coordinate values are espressed in normalized units [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="Layout">
-		<xs:annotation>
-			<xs:documentation>A layout describes a set of Video windows that are displayed simultaniously on a display. </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayout" type="tt:PaneLayout" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of panes assembling the display layout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="CodingCapabilities">
-		<xs:annotation>
-			<xs:documentation>This type contains the Audio and Video coding capabilities of a display service.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="AudioEncodingCapabilities" type="tt:AudioEncoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio encoding this section describes the supported codecs and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioDecodingCapabilities" type="tt:AudioDecoderConfigurationOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the device supports audio decoding this section describes the supported codecs and their settings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoDecodingCapabilities" type="tt:VideoDecoderConfigurationOptions">
-				<xs:annotation>
-					<xs:documentation>This section describes the supported video codesc and their configuration.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptions">
-		<xs:annotation>
-			<xs:documentation>The options supported for a display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="PaneLayoutOptions" type="tt:PaneLayoutOptions" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Lists the possible Pane Layouts of the Video Output</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:LayoutOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="LayoutOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneLayoutOptions">
-		<xs:annotation>
-			<xs:documentation>Description of a pane layout describing a complete display layout.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Area" type="tt:Rectangle" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of areas assembling a layout. Coordinate values are in the range [-1.0, 1.0].</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:PaneOptionExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PaneOptionExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<!--      End, Display Related Types  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--   Receiver Types              -->
-	<!--===============================-->
-	<xs:complexType name="Receiver">
-		<xs:annotation>
-			<xs:documentation>
-			Description of a receiver, including its token and configuration.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Unique identifier of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:ReceiverConfiguration">
-				<xs:annotation>
-					<xs:documentation>Describes the configuration of the receiver.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-			Describes the configuration of a receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Mode" type="tt:ReceiverMode">
-				<xs:annotation>
-					<xs:documentation>The following connection modes are defined:</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MediaUri" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Details of the URI to which the receiver should connect.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StreamSetup" type="tt:StreamSetup">
-				<xs:annotation>
-					<xs:documentation>Stream connection parameters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverMode">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies a receiver connection mode.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AutoConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver connects on demand, as required by consumers of the media streams.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="AlwaysConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver attempts to maintain a persistent connection to the configured endpoint.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="NeverConnect">
-				<xs:annotation>
-					<xs:documentation>The receiver does not attempt to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="ReceiverState">
-		<xs:annotation>
-			<xs:documentation>
-			Specifies the current connection state of the receiver.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="NotConnected">
-				<xs:annotation>
-					<xs:documentation>The receiver is not connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connecting">
-				<xs:annotation>
-					<xs:documentation>The receiver is attempting to connect.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Connected">
-				<xs:annotation>
-					<xs:documentation>The receiver is connected.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="ReceiverStateInformation">
-		<xs:annotation>
-			<xs:documentation>
-			Contains information about a receiver's current state.
-		</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="State" type="tt:ReceiverState">
-				<xs:annotation>
-					<xs:documentation>The connection state of the receiver may have one of the following states: </xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreated" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates whether or not the receiver was created automatically.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--   End, Receiver Types         					  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Storage Types         -->
-	<!--===============================-->
-	<xs:simpleType name="ReceiverReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="SourceReference">
-		<xs:sequence>
-			<xs:element name="Token" type="tt:ReferenceToken"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:anyURI" use="optional" default="http://www.onvif.org/ver10/schema/Receiver"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="Description">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="DateTimeRange">
-		<xs:sequence>
-			<xs:element name="From" type="xs:dateTime"/>
-			<xs:element name="Until" type="xs:dateTime"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSummary">
-		<xs:sequence>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The earliest point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataUntil" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The most recent point in time where there is recorded data on the device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="NumberRecordings" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The device contains this many recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScope">
-		<xs:annotation>
-			<xs:documentation>A structure for defining a limited scope when searching in recorded data.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="IncludedSources" type="tt:SourceReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of sources that are included in the scope. If this list is included, only data from one of these sources shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="IncludedRecordings" type="tt:RecordingReference" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A list of recordings that are included in the scope. If this list is included, only data from one of these recordings shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformationFilter" type="tt:XPathExpression" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>An xpath expression used to specify what recordings to search. Only those recordings with an RecordingInformation structure that matches the filter shall be searched.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:SearchScopeExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Extension point</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SearchScopeExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EventFilter">
-		<xs:complexContent>
-			<xs:extension base="wsnt:FilterType">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="PTZPositionFilter">
-		<xs:sequence>
-			<xs:element name="MinPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The lower boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaxPosition" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The upper boundary of the PTZ volume to look for.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EnterOrExit" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, search for when entering the specified PTZ volume.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataFilter">
-		<xs:sequence>
-			<xs:element name="MetadataStreamFilter" type="tt:XPathExpression"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="XPathExpression">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="FindRecordingResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingInformation" type="tt:RecordingInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A RecordingInformation structure for each found recording matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindEventResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindEventResult structure for each found event matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindEventResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>The recording where this event was found. Empty string if no recording is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the track where this event was found. Empty string if no track is associated with this event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the event occured.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Event" type="wsnt:NotificationMessageHolderType">
-				<xs:annotation>
-					<xs:documentation>The description of the event.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="StartStateEvent" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>If true, indicates that the event is a virtual event generated for this particular search session to give the state of a property at the start time of the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindPTZPositionResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindPTZPositionResult structure for each found PTZ position matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindPTZPositionResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The time when the PTZ position was valid.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Position" type="tt:PTZVector">
-				<xs:annotation>
-					<xs:documentation>The PTZ position.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResultList">
-		<xs:sequence>
-			<xs:element name="SearchState" type="tt:SearchState">
-				<xs:annotation>
-					<xs:documentation>The state of the search when the result is returned. Indicates if there can be more results, or if the search is completed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Result" type="tt:FindMetadataResult" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A FindMetadataResult structure for each found set of Metadata matching the search.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="FindMetadataResult">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording containing the metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the metadata track containing the matching metadata.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Time" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The point in time when the matching metadata occurs in the metadata track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="SearchState">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Queued">
-				<xs:annotation>
-					<xs:documentation>The search is queued and not yet started.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Searching">
-				<xs:annotation>
-					<xs:documentation>The search is underway and not yet completed.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Completed">
-				<xs:annotation>
-					<xs:documentation>The search has been completed and no new results will be found.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>The state of the search is unknown. (This is not a valid response from GetSearchState.)</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:simpleType name="JobToken">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference"/>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>
-					Information about the source of the recording. This gives a description of where the data in the recording comes from. Since a single
-					recording is intended to record related material, there is just one source. It is indicates the physical location or the
-					major data source for the recording. Currently the recordingconfiguration cannot describe each individual data source.
-				</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="EarliestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="LatestRecording" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="Content" type="tt:Description"/>
-			<xs:element name="Track" type="tt:TrackInformation" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RecordingStatus" type="tt:RecordingStatus"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingSourceInformation">
-		<xs:annotation>
-			<xs:documentation>
-				A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SourceId" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>
-				Identifier for the source chosen by the client that creates the structure.
-				This identifier is opaque to the device. Clients may use any type of URI for this field. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Name" type="tt:Name">
-				<xs:annotation>
-					<xs:documentation>Informative user readable name of the source, e.g. "Camera23". A device shall support at least 20 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Location" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the physical location of the source, e.g. the coordinates on a map.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Address" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>URI provided by the service supplying data to be recorded. A device shall support at least 128 characters.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingStatus">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Initiated"/>
-			<xs:enumeration value="Recording"/>
-			<xs:enumeration value="Stopped"/>
-			<xs:enumeration value="Removing"/>
-			<xs:enumeration value="Removed"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="TrackInformation">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference"/>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track: "Video", "Audio" or "Metadata".
-					The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the contents of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataFrom" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The start date and time of the oldest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DataTo" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The stop date and time of the newest recorded data in the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="TrackType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Video"/>
-			<xs:enumeration value="Audio"/>
-			<xs:enumeration value="Metadata"/>
-			<xs:enumeration value="Extended">
-				<xs:annotation>
-					<xs:documentation>Placeholder for future extension.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="MediaAttributes">
-		<xs:annotation>
-			<xs:documentation>A set of media attributes valid for a recording at a point in time or for a time interval.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>A reference to the recording that has these attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TrackAttributes" type="tt:TrackAttributes" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>A set of attributes for each track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="From" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid from this point in time in the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Until" type="xs:dateTime">
-				<xs:annotation>
-					<xs:documentation>The attributes are valid until this point in time in the recording. Can be equal to 'From' to indicate that the attributes are only known to be valid for this particular point in time.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributes">
-		<xs:sequence>
-			<xs:element name="TrackInformation" type="tt:TrackInformation">
-				<xs:annotation>
-					<xs:documentation>The basic information about the track. Note that a track may represent a single contiguous time span or consist of multiple slices.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VideoAttributes" type="tt:VideoAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is a video track, exactly one of this structure shall be present and contain the video attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AudioAttributes" type="tt:AudioAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an audio track, exactly one of this structure shall be present and contain the audio attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MetadataAttributes" type="tt:MetadataAttributes" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If the track is an metadata track, exactly one of this structure shall be present and contain the metadata attributes.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:TrackAttributesExtension" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation/>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackAttributesExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="VideoAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Average bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Width" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The width of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Height" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The height of the video in pixels.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="tt:VideoEncoding">
-				<xs:annotation>
-					<xs:documentation>Used video codec, either Jpeg, H.264 or Mpeg4</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Framerate" type="xs:float">
-				<xs:annotation>
-					<xs:documentation>Average framerate in frames per second.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AudioAttributes">
-		<xs:sequence>
-			<xs:element name="Bitrate" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The bitrate in kbps.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Encoding" type="tt:AudioEncoding">
-				<xs:annotation>
-					<xs:documentation>Audio codec used for encoding the audio (either G.711, G.726 or AAC)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Samplerate" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>The sample rate in kHz.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataAttributes">
-		<xs:sequence>
-			<xs:element name="CanContainPTZ" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be PTZ data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainAnalytics" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be analytics data in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CanContainNotifications" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>Indicates that there can be notifications in the metadata track in the specified time interval.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="PtzSpaces" type="tt:StringAttrList">
-			<xs:annotation>
-				<xs:documentation>List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. </xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobReference">
-		<xs:restriction base="tt:ReferenceToken"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingConfiguration">
-		<xs:sequence>
-			<xs:element name="Source" type="tt:RecordingSourceInformation">
-				<xs:annotation>
-					<xs:documentation>Information about the source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Content" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="MaximumRetentionTime" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>Sspecifies the maximum time that data in any track within the
-				recording shall be stored. The device shall delete any data older than the maximum retention
-				time. Such data shall not be accessible anymore. If the MaximumRetentionPeriod is set to 0,
-				the device shall not limit the retention time of stored data, except by resource constraints.
-				Whatever the value of MaximumRetentionTime, the device may automatically delete
-				recordings to free up storage space for new recordings.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="TrackConfiguration">
-		<xs:sequence>
-			<xs:element name="TrackType" type="tt:TrackType">
-				<xs:annotation>
-					<xs:documentation>Type of the track. It shall be equal to the strings “Video”,
-				“Audio” or “Metadata”. The track shall only be able to hold data of that type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Description" type="tt:Description">
-				<xs:annotation>
-					<xs:documentation>Informative description of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingsResponseItem">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Token of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:RecordingConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:GetTracksResponseList">
-				<xs:annotation>
-					<xs:documentation>List of tracks.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseList">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:GetTracksResponseItem" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Configuration of a track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetTracksResponseItem">
-		<xs:sequence>
-			<xs:element name="TrackToken" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Token of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Configuration" type="tt:TrackConfiguration">
-				<xs:annotation>
-					<xs:documentation>Configuration of the track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfiguration">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the recording to which this job shall store the received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Mode" type="tt:RecordingJobMode">
-				<xs:annotation>
-					<xs:documentation>The mode of the job. If it is idle, nothing shall happen. If it is active, the device shall try
-				to obtain data from the receivers. A client shall use GetRecordingJobState to determine if data transfer is really taking place.<br/>
-				The only valid values for Mode shall be “Idle” and “Active”.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Priority" type="xs:int">
-				<xs:annotation>
-					<xs:documentation>This shall be a non-negative number. If there are multiple recording jobs that store data to
-				the same track, the device will only store the data for the recording job with the highest
-				priority. The priority is specified per recording job, but the device shall determine the priority
-				of each track individually. If there are two recording jobs with the same priority, the device
-				shall record the data corresponding to the recording job that was activated the latest.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Source" type="tt:RecordingJobSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Source of the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobMode">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>This field shall be a reference to the source of the data. The type of the source
-				is determined by the attribute Type in the SourceToken structure. If Type is
-				http://www.onvif.org/ver10/schema/Receiver, the token is a ReceiverReference. In this case
-				the device shall receive the data over the network. If Type is
-				http://www.onvif.org/ver10/schema/Profile, the token identifies a media profile, instructing the
-				device to obtain data from a profile that exists on the local device.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AutoCreateReceiver" type="xs:boolean" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>If this field is TRUE, and if the SourceToken is omitted, the device
-				shall create a receiver object (through the receiver service) and assign the
-				ReceiverReference to the SourceToken field. When retrieving the RecordingJobConfiguration
-				from the device, the AutoCreateReceiver field shall never be present.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobTrack" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of tracks associated with the recording.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobSourceExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobSourceExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>If the received RTSP stream contains multiple tracks of the same type, the
-						SourceTag differentiates between those Tracks. This field can be ignored in case of recording a local source.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>The destination is the tracktoken of the track to which the device shall store the
-				received data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformation">
-		<xs:sequence>
-			<xs:element name="RecordingToken" type="tt:RecordingReference">
-				<xs:annotation>
-					<xs:documentation>Identification of the recording that the recording job records to.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over the whole RecordingJobInformation structure.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Sources" type="tt:RecordingJobStateSource" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:RecordingJobStateInformationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateInformationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="RecordingJobState">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateSource">
-		<xs:sequence>
-			<xs:element name="SourceToken" type="tt:SourceReference">
-				<xs:annotation>
-					<xs:documentation>Identifies the data source of the recording job.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Holds the aggregated state over all substructures of RecordingJobStateSource.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Tracks" type="tt:RecordingJobStateTracks">
-				<xs:annotation>
-					<xs:documentation>List of track items.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTracks">
-		<xs:sequence>
-			<xs:element name="Track" type="tt:RecordingJobStateTrack" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="RecordingJobStateTrack">
-		<xs:sequence>
-			<xs:element name="SourceTag" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>Identifies the track of the data source that provides the data.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Destination" type="tt:TrackReference">
-				<xs:annotation>
-					<xs:documentation>Indicates the destination track.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Error" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optionally holds an implementation defined string value that describes the error.
-				The string should be in the English language.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:RecordingJobState">
-				<xs:annotation>
-					<xs:documentation>Provides the job state of the track. The valid
-				values of state shall be “Idle”, “Active” and “Error”. If state equals “Error”, the Error field may be filled in with an implementation defined value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="GetRecordingJobsResponseItem">
-		<xs:sequence>
-			<xs:element name="JobToken" type="tt:RecordingJobReference"/>
-			<xs:element name="JobConfiguration" type="tt:RecordingJobConfiguration"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, RecordingService Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Replay Types         		  -->
-	<!--===============================-->
-	<xs:complexType name="ReplayConfiguration">
-		<xs:annotation>
-			<xs:documentation>
-      Configuration parameters for the replay service.
-    </xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="SessionTimeout" type="xs:duration">
-				<xs:annotation>
-					<xs:documentation>The RTSP session timeout.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Replay Types         		  -->
-	<!--===============================-->
-	<!--===============================-->
-	<!--===============================-->
-	<!--         Analytics Device Types         -->
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngine">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="AnalyticsEngineConfiguration" type="tt:AnalyticsDeviceEngineConfiguration"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfiguration">
-		<xs:sequence>
-			<xs:element name="EngineConfiguration" type="tt:EngineConfiguration" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:AnalyticsDeviceEngineConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsDeviceEngineConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="EngineConfiguration">
-		<xs:sequence>
-			<xs:element name="VideoAnalyticsConfiguration" type="tt:VideoAnalyticsConfiguration"/>
-			<xs:element name="AnalyticsEngineInputInfo" type="tt:AnalyticsEngineInputInfo"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfo">
-		<xs:sequence>
-			<xs:element name="InputInfo" type="tt:Config" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:AnalyticsEngineInputInfoExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInputInfoExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineInput">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="SourceIdentification" type="tt:SourceIdentification"/>
-					<xs:element name="VideoInput" type="tt:VideoEncoderConfiguration"/>
-					<xs:element name="MetadataInput" type="tt:MetadataInput"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentification">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string"/>
-			<xs:element name="Token" type="tt:ReferenceToken" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:SourceIdentificationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="SourceIdentificationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInput">
-		<xs:sequence>
-			<xs:element name="MetadataConfig" type="tt:Config" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Extension" type="tt:MetadataInputExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MetadataInputExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsEngineControl">
-		<xs:complexContent>
-			<xs:extension base="tt:ConfigurationEntity">
-				<xs:sequence>
-					<xs:element name="EngineToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine (AnalyticsEngine) being controlled.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="EngineConfigToken" type="tt:ReferenceToken">
-						<xs:annotation>
-							<xs:documentation>Token of the analytics engine configuration (VideoAnalyticsConfiguration) in effect.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="InputToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the input (AnalyticsEngineInput) configuration applied.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="ReceiverToken" type="tt:ReferenceToken" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Tokens of the receiver providing media input data. The order of ReceiverToken shall exactly match the order of InputToken.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Multicast" type="tt:MulticastConfiguration" minOccurs="0"/>
-					<xs:element name="Subscription" type="tt:Config"/>
-					<xs:element name="Mode" type="tt:ModeOfOperation"/>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="ModeOfOperation">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Idle"/>
-			<xs:enumeration value="Active"/>
-			<xs:enumeration value="Unknown">
-				<xs:annotation>
-					<xs:documentation>This case should never happen.</xs:documentation>
-				</xs:annotation>
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsStateInformation">
-		<xs:sequence>
-			<xs:element name="AnalyticsEngineControlToken" type="tt:ReferenceToken">
-				<xs:annotation>
-					<xs:documentation>Token of the control object whose status is requested.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="State" type="tt:AnalyticsState"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="AnalyticsState">
-		<xs:sequence>
-			<xs:element name="Error" type="xs:string" minOccurs="0"/>
-			<xs:element name="State" type="xs:string"/>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<!--         End, Analytics Device Types         -->
-	<!--===============================-->
-	<!--=========================================-->
-	<!--  Action event payload Types   -->
-	<!--=========================================-->
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayload">
-		<xs:annotation>
-			<xs:documentation>Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="RequestInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Request Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ResponseInfo" type="soapenv:Envelope" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Response Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Fault" type="soapenv:Fault" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Fault Message</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:ActionEngineEventPayloadExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ActionEngineEventPayloadExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Action event payload Types   -->
-	<!--=========================================-->
-        <!--=========================================-->
-	<!--  Begin, Audio event types               -->
-	<!--=========================================-->
-	<xs:simpleType name="AudioClassType">
-		<xs:annotation>
-		<xs:documentation>
-		  AudioClassType acceptable values are;
-		   gun_shot, scream, glass_breaking, tire_screech   
-		</xs:documentation>
-		</xs:annotation>
-	<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-
-	<xs:complexType name="AudioClassCandidate">
-	<xs:sequence>
-		<xs:element name="Type" type="tt:AudioClassType">
-			<xs:annotation>
-			<xs:documentation>Indicates audio class label</xs:documentation>
-			</xs:annotation>
-		</xs:element> 
- 		<xs:element name="Likelihood" type="xs:float">
-			<xs:annotation>
-			<xs:documentation>A likelihood/probability that the corresponding audio event belongs to this class. The sum of the likelihoods shall NOT exceed 1</xs:documentation>
-			</xs:annotation>
-		</xs:element>  
-		<xs:any namespace="##targetNamespace" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-
-	<xs:complexType name="AudioClassDescriptor">
-	<xs:sequence>
-		<xs:element name="ClassCandidate" type="tt:AudioClassCandidate" minOccurs="0" maxOccurs="unbounded">
-			<xs:annotation>
-			<xs:documentation>Array of audio class label and class probability</xs:documentation>
-			</xs:annotation>
-		</xs:element>
-		<xs:element name="Extension" type="tt:AudioClassDescriptorExtension" minOccurs="0"/>
-	</xs:sequence>
-	<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<xs:complexType name="AudioClassDescriptorExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, Audio event types                 -->
-	<!--=========================================-->	
-	<!--==================================-->
-	<!--  Begin, OSD Device Types         -->
-	<!--==================================-->
-	<xs:complexType name="OSDReference">
-		<xs:simpleContent>
-			<xs:extension base="tt:ReferenceToken">
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:simpleType name="OSDType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Text"/>
-			<xs:enumeration value="Image"/>
-			<xs:enumeration value="Extended"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>For OSD position type, following are the pre-defined: <ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Pos" type="tt:Vector" minOccurs="0"/>
-			<xs:element name="Extension" type="tt:OSDPosConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDPosConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColor">
-		<xs:annotation>
-			<xs:documentation>The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:Color"/>
-		</xs:sequence>
-		<xs:attribute name="Transparent" type="xs:int" use="optional"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfiguration">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-						The following OSD Text Type are defined:<ul>
-							<li>Plain - The Plain type means the OSD is shown as a text string which defined in the "PlainText" item.</li>
-							<li>Date - The Date type means the OSD is shown as a date, format of which should be present in the "DateFormat" item.</li>
-							<li>Time - The Time type means the OSD is shown as a time, format of which should be present in the "TimeFormat" item.</li>
-							<li>DateAndTime - The DateAndTime type means the OSD is shown as date and time, format of which should be present in the "DateFormat" and the "TimeFormat" item.</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD date formats. This element shall be present when the value of Type field has Date or DateAndTime. The following DateFormat are defined:<ul>
-							<li>M/d/yyyy - e.g. 3/6/2013</li>
-							<li>MM/dd/yyyy - e.g. 03/06/2013</li>
-							<li>dd/MM/yyyy - e.g. 06/03/2013</li>
-							<li>yyyy/MM/dd - e.g. 2013/03/06</li>
-							<li>yyyy-MM-dd - e.g. 2013-06-03</li>
-							<li>dddd, MMMM dd, yyyy - e.g. Wednesday, March 06, 2013</li>
-							<li>MMMM dd, yyyy - e.g. March 06, 2013</li>
-							<li>dd MMMM, yyyy - e.g. 06 March, 2013</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>
-						List of supported OSD time formats. This element shall be present when the value of Type field has Time or DateAndTime. The following TimeFormat are defined:<ul>
-							<li>h:mm:ss tt - e.g. 2:14:21 PM</li>
-							<li>hh:mm:ss tt - e.g. 02:14:21 PM</li>
-							<li>H:mm:ss - e.g. 14:14:21</li>
-							<li>HH:mm:ss - e.g. 14:14:21</li>
-						</ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSize" type="xs:int" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font size of the text in pt.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Font color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColor" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Background color of the text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PlainText" type="xs:string" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>The content of text to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfiguration">
-		<xs:sequence>
-			<xs:element name="ImgPath" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>The URI of the image which to be displayed.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgConfigurationExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorspaceRange">
-		<xs:sequence>
-			<xs:element name="X" type="tt:FloatRange"/>
-			<xs:element name="Y" type="tt:FloatRange"/>
-			<xs:element name="Z" type="tt:FloatRange"/>
-			<xs:element name="Colorspace" type="xs:anyURI"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="ColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color supported. Either list each color or define the range of color value. The following values are acceptable for Colourspace attribute.<ul><li>http://www.onvif.org/ver10/colorspace/YCbCr - YCbCr colourspace</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELUV - CIE LUV</li>
-				<li>http://www.onvif.org/ver10/colorspace/CIELAB - CIE 1976 (L*a*b*)</li>
-				<li>http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace</li></ul>
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:choice>
-				<xs:element name="ColorList" type="tt:Color" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>List the supported color.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="ColorspaceRange" type="tt:ColorspaceRange" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>Define the rang of color supported.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:choice>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptions">
-		<xs:annotation>
-			<xs:documentation>Describe the option of the color and its transparency.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="Color" type="tt:ColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Optional list of supported colors.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Transparent" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the transparent level. Larger means more tranparent.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDColorOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDColorOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptions">
-		<xs:sequence>
-			<xs:element name="Type" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported OSD text type. When a device indicates the supported number relating to Text type in MaximumNumberOfOSDs, the type shall be presented.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontSizeRange" type="tt:IntRange" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Range of the font size value.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DateFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported date format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TimeFormat" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of supported time format.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="FontColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported font color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="BackgroundColor" type="tt:OSDColorOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>List of supported background color.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDTextOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDTextOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptions">
-		<xs:sequence>
-			<xs:element name="ImagePath" type="xs:anyURI" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List of avaiable uris of image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDImgOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDImgOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfiguration">
-		<xs:complexContent>
-			<xs:extension base="tt:DeviceEntity">
-				<xs:sequence>
-					<xs:element name="VideoSourceConfigurationToken" type="tt:OSDReference">
-						<xs:annotation>
-							<xs:documentation>Reference to the video source configuration.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Type" type="tt:OSDType">
-						<xs:annotation>
-							<xs:documentation>Type of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Position" type="tt:OSDPosConfiguration">
-						<xs:annotation>
-							<xs:documentation>Position configuration of OSD.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="TextString" type="tt:OSDTextConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Text configuration of OSD. It shall be present when the value of Type field is Text.</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Image" type="tt:OSDImgConfiguration" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Image configuration of OSD. It shall be present when the value of Type field is Image</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="Extension" type="tt:OSDConfigurationExtension" minOccurs="0"/>
-				</xs:sequence>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="MaximumNumberOfOSDs">
-		<xs:attribute name="Total" type="xs:int" use="required"/>
-		<xs:attribute name="Image" type="xs:int"/>
-		<xs:attribute name="PlainText" type="xs:int"/>
-		<xs:attribute name="Date" type="xs:int"/>
-		<xs:attribute name="Time" type="xs:int"/>
-		<xs:attribute name="DateAndTime" type="xs:int"/>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptions">
-		<xs:sequence>
-			<xs:element name="MaximumNumberOfOSDs" type="tt:MaximumNumberOfOSDs">
-				<xs:annotation>
-					<xs:documentation>The maximum number of OSD configurations supported for the specificate video source configuration. If a device limits the number of instances by OSDType, it should indicate the supported number via the related attribute.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Type" type="tt:OSDType" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List supported type of OSD configuration. When a device indicates the supported number for each types in MaximumNumberOfOSDs, related type shall be presented. A device shall return Option element relating to listed type.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PositionOption" type="xs:string" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>List available OSD position type. Following are the pre-defined:<ul><li>UpperLeft</li>
-						<li>UpperRight</li>
-						<li>LowerLeft</li>
-						<li>LowerRight</li>
-						<li>Custom</li></ul>
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TextOption" type="tt:OSDTextOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD text configuration. This element shall be returned if the device is signaling the support for Text.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="ImageOption" type="tt:OSDImgOptions" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Option of the OSD image configuration. This element shall be returned if the device is signaling the support for Image.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Extension" type="tt:OSDConfigurationOptionsExtension" minOccurs="0"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--===============================-->
-	<xs:complexType name="OSDConfigurationOptionsExtension">
-		<xs:sequence>
-			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:anyAttribute processContents="lax"/>
-	</xs:complexType>
-	<!--=========================================-->
-	<!--  End, OSD Device Types                  -->
-	<!--=========================================-->
-</xs:schema>
diff --git a/onvif/wsdl/ptz.wsdl b/onvif/wsdl/ptz.wsdl
deleted file mode 100644
index e977619be..000000000
--- a/onvif/wsdl/ptz.wsdl
+++ /dev/null
@@ -1,1300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../ver20/util/onvif-wsdl-viewer.xsl"?>
-<!--
-Copyright (c) 2008-2012 by ONVIF: Open Network Video Interface Forum. All rights reserved.
-
-Recipients of this document may copy, distribute, publish, or display this document so long as this copyright notice, license and disclaimer are retained with all copies of the document. No license is granted to modify this document.
-
-THIS DOCUMENT IS PROVIDED "AS IS," AND THE CORPORATION AND ITS MEMBERS AND THEIR AFFILIATES, MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THIS DOCUMENT ARE SUITABLE FOR ANY PURPOSE; OR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-IN NO EVENT WILL THE CORPORATION OR ITS MEMBERS OR THEIR AFFILIATES BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT, WHETHER OR NOT (1) THE CORPORATION, MEMBERS OR THEIR AFFILIATES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR (2) SUCH DAMAGES WERE REASONABLY FORESEEABLE, AND ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THIS DOCUMENT.  THE FOREGOING DISCLAIMER AND LIMITATION ON LIABILITY DO NOT APPLY TO, INVALIDATE, OR LIMIT REPRESENTATIONS AND WARRANTIES MADE BY THE MEMBERS AND THEIR RESPECTIVE AFFILIATES TO THE CORPORATION AND OTHER MEMBERS IN CERTAIN WRITTEN POLICIES OF THE CORPORATION.
--->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="PTZService" targetNamespace="http://www.onvif.org/ver20/ptz/wsdl">
-	<wsdl:types>
-		<xs:schema targetNamespace="http://www.onvif.org/ver20/ptz/wsdl" xmlns:tt="http://www.onvif.org/ver10/schema" xmlns:tptz="http://www.onvif.org/ver20/ptz/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="2.4">
-			<xs:import namespace="http://www.onvif.org/ver10/schema" schemaLocation="file:wsdl/onvif-local.xsd"/>
-			<!--  Message Request/Responses elements  -->
-			<!--===============================-->
-			<xs:element name="GetServiceCapabilities">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetServiceCapabilitiesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Capabilities" type="tptz:Capabilities">
-							<xs:annotation>
-								<xs:documentation>The capabilities for the PTZ service is returned in the Capabilities element.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:complexType name="Capabilities">
-				<xs:sequence>
-					<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-				<xs:attribute name="EFlip" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not EFlip is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="Reverse" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates whether or not reversing of PT control direction is supported.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="GetCompatibleConfigurations" type="xs:boolean">
-					<xs:annotation>
-						<xs:documentation>Indicates support for the GetCompatibleConfigurations command.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:anyAttribute processContents="lax"/>
-			</xs:complexType>
-			<xs:element name="Capabilities" type="tptz:Capabilities"/>
-			<!--===============================-->
-			<xs:element name="GetNodes">
-				<xs:complexType/>
-			</xs:element>
-			<xs:element name="GetNodesResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZNode" type="tt:PTZNode" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of the existing PTZ Nodes on the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetNode">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="NodeToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested PTZNode.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetNodeResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZNode" type="tt:PTZNode">
-							<xs:annotation>
-								<xs:documentation>A requested PTZNode.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfigurations">
-				<xs:complexType/>
-			</xs:element>
-			<xs:element name="GetConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of all existing PTZConfigurations on the device.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of the requested PTZConfiguration.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
-							<xs:annotation>
-								<xs:documentation>A requested PTZConfiguration.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetConfiguration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration">
-							<xs:annotation>
-								<xs:documentation>
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="ForcePersistence" type="xs:boolean">
-							<xs:annotation>
-								<xs:documentation>Flag that makes configuration persistent. Example: User wants the configuration to exist after reboot.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetConfigurationResponse">
-				<xs:complexType>
-					<xs:sequence minOccurs="0"/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetConfigurationOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ConfigurationToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Token of an existing configuration that the options are intended for.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetConfigurationOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfigurationOptions" type="tt:PTZConfigurationOptions">
-							<xs:annotation>
-								<xs:documentation>The requested PTZ configuration options.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SendAuxiliaryCommand">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="AuxiliaryData" type="tt:AuxiliaryData">
-							<xs:annotation>
-								<xs:documentation>The Auxiliary request data.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SendAuxiliaryCommandResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="AuxiliaryResponse" type="tt:AuxiliaryData">
-							<xs:annotation>
-								<xs:documentation>The response contains the auxiliary response.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresets">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Preset" type="tt:PTZPreset" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of presets which are available for the requested MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetPreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetName" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested preset name.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetPresetResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A token to the Preset which has been set.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePresetResponse">
-				<xs:complexType/>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GotoPreset">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PresetToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A requested preset token.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GotoPresetResponse">
-				<xs:complexType/>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetStatus">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the PTZStatus should be requested.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStatusResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZStatus" type="tt:PTZStatus">
-							<xs:annotation>
-								<xs:documentation>The PTZStatus for the requested MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GotoHomePosition">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the operation should take place.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>A requested speed.The speed parameter can only be specified when Speed Spaces are available for the PTZ Node.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GotoHomePositionResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="SetHomePosition">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile where the home position should be set.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SetHomePositionResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ContinuousMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Velocity" type="tt:PTZSpeed">
-							<xs:annotation>
-								<xs:documentation>A Velocity vector specifying the velocity of pan, tilt and zoom.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Timeout" type="xs:duration" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Timeout parameter.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ContinuousMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RelativeMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Translation" type="tt:PTZVector">
-							<xs:annotation>
-								<xs:documentation>A positional Translation relative to the current position
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Speed parameter.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RelativeMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="AbsoluteMove">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Position" type="tt:PTZVector">
-							<xs:annotation>
-								<xs:documentation>A Position vector specifying the absolute target position.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Speed" type="tt:PTZSpeed" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>An optional Speed.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AbsoluteMoveResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="Stop">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>A reference to the MediaProfile that indicate what should be stopped.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="PanTilt" type="xs:boolean" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Set true when we want to stop ongoing pan and tilt movements.If PanTilt arguments are not present, this command stops these movements.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Zoom" type="xs:boolean" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Set true when we want to stop ongoing zoom movement.If Zoom arguments are not present, this command stops ongoing zoom movement.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="StopResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTours">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetToursResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTour" type="tt:PresetTour" minOccurs="0" maxOccurs="unbounded"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetTourResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTour" type="tt:PresetTour"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetPresetTourOptions">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetPresetTourOptionsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Options" type="tt:PTZPresetTourOptions"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="CreatePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="CreatePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="ModifyPresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTour" type="tt:PresetTour"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ModifyPresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="OperatePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-						<xs:element name="Operation" type="tt:PTZPresetTourOperation"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OperatePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="RemovePresetTour">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken"/>
-						<xs:element name="PresetTourToken" type="tt:ReferenceToken"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="RemovePresetTourResponse">
-				<xs:complexType>
-					<xs:sequence/>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-			<xs:element name="GetCompatibleConfigurations">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="ProfileToken" type="tt:ReferenceToken">
-							<xs:annotation>
-								<xs:documentation>Contains the token of an existing media profile the configurations shall be compatible with.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetCompatibleConfigurationsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PTZConfiguration" type="tt:PTZConfiguration" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>A list of all existing PTZConfigurations on the NVT that is suitable to be added to the addressed media profile.
-								</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<!--===============================-->
-		</xs:schema>
-	</wsdl:types>
-	<wsdl:message name="GetServiceCapabilitiesRequest">
-		<wsdl:part name="parameters" element="tptz:GetServiceCapabilities"/>
-	</wsdl:message>
-	<wsdl:message name="GetServiceCapabilitiesResponse">
-		<wsdl:part name="parameters" element="tptz:GetServiceCapabilitiesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodesRequest">
-		<wsdl:part name="parameters" element="tptz:GetNodes"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodesResponse">
-		<wsdl:part name="parameters" element="tptz:GetNodesResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodeRequest">
-		<wsdl:part name="parameters" element="tptz:GetNode"/>
-	</wsdl:message>
-	<wsdl:message name="GetNodeResponse">
-		<wsdl:part name="parameters" element="tptz:GetNodeResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationsRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationsResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetConfigurationRequest">
-		<wsdl:part name="parameters" element="tptz:SetConfiguration"/>
-	</wsdl:message>
-	<wsdl:message name="SetConfigurationResponse">
-		<wsdl:part name="parameters" element="tptz:SetConfigurationResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationOptionsRequest">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetConfigurationOptionsResponse">
-		<wsdl:part name="parameters" element="tptz:GetConfigurationOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetsRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresets"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetsResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetPresetRequest">
-		<wsdl:part name="parameters" element="tptz:SetPreset"/>
-	</wsdl:message>
-	<wsdl:message name="SetPresetResponse">
-		<wsdl:part name="parameters" element="tptz:SetPresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetRequest">
-		<wsdl:part name="parameters" element="tptz:RemovePreset"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetResponse">
-		<wsdl:part name="parameters" element="tptz:RemovePresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GotoPresetRequest">
-		<wsdl:part name="parameters" element="tptz:GotoPreset"/>
-	</wsdl:message>
-	<wsdl:message name="GotoPresetResponse">
-		<wsdl:part name="parameters" element="tptz:GotoPresetResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetStatusRequest">
-		<wsdl:part name="parameters" element="tptz:GetStatus"/>
-	</wsdl:message>
-	<wsdl:message name="GetStatusResponse">
-		<wsdl:part name="parameters" element="tptz:GetStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandRequest">
-		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommand"/>
-	</wsdl:message>
-	<wsdl:message name="SendAuxiliaryCommandResponse">
-		<wsdl:part name="parameters" element="tptz:SendAuxiliaryCommandResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GotoHomePositionRequest">
-		<wsdl:part name="parameters" element="tptz:GotoHomePosition"/>
-	</wsdl:message>
-	<wsdl:message name="GotoHomePositionResponse">
-		<wsdl:part name="parameters" element="tptz:GotoHomePositionResponse"/>
-	</wsdl:message>
-	<wsdl:message name="SetHomePositionRequest">
-		<wsdl:part name="parameters" element="tptz:SetHomePosition"/>
-	</wsdl:message>
-	<wsdl:message name="SetHomePositionResponse">
-		<wsdl:part name="parameters" element="tptz:SetHomePositionResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ContinuousMoveRequest">
-		<wsdl:part name="parameters" element="tptz:ContinuousMove"/>
-	</wsdl:message>
-	<wsdl:message name="ContinuousMoveResponse">
-		<wsdl:part name="parameters" element="tptz:ContinuousMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RelativeMoveRequest">
-		<wsdl:part name="parameters" element="tptz:RelativeMove"/>
-	</wsdl:message>
-	<wsdl:message name="RelativeMoveResponse">
-		<wsdl:part name="parameters" element="tptz:RelativeMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="AbsoluteMoveRequest">
-		<wsdl:part name="parameters" element="tptz:AbsoluteMove"/>
-	</wsdl:message>
-	<wsdl:message name="AbsoluteMoveResponse">
-		<wsdl:part name="parameters" element="tptz:AbsoluteMoveResponse"/>
-	</wsdl:message>
-	<wsdl:message name="StopRequest">
-		<wsdl:part name="parameters" element="tptz:Stop"/>
-	</wsdl:message>
-	<wsdl:message name="StopResponse">
-		<wsdl:part name="parameters" element="tptz:StopResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetToursRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTours"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetToursResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetToursResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourOptionsRequest">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourOptions"/>
-	</wsdl:message>
-	<wsdl:message name="GetPresetTourOptionsResponse">
-		<wsdl:part name="parameters" element="tptz:GetPresetTourOptionsResponse"/>
-	</wsdl:message>
-	<wsdl:message name="CreatePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:CreatePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="CreatePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:CreatePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="ModifyPresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:ModifyPresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="ModifyPresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:ModifyPresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="OperatePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:OperatePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="OperatePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:OperatePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetTourRequest">
-		<wsdl:part name="parameters" element="tptz:RemovePresetTour"/>
-	</wsdl:message>
-	<wsdl:message name="RemovePresetTourResponse">
-		<wsdl:part name="parameters" element="tptz:RemovePresetTourResponse"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleConfigurationsRequest">
-		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurations"/>
-	</wsdl:message>
-	<wsdl:message name="GetCompatibleConfigurationsResponse">
-		<wsdl:part name="parameters" element="tptz:GetCompatibleConfigurationsResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="PTZ">
-		<wsdl:operation name="GetServiceCapabilities">
-			<wsdl:documentation>Returns the capabilities of the PTZ service. The result is returned in a typed answer.</wsdl:documentation>
-			<wsdl:input message="tptz:GetServiceCapabilitiesRequest"/>
-			<wsdl:output message="tptz:GetServiceCapabilitiesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNodes">
-			<wsdl:documentation>
-				Get the descriptions of the available PTZ Nodes.
-				<br/>
-				A PTZ-capable device may have multiple PTZ Nodes. The PTZ Nodes may represent
-				mechanical PTZ drivers, uploaded PTZ drivers or digital PTZ drivers. PTZ Nodes are the
-				lowest level entities in the PTZ control API and reflect the supported PTZ capabilities. The
-				PTZ Node is referenced either by its name or by its reference token. 
-      		</wsdl:documentation>
-			<wsdl:input message="tptz:GetNodesRequest"/>
-			<wsdl:output message="tptz:GetNodesResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetNode">
-			<wsdl:documentation>Get a specific PTZ Node identified by a reference
-        token or a name.
-	  </wsdl:documentation>
-			<wsdl:input message="tptz:GetNodeRequest"/>
-			<wsdl:output message="tptz:GetNodeResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfiguration">
-			<wsdl:documentation>Get a specific PTZonfiguration from the device, identified by its reference token or name.
-				<br/>
-				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
-				requests without the need to specify a certain coordinate system. The default Speeds are
-				introduced to control the speed of move requests (absolute, relative, preset), where no
-				explicit speed has been set.<br/>
-				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
-				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
-				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
-				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
-				coordinate system for which the limits have been specified. That means that even if
-				movements are specified in a different coordinate system, the requested movements shall be
-				transformed to the coordinate system of the limits where the limits can be checked. When a
-				relative or continuous movements is specified, which would leave the specified limits, the PTZ
-				unit has to move along the specified limits. The Zoom Limits have to be interpreted
-				accordingly.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationRequest"/>
-			<wsdl:output message="tptz:GetConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurations">
-			<wsdl:documentation>
-		        Get all the existing PTZConfigurations from the device.
-				<br/>
-				The default Position/Translation/Velocity Spaces are introduced to allow NVCs sending move
-				requests without the need to specify a certain coordinate system. The default Speeds are
-				introduced to control the speed of move requests (absolute, relative, preset), where no
-				explicit speed has been set.<br/>
-				The allowed pan and tilt range for Pan/Tilt Limits is defined by a two-dimensional space range
-				that is mapped to a specific Absolute Pan/Tilt Position Space. At least one Pan/Tilt Position
-				Space is required by the PTZNode to support Pan/Tilt limits. The limits apply to all supported
-				absolute, relative and continuous Pan/Tilt movements. The limits shall be checked within the
-				coordinate system for which the limits have been specified. That means that even if
-				movements are specified in a different coordinate system, the requested movements shall be
-				transformed to the coordinate system of the limits where the limits can be checked. When a
-				relative or continuous movements is specified, which would leave the specified limits, the PTZ
-				unit has to move along the specified limits. The Zoom Limits have to be interpreted
-				accordingly.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationsRequest"/>
-			<wsdl:output message="tptz:GetConfigurationsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetConfiguration">
-			<wsdl:documentation>
-        Set/update a existing PTZConfiguration on the device.
-      </wsdl:documentation>
-			<wsdl:input message="tptz:SetConfigurationRequest"/>
-			<wsdl:output message="tptz:SetConfigurationResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurationOptions">
-			<wsdl:documentation>
-				List supported coordinate systems including their range limitations. Therefore, the options
-				MAY differ depending on whether the PTZ Configuration is assigned to a Profile containing a
-				Video Source Configuration. In that case, the options may additionally contain coordinate
-				systems referring to the image coordinate system described by the Video Source
-				Configuration. If the PTZ Node supports continuous movements, it shall return a Timeout Range within
-				which Timeouts are accepted by the PTZ Node.				
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetConfigurationOptionsRequest"/>
-			<wsdl:output message="tptz:GetConfigurationOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<wsdl:documentation>
-        Operation to send auxiliary commands to the PTZ device
-        mapped by the PTZNode in the selected profile. The
-        operation is supported
-        if the AuxiliarySupported element of the PTZNode is true
-      </wsdl:documentation>
-			<wsdl:input message="tptz:SendAuxiliaryCommandRequest"/>
-			<wsdl:output message="tptz:SendAuxiliaryCommandResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresets">
-			<wsdl:documentation>
-        Operation to request all PTZ presets for the PTZNode
-        in the selected profile. The operation is supported if there is support
-        for at least on PTZ preset by the PTZNode.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetsRequest"/>
-			<wsdl:output message="tptz:GetPresetsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetPreset">
-			<wsdl:documentation>
-				The SetPreset command saves the current device position parameters so that the device can
-				move to the saved preset position through the GotoPreset operation.
-				In order to create a new preset, the SetPresetRequest contains no PresetToken. If creation is
-				successful, the Response contains the PresetToken which uniquely identifies the Preset. An
-				existing Preset can be overwritten by specifying the PresetToken of the corresponding Preset.
-				In both cases (overwriting or creation) an optional PresetName can be specified. The
-				operation fails if the PTZ device is moving during the SetPreset operation.
-				The device MAY internally save additional states such as imaging properties in the PTZ
-				Preset which then should be recalled in the GotoPreset operation.      </wsdl:documentation>
-			<wsdl:input message="tptz:SetPresetRequest"/>
-			<wsdl:output message="tptz:SetPresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePreset">
-			<wsdl:documentation>
-        Operation to remove a PTZ preset for the Node in
-        the
-        selected profile. The operation is supported if the
-        PresetPosition
-        capability exists for teh Node in the
-        selected profile.
-      </wsdl:documentation>
-			<wsdl:input message="tptz:RemovePresetRequest"/>
-			<wsdl:output message="tptz:RemovePresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GotoPreset">
-			<wsdl:documentation>
-        Operation to go to a saved preset position for the
-        PTZNode in the selected profile. The operation is supported if there is
-        support for at least on PTZ preset by the PTZNode.</wsdl:documentation>
-			<wsdl:input message="tptz:GotoPresetRequest"/>
-			<wsdl:output message="tptz:GotoPresetResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GotoHomePosition">
-			<wsdl:documentation>
-        Operation to move the PTZ device to it's &quot;home&quot; position. The operation is supported if the HomeSupported element in the PTZNode is true.</wsdl:documentation>
-			<wsdl:input message="tptz:GotoHomePositionRequest"/>
-			<wsdl:output message="tptz:GotoHomePositionResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="SetHomePosition">
-			<wsdl:documentation>Operation to save current position as the home position.
-				The SetHomePosition command returns with a failure if the “home” position is fixed and
-				cannot be overwritten. If the SetHomePosition is successful, it is possible to recall the
-				Home Position with the GotoHomePosition command.</wsdl:documentation>
-			<wsdl:input message="tptz:SetHomePositionRequest"/>
-			<wsdl:output message="tptz:SetHomePositionResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ContinuousMove">
-			<wsdl:documentation>Operation for continuous Pan/Tilt and Zoom movements. The operation is supported if the PTZNode supports at least one continuous Pan/Tilt or Zoom space. If the space argument is omitted, the default space set by the PTZConfiguration will be used.</wsdl:documentation>
-			<wsdl:input message="tptz:ContinuousMoveRequest"/>
-			<wsdl:output message="tptz:ContinuousMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RelativeMove">
-			<wsdl:documentation>Operation for Relative Pan/Tilt and Zoom Move. The operation is supported if the PTZNode supports at least one relative Pan/Tilt or Zoom space.<br/> 
-				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
-				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
-				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:RelativeMoveRequest"/>
-			<wsdl:output message="tptz:RelativeMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetStatus">
-			<wsdl:documentation>
-				Operation to request PTZ status for the Node in the
-				selected profile.</wsdl:documentation>
-			<wsdl:input message="tptz:GetStatusRequest"/>
-			<wsdl:output message="tptz:GetStatusResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="AbsoluteMove">
-			<wsdl:documentation>Operation to move pan,tilt or zoom to a absolute destination. <br/>
-				The speed argument is optional. If an x/y speed value is given it is up to the device to either use 
-				the x value as absolute resoluting speed vector or to map x and y to the component speed. 
-				If the speed argument is omitted, the default speed set by the PTZConfiguration will be used.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:AbsoluteMoveRequest"/>
-			<wsdl:output message="tptz:AbsoluteMoveResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="Stop">
-			<wsdl:documentation>Operation to stop ongoing pan, tilt and zoom movements of absolute relative and continuous type.
-If no stop argument for pan, tilt or zoom is set, the device will stop all ongoing pan, tilt and zoom movements.</wsdl:documentation>
-			<wsdl:input message="tptz:StopRequest"/>
-			<wsdl:output message="tptz:StopResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTours">
-			<wsdl:documentation>Operation to request PTZ preset tours in the selected media profiles.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetToursRequest"/>
-			<wsdl:output message="tptz:GetPresetToursResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTour">
-			<wsdl:documentation>Operation to request a specific PTZ preset tour in the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetTourRequest"/>
-			<wsdl:output message="tptz:GetPresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTourOptions">
-			<wsdl:documentation>Operation to request available options to configure PTZ preset tour.</wsdl:documentation>
-			<wsdl:input message="tptz:GetPresetTourOptionsRequest"/>
-			<wsdl:output message="tptz:GetPresetTourOptionsResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="CreatePresetTour">
-			<wsdl:documentation>Operation to create a preset tour for the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:CreatePresetTourRequest"/>
-			<wsdl:output message="tptz:CreatePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="ModifyPresetTour">
-			<wsdl:documentation>Operation to modify a preset tour for the selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:ModifyPresetTourRequest"/>
-			<wsdl:output message="tptz:ModifyPresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="OperatePresetTour">
-			<wsdl:documentation>Operation to perform specific operation on the preset tour in selected media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:OperatePresetTourRequest"/>
-			<wsdl:output message="tptz:OperatePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePresetTour">
-			<wsdl:documentation>Operation to delete a specific preset tour from the media profile.</wsdl:documentation>
-			<wsdl:input message="tptz:RemovePresetTourRequest"/>
-			<wsdl:output message="tptz:RemovePresetTourResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleConfigurations">
-			<wsdl:documentation>Operation to get all available PTZConfigurations that can be added to the referenced media profile. <br/>
-				A device providing more than one PTZConfiguration or more than one VideoSourceConfiguration or which has any other resource
-				interdependency between PTZConfiguration entities and other resources listable in a media profile should implement this operation.
-				PTZConfiguration entities returned by this operation shall not fail on adding them to the referenced media profile.
-			</wsdl:documentation>
-			<wsdl:input message="tptz:GetCompatibleConfigurationsRequest"/>
-			<wsdl:output message="tptz:GetCompatibleConfigurationsResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="PTZBinding" type="tptz:PTZ">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="GetServiceCapabilities">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetServiceCapabilities"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurations">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresets">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresets"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetPreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetPreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GotoPreset">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetStatus">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetStatus"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNodes">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNodes"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetNode">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetNode"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetConfiguration">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetConfiguration"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetConfigurationOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetConfigurationOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GotoHomePosition">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GotoHomePosition"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SetHomePosition">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SetHomePosition"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ContinuousMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RelativeMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RelativeMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="SendAuxiliaryCommand">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/SendAuxiliaryCommand"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="AbsoluteMove">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/AbsoluteMove"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="Stop">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/Stop"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTours">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTours"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetPresetTourOptions">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetPresetTourOptions"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="CreatePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/CreatePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="ModifyPresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/ModifyPresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="OperatePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/OperatePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="RemovePresetTour">
-			<soap:operation soapAction="http://www.onvif.org/ver20/ptz/wsdl/RemovePresetTour"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="GetCompatibleConfigurations">
-			<soap:operation
-				soapAction="http://www.onvif.org/ver20/ptz/wsdl/GetCompatibleConfigurations"/>
-			<wsdl:input>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<!--===============================-->
-  <wsdl:service name="PTZ">
-    <wsdl:port name="PTZPort" binding="tptz:PTZBinding" >
-      <soap:address
-        location="http://www.examples.com/PTZ/" />
-    </wsdl:port>
-  </wsdl:service>
-	<!--===============================-->
-</wsdl:definitions>
diff --git a/onvif/wsdl/soap-envelop.xsd b/onvif/wsdl/soap-envelop.xsd
deleted file mode 100644
index b1a20e08e..000000000
--- a/onvif/wsdl/soap-envelop.xsd
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- Schema for the SOAP/1.1 envelope
-
-Portions © 2001 DevelopMentor. 
-© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
- 
-This document is governed by the W3C Software License [1] as described in the FAQ [2].
-[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
-By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-
-1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
-
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
-
-3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
-
-Original W3C files; http://www.w3.org/2001/06/soap-envelope
-Changes made: 
-     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
-     - reverted mustUnderstand to only allow 0 and 1 as lexical values
-	 - made encodingStyle a global attribute 20020825
-	 - removed default value from mustUnderstand attribute declaration
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
-           targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
-
-     
-  <!-- Envelope, header and body -->
-  <xs:element name="Envelope" type="tns:Envelope" />
-  <xs:complexType name="Envelope" >
-    <xs:sequence>
-      <xs:element ref="tns:Header" minOccurs="0" />
-      <xs:element ref="tns:Body" minOccurs="1" />
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Header" type="tns:Header" />
-  <xs:complexType name="Header" >
-    <xs:sequence>
-      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-  
-  <xs:element name="Body" type="tns:Body" />
-  <xs:complexType name="Body" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" >
-	  <xs:annotation>
-	    <xs:documentation>
-		  Prose in the spec does not specify that attributes are allowed on the Body element
-		</xs:documentation>
-	  </xs:annotation>
-	</xs:anyAttribute>
-  </xs:complexType>
-
-       
-  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them.  -->
-  <xs:attribute name="mustUnderstand" >	
-     <xs:simpleType>
-     <xs:restriction base='xs:boolean'>
-	   <xs:pattern value='0|1' />
-	 </xs:restriction>
-   </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="actor" type="xs:anyURI" />
-
-  <xs:simpleType name="encodingStyle" >
-    <xs:annotation>
-	  <xs:documentation>
-	    'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:list itemType="xs:anyURI" />
-  </xs:simpleType>
-
-  <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
-  <xs:attributeGroup name="encodingStyle" >
-    <xs:attribute ref="tns:encodingStyle" />
-  </xs:attributeGroup>
-
-  <xs:element name="Fault" type="tns:Fault" />
-  <xs:complexType name="Fault" final="extension" >
-    <xs:annotation>
-	  <xs:documentation>
-	    Fault reporting structure
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:sequence>
-      <xs:element name="faultcode" type="xs:QName" />
-      <xs:element name="faultstring" type="xs:string" />
-      <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
-      <xs:element name="detail" type="tns:detail" minOccurs="0" />      
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="detail">
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax" /> 
-  </xs:complexType>
-
-</xs:schema>
-
-
-
-
-
-
diff --git a/onvif/wsdl/t-1.xsd b/onvif/wsdl/t-1.xsd
deleted file mode 100644
index ae42cfbc7..000000000
--- a/onvif/wsdl/t-1.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004-2006). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
--->
-
-
-<xsd:schema 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:wstop = "http://docs.oasis-open.org/wsn/t-1"
-  targetNamespace = "http://docs.oasis-open.org/wsn/t-1"   
-  elementFormDefault="qualified"  attributeFormDefault="unqualified">
-
-<!-- =============== utility type definitions  ==================== -->
-  <xsd:complexType name="Documentation" mixed="true">
-    <xsd:sequence>
-      <xsd:any processContents="lax" minOccurs="0" 
-               maxOccurs="unbounded" namespace="##any"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="ExtensibleDocumented" abstract="true" 
-                   mixed="false">
-    <xsd:sequence>
-      <xsd:element name="documentation" type="wstop:Documentation" 
-                   minOccurs="0" />
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax" />
-</xsd:complexType>
-
-<xsd:complexType name="QueryExpressionType" mixed="true">
-  <xsd:sequence>
-    <xsd:any minOccurs="0" maxOccurs="1" processContents="lax" />
-  </xsd:sequence>
-  <xsd:attribute name="Dialect" type="xsd:anyURI" use="required"/>
-</xsd:complexType>
-
-<!-- ================== Topic-Namespace Related  ================ -->   
-  <xsd:complexType name="TopicNamespaceType">
-    <xsd:complexContent>
-       <xsd:extension base="wstop:ExtensibleDocumented">
-         <xsd:sequence>
-           <xsd:element name="Topic" 
-                        minOccurs="0" maxOccurs="unbounded">
-              <xsd:complexType>
-              	<xsd:complexContent>
-              	  <xsd:extension base="wstop:TopicType">
-              	    <xsd:attribute name="parent" type="wstop:ConcreteTopicExpression" />
-              	  </xsd:extension>
-              	</xsd:complexContent>
-              </xsd:complexType>
-           </xsd:element>   
-           <xsd:any namespace="##other" 
-                    minOccurs="0" maxOccurs="unbounded" 
-                    processContents="lax"/>
-         </xsd:sequence>
-         <xsd:attribute name="name" type="xsd:NCName"/>
-         <xsd:attribute name="targetNamespace" type="xsd:anyURI" 
-                        use="required"/>
-         <xsd:attribute name="final" type="xsd:boolean" 
-                                     default="false"/>
-       </xsd:extension>
-     </xsd:complexContent> 
-   </xsd:complexType>
-
-  <xsd:element name="TopicNamespace" type="wstop:TopicNamespaceType">
-    <xsd:unique name="rootTopicUniqueness">
-      <xsd:selector xpath="wstop:Topic"/>
-        <xsd:field xpath="@name"/>
-    </xsd:unique>
-  </xsd:element>
-  
-  <xsd:attribute name="topicNamespaceLocation" type="xsd:anyURI"/>
-
-
-
-<!-- ===================== Topic Related  ========================= -->   
-
-  <xsd:complexType name="TopicType">
-    <xsd:complexContent>
-      <xsd:extension base="wstop:ExtensibleDocumented">
-        <xsd:sequence>
-          <xsd:element name="MessagePattern" 
-                       type="wstop:QueryExpressionType" 
-                       minOccurs="0" maxOccurs="1" />
-              <xsd:any minOccurs="0"/>
-<!--          <xsd:element name="Topic" type="wstop:TopicType" 
-                       minOccurs="0" maxOccurs="unbounded"> 
-            <xsd:unique name="childTopicUniqueness">
-              <xsd:selector xpath="wstop:topic"/>
-              <xsd:field xpath="@name"/>
-            </xsd:unique>
-          </xsd:element> -->
-          <xsd:any namespace="##other" minOccurs="0" 
-                                       maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="name" use="required" type="xsd:NCName"/>
- <!--
-         <xsd:attribute name="messageTypes">
-          <xsd:simpleType>
-            <xsd:list itemType="xsd:QName"/>
-          </xsd:simpleType>
-        </xsd:attribute>
--->
-        <xsd:attribute name="final" type="xsd:boolean" 
-                                     default="false"/>
-      </xsd:extension>
-    </xsd:complexContent>  
-  </xsd:complexType>
-
-<!-- ================ Topic Set Related  =================== -->   
-  
-  <xsd:complexType name="TopicSetType">
-    <xsd:complexContent>
-       <xsd:extension base="wstop:ExtensibleDocumented">
-         <xsd:sequence>
-           <xsd:any namespace="##other" 
-                    minOccurs="0" maxOccurs="unbounded" 
-                    processContents="lax"/>
-         </xsd:sequence>
-       </xsd:extension>
-     </xsd:complexContent> 
-   </xsd:complexType>
-
-  <xsd:element name="TopicSet" type="wstop:TopicSetType"/>
-<xsd:attribute name="topic" type="xsd:boolean" default="false"/>
-
-<!-- ================ Topic Expression Related  =================== -->   
-  
-  <xsd:simpleType name="FullTopicExpression">
-    <xsd:restriction base="xsd:token">
-      <xsd:annotation>
-        <xsd:documentation>
-        TopicPathExpression  ::=   TopicPath ( '|' TopicPath )*  
-        TopicPath       ::=   RootTopic ChildTopicExpression* 
-        RootTopic       ::=   NamespacePrefix? ('//')? (NCName | '*')  
-        NamespacePrefix ::=   NCName ':'      
-        ChildTopicExpression ::=   '/' '/'? (QName | NCName | '*'| '.')
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:pattern value= 
-         "([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*(\|([\i-[:]][\c-[:]]*:)?(//)?([\i-[:]][\c-[:]]*|\*)((/|//)(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*|\*|[.]))*)*">
-      </xsd:pattern>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="ConcreteTopicExpression">
-    <xsd:restriction base="xsd:token">
-      <xsd:annotation>
-        <xsd:documentation>
-  The pattern allows strings matching the following EBNF:
-    ConcreteTopicPath    ::=   RootTopic ChildTopic*    
-    RootTopic            ::=   QName  
-    ChildTopic           ::=   '/' (QName | NCName) 
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:pattern value=
-"(([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)(/([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*)*" >
-      </xsd:pattern>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="SimpleTopicExpression">
-    <xsd:restriction base="xsd:QName">
-      <xsd:annotation>
-        <xsd:documentation>
-  The pattern allows strings matching the following EBNF:
-    RootTopic            ::=   QName  
-                        
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-</xsd:schema>
diff --git a/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd b/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd
deleted file mode 100644
index 3307efc1d..000000000
--- a/onvif/wsdl/wsdd-discovery-1.1-schema-os.xsd
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) OASIS(r) 2009. All Rights Reserved.
-
-All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification.
-
-OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent claims that would necessarily be infringed by implementations of this specification by a patent holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification. OASIS may include such claims on its website, but disclaims any obligation to do so.
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to rights in any document or deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any information or list of intellectual property rights will at any time be complete, or that any claims in such list are, in fact, Essential Claims.
-
-The name "OASIS" is trademarks of OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
--->
-<xs:schema
-    targetNamespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
-    xmlns:tns="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
-    xmlns:wsa="http://www.w3.org/2005/08/addressing"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    blockDefault="#all" >
-
-  <xs:import
-      namespace="http://www.w3.org/2005/08/addressing"
-      schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd" />
-
-  <!-- //////////////////// Discovery Messages //////////////////// -->
-
-  <xs:element name="Hello" type="tns:HelloType" />
-  <xs:complexType name="HelloType" >
-    <xs:sequence>
-      <xs:element ref="wsa:EndpointReference" />
-      <xs:element ref="tns:Types" minOccurs="0" />
-      <xs:element ref="tns:Scopes" minOccurs="0" />
-      <xs:element ref="tns:XAddrs" minOccurs="0" />
-      <xs:element ref="tns:MetadataVersion" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Bye" type="tns:ByeType" />
-  <xs:complexType name="ByeType" >
-    <xs:sequence>
-      <xs:element ref="wsa:EndpointReference" />
-      <xs:element ref="tns:Types" minOccurs="0" />
-      <xs:element ref="tns:Scopes" minOccurs="0" />
-      <xs:element ref="tns:XAddrs" minOccurs="0" />
-      <xs:element ref="tns:MetadataVersion" minOccurs="0" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Probe" type="tns:ProbeType" />
-  <xs:complexType name="ProbeType" >
-    <xs:sequence>
-      <xs:element ref="tns:Types" minOccurs="0" />
-      <xs:element ref="tns:Scopes" minOccurs="0" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="ProbeMatches" type="tns:ProbeMatchesType" />
-  <xs:complexType name="ProbeMatchesType" >
-    <xs:sequence>
-      <xs:element name="ProbeMatch"
-                  type="tns:ProbeMatchType"
-                  minOccurs="0"
-                  maxOccurs="unbounded" >
-      </xs:element>
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-  <xs:complexType name="ProbeMatchType" >
-    <xs:sequence>
-      <xs:element ref="wsa:EndpointReference" />
-      <xs:element ref="tns:Types" minOccurs="0" />
-      <xs:element ref="tns:Scopes" minOccurs="0" />
-      <xs:element ref="tns:XAddrs" minOccurs="0" />
-      <xs:element ref="tns:MetadataVersion" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Resolve" type="tns:ResolveType" />
-  <xs:complexType name="ResolveType" >
-    <xs:sequence>
-      <xs:element ref="wsa:EndpointReference" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="ResolveMatches" type="tns:ResolveMatchesType" />
-  <xs:complexType name="ResolveMatchesType" >
-    <xs:sequence>
-      <xs:element name="ResolveMatch" 
-                  type="tns:ResolveMatchType"
-                  minOccurs="0" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-  <xs:complexType name="ResolveMatchType" >
-    <xs:sequence>
-      <xs:element ref="wsa:EndpointReference" />
-      <xs:element ref="tns:Types" minOccurs="0" />
-      <xs:element ref="tns:Scopes" minOccurs="0" />
-      <xs:element ref="tns:XAddrs" minOccurs="0" />
-      <xs:element ref="tns:MetadataVersion" />
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-  <xs:element name="Types" type="tns:QNameListType" />
-  <xs:simpleType name="QNameListType" >
-    <xs:list itemType="xs:QName" />
-  </xs:simpleType>
-
-  <xs:element name="Scopes" type="tns:ScopesType" />
-  <xs:complexType name="ScopesType" >
-    <xs:simpleContent>
-      <xs:extension base="tns:UriListType" >
-        <xs:attribute name="MatchBy" type="xs:anyURI" />
-        <xs:anyAttribute namespace="##other" processContents="lax" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="XAddrs" type="tns:UriListType" />
-  <xs:simpleType name="UriListType" >
-    <xs:list itemType="xs:anyURI" />
-  </xs:simpleType>
-
-  <xs:element name="MetadataVersion" type="xs:unsignedInt" />
-
-  <!-- //////////////////// Faults //////////////////// -->
-
-  <xs:simpleType name="FaultCodeType" >
-	<xs:restriction base="xs:QName" >
-	  <xs:enumeration value="tns:MatchingRuleNotSupported" />
-	</xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="FaultCodeOpenType" >
-    <xs:union memberTypes="tns:FaultCodeType xs:QName" />
-  </xs:simpleType>
-
-  <xs:element name="SupportedMatchingRules" type="tns:UriListType" />
-
-  <!-- //////////////////// Compact Signature //////////////////// -->
-
-  <xs:attribute name="Id" type="xs:ID"/>
-
-  <xs:element name="Security" type="tns:SecurityType" />
-  <xs:complexType name="SecurityType" >
-    <xs:sequence>
-      <xs:element ref="tns:Sig" minOccurs="0" />
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType> 
-
-  <xs:element name="Sig" type="tns:SigType" />
-  <xs:complexType name="SigType" >
-    <xs:sequence>
-      <xs:any namespace="##other"
-              processContents="lax"
-              minOccurs="0"
-              maxOccurs="unbounded" />
-    </xs:sequence>
-    <xs:attribute name="Scheme" type="xs:anyURI" use="required" />
-    <xs:attribute name="KeyId" type="xs:base64Binary" />
-    <xs:attribute name="Refs" type="xs:IDREFS" use="required" />
-    <xs:attribute name="Sig" type="xs:base64Binary" use="required" />
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType> 
-
-  <!-- //////////////////// General Headers //////////////////// -->
-
-  <xs:element name="AppSequence" type="tns:AppSequenceType" />
-  <xs:complexType name="AppSequenceType" >
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType" >
-        <xs:attribute name="InstanceId"
-                      type="xs:unsignedInt"
-                      use="required" />
-        <xs:attribute name="SequenceId" type="xs:anyURI" />
-        <xs:attribute name="MessageNumber"
-                      type="xs:unsignedInt"
-                      use="required" />
-        <xs:anyAttribute namespace="##other" processContents="lax" />
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-</xs:schema>
diff --git a/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl b/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl
deleted file mode 100644
index 36936b2a1..000000000
--- a/onvif/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) OASIS(r) 2009. All Rights Reserved.
-
-All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification.
-
-OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent claims that would necessarily be infringed by implementations of this specification by a patent holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification. OASIS may include such claims on its website, but disclaims any obligation to do so.
-
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to rights in any document or deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any information or list of intellectual property rights will at any time be complete, or that any claims in such list are, in fact, Essential Claims.
-
-The name "OASIS" is trademarks of OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
--->
-<wsdl:definitions
-    targetNamespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
-    xmlns:tns="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
-    xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-  <wsdl:types>
-    <xs:schema>
-      <xs:import
-          namespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01"
-          schemaLocation="http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd" />
-    </xs:schema>
-  </wsdl:types>
-
-  <wsdl:message name="HelloMessage" >
-    <wsdl:part name="parameters" element="tns:Hello" />
-  </wsdl:message>
-
-  <wsdl:message name="ByeMessage" >
-    <wsdl:part name="parameters" element="tns:Bye" />
-  </wsdl:message>
-
-  <wsdl:message name="ProbeMessage" >
-    <wsdl:part name="parameters" element="tns:Probe" />
-  </wsdl:message>
-
-  <wsdl:message name="ProbeMatchMessage" >
-    <wsdl:part name="parameters" element="tns:ProbeMatches" />
-  </wsdl:message>
-
-  <wsdl:message name="ResolveMessage" >
-    <wsdl:part name="parameters" element="tns:Resolve" />
-  </wsdl:message>
-
-  <wsdl:message name="ResolveMatchMessage" >
-    <wsdl:part name="parameters" element="tns:ResolveMatches" />
-  </wsdl:message>
-
-  <wsdl:portType name="TargetService" >
-    <wsdl:operation name="HelloOp" >
-      <wsdl:output message="tns:HelloMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ByeOp" >
-      <wsdl:output message="tns:ByeMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ProbeOp" >
-      <wsdl:input message="tns:ProbeMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ProbeMatchOp" >
-      <wsdl:output message="tns:ProbeMatchMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ResolveOp" >
-      <wsdl:input message="tns:ResolveMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ResolveMatchOp" >
-      <wsdl:output message="tns:ResolveMatchMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ResolveMatches"
-      />
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <!-- If this portType is included in Types, it indicates the 
-       Target Service is a Discovery Proxy operating in a managed mode. 
-       Discovery Proxies also implement tns:TargetService in an ad hoc mode.
-  -->
-  <wsdl:portType name="DiscoveryProxy">
-    <wsdl:operation name="HelloOp" >
-      <wsdl:input message="tns:HelloMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Hello"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ByeOp" >
-      <wsdl:input message="tns:ByeMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Bye"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ProbeOp" >
-      <wsdl:input message="tns:ProbeMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"
-      />
-      <wsdl:output message="tns:ProbeMatchMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches"
-      />
-    </wsdl:operation>
-    <wsdl:operation name="ResolveOp" >
-      <wsdl:input message="tns:ResolveMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Resolve"
-      />
-      <wsdl:output message="tns:ResolveMatchMessage"
-      wsaw:Action
-      ="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ResolveMatches"
-      />
-    </wsdl:operation>
-  </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/onvif/wsdl/wsdiscovery-udp.wsdl b/onvif/wsdl/wsdiscovery-udp.wsdl
deleted file mode 100644
index 54b9fc92d..000000000
--- a/onvif/wsdl/wsdiscovery-udp.wsdl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" ?>
-
-<wsdl:definitions targetNamespace="http://127.0.0.1"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-                  xmlns:wsdd="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01" 
-                  xmlns:local="http://127.0.0.1">
-  <wsdl:import namespace="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01" 
-               location="http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-wsdl-os.wsdl"/> 
-  <!--===============================-->
-	<wsdl:binding name="WSDiscoveryBinding" type="wsdd:DiscoveryProxy">
-		<soap:binding style="document" transport="http://docs.oasis-open.org/ws-dd/soapoverudp/1.1"/>
-   	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-		<wsdl:operation name="ProbeOp">
-			<soap:operation soapAction="http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe"/>
-			<wsdl:input>
-<!-- <soap:header -->
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body parts="parameters" use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-  	<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-	</wsdl:binding>
-	<!--===============================-->
-  <wsdl:service name="WSDiscovery">
-    <wsdl:port name="WSDiscoveryPort" binding="local:WSDiscoveryBinding" >
-      <soap:address
-        location="soap.udp://239.255.255.250:3702/" />
-    </wsdl:port>
-  </wsdl:service>
-	<!--===============================-->
-</wsdl:definitions>
diff --git a/onvif/wsdl/wsdl.xsd b/onvif/wsdl/wsdl.xsd
deleted file mode 100644
index a81ab5691..000000000
--- a/onvif/wsdl/wsdl.xsd
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
-           elementFormDefault="qualified" >
-   
-  <xs:complexType mixed="true" name="tDocumentation" >
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="tDocumented" >
-    <xs:annotation>
-      <xs:documentation>
-      This type is extended by  component types to allow them to be documented
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-	 
-  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow attributes from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:anyAttribute namespace="##other" processContents="lax" />    
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tExtensibleDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow elements from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="definitions" type="wsdl:tDefinitions" >
-    <xs:key name="message" >
-      <xs:selector xpath="wsdl:message" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="portType" >
-      <xs:selector xpath="wsdl:portType" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="binding" >
-      <xs:selector xpath="wsdl:binding" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="service" >
-      <xs:selector xpath="wsdl:service" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="import" >
-      <xs:selector xpath="wsdl:import" />
-      <xs:field xpath="@namespace" />
-    </xs:key>
-  </xs:element>
-
-  <xs:group name="anyTopLevelOptionalElement" >
-    <xs:annotation>
-      <xs:documentation>
-      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="import" type="wsdl:tImport" />
-      <xs:element name="types" type="wsdl:tTypes" />                     
-      <xs:element name="message"  type="wsdl:tMessage" >
-<!--
-        <xs:unique name="part" >
-          <xs:selector xpath="wsdl:part" />
-          <xs:field xpath="@name" />
-        </xs:unique>
--->
-      </xs:element>
-      <xs:element name="portType" type="wsdl:tPortType" />
-      <xs:element name="binding"  type="wsdl:tBinding" />
-      <xs:element name="service"  type="wsdl:tService" >
-<!--
-        <xs:unique name="port" >
-          <xs:selector xpath="wsdl:port" />
-          <xs:field xpath="@name" />
-        </xs:unique>
--->
-	  </xs:element>
-    </xs:choice>
-  </xs:group>
-
-  <xs:complexType name="tDefinitions" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tImport" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tTypes" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" />
-    </xs:complexContent>   
-  </xs:complexType>
-     
-  <xs:complexType name="tMessage" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPart" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="element" type="xs:QName" use="optional" />
-        <xs:attribute name="type" type="xs:QName" use="optional" />    
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPortType" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-   
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-	    <xs:sequence>
-          <xs:choice>
-            <xs:group ref="wsdl:request-response-or-one-way-operation" />
-            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-    
-  <xs:group name="request-response-or-one-way-operation" >
-    <xs:sequence>
-      <xs:element name="input" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="output" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:group name="solicit-response-or-notification-operation" >
-    <xs:sequence>
-      <xs:element name="output" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="input" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-	  </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-        
-  <xs:complexType name="tParam" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName"  use="required" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="type" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-    
-  <xs:complexType name="tBindingOperationMessage" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="tBindingOperationFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tBindingOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tService" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tPort" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="binding" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="required" type="xs:boolean" />
-  <xs:complexType name="tExtensibilityElement" abstract="true" >
-    <xs:attribute ref="wsdl:required" use="optional" />
-  </xs:complexType>
-
-</xs:schema>
diff --git a/onvif/wsdl/wsdl11soap12.xsd b/onvif/wsdl/wsdl11soap12.xsd
deleted file mode 100644
index a5e7a0b94..000000000
--- a/onvif/wsdl/wsdl11soap12.xsd
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2006, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files
-
-The Authors grant permission to copy and distribute the WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files in any medium without fee or royalty as long as this notice and license are distributed with them.  The originals of these files can be located at:
-
-http://schemas.xmlsoap.org/wsdl/soap12/wsdl11soap12.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to these files or any program or service that uses these files, written prior permission.  Title to copyright in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           xmlns:wsoap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap12/" >
-
-  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
-
-  <xs:complexType name="tExtensibilityElementOpenAttrs" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="binding" type="wsoap12:tBinding" />
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
-        <xs:attribute name="transport" type="xs:anyURI" use="required" />
-        <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="tStyleChoice" >
-    <xs:restriction base="xs:string" >
-      <xs:enumeration value="rpc" />
-      <xs:enumeration value="document" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="operation" type="wsoap12:tOperation" />
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
-        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
-        <xs:attribute name="soapActionRequired" type="xs:boolean" use="optional" />
-        <xs:attribute name="style" type="wsoap12:tStyleChoice" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="body" type="wsoap12:tBody" />
-  <xs:attributeGroup name="tBodyAttributes" >
-    <!-- The encodingStyle attribute is now a single URI, instead of a list of URIs -->
-    <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
-    <xs:attribute name="use" type="wsoap12:useChoice" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
-  </xs:attributeGroup>
-  <xs:simpleType name="tParts">
-    <xs:list itemType="xs:NMTOKEN"/>
-  </xs:simpleType>
-  <xs:complexType name="tBody" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
-        <xs:attribute name="parts" type="wsoap12:tParts" use="optional" />
-        <xs:attributeGroup ref = "wsoap12:tBodyAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="useChoice" >
-    <xs:restriction base="xs:string" >
-      <xs:enumeration value="literal" />
-      <xs:enumeration value="encoded" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="fault" type="wsoap12:tFault" />
-  <xs:complexType name="tFaultRes" abstract="true" >
-    <xs:complexContent>
-      <xs:restriction base="wsoap12:tBody" >
-	    <xs:attribute ref="wsdl:required" use="optional" /> 
-        <xs:attribute name="parts" type="wsoap12:tParts" use="prohibited" />
-		<xs:attributeGroup ref="wsoap12:tBodyAttributes" />
-      </xs:restriction>
-    </xs:complexContent>  	
-  </xs:complexType>
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tFaultRes">
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <xs:element name="header" type="wsoap12:tHeader" />
-  <xs:attributeGroup name="tHeaderAttributes" >
-    <xs:attribute name="message" type="xs:QName" use="required" />
-    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
-    <xs:attribute name="use" type="wsoap12:useChoice" use="required" />
-    <xs:attribute name="encodingStyle" type="xs:anyURI" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />      
-  </xs:attributeGroup>
-  <xs:complexType name="tHeader" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
-        <xs:sequence>
-          <xs:element ref="wsoap12:headerfault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-		<xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="headerfault" type="wsoap12:tHeaderFault" />
-  <xs:complexType name="tHeaderFault" >
-	<xs:attributeGroup ref="wsoap12:tHeaderAttributes" />
-	<xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="address" type="wsoap12:tAddress" />
-  <xs:complexType name="tAddress" >
-    <xs:complexContent>
-      <xs:extension base="wsoap12:tExtensibilityElementOpenAttrs" >
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-</xs:schema>
diff --git a/onvif/wsdl/xmlmime.xsd b/onvif/wsdl/xmlmime.xsd
deleted file mode 100644
index 766a07bd9..000000000
--- a/onvif/wsdl/xmlmime.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<!-- 
-   W3C XML Schema defined in the Describing Media Content of Binary Data in XML
-   specification
-     http://www.w3.org/TR/xml-media-types
-
-   Copyright © 2005 World Wide Web Consortium,
-  
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C® Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   $Id: xmlmime.xsd,v 1.1 2005/04/25 17:08:35 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
-           targetNamespace="http://www.w3.org/2005/05/xmlmime" >
-
-  <xs:attribute name="contentType">
-    <xs:simpleType>
-      <xs:restriction base="xs:string" >
-      <xs:minLength value="3" />
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-
-  <xs:attribute name="expectedContentTypes" type="xs:string" />
-
-  <xs:complexType name="base64Binary" >
-    <xs:simpleContent>
-        <xs:extension base="xs:base64Binary" >
-            <xs:attribute ref="xmime:contentType" />
-        </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:complexType name="hexBinary" >
-    <xs:simpleContent>
-        <xs:extension base="xs:hexBinary" >
-            <xs:attribute ref="xmime:contentType" />
-        </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/onvif/wsdl/xop-include.xsd b/onvif/wsdl/xop-include.xsd
deleted file mode 100644
index edb43a086..000000000
--- a/onvif/wsdl/xop-include.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' 
-           xmlns:tns='http://www.w3.org/2004/08/xop/include' 
-           targetNamespace='http://www.w3.org/2004/08/xop/include' >
-
-  <xs:element name='Include' type='tns:Include' />
-  <xs:complexType name='Include' >
-	<xs:sequence>
-	  <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
-	</xs:sequence>
-	<xs:attribute name='href' type='xs:anyURI' use='required' />
-	<xs:anyAttribute namespace='##other' />
-  </xs:complexType>
-</xs:schema>

From ee48c830d01d525ae498875b307c2e9c59ce06f3 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Wed, 10 Feb 2016 16:25:23 +0100
Subject: [PATCH 224/362] Added README and removed WSDL files in onvif folder

---
 onvif/README | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 onvif/README

diff --git a/onvif/README b/onvif/README
new file mode 100644
index 000000000..6105076f6
--- /dev/null
+++ b/onvif/README
@@ -0,0 +1,103 @@
+ZoneMinder ONVIF support
+
+Copyright (C) 2016  Jan M. Hochstein
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--------------------------------------------------------------------------
+
+1. PURPOSE
+----------
+
+The files in this folder and its subfolders add ONVIF support to zoneminder. 
+The ONVIF consortium (www.onvif.org) publishes the ONVIF specifications. These 
+specifications describe ways of connecting to and communicating with network 
+video devices. Hardware and software that adhere to these specifications are 
+meant to be interoperable.
+
+
+2. SUBFOLDERS
+-------------
+
+doc/      - Documentation
+modules/  - perl modules necessary for SOAP communication
+proxy/    - perl SOAP proxy modules generated according to the ONVIF 
+            specifications
+scripts/  - application logic
+wsdl/     - (empty) this is only used during the proxy generation process
+
+
+3. LICENSE
+----------
+The files in the subfolder proxy/ are generated files. Since generating them 
+is difficult they are included anyway. They are published under the same 
+license as this file.
+
+
+4. PROXY GENERATION
+-------------------
+
+SOAP messages use XML format and need to comply to the schema expected by the 
+receiver. While it is possible to build messages through string concatenation 
+it is impractical for all but testing purposes.
+Here we use SOAP proxy modules generated by the script wsdl2perl.pl from the 
+SOAP::WSDL module (http://search.cpan.org/~mkutter/SOAP-WSDL-2.00.10/) 
+version 2.00.10. 
+
+A - Get the input files.
+
+    Download these files and any web service (.wsdl) or schema (.xsd) 
+    files referenced therein into the wsdl/ subfolder.
+
+    http://www.onvif.org/onvif/ver10/device/wsdl/devicemgmt.wsdl
+    http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl
+    http://www.onvif.org/onvif/ver20/ptz/wsdl/ptz.wsdl
+    http://www.onvif.org/onvif/ver20/analytics/wsdl/analytics.wsdl
+
+    The complete list of files we have during build is:
+    
+    analytics.wsdl
+    b-2.xsd
+    bf-2.xsd
+    br-2.xsd
+    brw-2.wsdl
+    bw-2.wsdl
+    devicemgmt.wsdl
+    media.wsdl
+    onvif.xsd
+    ptz.wsdl
+    r-2.xsd
+    rw-2.wsdl
+    soap-envelop.xsd
+    t-1.xsd
+    wsdd-discovery-1.1-schema-os.xsd
+    wsdd-discovery-1.1-wsdl-os.wsdl
+    wsdiscovery-udp.wsdl
+    wsdl11soap12.xsd
+    wsdl.xsd
+    wsnotification.wsdl
+    xmlmime.xsd
+    xop-include.xsd
+
+B - Generate the proxy modules using these commands.
+
+    wsdl2perl.pl -p ONVIF::Device:: -b proxy/lib file:wsdl/devicemgmt.wsdl
+    wsdl2perl.pl -p ONVIF::Media:: -b proxy/lib file:wsdl/media.wsdl
+    wsdl2perl.pl -p ONVIF::PTZ:: -b proxy/lib file:wsdl/ptz.wsdl
+    wsdl2perl.pl -p ONVIF::Event:: -b proxy/lib file:wsdl/event.wsdl
+    wsdl2perl.pl -p ONVIF::Analytics:: -b proxy/lib file:wsdl/analytics.wsdl
+    wsdl2perl.pl -p WSDiscovery:: -b proxy/lib file:wsdl/wsdiscovery-udp.wsdl
+    wsdl2perl.pl -p WSNotification:: -b proxy/lib file:wsdl/wsnotification.wsdl
+
+    I had to tweak SOAP::WSDL a little bit to get correct proxies.

From 61932a6470dba2c2a2e1724f29d1204d6efe89f7 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Wed, 10 Feb 2016 16:36:21 +0100
Subject: [PATCH 225/362] Corrected file copyrights

---
 onvif/README                                  |  5 ++--
 onvif/modules/lib/ONVIF/Client.pm             |  2 +-
 .../lib/ONVIF/Deserializer/MessageParser.pm   | 25 ++++++++++++++++++-
 onvif/modules/lib/ONVIF/Deserializer/XSD.pm   | 24 ++++++++++++++++++
 onvif/modules/lib/ONVIF/Serializer/Base.pm    | 25 ++++++++++++++++++-
 onvif/modules/lib/ONVIF/Serializer/SOAP11.pm  | 25 ++++++++++++++++++-
 onvif/modules/lib/ONVIF/Serializer/SOAP12.pm  | 25 ++++++++++++++++++-
 onvif/modules/lib/WSDiscovery/TransportUDP.pm |  2 +-
 .../lib/WSSecurity/SecuritySerializer.pm      |  2 +-
 onvif/scripts/zmonvif-probe.pl                |  2 +-
 10 files changed, 126 insertions(+), 11 deletions(-)

diff --git a/onvif/README b/onvif/README
index 6105076f6..25065e18a 100644
--- a/onvif/README
+++ b/onvif/README
@@ -40,9 +40,8 @@ wsdl/     - (empty) this is only used during the proxy generation process
 
 3. LICENSE
 ----------
-The files in the subfolder proxy/ are generated files. Since generating them 
-is difficult they are included anyway. They are published under the same 
-license as this file.
+Any files in this folder and its subfolders are published under the same 
+license as this file if they do not carry additional license information.
 
 
 4. PROXY GENERATION
diff --git a/onvif/modules/lib/ONVIF/Client.pm b/onvif/modules/lib/ONVIF/Client.pm
index 2d16c9d13..eaf78747d 100644
--- a/onvif/modules/lib/ONVIF/Client.pm
+++ b/onvif/modules/lib/ONVIF/Client.pm
@@ -1,7 +1,7 @@
 # ==========================================================================
 #
 # ZoneMinder ONVIF Client module
-# Copyright (C) Jan M. Hochstein
+# Copyright (C) 2014  Jan M. Hochstein
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
index c9234ae76..b0ce6f0fd 100644
--- a/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
+++ b/onvif/modules/lib/ONVIF/Deserializer/MessageParser.pm
@@ -1,4 +1,27 @@
-#!/usr/bin/perl
+# ==========================================================================
+#
+# ZoneMinder ONVIF Client module
+# Copyright (C) 2014  Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of a SOAP message parser
+#
+
 package ONVIF::Deserializer::MessageParser;
 use strict; use warnings;
 
diff --git a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
index 6d96aa406..b4694d90d 100644
--- a/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
+++ b/onvif/modules/lib/ONVIF/Deserializer/XSD.pm
@@ -1,3 +1,27 @@
+# ==========================================================================
+#
+# ZoneMinder ONVIF Client module
+# Copyright (C) 2014  Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of a SOAP deserializer
+#
+
 package ONVIF::Deserializer::XSD;
 use strict;
 use warnings;
diff --git a/onvif/modules/lib/ONVIF/Serializer/Base.pm b/onvif/modules/lib/ONVIF/Serializer/Base.pm
index b6edf360f..7bab331cf 100644
--- a/onvif/modules/lib/ONVIF/Serializer/Base.pm
+++ b/onvif/modules/lib/ONVIF/Serializer/Base.pm
@@ -1,4 +1,27 @@
-#!/usr/bin/perl -w
+# ==========================================================================
+#
+# ZoneMinder ONVIF Client module
+# Copyright (C) 2014  Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the base class for the SOAP serializers
+#
+
 package ONVIF::Serializer::Base;
 use strict;
 use warnings;
diff --git a/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm b/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm
index 2813a0688..442a11d7a 100644
--- a/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm
+++ b/onvif/modules/lib/ONVIF/Serializer/SOAP11.pm
@@ -1,4 +1,27 @@
-#!/usr/bin/perl -w
+# ==========================================================================
+#
+# ZoneMinder ONVIF Client module
+# Copyright (C) 2014  Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the SOAP 1.1 serializer
+#
+
 package ONVIF::Serializer::SOAP11;
 use strict;
 use warnings;
diff --git a/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm b/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm
index d378a3614..2805ea40f 100644
--- a/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm
+++ b/onvif/modules/lib/ONVIF/Serializer/SOAP12.pm
@@ -1,4 +1,27 @@
-#!/usr/bin/perl -w
+# ==========================================================================
+#
+# ZoneMinder ONVIF Client module
+# Copyright (C) 2014  Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the SOAP 1.2 serializer
+#
+
 package ONVIF::Serializer::SOAP12;
 use strict;
 use warnings;
diff --git a/onvif/modules/lib/WSDiscovery/TransportUDP.pm b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
index 9bc6c74c9..375f9628d 100644
--- a/onvif/modules/lib/WSDiscovery/TransportUDP.pm
+++ b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
@@ -1,7 +1,7 @@
 # ==========================================================================
 #
 # Perl WS-Discovery implementation
-# Copyright (C) Jan M. Hochstein
+# Copyright (C) 2014  Jan M. Hochstein
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
index a2daac028..cbb6ae8f9 100644
--- a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
+++ b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
@@ -1,7 +1,7 @@
 # ==========================================================================
 #
 # Perl WS-Security header for SOAP::WSDL
-# Copyright (C) Jan M. Hochstein
+# Copyright (C) 2014  Jan M. Hochstein
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index fb550f475..8740fb7e6 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -3,7 +3,7 @@
 # ==========================================================================
 #
 # ZoneMinder ONVIF Control Protocol Module
-# Copyright (C) Jan M. Hochstein
+# Copyright (C) 2014  Jan M. Hochstein
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

From 18c493a1806864c4d0ef152410e23f20e6de3956 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 10 Feb 2016 13:04:14 -0600
Subject: [PATCH 226/362] Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD

---
 .../lib/ZoneMinder/ConfigData.pm.in           | 21 +++++++++++++++++
 scripts/zmtelemetry.pl.in                     | 23 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index ffe063b60..2c014aee2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2763,6 +2763,27 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         type        => $types{boolean},
         category    => "system",
     },
+    {
+        name        => "ZM_TELEMETRY_UUID",
+        default     => "yes",
+        description => "Unique identifier for ZoneMinder telemetry",
+        help        => qqq("
+            This variable is auto-generated once by the system and is used to
+            uniquely identify it among all other ZoneMinder systems in
+            existence.
+        "),
+        type        => $types{string},
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_TELEMETRY_LAST_UPLOAD",
+        default     => "",
+        description => "When the last ZoneMinder telemetry upload ocurred",
+        help        => "",
+        type        => $types{integer},
+        readonly    => 1,
+        category    => "dynamic",
+    },
     {
         name        => "ZM_UPDATE_CHECK_PROXY",
         default     => "",
diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 4a3a6efcf..bc7458ac1 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -91,7 +91,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             if ( sendData($result) ) {
                 $lastCheck = $now;
 
-                my $lc_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_CHECK'";
+                my $lc_sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_LAST_UPLOAD'";
                 my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
                 my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
             }
@@ -156,3 +156,24 @@ sub sendData {
     return $success;
 }
 
+# Retrieves the UUID from the database. Creates a new UUID if one does not exist.
+sub getUUID {
+    my $uuid= "";
+
+    if ( $Config{ZM_TELEMETRY_UUID} ) {
+        $uuid = $Config{ZM_TELEMETRY_UUID};
+    } else {
+        use OSSSP::uuid;
+        my $uuidobj = OSSP::uuid->new;
+        $uuidobj -> make("v1");
+        $uuid = $uuidobj->export("str");
+
+        my $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_UUID'";
+        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $uuid ) or die( "Can't execute: ".$sth->errstr() );
+    }
+
+return $uuid;
+}
+
+

From f48ffb60e6376220def5019c303ab5cf0b06d59b Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 10 Feb 2016 13:37:22 -0600
Subject: [PATCH 227/362] update ZM_TELEMETRY_UUID after creating uuid

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index bc7458ac1..1b68f31c3 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -166,7 +166,7 @@ sub getUUID {
         use OSSSP::uuid;
         my $uuidobj = OSSP::uuid->new;
         $uuidobj -> make("v1");
-        $uuid = $uuidobj->export("str");
+        $uuid = $Config{ZM_TELEMETRY_UUID} = $uuidobj->export("str");
 
         my $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_UUID'";
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );

From 177a70a2485f9f7cc0a224e261b5bbd692e1aea1 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 10 Feb 2016 14:05:34 -0600
Subject: [PATCH 228/362] add getIP subroutine to zmtelemetry.pl

---
 scripts/zmtelemetry.pl.in | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 1b68f31c3..99e32cac1 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -176,4 +176,21 @@ sub getUUID {
 return $uuid;
 }
 
+# Retrieves the local server's external IP address
+sub getIP {   
+    use LWP::UserAgent;
+
+    my $ipaddr = "0.0.0.0";
+    my $ua = LWP::UserAgent->new;
+    my $server_endpoint = "https://wiki.zoneminder.com/ip.php";
+
+    my $req = HTTP::Request->new(GET => $server_endpoint);
+    my $resp = $ua->request($req);
+
+    if ($resp->is_success) {
+        $ipaddr = $resp->decoded_content;
+    }
+
+return $ipaddr;
+}
 

From 6d81ef247e8b1a37d8acff216dce07f7810778bc Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Wed, 10 Feb 2016 20:46:05 -0600
Subject: [PATCH 229/362] build telemetry hash then jsonencode it

---
 scripts/zmtelemetry.pl.in | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 99e32cac1..5d7fcb1a0 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -54,6 +54,9 @@ use ZoneMinder::Database qw(:all);
 use DBI;
 use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
+use LWP::UserAgent;
+use Sys::MemInfo;
+use Sys::CPU;
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
@@ -77,16 +80,26 @@ if ( $Config{ZM_TELEMETRY_DATA} )
         my $now = time();
         if ( ($now-$lastCheck) > CHECK_INTERVAL) )
         {
-            Info( "Colleting data to send to ZoneMinder Telemetry server\n" );
-
-            # This is where we gather our data. The following is just an oversimplified example.
-            # Modify accordingly.
+            Info( "Colleting data to send to ZoneMinder Telemetry server." );
 
+            # Build the telemetry hash
             # We should keep *BSD systems in mind when calling system commands
-            my $result = runSysCmd("uname -a")."\n";
-            my $result .= "ZM_DYN_CURR_VERSION: ".Config{ZM_DYN_CURR_VERSION};
+            my %telemetry;
+            $telemetry{uuid} = getUUID();
+            $telemetry{ip} = getIP();
+            $telemetry{timestamp} = runSysCmd("date -In");
+            #$telemetry{monitor_count} = TO-DO
+            #$telemetry{event_count} = TO-DO
+            $telemetry{distro} = runSysCmd("uname -a");
+            $telemetry{release} = runSysCmd("cat /etc/*{release,version}");
+            $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
+            $telemetry{system_memory} = totalmem() / (1024*1024);
+            $telemetry{processor_count} = cpu_count();
+            #$telemetry{monitors} = TO-DO
 
-            Info( "Sending data to ZoneMinder Telemetry server\n" );
+            Info( "Sending data to ZoneMinder Telemetry server." );
+
+            my $result = jsonEncode( \%telemetry );
 
             if ( sendData($result) ) {
                 $lastCheck = $now;
@@ -95,6 +108,8 @@ if ( $Config{ZM_TELEMETRY_DATA} )
                 my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
                 my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
             }
+
+           Info( "Telemetry data uploaded successfully."  );
         }
         sleep( 3600 );
     }
@@ -125,8 +140,6 @@ sub runSysCmd {
 sub sendData {
     my $msg = shift;
 
-    use LWP::UserAgent;
-
     my $ua = LWP::UserAgent->new;
     my $server_endpoint = "https://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/zmtelemetry/testing/";
 
@@ -147,11 +160,11 @@ sub sendData {
     if ($resp->is_success) {
         my $message = $resp->decoded_content;
         Info("Telemetry data successfully uploaded.");
-        Debug("Telemetry server upload success response message: $message\n");
+        Debug("Telemetry server upload success response message: $message");
         $success = 1;
     } else {
-        Warning("Telemetry server returned HTTP POST error code: ", $resp->code, "\n";
-        Debug("Telemetry server upload failure response message: ", $resp->message, "\n";
+        Warning("Telemetry server returned HTTP POST error code: $resp->code");
+        Debug("Telemetry server upload failure response message: $resp->message");
     }
     return $success;
 }
@@ -178,8 +191,6 @@ return $uuid;
 
 # Retrieves the local server's external IP address
 sub getIP {   
-    use LWP::UserAgent;
-
     my $ipaddr = "0.0.0.0";
     my $ua = LWP::UserAgent->new;
     my $server_endpoint = "https://wiki.zoneminder.com/ip.php";

From b28224cacb04d399a1c9b66016fd45e5eb5f9c52 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Thu, 11 Feb 2016 07:35:21 +0100
Subject: [PATCH 230/362] Added copyright information to mk_bigfont.pl

---
 utils/mk_bigfont.pl | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/utils/mk_bigfont.pl b/utils/mk_bigfont.pl
index 536fab882..ff2b1c30c 100755
--- a/utils/mk_bigfont.pl
+++ b/utils/mk_bigfont.pl
@@ -1,4 +1,31 @@
 #!/usr/bin/env perl
+#
+# ==========================================================================
+#
+# ZoneMinder Big Font Generate Script
+# Copyright (C) 2015 Robin Därmann
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+
+# Basically, this script reads src/zm_font.h and duplicates every bit of every
+# character found in that file. It then duplicates every generated line, so
+# that every character effectively gets double sized.
+# Output goes to STDOUT so it would be useful to redirect it to a file, i.e. to
+# src/zm_bigfont.c
 
 use strict;
 use warnings;

From f5ff5d152c870793cd74ea138576b6bdd0b4fff1 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 11 Feb 2016 07:22:31 -0600
Subject: [PATCH 231/362] Add count query subroutine

---
 scripts/zmtelemetry.pl.in | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 5d7fcb1a0..6e33c9b55 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -88,8 +88,8 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             $telemetry{uuid} = getUUID();
             $telemetry{ip} = getIP();
             $telemetry{timestamp} = runSysCmd("date -In");
-            #$telemetry{monitor_count} = TO-DO
-            #$telemetry{event_count} = TO-DO
+            $telemetry{monitor_count} = countQuery("Monitors");
+            $telemetry{event_count} = countQuery("Events");
             $telemetry{distro} = runSysCmd("uname -a");
             $telemetry{release} = runSysCmd("cat /etc/*{release,version}");
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
@@ -205,3 +205,15 @@ sub getIP {
 return $ipaddr;
 }
 
+# As the name implies, just your average mysql count query
+sub countQuery {
+    my $table = shift;
+    my $count = 0;
+
+    my $sql = "select count(*) from ?";
+    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    $count = $sth->execute( $table ) or die( "Can't execute: ".$sth->errstr() );
+
+return $count
+}
+

From 1811d715624d8dd6dd29aacd6096a014d43bcbb8 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 11 Feb 2016 08:10:16 -0600
Subject: [PATCH 232/362] make date format compatible with *BSD

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 6e33c9b55..9e2003ae9 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -87,7 +87,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             my %telemetry;
             $telemetry{uuid} = getUUID();
             $telemetry{ip} = getIP();
-            $telemetry{timestamp} = runSysCmd("date -In");
+            $telemetry{timestamp} = runSysCmd("date +%Y-%m-%dT%H:%M:%S%z");
             $telemetry{monitor_count} = countQuery("Monitors");
             $telemetry{event_count} = countQuery("Events");
             $telemetry{distro} = runSysCmd("uname -a");

From 1b6af8afaed4122bddcf7229e3f7f8608ec0cb0d Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 11 Feb 2016 13:10:36 -0600
Subject: [PATCH 233/362] modify telemetry parameters

---
 scripts/zmtelemetry.pl.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 9e2003ae9..439411790 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -57,6 +57,8 @@ use autouse 'Pod::Usage'=>qw(pod2usage);
 use LWP::UserAgent;
 use Sys::MemInfo;
 use Sys::CPU;
+use DateTime;
+use POSIX qw(strftime);
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
@@ -87,9 +89,10 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             my %telemetry;
             $telemetry{uuid} = getUUID();
             $telemetry{ip} = getIP();
-            $telemetry{timestamp} = runSysCmd("date +%Y-%m-%dT%H:%M:%S%z");
+            $telemetry{timestamp} = DateTime->now( time_zone => "local" )->strftime("%Y-%m-%dT%H:%M:%S%z");
             $telemetry{monitor_count} = countQuery("Monitors");
             $telemetry{event_count} = countQuery("Events");
+            $telemetry{architecture} = runSysCmd("uname -m");
             $telemetry{distro} = runSysCmd("uname -a");
             $telemetry{release} = runSysCmd("cat /etc/*{release,version}");
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;

From e8c38dd01665b24a13b8b5edb174ee97a949451d Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Thu, 11 Feb 2016 15:12:21 -0500
Subject: [PATCH 234/362] demoted to debug due to lots of logs

---
 src/zm_config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 8d293906c..5a7454a7b 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -136,9 +136,9 @@ void zmLoadConfig()
 	
 	}	
 	if ( ! staticConfig.SERVER_ID ) {
-		Info( "No Server ID or Name specified in config.  Not using Multi-Server Mode." );
+		Debug( 1, "No Server ID or Name specified in config.  Not using Multi-Server Mode." );
 	} else {
-		Info( "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID );
+		Debug( 1, "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID );
 	}
 }
 

From 017417d8f80f3b41d40e4b8095a6b5f45cb15207 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 08:06:51 -0600
Subject: [PATCH 235/362] small changes to zmtelemetry

---
 scripts/zmtelemetry.pl.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 439411790..c8f082aa6 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -48,9 +48,7 @@ use strict;
 use bytes;
 
 @EXTRA_PERL_LIB@
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Database qw(:all);
+use ZoneMinder;
 use DBI;
 use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
@@ -83,7 +81,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
         if ( ($now-$lastCheck) > CHECK_INTERVAL) )
         {
             Info( "Colleting data to send to ZoneMinder Telemetry server." );
-
+            my $dbh = zmDbConnect();
             # Build the telemetry hash
             # We should keep *BSD systems in mind when calling system commands
             my %telemetry;

From 799437fdf1cd4c864edc11c73ad13c9d5a0ded2f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 08:59:16 -0600
Subject: [PATCH 236/362] retrieve telemetry data from the monitors table

---
 scripts/zmtelemetry.pl.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index c8f082aa6..7dc52984b 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -96,7 +96,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
             $telemetry{system_memory} = totalmem() / (1024*1024);
             $telemetry{processor_count} = cpu_count();
-            #$telemetry{monitors} = TO-DO
+            $telemetry{monitors} = getMonitorRef();
 
             Info( "Sending data to ZoneMinder Telemetry server." );
 
@@ -218,3 +218,14 @@ sub countQuery {
 return $count
 }
 
+# Returns a reference to an array of hashes containing data from all monitors
+sub getMonitorRef {
+
+    my $sql = "SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors";
+    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+    $arrayref = $sth->fetchall_arrayref({});
+
+return $arrayref;
+}
+

From b04e1eb0c6dc6d2f0e60e00fda6212f5575fb09c Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 09:18:15 -0600
Subject: [PATCH 237/362] let mysql generate the uuid

---
 scripts/zmtelemetry.pl.in | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 7dc52984b..d8adb8ff1 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -177,14 +177,15 @@ sub getUUID {
     if ( $Config{ZM_TELEMETRY_UUID} ) {
         $uuid = $Config{ZM_TELEMETRY_UUID};
     } else {
-        use OSSSP::uuid;
-        my $uuidobj = OSSP::uuid->new;
-        $uuidobj -> make("v1");
-        $uuid = $Config{ZM_TELEMETRY_UUID} = $uuidobj->export("str");
-
-        my $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_UUID'";
+        my $sql = "select uuid()";
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $uuid ) or die( "Can't execute: ".$sth->errstr() );
+        my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+        $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
+        $sth->finish();
+
+        $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_UUID'";
+        $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+        $res = $sth->execute( $uuid ) or die( "Can't execute: ".$sth->errstr() );
     }
 
 return $uuid;
@@ -213,7 +214,8 @@ sub countQuery {
 
     my $sql = "select count(*) from ?";
     my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    $count = $sth->execute( $table ) or die( "Can't execute: ".$sth->errstr() );
+    my $res = $sth->execute( $table ) or die( "Can't execute: ".$sth->errstr() );
+    my $count = $sth->fetchrow_array();
 
 return $count
 }

From c892e912cf633822139ca38024e33c49a2d79167 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 10:47:12 -0600
Subject: [PATCH 238/362] use uname -p for telemetry architecture

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index d8adb8ff1..5ddaf1cfd 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -90,7 +90,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             $telemetry{timestamp} = DateTime->now( time_zone => "local" )->strftime("%Y-%m-%dT%H:%M:%S%z");
             $telemetry{monitor_count} = countQuery("Monitors");
             $telemetry{event_count} = countQuery("Events");
-            $telemetry{architecture} = runSysCmd("uname -m");
+            $telemetry{architecture} = runSysCmd("uname -p");
             $telemetry{distro} = runSysCmd("uname -a");
             $telemetry{release} = runSysCmd("cat /etc/*{release,version}");
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;

From 5045da9382fea120f130b4325f6d4abcaaacfe55 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 15:18:45 -0600
Subject: [PATCH 239/362] add initial distro determination logic to zmtelemetry

---
 scripts/zmtelemetry.pl.in | 100 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 3 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 5ddaf1cfd..b730c28c5 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -91,8 +91,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             $telemetry{monitor_count} = countQuery("Monitors");
             $telemetry{event_count} = countQuery("Events");
             $telemetry{architecture} = runSysCmd("uname -p");
-            $telemetry{distro} = runSysCmd("uname -a");
-            $telemetry{release} = runSysCmd("cat /etc/*{release,version}");
+            ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
             $telemetry{system_memory} = totalmem() / (1024*1024);
             $telemetry{processor_count} = cpu_count();
@@ -132,7 +131,7 @@ sub runSysCmd {
         chomp($path);
         $arguments[0] = $path;
         my $cmd = join(" ",@arguments);
-        my $result = qx( $cmd );
+        $result = qx( $cmd );
     }
     return chomp($result);
 }
@@ -231,3 +230,98 @@ sub getMonitorRef {
 return $arrayref;
 }
 
+sub getDistro {
+    my $kernel = "";
+    my $distro = "";
+    my $version = "";
+
+    my $test = runSysCmd("uname");
+
+    if ( $test =~ /Linux/ ) {
+        #print "Linux distro.\n";
+        ($kernel, $distro, $version) = linuxDistro();
+    } elsif ( $test =~ /.*BSD/ ) {
+        #print "BSD distro.\n";
+        $kernel = runSysCmd("uname -i");
+        $distro = runSysCmd("uname");
+        $version = runSysCmd("uname -r");
+    } elsif ( $test =~ /Darwin/ ) {
+        #print "Mac OS.\n";
+    } elsif ( $test =~ /SunOS|Solaris/ ) {
+        #print "Sun Solaris.\n";
+        $kernel = runSysCmd("uname -v");
+        $distro = runSysCmd("uname");
+        $version = runSysCmd("uname -r");   
+    } else {
+        $kernel = "Unknown"; 
+        $distro = "Unknown";
+        $version = "Unknown";
+    }
+
+return ($kernel, $distro, $version);
+}
+
+sub linuxDistro {
+    my $kernel = runSysCmd("uname -r");
+    my $distro = "Unknown Linux Distro";
+    my $version = "Unknown Linux Version";
+    my $found = 0;
+
+    #
+    # TO-DO: The regex's below are close but still need tweaking.
+    #
+
+    # os-release is the standard for many new distros based on systemd
+    if ( -f "/etc/os-release" ) {
+        open(my $RELFILE,"<","/etc/os-release") or die( "Can't Open file: $!\n" );
+        while (<$RELFILE>) {
+            if ( /PRETTY_NAME=\"?(.*)\"?.*/ ) {
+                $distro = $1;
+                $found = 1;
+            }
+            if ( /VERSION_ID=\"?(.*)\"?.*/ ) {
+                $version = $1;
+                $found = 1;
+            }
+        }
+        close $RELFILE;
+    # exists on many distros but does not always contain useful information, such as redhat
+    } elsif ( -f "/etc/lsb-release" ) {
+        open(my $RELFILE,"<","/etc/lsb-release") or die( "Can't Open file: $!\n" );
+        while (<$RELFILE>) {
+            if ( /DISTRIB_DESCRIPTION=\"?(.*)\"?.*/ ) {
+                $distro = $1;
+                $found = 1;
+            }
+            if ( /DISTRIB_RELEASE=\"?(.*)\"?.*/ ) {
+                $version = $1;
+                $found = 1;
+            }
+        }
+        close $RELFILE;
+    }
+
+    # If all else fails, search through a list of known release files until we find one
+    if ( !$found ) {
+        @releasefile = ("/etc/SuSE-release", "/etc/redhat-release", "/etc/redhat_version",
+                        "/etc/fedora-release", "/etc/slackware-release", "/etc/slackware-version",
+                        "/etc/debian_release", "/etc/debian_version", "/etc/mandrake-release",
+                        "/etc/yellowdog-release", "/etc/gentoo-release");
+        foreach (@releasefile) {
+            if ( -f $_ ) {
+                open(my $RELFILE,"<",$_) or die( "Can't Open file: $!\n" );
+                while (<$RELFILE>) {
+                    if ( /(.*).* (\d+\.?\d*) .*/ ) {
+                        $distro = $1;
+                        $version = $2;
+                    }
+                }
+                close $RELFILE;               
+                last;
+            }
+        }
+    }
+return ($kernel, $distro, $version);
+}
+
+

From 3c48d81edb1ddf1097837032c42d32c600e38214 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 17:15:04 -0600
Subject: [PATCH 240/362] tweak regex's. add debug

---
 scripts/zmtelemetry.pl.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index b730c28c5..abfbf428d 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -238,17 +238,17 @@ sub getDistro {
     my $test = runSysCmd("uname");
 
     if ( $test =~ /Linux/ ) {
-        #print "Linux distro.\n";
+        Debug("Linux distro detected.");
         ($kernel, $distro, $version) = linuxDistro();
     } elsif ( $test =~ /.*BSD/ ) {
-        #print "BSD distro.\n";
+        Debug("BSD distro detected.");
         $kernel = runSysCmd("uname -i");
         $distro = runSysCmd("uname");
         $version = runSysCmd("uname -r");
     } elsif ( $test =~ /Darwin/ ) {
-        #print "Mac OS.\n";
+        Debug("Mac OS distro detected.");
     } elsif ( $test =~ /SunOS|Solaris/ ) {
-        #print "Sun Solaris.\n";
+        Debug("Sun Solaris detected.");
         $kernel = runSysCmd("uname -v");
         $distro = runSysCmd("uname");
         $version = runSysCmd("uname -r");   
@@ -275,12 +275,12 @@ sub linuxDistro {
     if ( -f "/etc/os-release" ) {
         open(my $RELFILE,"<","/etc/os-release") or die( "Can't Open file: $!\n" );
         while (<$RELFILE>) {
-            if ( /PRETTY_NAME=\"?(.*)\"?.*/ ) {
-                $distro = $1;
+            if ( /^NAME=(")?(.*)(?(1)\1|).*$/ ) {
+                $distro = $2;
                 $found = 1;
             }
-            if ( /VERSION_ID=\"?(.*)\"?.*/ ) {
-                $version = $1;
+            if ( /^VERSION_ID=(")?(.*)(?(1)\1|).*$/ ) {
+                $version = $2;
                 $found = 1;
             }
         }
@@ -289,12 +289,12 @@ sub linuxDistro {
     } elsif ( -f "/etc/lsb-release" ) {
         open(my $RELFILE,"<","/etc/lsb-release") or die( "Can't Open file: $!\n" );
         while (<$RELFILE>) {
-            if ( /DISTRIB_DESCRIPTION=\"?(.*)\"?.*/ ) {
-                $distro = $1;
+            if ( /^DISTRIB_DESCRIPTION=(")?(.*)(?(1)\1|).*$/ ) {
+                $distro = $2;
                 $found = 1;
             }
-            if ( /DISTRIB_RELEASE=\"?(.*)\"?.*/ ) {
-                $version = $1;
+            if ( /^DISTRIB_RELEASE=(")?(.*)(?(1)\1|).*$/ ) {
+                $version = $2;
                 $found = 1;
             }
         }

From 24838a91c9f2bebc87751e746f7caaa4041c8da6 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 17:38:00 -0600
Subject: [PATCH 241/362] set kernel, distro, and version for Mac OS

---
 scripts/zmtelemetry.pl.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index abfbf428d..d5fa56bad 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -247,6 +247,9 @@ sub getDistro {
         $version = runSysCmd("uname -r");
     } elsif ( $test =~ /Darwin/ ) {
         Debug("Mac OS distro detected.");
+        $kernel = runSysCmd("uname -v");
+        $distro = runSysCmd("uname");
+        $version = runSysCmd("uname -r");
     } elsif ( $test =~ /SunOS|Solaris/ ) {
         Debug("Sun Solaris detected.");
         $kernel = runSysCmd("uname -v");

From 87857f5dc1398d819dc08187cf54d10e2d5db807 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 12 Feb 2016 17:45:08 -0600
Subject: [PATCH 242/362] more debug and warnings

---
 scripts/zmtelemetry.pl.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index d5fa56bad..fa6f9631d 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -256,6 +256,7 @@ sub getDistro {
         $distro = runSysCmd("uname");
         $version = runSysCmd("uname -r");   
     } else {
+        Warning("ZoneMinder was unable to determine the host system. Please report.");
         $kernel = "Unknown"; 
         $distro = "Unknown";
         $version = "Unknown";
@@ -317,6 +318,7 @@ sub linuxDistro {
                     if ( /(.*).* (\d+\.?\d*) .*/ ) {
                         $distro = $1;
                         $version = $2;
+                        $found = 1;
                     }
                 }
                 close $RELFILE;               
@@ -324,6 +326,11 @@ sub linuxDistro {
             }
         }
     }
+
+    if ( !found ) {
+        Warning("ZoneMinder was unable to determine Linux distro. Please report.");
+    }
+
 return ($kernel, $distro, $version);
 }
 

From 5150829a9fb325aa00de4a790b1b06a7198c8abe Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Sat, 13 Feb 2016 16:22:44 +1100
Subject: [PATCH 243/362] Convert to Travis Trusty

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d44973e2e..59018e553 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: cpp
+sudo: required
+dist: trusty
 notifications:
   irc: "chat.freenode.net#zoneminder-dev"
 branches:
@@ -24,7 +26,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
 install:
-  - git clone -b n2.8.1 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n2.8.6 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 

From 4303aa4fe28c3db2b8392e0de7de4db887223eaa Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Sat, 13 Feb 2016 16:34:49 +1100
Subject: [PATCH 244/362] Remove libvlc5 and libvlccore5, also attempt clang
 builds

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 59018e553..eeb99bd96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,10 @@ env:
     - ZM_BUILDMETHOD=autotools
 compiler:
   - gcc
+  - clang
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
+  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
 install:
   - git clone -b n2.8.6 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg

From 08af88df1024b6be08ba2b30e8068de658ca5887 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 13 Feb 2016 08:54:40 -0600
Subject: [PATCH 245/362] fix compilation errors

---
 scripts/zmtelemetry.pl.in | 59 ++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index fa6f9631d..ad5e9914b 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -53,8 +53,8 @@ use DBI;
 use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 use LWP::UserAgent;
-use Sys::MemInfo;
-use Sys::CPU;
+use Sys::MemInfo qw(totalmem);
+use Sys::CPU qw(cpu_count);
 use DateTime;
 use POSIX qw(strftime);
 
@@ -75,27 +75,25 @@ if ( $Config{ZM_TELEMETRY_DATA} )
 
     my $lastCheck = $Config{ZM_TELEMETRY_LAST_CHECK};
 
-    while( 1 )
-    {
+    while( 1 ) {
         my $now = time();
-        if ( ($now-$lastCheck) > CHECK_INTERVAL) )
-        {
+        if ( ($now-$lastCheck) > CHECK_INTERVAL ) {
             Info( "Colleting data to send to ZoneMinder Telemetry server." );
             my $dbh = zmDbConnect();
             # Build the telemetry hash
             # We should keep *BSD systems in mind when calling system commands
             my %telemetry;
-            $telemetry{uuid} = getUUID();
+            $telemetry{uuid} = getUUID($dbh);
             $telemetry{ip} = getIP();
             $telemetry{timestamp} = DateTime->now( time_zone => "local" )->strftime("%Y-%m-%dT%H:%M:%S%z");
-            $telemetry{monitor_count} = countQuery("Monitors");
-            $telemetry{event_count} = countQuery("Events");
+            $telemetry{monitor_count} = countQuery($dbh,"Monitors");
+            $telemetry{event_count} = countQuery($dbh,"Events");
             $telemetry{architecture} = runSysCmd("uname -p");
             ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
             $telemetry{system_memory} = totalmem() / (1024*1024);
             $telemetry{processor_count} = cpu_count();
-            $telemetry{monitors} = getMonitorRef();
+            $telemetry{monitors} = getMonitorRef($dbh);
 
             Info( "Sending data to ZoneMinder Telemetry server." );
 
@@ -104,9 +102,10 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             if ( sendData($result) ) {
                 $lastCheck = $now;
 
-                my $lc_sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_LAST_UPLOAD'";
-                my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
-                my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
+                my $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_LAST_UPLOAD'";
+                my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+                my $res = $sth->execute( "$lastCheck" ) or die( "Can't execute: ".$sth->errstr() );
+                $sth->finish();
             }
 
            Info( "Telemetry data uploaded successfully."  );
@@ -116,6 +115,10 @@ if ( $Config{ZM_TELEMETRY_DATA} )
     print( "Update agent exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
 }
 
+###############
+# SUBROUTINES #
+###############
+
 # Find, verify, then run the supplied system command
 sub runSysCmd {
     my $msg = shift;
@@ -156,35 +159,35 @@ sub sendData {
     $req->content($msg);
  
     my $resp = $ua->request($req);
-    my success = 0;
     if ($resp->is_success) {
         my $message = $resp->decoded_content;
         Info("Telemetry data successfully uploaded.");
         Debug("Telemetry server upload success response message: $message");
-        $success = 1;
     } else {
         Warning("Telemetry server returned HTTP POST error code: $resp->code");
         Debug("Telemetry server upload failure response message: $resp->message");
     }
-    return $success;
+    return $resp->is_success;
 }
 
 # Retrieves the UUID from the database. Creates a new UUID if one does not exist.
 sub getUUID {
+    my $dbh = shift;
     my $uuid= "";
 
     if ( $Config{ZM_TELEMETRY_UUID} ) {
         $uuid = $Config{ZM_TELEMETRY_UUID};
     } else {
-        my $sql = "select uuid()";
+        my $sql = "SELECT uuid()";
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
         $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
         $sth->finish();
 
-        $sql = "update Config set Value = ? where Name = 'ZM_TELEMETRY_UUID'";
+        $sql = "UPDATE Config set Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'";
         $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-        $res = $sth->execute( $uuid ) or die( "Can't execute: ".$sth->errstr() );
+        $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
+        $sth->finish();
     }
 
 return $uuid;
@@ -208,24 +211,26 @@ return $ipaddr;
 
 # As the name implies, just your average mysql count query
 sub countQuery {
+    my $dbh = shift;
     my $table = shift;
-    my $count = 0;
 
-    my $sql = "select count(*) from ?";
+    my $sql = "SELECT count(*) FROM $table";
     my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( $table ) or die( "Can't execute: ".$sth->errstr() );
+    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
     my $count = $sth->fetchrow_array();
+    $sth->finish();
 
 return $count
 }
 
 # Returns a reference to an array of hashes containing data from all monitors
 sub getMonitorRef {
+    my $dbh = shift;
 
     my $sql = "SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors";
     my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-    $arrayref = $sth->fetchall_arrayref({});
+    my $arrayref = $sth->fetchall_arrayref({});
 
 return $arrayref;
 }
@@ -271,10 +276,6 @@ sub linuxDistro {
     my $version = "Unknown Linux Version";
     my $found = 0;
 
-    #
-    # TO-DO: The regex's below are close but still need tweaking.
-    #
-
     # os-release is the standard for many new distros based on systemd
     if ( -f "/etc/os-release" ) {
         open(my $RELFILE,"<","/etc/os-release") or die( "Can't Open file: $!\n" );
@@ -307,7 +308,7 @@ sub linuxDistro {
 
     # If all else fails, search through a list of known release files until we find one
     if ( !$found ) {
-        @releasefile = ("/etc/SuSE-release", "/etc/redhat-release", "/etc/redhat_version",
+        my @releasefile = ("/etc/SuSE-release", "/etc/redhat-release", "/etc/redhat_version",
                         "/etc/fedora-release", "/etc/slackware-release", "/etc/slackware-version",
                         "/etc/debian_release", "/etc/debian_version", "/etc/mandrake-release",
                         "/etc/yellowdog-release", "/etc/gentoo-release");
@@ -327,7 +328,7 @@ sub linuxDistro {
         }
     }
 
-    if ( !found ) {
+    if ( !$found ) {
         Warning("ZoneMinder was unable to determine Linux distro. Please report.");
     }
 

From ee3f87a2ad67b045c622c9f8b2aba08a73e9aaca Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 13 Feb 2016 14:53:22 -0600
Subject: [PATCH 246/362] additional refinements to zmtelemetry

---
 .../lib/ZoneMinder/ConfigData.pm.in           |  2 +-
 scripts/zmtelemetry.pl.in                     | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 2c014aee2..49c51e368 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -2765,7 +2765,7 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
     },
     {
         name        => "ZM_TELEMETRY_UUID",
-        default     => "yes",
+        default     => "",
         description => "Unique identifier for ZoneMinder telemetry",
         help        => qqq("
             This variable is auto-generated once by the system and is used to
diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index ad5e9914b..add9c141b 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -107,8 +107,6 @@ if ( $Config{ZM_TELEMETRY_DATA} )
                 my $res = $sth->execute( "$lastCheck" ) or die( "Can't execute: ".$sth->errstr() );
                 $sth->finish();
             }
-
-           Info( "Telemetry data uploaded successfully."  );
         }
         sleep( 3600 );
     }
@@ -135,8 +133,10 @@ sub runSysCmd {
         $arguments[0] = $path;
         my $cmd = join(" ",@arguments);
         $result = qx( $cmd );
+        chomp($result);
     }
-    return chomp($result);
+
+return $result;
 }
 
 # Upload message data to ZoneMinder telemetry server
@@ -150,6 +150,8 @@ sub sendData {
         $ua->proxy( "https", $Config{ZM_UPDATE_CHECK_PROXY} );
     }
 
+    Debug("Posting telemetry data to: $server_endpoint");
+
     # set custom HTTP request header fields
     my $req = HTTP::Request->new(POST => $server_endpoint);
     $req->header('content-type' => 'application/x-www-form-urlencoded');
@@ -159,15 +161,16 @@ sub sendData {
     $req->content($msg);
  
     my $resp = $ua->request($req);
-    if ($resp->is_success) {
-        my $message = $resp->decoded_content;
-        Info("Telemetry data successfully uploaded.");
-        Debug("Telemetry server upload success response message: $message");
+    my $resp_msg = $resp->decoded_content;
+    my $resp_code = $resp->code;
+    if ($resp->is_success) {       
+        Info("Telemetry data uploaded successfully.");
+        Debug("Telemetry server upload success response message: $resp_msg");
     } else {
-        Warning("Telemetry server returned HTTP POST error code: $resp->code");
-        Debug("Telemetry server upload failure response message: $resp->message");
+        Warning("Telemetry server returned HTTP POST error code: $resp_code");
+        Debug("Telemetry server upload failure response message: $resp_msg");
     }
-    return $resp->is_success;
+return $resp->is_success;
 }
 
 # Retrieves the UUID from the database. Creates a new UUID if one does not exist.
@@ -175,7 +178,8 @@ sub getUUID {
     my $dbh = shift;
     my $uuid= "";
 
-    if ( $Config{ZM_TELEMETRY_UUID} ) {
+    # Verify the current UUID is valid and not nil
+    if (( $Config{ZM_TELEMETRY_UUID} =~ /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i ) && ( $Config{ZM_TELEMETRY_UUID} ne "00000000-0000-0000-0000-000000000000" )) {
         $uuid = $Config{ZM_TELEMETRY_UUID};
     } else {
         my $sql = "SELECT uuid()";
@@ -189,6 +193,7 @@ sub getUUID {
         $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
         $sth->finish();
     }
+    Debug("Using UUID of: $uuid");
 
 return $uuid;
 }
@@ -206,6 +211,8 @@ sub getIP {
         $ipaddr = $resp->decoded_content;
     }
 
+    Info("Found external ip address of: $ipaddr");
+
 return $ipaddr;
 }
 

From 47eaea78bed46985bb86bd856dc047d12af30086 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 13 Feb 2016 15:01:22 -0600
Subject: [PATCH 247/362] use units of bytes for total memory

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index add9c141b..c2a482a1c 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -91,7 +91,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             $telemetry{architecture} = runSysCmd("uname -p");
             ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
             $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
-            $telemetry{system_memory} = totalmem() / (1024*1024);
+            $telemetry{system_memory} = totalmem();
             $telemetry{processor_count} = cpu_count();
             $telemetry{monitors} = getMonitorRef($dbh);
 

From 37c7b71b03672757d7a2bb55475cc1c31e016b1c Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 13 Feb 2016 15:26:31 -0600
Subject: [PATCH 248/362] add out-of-source build support to onvif/scripts
 folder

---
 onvif/scripts/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/onvif/scripts/CMakeLists.txt b/onvif/scripts/CMakeLists.txt
index 09775b3f2..3405fa756 100644
--- a/onvif/scripts/CMakeLists.txt
+++ b/onvif/scripts/CMakeLists.txt
@@ -1,4 +1,9 @@
 # CMakeLists.txt for the ZoneMinder perl scripts.
 
+# If this is an out-of-source build, copy the files we need to the binary directory
+if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/zmonvif-probe.pl" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+
 # Install the perl scripts
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmonvif-probe.pl"  DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

From cd8a4adfabee2bbf4abbbf4e3e44f40bdbd2d198 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 15 Feb 2016 08:43:34 -0600
Subject: [PATCH 249/362] replace uname system call with native perl when
 applicable

---
 scripts/zmtelemetry.pl.in | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index c2a482a1c..26b620d38 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -56,7 +56,7 @@ use LWP::UserAgent;
 use Sys::MemInfo qw(totalmem);
 use Sys::CPU qw(cpu_count);
 use DateTime;
-use POSIX qw(strftime);
+use POSIX qw(strftime uname);
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
@@ -246,27 +246,26 @@ sub getDistro {
     my $kernel = "";
     my $distro = "";
     my $version = "";
+    my @uname = uname();
 
-    my $test = runSysCmd("uname");
-
-    if ( $test =~ /Linux/ ) {
+    if ( $uname[0] =~ /Linux/ ) {
         Debug("Linux distro detected.");
         ($kernel, $distro, $version) = linuxDistro();
-    } elsif ( $test =~ /.*BSD/ ) {
+    } elsif ( $uname[0] =~ /.*BSD/ ) {
         Debug("BSD distro detected.");
-        $kernel = runSysCmd("uname -i");
-        $distro = runSysCmd("uname");
-        $version = runSysCmd("uname -r");
-    } elsif ( $test =~ /Darwin/ ) {
+        $kernel = $uname[3];
+        $distro = $uname[0];
+        $version = $uname[2];
+    } elsif ( $uname[0] =~ /Darwin/ ) {
         Debug("Mac OS distro detected.");
-        $kernel = runSysCmd("uname -v");
-        $distro = runSysCmd("uname");
-        $version = runSysCmd("uname -r");
-    } elsif ( $test =~ /SunOS|Solaris/ ) {
+        $kernel = $uname[3];
+        $distro = runSysCmd("sw_vers -productName");
+        $version = runSysCmd("sw_vers -productVersion");
+    } elsif ( $uname[0] =~ /SunOS|Solaris/ ) {
         Debug("Sun Solaris detected.");
-        $kernel = runSysCmd("uname -v");
-        $distro = runSysCmd("uname");
-        $version = runSysCmd("uname -r");   
+        $kernel = $uname[3];
+        $distro = $uname[1];
+        $version = $uname[2];   
     } else {
         Warning("ZoneMinder was unable to determine the host system. Please report.");
         $kernel = "Unknown"; 
@@ -278,7 +277,8 @@ return ($kernel, $distro, $version);
 }
 
 sub linuxDistro {
-    my $kernel = runSysCmd("uname -r");
+    my @uname = uname();
+    my $kernel = $uname[2];
     my $distro = "Unknown Linux Distro";
     my $version = "Unknown Linux Version";
     my $found = 0;

From 87aceef479a8656ff4d7a0b099a89cd5879b3776 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 15 Feb 2016 08:50:11 -0600
Subject: [PATCH 250/362] change server endpoint

---
 scripts/zmtelemetry.pl.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 26b620d38..6697e4700 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -66,8 +66,7 @@ use constant CHECK_INTERVAL => (14*24*60*60); # Interval between version checks
 
 # Setting these as contants for now. 
 # Alternatively, we can put these in the dB and then retrieve using the Config hash.
-use constant ZM_TELEMETRY_SERVER_NAME => "38092a65757da3cb5f949b6b94aa8fc9.us-east-1.aws.found.io";
-use constant ZM_TELEMETRY_SERVER_PORT => "9243";
+use constant ZM_TELEMETRY_SERVER_ENDPOINT => 'https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing';
 
 if ( $Config{ZM_TELEMETRY_DATA} )
 {
@@ -144,7 +143,7 @@ sub sendData {
     my $msg = shift;
 
     my $ua = LWP::UserAgent->new;
-    my $server_endpoint = "https://".ZM_TELEMETRY_SERVER_NAME.":".ZM_TELEMETRY_SERVER_PORT."/zmtelemetry/testing/";
+    my $server_endpoint = ZM_TELEMETRY_SERVER_ENDPOINT;
 
     if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
         $ua->proxy( "https", $Config{ZM_UPDATE_CHECK_PROXY} );

From e3afa5d1ec08acdac0082401dc417f80623e99a9 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 15 Feb 2016 12:38:13 -0600
Subject: [PATCH 251/362] change to testing5

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 6697e4700..e4475339f 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -66,7 +66,7 @@ use constant CHECK_INTERVAL => (14*24*60*60); # Interval between version checks
 
 # Setting these as contants for now. 
 # Alternatively, we can put these in the dB and then retrieve using the Config hash.
-use constant ZM_TELEMETRY_SERVER_ENDPOINT => 'https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing';
+use constant ZM_TELEMETRY_SERVER_ENDPOINT => 'https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing5';
 
 if ( $Config{ZM_TELEMETRY_DATA} )
 {

From 041585b4a26f069d639417e9b360002bcff1b2c8 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 15 Feb 2016 14:03:16 -0600
Subject: [PATCH 252/362] Change Info to Debug

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index e4475339f..a2f191ceb 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -210,7 +210,7 @@ sub getIP {
         $ipaddr = $resp->decoded_content;
     }
 
-    Info("Found external ip address of: $ipaddr");
+    Debug("Found external ip address of: $ipaddr");
 
 return $ipaddr;
 }

From 8a2dc2897d3d35b47cb2a853c158ff654c63a9bb Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 15 Feb 2016 14:11:58 -0600
Subject: [PATCH 253/362] Perl DateTime dependency not needed

---
 scripts/zmtelemetry.pl.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index a2f191ceb..a5c2e00a3 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -55,7 +55,6 @@ use autouse 'Pod::Usage'=>qw(pod2usage);
 use LWP::UserAgent;
 use Sys::MemInfo qw(totalmem);
 use Sys::CPU qw(cpu_count);
-use DateTime;
 use POSIX qw(strftime uname);
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
@@ -84,7 +83,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
             my %telemetry;
             $telemetry{uuid} = getUUID($dbh);
             $telemetry{ip} = getIP();
-            $telemetry{timestamp} = DateTime->now( time_zone => "local" )->strftime("%Y-%m-%dT%H:%M:%S%z");
+            $telemetry{timestamp} = strftime( "%Y-%m-%dT%H:%M:%S%z", localtime() );
             $telemetry{monitor_count} = countQuery($dbh,"Monitors");
             $telemetry{event_count} = countQuery($dbh,"Events");
             $telemetry{architecture} = runSysCmd("uname -p");

From 6332f28c5364c3f7b8cd6797c335041a9293ec77 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Tue, 16 Feb 2016 11:47:49 +0200
Subject: [PATCH 254/362] zm_monitor: fix overlap in memcpy buffers

behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 20b8b7802..e674879e4 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3981,7 +3981,7 @@ void MonitorStream::processCommand( const CmdMsg *msg )
 
     DataMsg status_msg;
     status_msg.msg_type = MSG_DATA_WATCH;
-    memcpy( &status_msg.msg_data, &status_data, sizeof(status_msg.msg_data) );
+    memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
     int nbytes = 0;
     if ( (nbytes = sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) )) < 0 )
     {

From 172a4c6bd4a7ad5ff438e425df3a84db77569282 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 16 Feb 2016 09:29:49 -0500
Subject: [PATCH 255/362] Add montagereview.php to autotools build.

---
 web/skins/classic/views/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/views/Makefile.am b/web/skins/classic/views/Makefile.am
index 6b989bea0..4167a886b 100644
--- a/web/skins/classic/views/Makefile.am
+++ b/web/skins/classic/views/Makefile.am
@@ -37,6 +37,7 @@ dist_web_DATA = \
 	monitorpreset.php \
 	monitorprobe.php \
 	montage.php \
+    montagereview.php \
 	none.php \
   onvifprobe.php \
 	optionhelp.php \

From d1ba45c56a5e06b2ce323afc62b93b887489fb04 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 16 Feb 2016 10:02:30 -0500
Subject: [PATCH 256/362] include the sock path in the error message and output
 an error on failure to open pid file

---
 scripts/zmdc.pl.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 5e2fb47c7..c2f0aff1a 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -250,13 +250,15 @@ sub run
     {
         print( $PID $$ );
         close( $PID );
+	} else {
+		Error( "Can't open pid file at " . ZM_PID );
     }
 
     killAll( 1 );
 
     socket( SERVER, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
-    unlink( main::SOCK_FILE );
-    bind( SERVER, $saddr ) or Fatal( "Can't bind: $!" );
+    unlink( main::SOCK_FILE ) or Error( "Unable to unlink " . main::SOCK_FILE );
+    bind( SERVER, $saddr ) or Fatal( "Can't bind to " . main::SOCK_FILE . ": $!" );
     listen( SERVER, SOMAXCONN ) or Fatal( "Can't listen: $!" );
 
     $SIG{CHLD} = \&reaper;

From 632e9c8e5383fe207f284ef92ed30265d5a8d401 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Thu, 18 Feb 2016 00:28:30 +1100
Subject: [PATCH 257/362] Upgrade bundled jQuery (Closes: #1263)

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
---
 web/skins/classic/js/jquery-1.11.3.js | 10351 ++++++++++++++++++++++++
 web/skins/classic/js/jquery-1.7.2.js  |  9404 ---------------------
 web/skins/classic/js/jquery.js        |     2 +-
 web/skins/classic/js/jquery.url       |     2 +-
 4 files changed, 10353 insertions(+), 9406 deletions(-)
 create mode 100644 web/skins/classic/js/jquery-1.11.3.js
 delete mode 100644 web/skins/classic/js/jquery-1.7.2.js

diff --git a/web/skins/classic/js/jquery-1.11.3.js b/web/skins/classic/js/jquery-1.11.3.js
new file mode 100644
index 000000000..6feb11086
--- /dev/null
+++ b/web/skins/classic/js/jquery-1.11.3.js
@@ -0,0 +1,10351 @@
+/*!
+ * jQuery JavaScript Library v1.11.3
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2015-04-28T16:19Z
+ */
+
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper window is present,
+		// execute the factory and get jQuery
+		// For environments that do not inherently posses a window with a document
+		// (such as Node.js), expose a jQuery-making factory as module.exports
+		// This accentuates the need for the creation of a real window
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//
+
+var deletedIds = [];
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
+var
+	version = "1.11.3",
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Support: Android<4.1, IE<9
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn = jQuery.prototype = {
+	// The current version of jQuery being used
+	jquery: version,
+
+	constructor: jQuery,
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num != null ?
+
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+
+			// Return all the elements in a clean array
+			slice.call( this );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: deletedIds.sort,
+	splice: deletedIds.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+
+		// skip the boolean and the target
+		target = arguments[ i ] || {};
+		i++;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( i === length ) {
+		target = this;
+		i--;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	// Unique for each copy of jQuery on the page
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+	// Assume jQuery is ready without the ready module
+	isReady: true,
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	noop: function() {},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		/* jshint eqeqeq: false */
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	isPlainObject: function( obj ) {
+		var key;
+
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( support.ownLast ) {
+			for ( key in obj ) {
+				return hasOwn.call( obj, key );
+			}
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call(obj) ] || "object" :
+			typeof obj;
+	},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && jQuery.trim( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
+
+		if ( args ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Support: Android<4.1, IE<9
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( indexOf ) {
+				return indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var len = +second.length,
+			j = 0,
+			i = first.length;
+
+		while ( j < len ) {
+			first[ i++ ] = second[ j++ ];
+		}
+
+		// Support: IE<9
+		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+		if ( len !== len ) {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
+			i = 0,
+			length = elems.length,
+			callbackExpect = !invert;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
+			}
+		}
+
+		return matches;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
+
+		// Go through the array, translating each of the items to their new values
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	now: function() {
+		return +( new Date() );
+	},
+
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = "length" in obj && obj.length,
+		type = jQuery.type( obj );
+
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v2.2.0-pre
+ * http://sizzlejs.com/
+ *
+ * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-12-16
+ */
+(function( window ) {
+
+var i,
+	support,
+	Expr,
+	getText,
+	isXML,
+	tokenize,
+	compile,
+	select,
+	outermostContext,
+	sortInput,
+	hasDuplicate,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + 1 * new Date(),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+		}
+		return 0;
+	},
+
+	// General-purpose constants
+	MAX_NEGATIVE = 1 << 31,
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
+		var i = 0,
+			len = list.length;
+		for ( ; i < len; i++ ) {
+			if ( list[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
+
+	pseudos = ":(" + characterEncoding + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rsibling = /[+~]/,
+	rescape = /'|\\/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox<24
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			high < 0 ?
+				// BMP codepoint
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
+	};
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+	nodeType = context.nodeType;
+
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
+		return results;
+	}
+
+	if ( !seed && documentIsHTML ) {
+
+		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
+		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document (jQuery #6963)
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, context.getElementsByTagName( selector ) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getElementsByClassName ) {
+				push.apply( results, context.getElementsByClassName( m ) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+			nid = old = expando;
+			newContext = context;
+			newSelector = nodeType !== 1 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results,
+						newContext.querySelectorAll( newSelector )
+					);
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key + " " ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return !!fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( div.parentNode ) {
+			div.parentNode.removeChild( div );
+		}
+		// release memory in IE
+		div = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = attrs.length;
+
+	while ( i-- ) {
+		Expr.attrHandle[ arr[i] ] = handler;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			( ~b.sourceIndex || MAX_NEGATIVE ) -
+			( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+	parent = doc.defaultView;
+
+	// Support: IE>8
+	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
+	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+	// IE6-8 do not support the defaultView property so parent will be undefined
+	if ( parent && parent !== parent.top ) {
+		// IE11 does not have attachEvent, so all must suffer
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", unloadHandler, false );
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", unloadHandler );
+		}
+	}
+
+	/* Support tests
+	---------------------------------------------------------------------- */
+	documentIsHTML = !isXML( doc );
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
+	support.attributes = assert(function( div ) {
+		div.className = "i";
+		return !div.getAttribute("className");
+	});
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( div ) {
+		docElem.appendChild( div ).id = expando;
+		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+	});
+
+	// ID find and filter
+	if ( support.getById ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [ m ] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		// Support: IE6/7
+		// getElementById is not reliable as a find shortcut
+		delete Expr.find["ID"];
+
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
+			}
+		} :
+
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See http://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\f]' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
+		});
+
+		assert(function( div ) {
+			// Support: Windows 8 Native Apps
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = doc.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			div.appendChild( input ).setAttribute( "name", "D" );
+
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = hasCompare || rnative.test( docElem.contains ) ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Document order sorting
+	sortOrder = hasCompare ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+		if ( compare ) {
+			return compare;
+		}
+
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
+	} :
+	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Parentless nodes are either documents or disconnected
+		if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return doc;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch (e) {}
+	}
+
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined;
+
+	return val !== undefined ?
+		val :
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		while ( (node = elem[i++]) ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (jQuery #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[6] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeType < 6 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( (tokens = []) );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var oldCache, outerCache,
+				newCache = [ dirruns, doneName ];
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (oldCache = outerCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
+						} else {
+							// Reuse newcache so results back-propagate to previous elements
+							outerCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, outermost ) {
+			var elem, j, matcher,
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				setMatched = [],
+				contextBackup = outermostContext,
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !match ) {
+			match = tokenize( selector );
+		}
+		i = match.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( match[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
+	}
+	return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+	results = results || [];
+
+	// Try to minimize operations if there is no seed and only one group
+	if ( match.length === 1 ) {
+
+		// Take a shortcut and set the context if the root selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
+			}
+
+			selector = selector.slice( tokens.shift().value.length );
+		}
+
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
+
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
+
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function if one is not provided
+	// Provide `match` to avoid retokenization if we modified the selector above
+	( compiled || compile( selector, match ) )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		rsibling.test( selector ) && testContext( context.parentNode ) || context
+	);
+	return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome 14-35+
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
+		}
+	});
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		});
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		});
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
+	});
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		}));
+};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], false) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], true) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+});
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+
+					// scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof rootjQuery.ready !== "undefined" ?
+				rootjQuery.ready( selector ) :
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.extend({
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+jQuery.fn.extend({
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter(function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && (pos ?
+					pos.index(cur) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector(cur, selectors)) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.unique(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.unique( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+});
+var rnotwhite = (/\S+/g);
+
+
+
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				firingLength = 0;
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( list && ( !fired || stack ) ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+
+
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+								}
+							});
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[0] + "With" ] = list.fireWith;
+		});
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+
+					} else if ( !(--remaining) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+});
+
+
+// The deferred used on DOM ready
+var readyList;
+
+jQuery.fn.ready = function( fn ) {
+	// Add the callback
+	jQuery.ready.promise().done( fn );
+
+	return this;
+};
+
+jQuery.extend({
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( !document.body ) {
+			return setTimeout( jQuery.ready );
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.triggerHandler ) {
+			jQuery( document ).triggerHandler( "ready" );
+			jQuery( document ).off( "ready" );
+		}
+	}
+});
+
+/**
+ * Clean-up method for dom ready events
+ */
+function detach() {
+	if ( document.addEventListener ) {
+		document.removeEventListener( "DOMContentLoaded", completed, false );
+		window.removeEventListener( "load", completed, false );
+
+	} else {
+		document.detachEvent( "onreadystatechange", completed );
+		window.detachEvent( "onload", completed );
+	}
+}
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+	// readyState === "complete" is good enough for us to call the dom ready in oldIE
+	if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
+		detach();
+		jQuery.ready();
+	}
+}
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// we once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed, false );
+
+		// If IE event model is used
+		} else {
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch(e) {}
+
+			if ( top && top.doScroll ) {
+				(function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll("left");
+						} catch(e) {
+							return setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				})();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+
+var strundefined = typeof undefined;
+
+
+
+// Support: IE<9
+// Iteration over object's inherited properties before its own
+var i;
+for ( i in jQuery( support ) ) {
+	break;
+}
+support.ownLast = i !== "0";
+
+// Note: most support tests are defined in their respective modules.
+// false until the test is run
+support.inlineBlockNeedsLayout = false;
+
+// Execute ASAP in case we need to set body.style.zoom
+jQuery(function() {
+	// Minified: var a,b,c,d
+	var val, div, body, container;
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	if ( !body || !body.style ) {
+		// Return for frameset docs that don't have a body
+		return;
+	}
+
+	// Setup
+	div = document.createElement( "div" );
+	container = document.createElement( "div" );
+	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+	body.appendChild( container ).appendChild( div );
+
+	if ( typeof div.style.zoom !== strundefined ) {
+		// Support: IE<8
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
+
+		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
+		if ( val ) {
+			// Prevent IE 6 from affecting layout for positioned elements #11048
+			// Prevent IE from shrinking the body in IE 7 mode #12869
+			// Support: IE<8
+			body.style.zoom = 1;
+		}
+	}
+
+	body.removeChild( container );
+});
+
+
+
+
+(function() {
+	var div = document.createElement( "div" );
+
+	// Execute the test only if not already executed in another module.
+	if (support.deleteExpando == null) {
+		// Support: IE<9
+		support.deleteExpando = true;
+		try {
+			delete div.test;
+		} catch( e ) {
+			support.deleteExpando = false;
+		}
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+})();
+
+
+/**
+ * Determines whether an object can have data
+ */
+jQuery.acceptData = function( elem ) {
+	var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ],
+		nodeType = +elem.nodeType || 1;
+
+	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
+	return nodeType !== 1 && nodeType !== 9 ?
+		false :
+
+		// Nodes accept data unless otherwise specified; rejection can be conditional
+		!noData || noData !== true && elem.getAttribute("classid") === noData;
+};
+
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var ret, thisCache,
+		internalKey = jQuery.expando,
+
+		// We have to handle DOM nodes and JS objects differently because IE6-7
+		// can't GC object references properly across the DOM-JS boundary
+		isNode = elem.nodeType,
+
+		// Only DOM nodes need the global jQuery cache; JS object data is
+		// attached directly to the object so GC can occur automatically
+		cache = isNode ? jQuery.cache : elem,
+
+		// Only defining an ID for JS objects if its cache already exists allows
+		// the code to shortcut on the same path as a DOM node with no cache
+		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+	// Avoid doing any more work than we need to when trying to get data on an
+	// object that has no data at all
+	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
+		return;
+	}
+
+	if ( !id ) {
+		// Only DOM nodes need a new unique ID for each element since their data
+		// ends up in the global cache
+		if ( isNode ) {
+			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
+		} else {
+			id = internalKey;
+		}
+	}
+
+	if ( !cache[ id ] ) {
+		// Avoid exposing jQuery metadata on plain JS objects when the object
+		// is serialized using JSON.stringify
+		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
+	}
+
+	// An object can be passed to jQuery.data instead of a key/value pair; this gets
+	// shallow copied over onto the existing cache
+	if ( typeof name === "object" || typeof name === "function" ) {
+		if ( pvt ) {
+			cache[ id ] = jQuery.extend( cache[ id ], name );
+		} else {
+			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		}
+	}
+
+	thisCache = cache[ id ];
+
+	// jQuery data() is stored in a separate object inside the object's internal data
+	// cache in order to avoid key collisions between internal data and user-defined
+	// data.
+	if ( !pvt ) {
+		if ( !thisCache.data ) {
+			thisCache.data = {};
+		}
+
+		thisCache = thisCache.data;
+	}
+
+	if ( data !== undefined ) {
+		thisCache[ jQuery.camelCase( name ) ] = data;
+	}
+
+	// Check for both converted-to-camel and non-converted data property names
+	// If a data property was specified
+	if ( typeof name === "string" ) {
+
+		// First Try to find as-is property data
+		ret = thisCache[ name ];
+
+		// Test for null|undefined property data
+		if ( ret == null ) {
+
+			// Try to find the camelCased property
+			ret = thisCache[ jQuery.camelCase( name ) ];
+		}
+	} else {
+		ret = thisCache;
+	}
+
+	return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var thisCache, i,
+		isNode = elem.nodeType,
+
+		// See jQuery.data for more information
+		cache = isNode ? jQuery.cache : elem,
+		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+	// If there is already no cache entry for this object, there is no
+	// purpose in continuing
+	if ( !cache[ id ] ) {
+		return;
+	}
+
+	if ( name ) {
+
+		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+		if ( thisCache ) {
+
+			// Support array or space separated string names for data keys
+			if ( !jQuery.isArray( name ) ) {
+
+				// try the string as a key before any manipulation
+				if ( name in thisCache ) {
+					name = [ name ];
+				} else {
+
+					// split the camel cased version by spaces unless a key with the spaces exists
+					name = jQuery.camelCase( name );
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+						name = name.split(" ");
+					}
+				}
+			} else {
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+			}
+
+			i = name.length;
+			while ( i-- ) {
+				delete thisCache[ name[i] ];
+			}
+
+			// If there is no data left in the cache, we want to continue
+			// and let the cache object itself get destroyed
+			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+				return;
+			}
+		}
+	}
+
+	// See jQuery.data for more information
+	if ( !pvt ) {
+		delete cache[ id ].data;
+
+		// Don't destroy the parent cache unless the internal data object
+		// had been the only thing left in it
+		if ( !isEmptyDataObject( cache[ id ] ) ) {
+			return;
+		}
+	}
+
+	// Destroy the cache
+	if ( isNode ) {
+		jQuery.cleanData( [ elem ], true );
+
+	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+	/* jshint eqeqeq: false */
+	} else if ( support.deleteExpando || cache != cache.window ) {
+		/* jshint eqeqeq: true */
+		delete cache[ id ];
+
+	// When all else fails, null
+	} else {
+		cache[ id ] = null;
+	}
+}
+
+jQuery.extend({
+	cache: {},
+
+	// The following elements (space-suffixed to avoid Object.prototype collisions)
+	// throw uncatchable exceptions if you attempt to set expando properties
+	noData: {
+		"applet ": true,
+		"embed ": true,
+		// ...but Flash objects (which have this classid) *can* handle expandos
+		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return internalData( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		return internalRemoveData( elem, name );
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return internalData( elem, name, data, true );
+	},
+
+	_removeData: function( elem, name ) {
+		return internalRemoveData( elem, name, true );
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var i, name, data,
+			elem = this[0],
+			attrs = elem && elem.attributes;
+
+		// Special expections of .data basically thwart jQuery.access,
+		// so implement the relevant behavior ourselves
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					i = attrs.length;
+					while ( i-- ) {
+
+						// Support: IE11+
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = jQuery.camelCase( name.slice(5) );
+								dataAttr( elem, name, data[ name ] );
+							}
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		return arguments.length > 1 ?
+
+			// Sets one value
+			this.each(function() {
+				jQuery.data( this, key, value );
+			}) :
+
+			// Gets one value
+			// Try to fetch any internally stored data first
+			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray(data) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				jQuery._removeData( elem, type + "queue" );
+				jQuery._removeData( elem, key );
+			})
+		});
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while ( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+});
+var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+	};
+
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		length = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
+			} else {
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
+			}
+		}
+
+		if ( fn ) {
+			for ( ; i < length; i++ ) {
+				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+			}
+		}
+	}
+
+	return chainable ?
+		elems :
+
+		// Gets
+		bulk ?
+			fn.call( elems ) :
+			length ? fn( elems[0], key ) : emptyGet;
+};
+var rcheckableType = (/^(?:checkbox|radio)$/i);
+
+
+
+(function() {
+	// Minified: var a,b,c
+	var input = document.createElement( "input" ),
+		div = document.createElement( "div" ),
+		fragment = document.createDocumentFragment();
+
+	// Setup
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// IE strips leading whitespace when .innerHTML is used
+	support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+	// Make sure that tbody elements aren't automatically inserted
+	// IE will insert them into empty tables
+	support.tbody = !div.getElementsByTagName( "tbody" ).length;
+
+	// Make sure that link elements get serialized correctly by innerHTML
+	// This requires a wrapper element in IE
+	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
+
+	// Makes sure cloning an html5 element does not cause problems
+	// Where outerHTML is undefined, this still works
+	support.html5Clone =
+		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	input.type = "checkbox";
+	input.checked = true;
+	fragment.appendChild( input );
+	support.appendChecked = input.checked;
+
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	// Support: IE6-IE11+
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	fragment.appendChild( div );
+	div.innerHTML = "<input type='radio' checked='checked' name='t'/>";
+
+	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
+	// old WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Opera does not clone events (and typeof div.attachEvent === undefined).
+	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+	support.noCloneEvent = true;
+	if ( div.attachEvent ) {
+		div.attachEvent( "onclick", function() {
+			support.noCloneEvent = false;
+		});
+
+		div.cloneNode( true ).click();
+	}
+
+	// Execute the test only if not already executed in another module.
+	if (support.deleteExpando == null) {
+		// Support: IE<9
+		support.deleteExpando = true;
+		try {
+			delete div.test;
+		} catch( e ) {
+			support.deleteExpando = false;
+		}
+	}
+})();
+
+
+(function() {
+	var i, eventName,
+		div = document.createElement( "div" );
+
+	// Support: IE<9 (lack submit/change bubble), Firefox 23+ (lack focusin event)
+	for ( i in { submit: true, change: true, focusin: true }) {
+		eventName = "on" + i;
+
+		if ( !(support[ i + "Bubbles" ] = eventName in window) ) {
+			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+			div.setAttribute( eventName, "t" );
+			support[ i + "Bubbles" ] = div.attributes[ eventName ].expando === false;
+		}
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+})();
+
+
+var rformElems = /^(?:input|select|textarea)$/i,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+		var tmp, events, t, handleObjIn,
+			special, eventHandle, handleObj,
+			handlers, type, namespaces, origType,
+			elemData = jQuery._data( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !(events = elemData.events) ) {
+			events = elemData.events = {};
+		}
+		if ( !(eventHandle = elemData.handle) ) {
+			eventHandle = elemData.handle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== strundefined && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// There *must* be a type, no attaching namespace-only handlers
+			if ( !type ) {
+				continue;
+			}
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !(handlers = events[ type ]) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+		var j, handleObj, tmp,
+			origCount, t, events,
+			special, handlers, type,
+			namespaces, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery._removeData( elem, "events" );
+		}
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		var handle, ontype, cur,
+			bubbleType, special, tmp, i,
+			eventPath = [ elem || document ],
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+
+		cur = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
+				jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					try {
+						elem[ type ]();
+					} catch ( e ) {
+						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+					}
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, ret, handleObj, matched, j,
+			handlerQueue = [],
+			args = slice.call( arguments ),
+			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( (event.result = ret) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var sel, handleObj, matches, i,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+			/* jshint eqeqeq: false */
+			for ( ; cur != this; cur = cur.parentNode || this ) {
+				/* jshint eqeqeq: true */
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+		}
+
+		return handlerQueue;
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Support: IE<9
+		// Fix target property (#1925)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Support: Chrome 23+, Safari?
+		// Target should not be a text node (#504, #13143)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Support: IE<9
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+		event.metaKey = !!event.metaKey;
+
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var body, eventDoc, doc,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					try {
+						this.focus();
+						return false;
+					} catch ( e ) {
+						// Support: IE<9
+						// If we error on focus to hidden element (#1486, #12518),
+						// let .trigger() run the handlers
+					}
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return jQuery.nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event, to properly expose it to GC
+			if ( typeof elem[ name ] === strundefined ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+				// Support: IE < 9, Android < 4.0
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+		if ( !e ) {
+			return;
+		}
+
+		// If preventDefault exists, run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// Support: IE
+		// Otherwise set the returnValue property of the original event to false
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+		if ( !e ) {
+			return;
+		}
+		// If stopPropagation exists, run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+
+		// Support: IE
+		// Set the cancelBubble property of the original event to true
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
+		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && e.stopImmediatePropagation ) {
+			e.stopImmediatePropagation();
+		}
+
+		this.stopPropagation();
+	}
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					jQuery._data( form, "submitBubbles", true );
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+						}
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event, true );
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					jQuery._data( elem, "changeBubbles", true );
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					jQuery._removeData( doc, fix );
+				} else {
+					jQuery._data( doc, fix, attaches );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var type, origFn;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[0];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+});
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /^$|\/(?:java|ecma)script/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+	// We have to close these tags to support XHTML (#13200)
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		area: [ 1, "<map>", "</map>" ],
+		param: [ 1, "<object>", "</object>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+		// unless wrapped in a div with non-breaking characters in front of it.
+		_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
+	},
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) :
+			undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+// Support: IE<8
+// Manipulating tables requires a tbody
+function manipulationTarget( elem, content ) {
+	return jQuery.nodeName( elem, "table" ) &&
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
+
+		elem.getElementsByTagName("tbody")[0] ||
+			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+		elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+	if ( match ) {
+		elem.type = match[1];
+	} else {
+		elem.removeAttribute("type");
+	}
+	return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; (elem = elems[i]) != null; i++ ) {
+		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+	}
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function fixCloneNodeIssues( src, dest ) {
+	var nodeName, e, data;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 copies events bound via attachEvent when using cloneNode.
+	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
+		data = jQuery._data( dest );
+
+		for ( e in data.events ) {
+			jQuery.removeEvent( dest, e, data.handle );
+		}
+
+		// Event data gets referenced instead of copied if the expando gets copied too
+		dest.removeAttribute( jQuery.expando );
+	}
+
+	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+	if ( nodeName === "script" && dest.text !== src.text ) {
+		disableScript( dest ).text = src.text;
+		restoreScript( dest );
+
+	// IE6-10 improperly clones children of object elements using classid.
+	// IE10 throws NoModificationAllowedError if parent is null, #12132.
+	} else if ( nodeName === "object" ) {
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.defaultSelected = dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var destElements, node, clone, i, srcElements,
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+		}
+
+		if ( (!support.noCloneEvent || !support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			// Fix all IE cloning issues
+			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					fixCloneNodeIssues( node, destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+					cloneCopyEvent( node, destElements[i] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		destElements = srcElements = node = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	buildFragment: function( elems, context, scripts, selection ) {
+		var j, elem, contains,
+			tmp, tag, tbody, wrap,
+			l = elems.length,
+
+			// Ensure a safe fragment
+			safe = createSafeFragment( context ),
+
+			nodes = [],
+			i = 0;
+
+		for ( ; i < l; i++ ) {
+			elem = elems[ i ];
+
+			if ( elem || elem === 0 ) {
+
+				// Add nodes directly
+				if ( jQuery.type( elem ) === "object" ) {
+					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+				// Convert non-html into a text node
+				} else if ( !rhtml.test( elem ) ) {
+					nodes.push( context.createTextNode( elem ) );
+
+				// Convert html into DOM nodes
+				} else {
+					tmp = tmp || safe.appendChild( context.createElement("div") );
+
+					// Deserialize a standard representation
+					tag = (rtagName.exec( elem ) || [ "", "" ])[ 1 ].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+
+					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+					// Descend through wrappers to the right content
+					j = wrap[0];
+					while ( j-- ) {
+						tmp = tmp.lastChild;
+					}
+
+					// Manually add leading whitespace removed by IE
+					if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						elem = tag === "table" && !rtbody.test( elem ) ?
+							tmp.firstChild :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !rtbody.test( elem ) ?
+								tmp :
+								0;
+
+						j = elem && elem.childNodes.length;
+						while ( j-- ) {
+							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+								elem.removeChild( tbody );
+							}
+						}
+					}
+
+					jQuery.merge( nodes, tmp.childNodes );
+
+					// Fix #12392 for WebKit and IE > 9
+					tmp.textContent = "";
+
+					// Fix #12392 for oldIE
+					while ( tmp.firstChild ) {
+						tmp.removeChild( tmp.firstChild );
+					}
+
+					// Remember the top-level container for proper cleanup
+					tmp = safe.lastChild;
+				}
+			}
+		}
+
+		// Fix #11356: Clear elements from fragment
+		if ( tmp ) {
+			safe.removeChild( tmp );
+		}
+
+		// Reset defaultChecked for any radios and checkboxes
+		// about to be appended to the DOM in IE 6/7 (#8060)
+		if ( !support.appendChecked ) {
+			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+		}
+
+		i = 0;
+		while ( (elem = nodes[ i++ ]) ) {
+
+			// #4087 - If origin and destination elements are the same, and this is
+			// that element, do not do anything
+			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+				continue;
+			}
+
+			contains = jQuery.contains( elem.ownerDocument, elem );
+
+			// Append to fragment
+			tmp = getAll( safe.appendChild( elem ), "script" );
+
+			// Preserve script evaluation history
+			if ( contains ) {
+				setGlobalEval( tmp );
+			}
+
+			// Capture executables
+			if ( scripts ) {
+				j = 0;
+				while ( (elem = tmp[ j++ ]) ) {
+					if ( rscriptType.test( elem.type || "" ) ) {
+						scripts.push( elem );
+					}
+				}
+			}
+		}
+
+		tmp = null;
+
+		return safe;
+	},
+
+	cleanData: function( elems, /* internal */ acceptData ) {
+		var elem, type, id, data,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			deleteExpando = support.deleteExpando,
+			special = jQuery.event.special;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+			if ( acceptData || jQuery.acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
+
+						delete cache[ id ];
+
+						// IE does not allow us to delete expando properties from nodes,
+						// nor does it have a removeAttribute function on Document nodes;
+						// we must handle all of these cases
+						if ( deleteExpando ) {
+							delete elem[ internalKey ];
+
+						} else if ( typeof elem.removeAttribute !== strundefined ) {
+							elem.removeAttribute( internalKey );
+
+						} else {
+							elem[ internalKey ] = null;
+						}
+
+						deletedIds.push( id );
+					}
+				}
+			}
+		}
+	}
+});
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		});
+	},
+
+	after: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		});
+	},
+
+	remove: function( selector, keepData /* Internal Use Only */ ) {
+		var elem,
+			elems = selector ? jQuery.filter( selector, this ) : this,
+			i = 0;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( !keepData && elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem ) );
+			}
+
+			if ( elem.parentNode ) {
+				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+					setGlobalEval( getAll( elem, "script" ) );
+				}
+				elem.parentNode.removeChild( elem );
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map(function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ (rtagName.exec( value ) || [ "", "" ])[ 1 ].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var arg = arguments[ 0 ];
+
+		// Make the changes, replacing each context element with the new content
+		this.domManip( arguments, function( elem ) {
+			arg = this.parentNode;
+
+			jQuery.cleanData( getAll( this ) );
+
+			if ( arg ) {
+				arg.replaceChild( elem, this );
+			}
+		});
+
+		// Force removal if there was no new content (e.g., from empty arguments)
+		return arg && (arg.length || arg.nodeType) ? this : this.remove();
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, callback ) {
+
+		// Flatten any nested arrays
+		args = concat.apply( [], args );
+
+		var first, node, hasScripts,
+			scripts, doc, fragment,
+			i = 0,
+			l = this.length,
+			set = this,
+			iNoClone = l - 1,
+			value = args[0],
+			isFunction = jQuery.isFunction( value );
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( isFunction ||
+				( l > 1 && typeof value === "string" &&
+					!support.checkClone && rchecked.test( value ) ) ) {
+			return this.each(function( index ) {
+				var self = set.eq( index );
+				if ( isFunction ) {
+					args[0] = value.call( this, index, self.html() );
+				}
+				self.domManip( args, callback );
+			});
+		}
+
+		if ( l ) {
+			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+			first = fragment.firstChild;
+
+			if ( fragment.childNodes.length === 1 ) {
+				fragment = first;
+			}
+
+			if ( first ) {
+				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+				hasScripts = scripts.length;
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				for ( ; i < l; i++ ) {
+					node = fragment;
+
+					if ( i !== iNoClone ) {
+						node = jQuery.clone( node, true, true );
+
+						// Keep references to cloned scripts for later restoration
+						if ( hasScripts ) {
+							jQuery.merge( scripts, getAll( node, "script" ) );
+						}
+					}
+
+					callback.call( this[i], node, i );
+				}
+
+				if ( hasScripts ) {
+					doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+					// Reenable scripts
+					jQuery.map( scripts, restoreScript );
+
+					// Evaluate executable scripts on first document insertion
+					for ( i = 0; i < hasScripts; i++ ) {
+						node = scripts[ i ];
+						if ( rscriptType.test( node.type || "" ) &&
+							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+							if ( node.src ) {
+								// Optional AJAX dependency, but won't run scripts if not present
+								if ( jQuery._evalUrl ) {
+									jQuery._evalUrl( node.src );
+								}
+							} else {
+								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+							}
+						}
+					}
+				}
+
+				// Fix #11809: Avoid leaking memory
+				fragment = first = null;
+			}
+		}
+
+		return this;
+	}
+});
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone(true);
+			jQuery( insert[i] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+
+var iframe,
+	elemdisplay = {};
+
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var style,
+		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		// getDefaultComputedStyle might be reliably used only on attached element
+		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
+
+			// Use of this method is a temporary fix (more like optmization) until something better comes along,
+			// since it was removed from specification and supported only in FF
+			style.display : jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+
+
+(function() {
+	var shrinkWrapBlocksVal;
+
+	support.shrinkWrapBlocks = function() {
+		if ( shrinkWrapBlocksVal != null ) {
+			return shrinkWrapBlocksVal;
+		}
+
+		// Will be changed later if needed.
+		shrinkWrapBlocksVal = false;
+
+		// Minified: var b,c,d
+		var div, body, container;
+
+		body = document.getElementsByTagName( "body" )[ 0 ];
+		if ( !body || !body.style ) {
+			// Test fired too early or in an unsupported environment, exit.
+			return;
+		}
+
+		// Setup
+		div = document.createElement( "div" );
+		container = document.createElement( "div" );
+		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+		body.appendChild( container ).appendChild( div );
+
+		// Support: IE6
+		// Check if elements with layout shrink-wrap their children
+		if ( typeof div.style.zoom !== strundefined ) {
+			// Reset CSS: box-sizing; display; margin; border
+			div.style.cssText =
+				// Support: Firefox<29, Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;" +
+				"padding:1px;width:1px;zoom:1";
+			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
+			shrinkWrapBlocksVal = div.offsetWidth !== 3;
+		}
+
+		body.removeChild( container );
+
+		return shrinkWrapBlocksVal;
+	};
+
+})();
+var rmargin = (/^margin/);
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+
+
+var getStyles, curCSS,
+	rposition = /^(top|right|bottom|left)$/;
+
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		if ( elem.ownerDocument.defaultView.opener ) {
+			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		}
+
+		return window.getComputedStyle( elem, null );
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var width, minWidth, maxWidth, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+
+		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
+
+		if ( computed ) {
+
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "";
+	};
+} else if ( document.documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var left, rs, rsLeft, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+		ret = computed ? computed[ name ] : undefined;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are proportional to the parent element instead
+		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "" || "auto";
+	};
+}
+
+
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			var condition = conditionFn();
+
+			if ( condition == null ) {
+				// The test was not ready at this point; screw the hook this time
+				// but check again when needed next time.
+				return;
+			}
+
+			if ( condition ) {
+				// Hook not needed (or it's not possible to use it due to missing dependency),
+				// remove it.
+				// Since there are no other hooks for marginRight, remove the whole object.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+
+			return (this.get = hookFn).apply( this, arguments );
+		}
+	};
+}
+
+
+(function() {
+	// Minified: var b,c,d,e,f,g, h,i
+	var div, style, a, pixelPositionVal, boxSizingReliableVal,
+		reliableHiddenOffsetsVal, reliableMarginRightVal;
+
+	// Setup
+	div = document.createElement( "div" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+	a = div.getElementsByTagName( "a" )[ 0 ];
+	style = a && a.style;
+
+	// Finish early in limited (non-browser) environments
+	if ( !style ) {
+		return;
+	}
+
+	style.cssText = "float:left;opacity:.5";
+
+	// Support: IE<9
+	// Make sure that element opacity exists (as opposed to filter)
+	support.opacity = style.opacity === "0.5";
+
+	// Verify style float existence
+	// (IE uses styleFloat instead of cssFloat)
+	support.cssFloat = !!style.cssFloat;
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	// Support: Firefox<29, Android 2.3
+	// Vendor-prefix box-sizing
+	support.boxSizing = style.boxSizing === "" || style.MozBoxSizing === "" ||
+		style.WebkitBoxSizing === "";
+
+	jQuery.extend(support, {
+		reliableHiddenOffsets: function() {
+			if ( reliableHiddenOffsetsVal == null ) {
+				computeStyleTests();
+			}
+			return reliableHiddenOffsetsVal;
+		},
+
+		boxSizingReliable: function() {
+			if ( boxSizingReliableVal == null ) {
+				computeStyleTests();
+			}
+			return boxSizingReliableVal;
+		},
+
+		pixelPosition: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelPositionVal;
+		},
+
+		// Support: Android 2.3
+		reliableMarginRight: function() {
+			if ( reliableMarginRightVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginRightVal;
+		}
+	});
+
+	function computeStyleTests() {
+		// Minified: var b,c,d,j
+		var div, body, container, contents;
+
+		body = document.getElementsByTagName( "body" )[ 0 ];
+		if ( !body || !body.style ) {
+			// Test fired too early or in an unsupported environment, exit.
+			return;
+		}
+
+		// Setup
+		div = document.createElement( "div" );
+		container = document.createElement( "div" );
+		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+		body.appendChild( container ).appendChild( div );
+
+		div.style.cssText =
+			// Support: Firefox<29, Android 2.3
+			// Vendor-prefix box-sizing
+			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
+			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
+			"border:1px;padding:1px;width:4px;position:absolute";
+
+		// Support: IE<9
+		// Assume reasonable values in the absence of getComputedStyle
+		pixelPositionVal = boxSizingReliableVal = false;
+		reliableMarginRightVal = true;
+
+		// Check for getComputedStyle so that this code is not run in IE<9.
+		if ( window.getComputedStyle ) {
+			pixelPositionVal = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+			boxSizingReliableVal =
+				( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+			// Support: Android 2.3
+			// Div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container (#3333)
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			contents = div.appendChild( document.createElement( "div" ) );
+
+			// Reset CSS: box-sizing; display; margin; border; padding
+			contents.style.cssText = div.style.cssText =
+				// Support: Firefox<29, Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+			contents.style.marginRight = contents.style.width = "0";
+			div.style.width = "1px";
+
+			reliableMarginRightVal =
+				!parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
+
+			div.removeChild( contents );
+		}
+
+		// Support: IE8
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+		contents = div.getElementsByTagName( "td" );
+		contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
+		reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+		if ( reliableHiddenOffsetsVal ) {
+			contents[ 0 ].style.display = "";
+			contents[ 1 ].style.display = "none";
+			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+		}
+
+		body.removeChild( container );
+	}
+
+})();
+
+
+// A method for quickly swapping in/out CSS properties to get correct calculations.
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+var
+		ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/,
+
+	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
+	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	},
+
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+	// shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt(0).toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+			}
+		} else {
+			hidden = isHidden( elem );
+
+			if ( display && display !== "none" || !hidden ) {
+				jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set. See: #7116
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight (for every problematic property) identical functions
+			if ( !support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+				// Support: IE
+				// Swallow errors from 'invalid' CSS values (#5509)
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+});
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
+					jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					}) :
+					getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+});
+
+if ( !support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+	function( elem, computed ) {
+		if ( computed ) {
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			// Work around by temporarily setting element display to inline-block
+			return jQuery.swap( elem, { "display": "inline-block" },
+				curCSS, [ elem, "marginRight" ] );
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return access( this, function( elem, name, value ) {
+			var styles, len,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each(function() {
+			if ( isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		});
+	}
+});
+
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	}
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value ),
+				target = tween.cur(),
+				parts = rfxnum.exec( value ),
+				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+				// Starting value computation is required for potential unit mismatches
+				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
+					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
+				scale = 1,
+				maxIterations = 20;
+
+			if ( start && start[ 3 ] !== unit ) {
+				// Trust units reported by jQuery.css
+				unit = unit || start[ 3 ];
+
+				// Make sure we update the tween properties later on
+				parts = parts || [];
+
+				// Iteratively approximate from a nonzero starting point
+				start = +target || 1;
+
+				do {
+					// If previous iteration zeroed out, double until we get *something*
+					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+					scale = scale || ".5";
+
+					// Adjust and apply
+					start = start / scale;
+					jQuery.style( tween.elem, prop, start + unit );
+
+				// Update scale, tolerating zero or NaN from tween.cur()
+				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+			}
+
+			// Update tween properties
+			if ( parts ) {
+				start = tween.start = +start || +target || 0;
+				tween.unit = unit;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[ 1 ] ?
+					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
+					+parts[ 2 ];
+			}
+
+			return tween;
+		} ]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	});
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
+
+			// we're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = jQuery._data( elem, "fxshow" );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		display = jQuery.css( elem, "display" );
+
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !support.shrinkWrapBlocks() ) {
+			anim.always(function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			});
+		}
+	}
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
+		style.display = display;
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each(function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		});
+	}
+});
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = setTimeout( next, time );
+		hooks.stop = function() {
+			clearTimeout( timeout );
+		};
+	});
+};
+
+
+(function() {
+	// Minified: var a,b,c,d,e
+	var input, div, select, a, opt;
+
+	// Setup
+	div = document.createElement( "div" );
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+	a = div.getElementsByTagName("a")[ 0 ];
+
+	// First batch of tests.
+	select = document.createElement("select");
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName("input")[ 0 ];
+
+	a.style.cssText = "top:1px";
+
+	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+	support.getSetAttribute = div.className !== "t";
+
+	// Get the style information from getAttribute
+	// (IE uses .cssText instead)
+	support.style = /top/.test( a.getAttribute("style") );
+
+	// Make sure that URLs aren't manipulated
+	// (IE normalizes it by default)
+	support.hrefNormalized = a.getAttribute("href") === "/a";
+
+	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+	support.checkOn = !!input.value;
+
+	// Make sure that a selected-by-default option has a working selected property.
+	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+	support.optSelected = opt.selected;
+
+	// Tests for enctype support on a form (#6743)
+	support.enctype = !!document.createElement("form").enctype;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE8 only
+	// Check if we can trust getAttribute("value")
+	input = document.createElement( "input" );
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+})();
+
+
+var rreturn = /\r/g;
+
+jQuery.fn.extend({
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					jQuery.trim( jQuery.text( elem ) );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
+
+						// Support: IE6
+						// When new option element is added to select box we need to
+						// force reflow of newly added node in order to workaround delay
+						// of initialization properties
+						try {
+							option.selected = optionSet = true;
+
+						} catch ( _ ) {
+
+							// Will be executed only in IE6
+							option.scrollHeight;
+						}
+
+					} else {
+						option.selected = false;
+					}
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+
+				return options;
+			}
+		}
+	}
+});
+
+// Radios and checkboxes getter/setter
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			// Support: Webkit
+			// "" is returned instead of "on" if a value isn't specified
+			return elem.getAttribute("value") === null ? "on" : elem.value;
+		};
+	}
+});
+
+
+
+
+var nodeHook, boolHook,
+	attrHandle = jQuery.expr.attrHandle,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = support.getSetAttribute,
+	getSetInput = support.input;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	}
+});
+
+jQuery.extend({
+	attr: function( elem, name, value ) {
+		var hooks, ret,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === strundefined ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+
+			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+			ret = jQuery.find.attr( elem, name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( (name = attrNames[i++]) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
+					// Set corresponding property to false
+					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+						elem[ propName ] = false;
+					// Support: IE<9
+					// Also clear defaultChecked/defaultSelected (if appropriate)
+					} else {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	}
+});
+
+// Hook for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		// Use defaultChecked and defaultSelected for oldIE
+		} else {
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+
+		return name;
+	}
+};
+
+// Retrieve booleans specially
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+
+	var getter = attrHandle[ name ] || jQuery.find.attr;
+
+	attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
+		function( elem, name, isXML ) {
+			var ret, handle;
+			if ( !isXML ) {
+				// Avoid an infinite loop by temporarily removing this function from the getter
+				handle = attrHandle[ name ];
+				attrHandle[ name ] = ret;
+				ret = getter( elem, name, isXML ) != null ?
+					name.toLowerCase() :
+					null;
+				attrHandle[ name ] = handle;
+			}
+			return ret;
+		} :
+		function( elem, name, isXML ) {
+			if ( !isXML ) {
+				return elem[ jQuery.camelCase( "default-" + name ) ] ?
+					name.toLowerCase() :
+					null;
+			}
+		};
+});
+
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = {
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					(ret = elem.ownerDocument.createAttribute( name ))
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			if ( name === "value" || value === elem.getAttribute( name ) ) {
+				return value;
+			}
+		}
+	};
+
+	// Some attributes are constructed with empty-string values when not defined
+	attrHandle.id = attrHandle.name = attrHandle.coords =
+		function( elem, name, isXML ) {
+			var ret;
+			if ( !isXML ) {
+				return (ret = elem.getAttributeNode( name )) && ret.value !== "" ?
+					ret.value :
+					null;
+			}
+		};
+
+	// Fixing value retrieval on a button requires this module
+	jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			if ( ret && ret.specified ) {
+				return ret.value;
+			}
+		},
+		set: nodeHook.set
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		};
+	});
+}
+
+if ( !support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case senstitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend({
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	}
+});
+
+jQuery.extend({
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
+				ret :
+				( elem[ name ] = value );
+
+		} else {
+			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
+				ret :
+				elem[ name ];
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				return tabindex ?
+					parseInt( tabindex, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						-1;
+			}
+		}
+	}
+});
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !support.hrefNormalized ) {
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each([ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	});
+}
+
+// Support: Safari, IE9+
+// mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	};
+}
+
+jQuery.each([
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+});
+
+// IE6/7 call enctype encoding
+if ( !support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+jQuery.fn.extend({
+	addClass: function( value ) {
+		var classes, elem, cur, clazz, j, finalValue,
+			i = 0,
+			len = this.length,
+			proceed = typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
+			});
+		}
+
+		if ( proceed ) {
+			// The disjunction here is for better compressibility (see removeClass)
+			classes = ( value || "" ).match( rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					" "
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( elem.className !== finalValue ) {
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, clazz, j, finalValue,
+			i = 0,
+			len = this.length,
+			proceed = arguments.length === 0 || typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
+			});
+		}
+		if ( proceed ) {
+			classes = ( value || "" ).match( rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					""
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = value ? jQuery.trim( cur ) : "";
+					if ( elem.className !== finalValue ) {
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					classNames = value.match( rnotwhite ) || [];
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( type === strundefined || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+});
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+});
+
+jQuery.fn.extend({
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+	}
+});
+
+
+var nonce = jQuery.now();
+
+var rquery = (/\?/);
+
+
+
+var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+	// Attempt to parse using the native JSON parser first
+	if ( window.JSON && window.JSON.parse ) {
+		// Support: Android 2.3
+		// Workaround failure to string-cast null input
+		return window.JSON.parse( data + "" );
+	}
+
+	var requireNonComma,
+		depth = null,
+		str = jQuery.trim( data + "" );
+
+	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
+	// after removing valid tokens
+	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
+
+		// Force termination if we see a misplaced comma
+		if ( requireNonComma && comma ) {
+			depth = 0;
+		}
+
+		// Perform no more replacements after returning to outermost depth
+		if ( depth === 0 ) {
+			return token;
+		}
+
+		// Commas must not follow "[", "{", or ","
+		requireNonComma = open || comma;
+
+		// Determine new depth
+		// array/object open ("[" or "{"): depth += true - false (increment)
+		// array/object close ("]" or "}"): depth += false - true (decrement)
+		// other cases ("," or primitive): depth += true - true (numeric cast)
+		depth += !close - !open;
+
+		// Remove this token
+		return "";
+	}) ) ?
+		( Function( "return " + str ) )() :
+		jQuery.error( "Invalid JSON: " + data );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, tmp;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	try {
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data, "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+	} catch( e ) {
+		xml = undefined;
+	}
+	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
+	// Document location
+	ajaxLocParts,
+	ajaxLocation,
+
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			while ( (dataType = dataTypes[i++]) ) {
+				// Prepend if requested
+				if ( dataType.charAt( 0 ) === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+				// Otherwise append
+				} else {
+					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		});
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var deep, key,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	current = dataTypes.shift();
+
+	// Convert to each sequential dataType
+	while ( current ) {
+
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText",
+			json: "responseJSON"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Cross-domain detection vars
+			parts,
+			// Loop variable
+			i,
+			// URL without anti-cache param
+			cacheURL,
+			// Response headers as string
+			responseHeadersString,
+			// timeout handle
+			timeoutTimer,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			transport,
+			// Response headers
+			responseHeaders,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+				jQuery( callbackContext ) :
+				jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks("once memory"),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( (match = rheaders.exec( responseHeadersString )) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger("ajaxStart");
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout(function() {
+					jqXHR.abort("timeout");
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Determine if successful
+			isSuccess = status >= 200 && status < 300 || status === 304;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// Convert no matter what (that way responseXXX fields are always set)
+			response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+			// If successful, handle type chaining
+			if ( isSuccess ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("etag");
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 || s.type === "HEAD" ) {
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					statusText = response.state;
+					success = response.data;
+					error = response.error;
+					isSuccess = !error;
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger("ajaxStop");
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	}
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		});
+	};
+});
+
+
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax({
+		url: url,
+		type: "GET",
+		dataType: "script",
+		async: false,
+		global: false,
+		"throws": true
+	});
+};
+
+
+jQuery.fn.extend({
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	}
+});
+
+
+jQuery.expr.filters.hidden = function( elem ) {
+	// Support: Opera <= 12.12
+	// Opera reports offsetWidths and offsetHeights less than zero on some elements
+	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+		(!support.reliableHiddenOffsets() &&
+			((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+};
+
+jQuery.expr.filters.visible = function( elem ) {
+	return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+jQuery.fn.extend({
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map(function() {
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		})
+		.filter(function() {
+			var type = this.type;
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		})
+		.map(function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ) {
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
+	// Support: IE6+
+	function() {
+
+		// XHR cannot access local files, always use ActiveX for that case
+		return !this.isLocal &&
+
+			// Support: IE7-8
+			// oldIE XHR does not support non-RFC2616 methods (#13240)
+			// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
+			// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
+			// Although this check for six methods instead of eight
+			// since IE also does not support "trace" and "connect"
+			/^(get|post|head|put|delete|options)$/i.test( this.type ) &&
+
+			createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+var xhrId = 0,
+	xhrCallbacks = {},
+	xhrSupported = jQuery.ajaxSettings.xhr();
+
+// Support: IE<10
+// Open requests must be manually aborted on unload (#5280)
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	});
+}
+
+// Determine support properties
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+	jQuery.ajaxTransport(function( options ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !options.crossDomain || support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+					var i,
+						xhr = options.xhr(),
+						id = ++xhrId;
+
+					// Open the socket
+					xhr.open( options.type, options.url, options.async, options.username, options.password );
+
+					// Apply custom fields if provided
+					if ( options.xhrFields ) {
+						for ( i in options.xhrFields ) {
+							xhr[ i ] = options.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( options.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( options.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !options.crossDomain && !headers["X-Requested-With"] ) {
+						headers["X-Requested-With"] = "XMLHttpRequest";
+					}
+
+					// Set headers
+					for ( i in headers ) {
+						// Support: IE<9
+						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
+						// request header to a null-value.
+						//
+						// To keep consistent with other XHR implementations, cast the value
+						// to string and ignore `undefined`.
+						if ( headers[ i ] !== undefined ) {
+							xhr.setRequestHeader( i, headers[ i ] + "" );
+						}
+					}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( options.hasContent && options.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, statusText, responses;
+
+						// Was never called and is aborted or complete
+						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+							// Clean up
+							delete xhrCallbacks[ id ];
+							callback = undefined;
+							xhr.onreadystatechange = jQuery.noop;
+
+							// Abort manually if needed
+							if ( isAbort ) {
+								if ( xhr.readyState !== 4 ) {
+									xhr.abort();
+								}
+							} else {
+								responses = {};
+								status = xhr.status;
+
+								// Support: IE<10
+								// Accessing binary-data responseText throws an exception
+								// (#11426)
+								if ( typeof xhr.responseText === "string" ) {
+									responses.text = xhr.responseText;
+								}
+
+								// Firefox throws an exception when accessing
+								// statusText for faulty cross-domain requests
+								try {
+									statusText = xhr.statusText;
+								} catch( e ) {
+									// We normalize with Webkit giving an empty statusText
+									statusText = "";
+								}
+
+								// Filter status for non standard behaviors
+
+								// If the request is local and we have data: assume a success
+								// (success with no data won't get notified, that's the best we
+								// can do given current implementations)
+								if ( !status && options.isLocal && !options.crossDomain ) {
+									status = responses.text ? 200 : 404;
+								// IE - #1450: sometimes returns 1223 when it should be 204
+								} else if ( status === 1223 ) {
+									status = 204;
+								}
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
+						}
+					};
+
+					if ( !options.async ) {
+						// if we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						setTimeout( callback );
+					} else {
+						// Add to the list of active xhr callbacks
+						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
+					}
+				}
+			};
+		}
+	});
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /(?:java|ecma)script/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || jQuery("head")[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement("script");
+
+				script.async = true;
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( script.parentNode ) {
+							script.parentNode.removeChild( script );
+						}
+
+						// Dereference the script
+						script = null;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+
+				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( undefined, true );
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context, defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+	context = context || document;
+
+	var parsed = rsingleTag.exec( data ),
+		scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[1] ) ];
+	}
+
+	parsed = jQuery.buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, response, type,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = jQuery.trim( url.slice( off, url.length ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax({
+			url: url,
+
+			// if "type" variable is undefined, then "GET" method will be used
+			type: type,
+			dataType: "html",
+			data: params
+		}).done(function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		}).complete( callback && function( jqXHR, status ) {
+			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+		});
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
+	};
+});
+
+
+
+
+jQuery.expr.filters.animated = function( elem ) {
+	return jQuery.grep(jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	}).length;
+};
+
+
+
+
+
+var docElem = window.document.documentElement;
+
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+jQuery.offset = {
+	setOffset: function( elem, options, i ) {
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+jQuery.fn.extend({
+	offset: function( options ) {
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each(function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				});
+		}
+
+		var docElem, win,
+			box = { top: 0, left: 0 },
+			elem = this[ 0 ],
+			doc = elem && elem.ownerDocument;
+
+		if ( !doc ) {
+			return;
+		}
+
+		docElem = doc.documentElement;
+
+		// Make sure it's not a disconnected DOM node
+		if ( !jQuery.contains( docElem, elem ) ) {
+			return box;
+		}
+
+		// If we don't have gBCR, just use 0,0 rather than error
+		// BlackBerry 5, iOS 3 (original iPhone)
+		if ( typeof elem.getBoundingClientRect !== strundefined ) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow( doc );
+		return {
+			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+		};
+	},
+
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset,
+			parentOffset = { top: 0, left: 0 },
+			elem = this[ 0 ];
+
+		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+			// we assume that getBoundingClientRect is available when computed position is fixed
+			offset = elem.getBoundingClientRect();
+		} else {
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
+
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
+
+			// Add offsetParent borders
+			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		return {
+			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || docElem;
+
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent || docElem;
+		});
+	}
+});
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+				// if curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+});
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
+});
+
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	});
+}
+
+
+
+
+var
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( typeof noGlobal === strundefined ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+
+
+
+return jQuery;
+
+}));
diff --git a/web/skins/classic/js/jquery-1.7.2.js b/web/skins/classic/js/jquery-1.7.2.js
deleted file mode 100644
index 3774ff986..000000000
--- a/web/skins/classic/js/jquery-1.7.2.js
+++ /dev/null
@@ -1,9404 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Wed Mar 21 12:46:34 2012 -0700
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Matches dashed string for camelizing
-	rdashAlpha = /-([a-z]|[0-9])/ig,
-	rmsPrefix = /^-ms-/,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = quickExpr.exec( selector );
-			}
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context ? context.ownerDocument || context : document );
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.7.2",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.add( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		i = +i;
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			readyList.fireWith( document, [ jQuery ] );
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).off( "ready" );
-			}
-		}
-	},
-
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
-
-		readyList = jQuery.Callbacks( "once memory" );
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return ( new Function( "return " + data ) )();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-		var xml, tmp;
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array, i ) {
-		var len;
-
-		if ( array ) {
-			if ( indexOf ) {
-				return indexOf.call( array, elem, i );
-			}
-
-			len = array.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in array && array[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-		var exec,
-			bulk = key == null,
-			i = 0,
-			length = elems.length;
-
-		// Sets many values
-		if ( key && typeof key === "object" ) {
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
-			}
-			chainable = 1;
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = pass === undefined && jQuery.isFunction( value );
-
-			if ( bulk ) {
-				// Bulk operations only iterate when executing function values
-				if ( exec ) {
-					exec = fn;
-					fn = function( elem, key, value ) {
-						return exec.call( jQuery( elem ), value );
-					};
-
-				// Otherwise they run against the entire set
-				} else {
-					fn.call( elems, value );
-					fn = null;
-				}
-			}
-
-			if ( fn ) {
-				for (; i < length; i++ ) {
-					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-				}
-			}
-
-			chainable = 1;
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
-
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-return jQuery;
-
-})();
-
-
-// String to Object flags format cache
-var flagsCache = {};
-
-// Convert String-formatted flags into Object-formatted ones and store in cache
-function createFlags( flags ) {
-	var object = flagsCache[ flags ] = {},
-		i, length;
-	flags = flags.split( /\s+/ );
-	for ( i = 0, length = flags.length; i < length; i++ ) {
-		object[ flags[i] ] = true;
-	}
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	flags:	an optional list of space-separated flags that will change how
- *			the callback list behaves
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible flags:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( flags ) {
-
-	// Convert flags from String-formatted to Object-formatted
-	// (we check in cache first)
-	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
-
-	var // Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = [],
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Add one or several callbacks to the list
-		add = function( args ) {
-			var i,
-				length,
-				elem,
-				type,
-				actual;
-			for ( i = 0, length = args.length; i < length; i++ ) {
-				elem = args[ i ];
-				type = jQuery.type( elem );
-				if ( type === "array" ) {
-					// Inspect recursively
-					add( elem );
-				} else if ( type === "function" ) {
-					// Add if not in unique mode and callback is not in
-					if ( !flags.unique || !self.has( elem ) ) {
-						list.push( elem );
-					}
-				}
-			}
-		},
-		// Fire callbacks
-		fire = function( context, args ) {
-			args = args || [];
-			memory = !flags.memory || [ context, args ];
-			fired = true;
-			firing = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
-					memory = true; // Mark as halted
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( !flags.once ) {
-					if ( stack && stack.length ) {
-						memory = stack.shift();
-						self.fireWith( memory[ 0 ], memory[ 1 ] );
-					}
-				} else if ( memory === true ) {
-					self.disable();
-				} else {
-					list = [];
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					var length = list.length;
-					add( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away, unless previous
-					// firing was halted (stopOnFalse)
-					} else if ( memory && memory !== true ) {
-						firingStart = length;
-						fire( memory[ 0 ], memory[ 1 ] );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					var args = arguments,
-						argIndex = 0,
-						argLength = args.length;
-					for ( ; argIndex < argLength ; argIndex++ ) {
-						for ( var i = 0; i < list.length; i++ ) {
-							if ( args[ argIndex ] === list[ i ] ) {
-								// Handle firingIndex and firingLength
-								if ( firing ) {
-									if ( i <= firingLength ) {
-										firingLength--;
-										if ( i <= firingIndex ) {
-											firingIndex--;
-										}
-									}
-								}
-								// Remove the element
-								list.splice( i--, 1 );
-								// If we have some unicity property then
-								// we only need to do this once
-								if ( flags.unique ) {
-									break;
-								}
-							}
-						}
-					}
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				if ( list ) {
-					var i = 0,
-						length = list.length;
-					for ( ; i < length; i++ ) {
-						if ( fn === list[ i ] ) {
-							return true;
-						}
-					}
-				}
-				return false;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory || memory === true ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( stack ) {
-					if ( firing ) {
-						if ( !flags.once ) {
-							stack.push( [ context, args ] );
-						}
-					} else if ( !( flags.once && memory ) ) {
-						fire( context, args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-
-
-var // Static reference to slice
-	sliceDeferred = [].slice;
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var doneList = jQuery.Callbacks( "once memory" ),
-			failList = jQuery.Callbacks( "once memory" ),
-			progressList = jQuery.Callbacks( "memory" ),
-			state = "pending",
-			lists = {
-				resolve: doneList,
-				reject: failList,
-				notify: progressList
-			},
-			promise = {
-				done: doneList.add,
-				fail: failList.add,
-				progress: progressList.add,
-
-				state: function() {
-					return state;
-				},
-
-				// Deprecated
-				isResolved: doneList.fired,
-				isRejected: failList.fired,
-
-				then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
-					deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
-					return this;
-				},
-				always: function() {
-					deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
-					return this;
-				},
-				pipe: function( fnDone, fnFail, fnProgress ) {
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( {
-							done: [ fnDone, "resolve" ],
-							fail: [ fnFail, "reject" ],
-							progress: [ fnProgress, "notify" ]
-						}, function( handler, data ) {
-							var fn = data[ 0 ],
-								action = data[ 1 ],
-								returned;
-							if ( jQuery.isFunction( fn ) ) {
-								deferred[ handler ](function() {
-									returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-									}
-								});
-							} else {
-								deferred[ handler ]( newDefer[ action ] );
-							}
-						});
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					if ( obj == null ) {
-						obj = promise;
-					} else {
-						for ( var key in promise ) {
-							obj[ key ] = promise[ key ];
-						}
-					}
-					return obj;
-				}
-			},
-			deferred = promise.promise({}),
-			key;
-
-		for ( key in lists ) {
-			deferred[ key ] = lists[ key ].fire;
-			deferred[ key + "With" ] = lists[ key ].fireWith;
-		}
-
-		// Handle state
-		deferred.done( function() {
-			state = "resolved";
-		}, failList.disable, progressList.lock ).fail( function() {
-			state = "rejected";
-		}, doneList.disable, progressList.lock );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( firstParam ) {
-		var args = sliceDeferred.call( arguments, 0 ),
-			i = 0,
-			length = args.length,
-			pValues = new Array( length ),
-			count = length,
-			pCount = length,
-			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
-				firstParam :
-				jQuery.Deferred(),
-			promise = deferred.promise();
-		function resolveFunc( i ) {
-			return function( value ) {
-				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				if ( !( --count ) ) {
-					deferred.resolveWith( deferred, args );
-				}
-			};
-		}
-		function progressFunc( i ) {
-			return function( value ) {
-				pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				deferred.notifyWith( promise, pValues );
-			};
-		}
-		if ( length > 1 ) {
-			for ( ; i < length; i++ ) {
-				if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
-					args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
-				} else {
-					--count;
-				}
-			}
-			if ( !count ) {
-				deferred.resolveWith( deferred, args );
-			}
-		} else if ( deferred !== firstParam ) {
-			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
-		}
-		return promise;
-	}
-});
-
-
-
-
-jQuery.support = (function() {
-
-	var support,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		fragment,
-		tds,
-		events,
-		eventName,
-		i,
-		isSupported,
-		div = document.createElement( "div" ),
-		documentElement = document.documentElement;
-
-	// Preliminary tests
-	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName( "*" );
-	a = div.getElementsByTagName( "a" )[ 0 ];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement( "select" );
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName( "input" )[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Tests for enctype support on a form(#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		pixelMargin: true
-	};
-
-	// jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
-	jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", function() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-		});
-		div.cloneNode( true ).fireEvent( "onclick" );
-	}
-
-	// Check if a radio maintains its value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute("type", "radio");
-	support.radioValue = input.value === "t";
-
-	input.setAttribute("checked", "checked");
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.lastChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	fragment.removeChild( input );
-	fragment.appendChild( div );
-
-	// Technique from Juriy Zaytsev
-	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for ( i in {
-			submit: 1,
-			change: 1,
-			focusin: 1
-		}) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	fragment.removeChild( div );
-
-	// Null elements to avoid leaks in IE
-	fragment = select = opt = div = input = null;
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, outer, inner, table, td, offsetSupport,
-			marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight,
-			paddingMarginBorderVisibility, paddingMarginBorder,
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		conMarginTop = 1;
-		paddingMarginBorder = "padding:0;margin:0;border:";
-		positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;";
-		paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;";
-		style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;";
-		html = "<div " + style + "display:block;'><div style='" + paddingMarginBorder + "0;display:block;overflow:hidden;'></div></div>" +
-			"<table " + style + "' cellpadding='0' cellspacing='0'>" +
-			"<tr><td></td></tr></table>";
-
-		container = document.createElement("div");
-		container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
-		body.insertBefore( container, body.firstChild );
-
-		// Construct the test element
-		div = document.createElement("div");
-		container.appendChild( div );
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		div.innerHTML = "<table><tr><td style='" + paddingMarginBorder + "0;display:none'></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName( "td" );
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE <= 8 fail this test)
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check if div with explicit width and no margin-right incorrectly
-		// gets computed margin-right based on width of container. For more
-		// info see bug #3333
-		// Fails in WebKit before Feb 2011 nightlies
-		// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-		if ( window.getComputedStyle ) {
-			div.innerHTML = "";
-			marginDiv = document.createElement( "div" );
-			marginDiv.style.width = "0";
-			marginDiv.style.marginRight = "0";
-			div.style.width = "2px";
-			div.appendChild( marginDiv );
-			support.reliableMarginRight =
-				( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
-		}
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			// (IE < 8 does this)
-			div.innerHTML = "";
-			div.style.width = div.style.padding = "1px";
-			div.style.border = 0;
-			div.style.overflow = "hidden";
-			div.style.display = "inline";
-			div.style.zoom = 1;
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Check if elements with layout shrink-wrap their children
-			// (IE 6 does this)
-			div.style.display = "block";
-			div.style.overflow = "visible";
-			div.innerHTML = "<div style='width:5px;'></div>";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-		}
-
-		div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility;
-		div.innerHTML = html;
-
-		outer = div.firstChild;
-		inner = outer.firstChild;
-		td = outer.nextSibling.firstChild.firstChild;
-
-		offsetSupport = {
-			doesNotAddBorder: ( inner.offsetTop !== 5 ),
-			doesAddBorderForTableAndCells: ( td.offsetTop === 5 )
-		};
-
-		inner.style.position = "fixed";
-		inner.style.top = "20px";
-
-		// safari subtracts parent border width here which is 5px
-		offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
-		inner.style.position = inner.style.top = "";
-
-		outer.style.overflow = "hidden";
-		outer.style.position = "relative";
-
-		offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
-		offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
-
-		if ( window.getComputedStyle ) {
-			div.style.marginTop = "1%";
-			support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%";
-		}
-
-		if ( typeof container.style.zoom !== "undefined" ) {
-			container.style.zoom = 1;
-		}
-
-		body.removeChild( container );
-		marginDiv = div = container = null;
-
-		jQuery.extend( support, offsetSupport );
-	});
-
-	return support;
-})();
-
-
-
-
-var rbrace = /^(?:\{.*\}|\[.*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-jQuery.extend({
-	cache: {},
-
-	// Please use with caution
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var privateCache, thisCache, ret,
-			internalKey = jQuery.expando,
-			getByName = typeof name === "string",
-
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
-
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
-
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey,
-			isEvents = name === "events";
-
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) {
-			return;
-		}
-
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ internalKey ] = id = ++jQuery.uuid;
-			} else {
-				id = internalKey;
-			}
-		}
-
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
-
-			// Avoids exposing jQuery metadata on plain JS objects when the object
-			// is serialized using JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
-
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ] = jQuery.extend( cache[ id ], name );
-			} else {
-				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-			}
-		}
-
-		privateCache = thisCache = cache[ id ];
-
-		// jQuery data() is stored in a separate object inside the object's internal data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data.
-		if ( !pvt ) {
-			if ( !thisCache.data ) {
-				thisCache.data = {};
-			}
-
-			thisCache = thisCache.data;
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
-
-		// Users should not attempt to inspect the internal events object using jQuery.data,
-		// it is undocumented and subject to change. But does anyone listen? No.
-		if ( isEvents && !thisCache[ name ] ) {
-			return privateCache.events;
-		}
-
-		// Check for both converted-to-camel and non-converted data property names
-		// If a data property was specified
-		if ( getByName ) {
-
-			// First Try to find as-is property data
-			ret = thisCache[ name ];
-
-			// Test for null|undefined property data
-			if ( ret == null ) {
-
-				// Try to find the camelCased property
-				ret = thisCache[ jQuery.camelCase( name ) ];
-			}
-		} else {
-			ret = thisCache;
-		}
-
-		return ret;
-	},
-
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var thisCache, i, l,
-
-			// Reference to internal data cache key
-			internalKey = jQuery.expando,
-
-			isNode = elem.nodeType,
-
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
-
-			// See jQuery.data for more information
-			id = isNode ? elem[ internalKey ] : internalKey;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-
-			thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-			if ( thisCache ) {
-
-				// Support array or space separated string names for data keys
-				if ( !jQuery.isArray( name ) ) {
-
-					// try the string as a key before any manipulation
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-
-						// split the camel cased version by spaces unless a key with the spaces exists
-						name = jQuery.camelCase( name );
-						if ( name in thisCache ) {
-							name = [ name ];
-						} else {
-							name = name.split( " " );
-						}
-					}
-				}
-
-				for ( i = 0, l = name.length; i < l; i++ ) {
-					delete thisCache[ name[i] ];
-				}
-
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-					return;
-				}
-			}
-		}
-
-		// See jQuery.data for more information
-		if ( !pvt ) {
-			delete cache[ id ].data;
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject(cache[ id ]) ) {
-				return;
-			}
-		}
-
-		// Browsers that fail expando deletion also refuse to delete expandos on
-		// the window, but it will allow it on all other JS objects; other browsers
-		// don't care
-		// Ensure that `cache` is not a window object #10080
-		if ( jQuery.support.deleteExpando || !cache.setInterval ) {
-			delete cache[ id ];
-		} else {
-			cache[ id ] = null;
-		}
-
-		// We destroyed the cache and need to eliminate the expando on the node to avoid
-		// false lookups in the cache for entries that no longer exist
-		if ( isNode ) {
-			// IE does not allow us to delete expando properties from nodes,
-			// nor does it have a removeAttribute function on Document nodes;
-			// we must handle all of these cases
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ internalKey ];
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( internalKey );
-			} else {
-				elem[ internalKey ] = null;
-			}
-		}
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		if ( elem.nodeName ) {
-			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-			if ( match ) {
-				return !(match === true || elem.getAttribute("classid") !== match);
-			}
-		}
-
-		return true;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var parts, part, attr, name, l,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attr = elem.attributes;
-					for ( l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
-
-						if ( name.indexOf( "data-" ) === 0 ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		parts = key.split( ".", 2 );
-		parts[1] = parts[1] ? "." + parts[1] : "";
-		part = parts[1] + "!";
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
-
-				// Try to fetch any internally stored data first
-				if ( data === undefined && elem ) {
-					data = jQuery.data( elem, key );
-					data = dataAttr( elem, key, data );
-				}
-
-				return data === undefined && parts[1] ?
-					this.data( parts[0] ) :
-					data;
-			}
-
-			parts[1] = value;
-			this.each(function() {
-				var self = jQuery( this );
-
-				self.triggerHandler( "setData" + part, parts );
-				jQuery.data( this, key, value );
-				self.triggerHandler( "changeData" + part, parts );
-			});
-		}, null, value, arguments.length > 1, null, false );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				jQuery.isNumeric( data ) ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	for ( var name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-
-
-
-function handleQueueMarkDefer( elem, type, src ) {
-	var deferDataKey = type + "defer",
-		queueDataKey = type + "queue",
-		markDataKey = type + "mark",
-		defer = jQuery._data( elem, deferDataKey );
-	if ( defer &&
-		( src === "queue" || !jQuery._data(elem, queueDataKey) ) &&
-		( src === "mark" || !jQuery._data(elem, markDataKey) ) ) {
-		// Give room for hard-coded callbacks to fire first
-		// and eventually mark/queue something else on the element
-		setTimeout( function() {
-			if ( !jQuery._data( elem, queueDataKey ) &&
-				!jQuery._data( elem, markDataKey ) ) {
-				jQuery.removeData( elem, deferDataKey, true );
-				defer.fire();
-			}
-		}, 0 );
-	}
-}
-
-jQuery.extend({
-
-	_mark: function( elem, type ) {
-		if ( elem ) {
-			type = ( type || "fx" ) + "mark";
-			jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 );
-		}
-	},
-
-	_unmark: function( force, elem, type ) {
-		if ( force !== true ) {
-			type = elem;
-			elem = force;
-			force = false;
-		}
-		if ( elem ) {
-			type = type || "fx";
-			var key = type + "mark",
-				count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 );
-			if ( count ) {
-				jQuery._data( elem, key, count );
-			} else {
-				jQuery.removeData( elem, key, true );
-				handleQueueMarkDefer( elem, type, "mark" );
-			}
-		}
-	},
-
-	queue: function( elem, type, data ) {
-		var q;
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			q = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !q || jQuery.isArray(data) ) {
-					q = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					q.push( data );
-				}
-			}
-			return q || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			fn = queue.shift(),
-			hooks = {};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			jQuery._data( elem, type + ".run", hooks );
-			fn.call( elem, function() {
-				jQuery.dequeue( elem, type );
-			}, hooks );
-		}
-
-		if ( !queue.length ) {
-			jQuery.removeData( elem, type + "queue " + type + ".run", true );
-			handleQueueMarkDefer( elem, type, "queue" );
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, object ) {
-		if ( typeof type !== "string" ) {
-			object = type;
-			type = undefined;
-		}
-		type = type || "fx";
-		var defer = jQuery.Deferred(),
-			elements = this,
-			i = elements.length,
-			count = 1,
-			deferDataKey = type + "defer",
-			queueDataKey = type + "queue",
-			markDataKey = type + "mark",
-			tmp;
-		function resolve() {
-			if ( !( --count ) ) {
-				defer.resolveWith( elements, [ elements ] );
-			}
-		}
-		while( i-- ) {
-			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
-					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
-						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
-					jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) {
-				count++;
-				tmp.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( object );
-	}
-});
-
-
-
-
-var rclass = /[\n\t\r]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea)?$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	nodeHook, boolHook, fixSpecified;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classNames, i, l, elem,
-			setClass, c, cl;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call(this, j, this.className) );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			classNames = value.split( rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className && classNames.length === 1 ) {
-						elem.className = value;
-
-					} else {
-						setClass = " " + elem.className + " ";
-
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
-								setClass += classNames[ c ] + " ";
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classNames, i, l, elem, className, c, cl;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call(this, j, this.className) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			classNames = ( value || "" ).split( rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						className = (" " + elem.className + " ").replace( rclass, " " );
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[ c ] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var self = jQuery(this), val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, i, max, option,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
-
-				// Loop through all the selected options
-				i = one ? index : 0;
-				max = one ? index + 1 : options.length;
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-
-	attr: function( elem, name, value, pass ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, "" + value );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			ret = elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var propName, attrNames, name, l, isBool,
-			i = 0;
-
-		if ( value && elem.nodeType === 1 ) {
-			attrNames = value.toLowerCase().split( rspace );
-			l = attrNames.length;
-
-			for ( ; i < l; i++ ) {
-				name = attrNames[ i ];
-
-				if ( name ) {
-					propName = jQuery.propFix[ name ] || name;
-					isBool = rboolean.test( name );
-
-					// See #9699 for explanation of this approach (setting first, then removal)
-					// Do not do this for boolean attributes (see #10870)
-					if ( !isBool ) {
-						jQuery.attr( elem, name, "" );
-					}
-					elem.removeAttribute( getSetAttribute ? name : propName );
-
-					// Set corresponding property to false for boolean attributes
-					if ( isBool && propName in elem ) {
-						elem[ propName ] = false;
-					}
-				}
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		},
-		// Use the value property for back compat
-		// Use the nodeHook for button elements in IE6/7 (#1954)
-		value: {
-			get: function( elem, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.get( elem, name );
-				}
-				return name in elem ?
-					elem.value :
-					null;
-			},
-			set: function( elem, value, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.set( elem, value, name );
-				}
-				// Does not return so that setAttribute is also used
-				elem.value = value;
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
-jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		// Fall back to attribute presence where some booleans are not supported
-		var attrNode,
-			property = jQuery.prop( elem, name );
-		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = true;
-			}
-
-			elem.setAttribute( name, name.toLowerCase() );
-		}
-		return name;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	fixSpecified = {
-		name: true,
-		id: true,
-		coords: true
-	};
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ?
-				ret.nodeValue :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				ret = document.createAttribute( name );
-				elem.setAttributeNode( ret );
-			}
-			return ( ret.nodeValue = value + "" );
-		}
-	};
-
-	// Apply the nodeHook to tabindex
-	jQuery.attrHooks.tabindex.set = nodeHook.set;
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			if ( value === "" ) {
-				value = "false";
-			}
-			nodeHook.set( elem, value, name );
-		}
-	};
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
-		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = "" + value );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-
-
-
-
-var rformElems = /^(?:textarea|input|select)$/i,
-	rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
-	rhoverHack = /(?:^|\s)hover(\.\S+)?\b/,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
-	quickParse = function( selector ) {
-		var quick = rquickIs.exec( selector );
-		if ( quick ) {
-			//   0  1    2   3
-			// [ _, tag, id, class ]
-			quick[1] = ( quick[1] || "" ).toLowerCase();
-			quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" );
-		}
-		return quick;
-	},
-	quickIs = function( elem, m ) {
-		var attrs = elem.attributes || {};
-		return (
-			(!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
-			(!m[2] || (attrs.id || {}).value === m[2]) &&
-			(!m[3] || m[3].test( (attrs[ "class" ] || {}).value ))
-		);
-	},
-	hoverHack = function( events ) {
-		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-	};
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var elemData, eventHandle, events,
-			t, tns, type, namespaces, handleObj,
-			handleObjIn, quick, handlers, special;
-
-		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
-		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		events = elemData.events;
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-		eventHandle = elemData.handle;
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = jQuery.trim( hoverHack(types) ).split( " " );
-		for ( t = 0; t < types.length; t++ ) {
-
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = tns[1];
-			namespaces = ( tns[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: tns[1],
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				quick: selector && quickParse( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			handlers = events[ type ];
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
-			t, tns, type, origType, namespaces, origCount,
-			j, events, special, handle, eventType, handleObj;
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
-		for ( t = 0; t < types.length; t++ ) {
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tns[1];
-			namespaces = tns[2];
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector? special.delegateType : special.bindType ) || type;
-			eventType = events[ type ] || [];
-			origCount = eventType.length;
-			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
-
-			// Remove matching events
-			for ( j = 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					 ( !handler || handler.guid === handleObj.guid ) &&
-					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
-					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					eventType.splice( j--, 1 );
-
-					if ( handleObj.selector ) {
-						eventType.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( eventType.length === 0 && origCount !== eventType.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery.removeData( elem, [ "events", "handle" ], true );
-		}
-	},
-
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Don't do events on text and comment nodes
-		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
-			return;
-		}
-
-		// Event object or event type
-		var type = event.type || event,
-			namespaces = [],
-			cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "!" ) >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
-
-		if ( type.indexOf( "." ) >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
-
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
-
-		event.type = type;
-		event.isTrigger = true;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join( "." );
-		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
-		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
-
-		// Handle a global trigger
-		if ( !elem ) {
-
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			cache = jQuery.cache;
-			for ( i in cache ) {
-				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
-					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
-				}
-			}
-			return;
-		}
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data != null ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		eventPath = [[ elem, special.bindType || type ]];
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
-			old = null;
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push([ cur, bubbleType ]);
-				old = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( old && old === elem.ownerDocument ) {
-				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
-			}
-		}
-
-		// Fire handlers on the event path
-		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
-
-			cur = eventPath[i][0];
-			event.type = eventPath[i][1];
-
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-			// Note that this is a bare JS function and not a jQuery handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				// IE<9 dies on focus/blur to hidden element (#1486)
-				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					old = elem[ ontype ];
-
-					if ( old ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( old ) {
-						elem[ ontype ] = old;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event || window.event );
-
-		var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
-			delegateCount = handlers.delegateCount,
-			args = [].slice.call( arguments, 0 ),
-			run_all = !event.exclusive && !event.namespace,
-			special = jQuery.event.special[ event.type ] || {},
-			handlerQueue = [],
-			i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers that should run if there are delegated events
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && !(event.button && event.type === "click") ) {
-
-			// Pregenerate a single jQuery object for reuse with .is()
-			jqcur = jQuery(this);
-			jqcur.context = this.ownerDocument || this;
-
-			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't process events on disabled elements (#6911, #8165)
-				if ( cur.disabled !== true ) {
-					selMatch = {};
-					matches = [];
-					jqcur[0] = cur;
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-						sel = handleObj.selector;
-
-						if ( selMatch[ sel ] === undefined ) {
-							selMatch[ sel ] = (
-								handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
-							);
-						}
-						if ( selMatch[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, matches: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( handlers.length > delegateCount ) {
-			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
-		}
-
-		// Run delegates first; they may want to stop propagation beneath us
-		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
-			matched = handlerQueue[ i ];
-			event.currentTarget = matched.elem;
-
-			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
-				handleObj = matched.matches[ j ];
-
-				// Triggered event must either 1) be non-exclusive and have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
-	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = jQuery.Event( originalEvent );
-
-		for ( i = copy.length; i; ) {
-			prop = copy[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Target should not be a text node (#504, Safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
-		if ( event.metaKey === undefined ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady
-		},
-
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-
-		focus: {
-			delegateType: "focusin"
-		},
-		blur: {
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
-				}
-			},
-
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-// Some plugins are using, but it's undocumented/deprecated and will be removed.
-// The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		if ( elem.detachEvent ) {
-			elem.detachEvent( "on" + type, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj,
-				selector = handleObj.selector,
-				ret;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !form._submit_attached ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					form._submit_attached = true;
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-		
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-							jQuery.event.simulate( "change", this, event, true );
-						}
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					elem._change_attached = true;
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) { // && selector != null
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			var handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( var type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	live: function( types, data, fn ) {
-		jQuery( this.context ).on( types, this.selector, data, fn );
-		return this;
-	},
-	die: function( types, fn ) {
-		jQuery( this.context ).off( types, this.selector || "**", fn );
-		return this;
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
-
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
-
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-	}
-});
-
-
-
-/*!
- * Sizzle CSS Selector Engine
- *  Copyright 2011, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	expando = "sizcache" + (Math.random() + '').replace('.', ''),
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true,
-	rBackslash = /\\/g,
-	rReturn = /\r\n/g,
-	rNonWord = /\W/;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function() {
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
-
-	var origContext = context;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var m, set, checkSet, extra, ret, cur, pop, i,
-		prune = true,
-		contextXML = Sizzle.isXML( context ),
-		parts = [],
-		soFar = selector;
-
-	// Reset the position of the chunker regexp (start from head)
-	do {
-		chunker.exec( "" );
-		m = chunker.exec( soFar );
-
-		if ( m ) {
-			soFar = m[3];
-
-			parts.push( m[1] );
-
-			if ( m[2] ) {
-				extra = m[3];
-				break;
-			}
-		}
-	} while ( m );
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context, seed );
-
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-
-				set = posProcess( selector, set, seed );
-			}
-		}
-
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
-			ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set )[0] :
-				ret.set[0];
-		}
-
-		if ( context ) {
-			ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
-			set = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set ) :
-				ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray( set );
-
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				cur = parts.pop();
-				pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-
-		} else if ( context && context.nodeType === 1 ) {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-
-		} else {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort( sortOrder );
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[ i - 1 ] ) {
-					results.splice( i--, 1 );
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function( expr, set ) {
-	return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
-	return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
-	var set, i, len, match, type, left;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( i = 0, len = Expr.order.length; i < len; i++ ) {
-		type = Expr.order[i];
-
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			left = match[1];
-			match.splice( 1, 1 );
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace( rBackslash, "" );
-				set = Expr.find[ type ]( match, context, isXML );
-
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( "*" ) :
-			[];
-	}
-
-	return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
-	var match, anyFound,
-		type, found, item, filter, left,
-		i, pass,
-		old = expr,
-		result = [],
-		curLoop = set,
-		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
-	while ( expr && set.length ) {
-		for ( type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				filter = Expr.filter[ type ];
-				left = match[1];
-
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							pass = not ^ found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-
-								} else {
-									curLoop[i] = false;
-								}
-
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Utility function for retreiving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-var getText = Sizzle.getText = function( elem ) {
-    var i, node,
-		nodeType = elem.nodeType,
-		ret = "";
-
-	if ( nodeType ) {
-		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-			// Use textContent || innerText for elements
-			if ( typeof elem.textContent === 'string' ) {
-				return elem.textContent;
-			} else if ( typeof elem.innerText === 'string' ) {
-				// Replace IE's carriage returns
-				return elem.innerText.replace( rReturn, '' );
-			} else {
-				// Traverse it's children
-				for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {
-					ret += getText( elem );
-				}
-			}
-		} else if ( nodeType === 3 || nodeType === 4 ) {
-			return elem.nodeValue;
-		}
-	} else {
-
-		// If no nodeType, this is expected to be an array
-		for ( i = 0; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			if ( node.nodeType !== 8 ) {
-				ret += getText( node );
-			}
-		}
-	}
-	return ret;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-
-	leftMatch: {},
-
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-
-	attrHandle: {
-		href: function( elem ) {
-			return elem.getAttribute( "href" );
-		},
-		type: function( elem ) {
-			return elem.getAttribute( "type" );
-		}
-	},
-
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !rNonWord.test( part ),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-
-		">": function( checkSet, part ) {
-			var elem,
-				isPartStr = typeof part === "string",
-				i = 0,
-				l = checkSet.length;
-
-			if ( isPartStr && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-
-			} else {
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-
-		"": function(checkSet, part, isXML){
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
-		},
-
-		"~": function( checkSet, part, isXML ) {
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
-		}
-	},
-
-	find: {
-		ID: function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		},
-
-		NAME: function( match, context ) {
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [],
-					results = context.getElementsByName( match[1] );
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-
-		TAG: function( match, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( match[1] );
-			}
-		}
-	},
-	preFilter: {
-		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
-			match = " " + match[1].replace( rBackslash, "" ) + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-
-		ID: function( match ) {
-			return match[1].replace( rBackslash, "" );
-		},
-
-		TAG: function( match, curLoop ) {
-			return match[1].replace( rBackslash, "" ).toLowerCase();
-		},
-
-		CHILD: function( match ) {
-			if ( match[1] === "nth" ) {
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
-
-				match[2] = match[2].replace(/^\+|\s*/g, '');
-
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-			else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-
-		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
-			var name = match[1] = match[1].replace( rBackslash, "" );
-
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			// Handle if an un-quoted value was used
-			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-
-		PSEUDO: function( match, curLoop, inplace, result, not ) {
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-
-					return false;
-				}
-
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-
-			return match;
-		},
-
-		POS: function( match ) {
-			match.unshift( true );
-
-			return match;
-		}
-	},
-
-	filters: {
-		enabled: function( elem ) {
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-
-		disabled: function( elem ) {
-			return elem.disabled === true;
-		},
-
-		checked: function( elem ) {
-			return elem.checked === true;
-		},
-
-		selected: function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		parent: function( elem ) {
-			return !!elem.firstChild;
-		},
-
-		empty: function( elem ) {
-			return !elem.firstChild;
-		},
-
-		has: function( elem, i, match ) {
-			return !!Sizzle( match[3], elem ).length;
-		},
-
-		header: function( elem ) {
-			return (/h\d/i).test( elem.nodeName );
-		},
-
-		text: function( elem ) {
-			var attr = elem.getAttribute( "type" ), type = elem.type;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
-		},
-
-		radio: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
-		},
-
-		checkbox: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
-		},
-
-		file: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
-		},
-
-		password: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
-		},
-
-		submit: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "submit" === elem.type;
-		},
-
-		image: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
-		},
-
-		reset: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "reset" === elem.type;
-		},
-
-		button: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && "button" === elem.type || name === "button";
-		},
-
-		input: function( elem ) {
-			return (/input|select|textarea|button/i).test( elem.nodeName );
-		},
-
-		focus: function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		}
-	},
-	setFilters: {
-		first: function( elem, i ) {
-			return i === 0;
-		},
-
-		last: function( elem, i, match, array ) {
-			return i === array.length - 1;
-		},
-
-		even: function( elem, i ) {
-			return i % 2 === 0;
-		},
-
-		odd: function( elem, i ) {
-			return i % 2 === 1;
-		},
-
-		lt: function( elem, i, match ) {
-			return i < match[3] - 0;
-		},
-
-		gt: function( elem, i, match ) {
-			return i > match[3] - 0;
-		},
-
-		nth: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		},
-
-		eq: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function( elem, match, i, array ) {
-			var name = match[1],
-				filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var j = 0, l = not.length; j < l; j++ ) {
-					if ( not[j] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-
-			} else {
-				Sizzle.error( name );
-			}
-		},
-
-		CHILD: function( elem, match ) {
-			var first, last,
-				doneName, parent, cache,
-				count, diff,
-				type = match[1],
-				node = elem;
-
-			switch ( type ) {
-				case "only":
-				case "first":
-					while ( (node = node.previousSibling) ) {
-						if ( node.nodeType === 1 ) {
-							return false;
-						}
-					}
-
-					if ( type === "first" ) {
-						return true;
-					}
-
-					node = elem;
-
-					/* falls through */
-				case "last":
-					while ( (node = node.nextSibling) ) {
-						if ( node.nodeType === 1 ) {
-							return false;
-						}
-					}
-
-					return true;
-
-				case "nth":
-					first = match[2];
-					last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-
-					doneName = match[0];
-					parent = elem.parentNode;
-
-					if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
-						count = 0;
-
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						}
-
-						parent[ expando ] = doneName;
-					}
-
-					diff = elem.nodeIndex - last;
-
-					if ( first === 0 ) {
-						return diff === 0;
-
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-
-		ID: function( elem, match ) {
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-
-		TAG: function( elem, match ) {
-			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
-		},
-
-		CLASS: function( elem, match ) {
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-
-		ATTR: function( elem, match ) {
-			var name = match[1],
-				result = Sizzle.attr ?
-					Sizzle.attr( elem, name ) :
-					Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				!type && Sizzle.attr ?
-				result != null :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-
-		POS: function( elem, match, i, array ) {
-			var name = match[2],
-				filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS,
-	fescape = function(all, num){
-		return "\\" + (num - 0 + 1);
-	};
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-// Expose origPOS
-// "global" as in regardless of relation to brackets/parens
-Expr.match.globalPOS = origPOS;
-
-var makeArray = function( array, results ) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
-	makeArray = function( array, results ) {
-		var i = 0,
-			ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-
-			} else {
-				for ( ; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
-	};
-
-} else {
-	sortOrder = function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
-
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-	siblingCheck = function( a, b, ret ) {
-		if ( a === b ) {
-			return ret;
-		}
-
-		var cur = a.nextSibling;
-
-		while ( cur ) {
-			if ( cur === b ) {
-				return -1;
-			}
-
-			cur = cur.nextSibling;
-		}
-
-		return 1;
-	};
-}
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date()).getTime(),
-		root = document.documentElement;
-
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-
-				return m ?
-					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-
-		Expr.filter.ID = function( elem, match ) {
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-
-	// release memory in IE
-	root = form = null;
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function( match, context ) {
-			var results = context.getElementsByTagName( match[1] );
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-
-		Expr.attrHandle.href = function( elem ) {
-			return elem.getAttribute( "href", 2 );
-		};
-	}
-
-	// release memory in IE
-	div = null;
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle,
-			div = document.createElement("div"),
-			id = "__sizzle__";
-
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-
-		Sizzle = function( query, context, extra, seed ) {
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && !Sizzle.isXML(context) ) {
-				// See if we find a selector to speed up
-				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-
-				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
-					// Speed-up: Sizzle("TAG")
-					if ( match[1] ) {
-						return makeArray( context.getElementsByTagName( query ), extra );
-
-					// Speed-up: Sizzle(".CLASS")
-					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
-						return makeArray( context.getElementsByClassName( match[2] ), extra );
-					}
-				}
-
-				if ( context.nodeType === 9 ) {
-					// Speed-up: Sizzle("body")
-					// The body element only exists once, optimize finding it
-					if ( query === "body" && context.body ) {
-						return makeArray( [ context.body ], extra );
-
-					// Speed-up: Sizzle("#ID")
-					} else if ( match && match[3] ) {
-						var elem = context.getElementById( match[3] );
-
-						// Check parentNode to catch when Blackberry 4.6 returns
-						// nodes that are no longer in the document #6963
-						if ( elem && elem.parentNode ) {
-							// Handle the case where IE and Opera return items
-							// by name instead of ID
-							if ( elem.id === match[3] ) {
-								return makeArray( [ elem ], extra );
-							}
-
-						} else {
-							return makeArray( [], extra );
-						}
-					}
-
-					try {
-						return makeArray( context.querySelectorAll(query), extra );
-					} catch(qsaError) {}
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					var oldContext = context,
-						old = context.getAttribute( "id" ),
-						nid = old || id,
-						hasParent = context.parentNode,
-						relativeHierarchySelector = /^\s*[+~]/.test( query );
-
-					if ( !old ) {
-						context.setAttribute( "id", nid );
-					} else {
-						nid = nid.replace( /'/g, "\\$&" );
-					}
-					if ( relativeHierarchySelector && hasParent ) {
-						context = context.parentNode;
-					}
-
-					try {
-						if ( !relativeHierarchySelector || hasParent ) {
-							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
-						}
-
-					} catch(pseudoError) {
-					} finally {
-						if ( !old ) {
-							oldContext.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		// release memory in IE
-		div = null;
-	})();
-}
-
-(function(){
-	var html = document.documentElement,
-		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
-
-	if ( matches ) {
-		// Check to see if it's possible to do matchesSelector
-		// on a disconnected node (IE 9 fails this)
-		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
-			pseudoWorks = false;
-
-		try {
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( document.documentElement, "[test!='']:sizzle" );
-
-		} catch( pseudoError ) {
-			pseudoWorks = true;
-		}
-
-		Sizzle.matchesSelector = function( node, expr ) {
-			// Make sure that attribute selectors are quoted
-			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			if ( !Sizzle.isXML( node ) ) {
-				try {
-					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
-						var ret = matches.call( node, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || !disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9, so check for that
-								node.document && node.document.nodeType !== 11 ) {
-							return ret;
-						}
-					}
-				} catch(e) {}
-			}
-
-			return Sizzle(expr, null, null, [node]).length > 0;
-		};
-	}
-})();
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function( match, context, isXML ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	// release memory in IE
-	div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem[ expando ] === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem[ expando ] = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem[ expando ] === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem[ expando ] = doneName;
-						elem.sizset = i;
-					}
-
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-if ( document.documentElement.contains ) {
-	Sizzle.contains = function( a, b ) {
-		return a !== b && (a.contains ? a.contains(b) : true);
-	};
-
-} else if ( document.documentElement.compareDocumentPosition ) {
-	Sizzle.contains = function( a, b ) {
-		return !!(a.compareDocumentPosition(b) & 16);
-	};
-
-} else {
-	Sizzle.contains = function() {
-		return false;
-	};
-}
-
-Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context, seed ) {
-	var match,
-		tmpSet = [],
-		later = "",
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet, seed );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-Sizzle.selectors.attrMap = {};
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	slice = Array.prototype.slice,
-	POS = jQuery.expr.match.globalPOS,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var self = this,
-			i, l;
-
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			});
-		}
-
-		var ret = this.pushStack( "", "find", selector ),
-			length, n, r;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				POS.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var ret = [], i, l, cur = this[0];
-
-		// Array (deprecated as of jQuery 1.7)
-		if ( jQuery.isArray( selectors ) ) {
-			var level = 1;
-
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				for ( i = 0; i < selectors.length; i++ ) {
-
-					if ( jQuery( cur ).is( selectors[ i ] ) ) {
-						ret.push({ selector: selectors[ i ], elem: cur, level: level });
-					}
-				}
-
-				cur = cur.parentNode;
-				level++;
-			}
-
-			return ret;
-		}
-
-		// String
-		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-
-				} else {
-					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
-						break;
-					}
-				}
-			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-		return this.pushStack( ret, "closest", selectors );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, slice.call( arguments ).join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-
-
-
-
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-	safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style)/i,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	},
-	safeFragment = createSafeFragment( document );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery.clean(arguments) );
-			return set;
-		}
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					null;
-			}
-
-
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( elem.getElementsByTagName( "*" ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.length ?
-				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-				this;
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, fragment, parent,
-			value = args[0],
-			scripts = [];
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = jQuery.buildFragment( args, this, scripts );
-			}
-
-			fragment = results.fragment;
-
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						// Make sure that we do not leak memory by inadvertently discarding
-						// the original fragment (which might have attached data) instead of
-						// using it; in addition, use the original fragment object for the last
-						// item instead of first because it can end up being emptied incorrectly
-						// in certain situations (Bug #8070).
-						// Fragments from the fragment cache must always be cloned and never used
-						// in place.
-						results.cacheable || ( l > 1 && i < lastIndex ) ?
-							jQuery.clone( fragment, true, true ) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, function( i, elem ) {
-					if ( elem.src ) {
-						jQuery.ajax({
-							type: "GET",
-							global: false,
-							url: elem.src,
-							async: false,
-							dataType: "script"
-						});
-					} else {
-						jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
-					}
-
-					if ( elem.parentNode ) {
-						elem.parentNode.removeChild( elem );
-					}
-				});
-			}
-		}
-
-		return this;
-	}
-});
-
-function root( elem, cur ) {
-	return jQuery.nodeName(elem, "table") ?
-		(elem.getElementsByTagName("tbody")[0] ||
-		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-		elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
-
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 fail to clone children inside object elements that use
-	// the proprietary classid attribute value (rather than the type
-	// attribute) to identify the type of content to display
-	if ( nodeName === "object" ) {
-		dest.outerHTML = src.outerHTML;
-
-	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-		if ( src.checked ) {
-			dest.defaultChecked = dest.checked = src.checked;
-		}
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-
-	// IE blanks contents when cloning scripts
-	} else if ( nodeName === "script" && dest.text !== src.text ) {
-		dest.text = src.text;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-
-	// Clear flags for bubbling special change/submit events, they must
-	// be reattached when the newly cloned events are first activated
-	dest.removeAttribute( "_submit_attached" );
-	dest.removeAttribute( "_change_attached" );
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults, doc,
-	first = args[ 0 ];
-
-	// nodes may contain either an explicit document object,
-	// a jQuery collection or context object.
-	// If nodes[0] contains a valid object to assign to doc
-	if ( nodes && nodes[0] ) {
-		doc = nodes[0].ownerDocument || nodes[0];
-	}
-
-	// Ensure that an attr object doesn't incorrectly stand in as a document object
-	// Chrome and Firefox seem to allow this to occur and will throw exception
-	// Fixes #8950
-	if ( !doc.createDocumentFragment ) {
-		doc = document;
-	}
-
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-	if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
-		first.charAt(0) === "<" && !rnocache.test( first ) &&
-		(jQuery.support.checkClone || !rchecked.test( first )) &&
-		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-		cacheable = true;
-
-		cacheresults = jQuery.fragments[ first ];
-		if ( cacheresults && cacheresults !== 1 ) {
-			fragment = cacheresults;
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ first ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [],
-			insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = ( i > 0 ? this.clone(true) : this ).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
-			}
-
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-function getAll( elem ) {
-	if ( typeof elem.getElementsByTagName !== "undefined" ) {
-		return elem.getElementsByTagName( "*" );
-
-	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
-		return elem.querySelectorAll( "*" );
-
-	} else {
-		return [];
-	}
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( elem.type === "checkbox" || elem.type === "radio" ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-// Finds all inputs and passes them to fixDefaultChecked
-function findInputs( elem ) {
-	var nodeName = ( elem.nodeName || "" ).toLowerCase();
-	if ( nodeName === "input" ) {
-		fixDefaultChecked( elem );
-	// Skip scripts, get other children
-	} else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) {
-		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-	}
-}
-
-// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
-function shimCloneNode( elem ) {
-	var div = document.createElement( "div" );
-	safeFragment.appendChild( div );
-
-	div.innerHTML = elem.outerHTML;
-	return div.firstChild;
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var srcElements,
-			destElements,
-			i,
-			// IE<=8 does not properly clone detached, unknown element nodes
-			clone = jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ?
-				elem.cloneNode( true ) :
-				shimCloneNode( elem );
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					cloneFixAttributes( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
-
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
-
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		srcElements = destElements = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	clean: function( elems, context, fragment, scripts ) {
-		var checkScriptType, script, j,
-				ret = [];
-
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Trim whitespace, otherwise indexOf won't work as expected
-					var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
-						wrap = wrapMap[ tag ] || wrapMap._default,
-						depth = wrap[0],
-						div = context.createElement("div"),
-						safeChildNodes = safeFragment.childNodes,
-						remove;
-
-					// Append wrapper element to unknown element safe doc fragment
-					if ( context === document ) {
-						// Use the fragment we've already created for this document
-						safeFragment.appendChild( div );
-					} else {
-						// Use a fragment created with the owner document
-						createSafeFragment( context ).appendChild( div );
-					}
-
-					// Go to html and back, then peel off extra wrappers
-					div.innerHTML = wrap[1] + elem + wrap[2];
-
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						var hasBody = rtbody.test(elem),
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
-
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
-
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
-							}
-						}
-					}
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
-
-					elem = div.childNodes;
-
-					// Clear elements from DocumentFragment (safeFragment or otherwise)
-					// to avoid hoarding elements. Fixes #11356
-					if ( div ) {
-						div.parentNode.removeChild( div );
-
-						// Guard against -1 index exceptions in FF3.6
-						if ( safeChildNodes.length > 0 ) {
-							remove = safeChildNodes[ safeChildNodes.length - 1 ];
-
-							if ( remove && remove.parentNode ) {
-								remove.parentNode.removeChild( remove );
-							}
-						}
-					}
-				}
-			}
-
-			// Resets defaultChecked for any radios and checkboxes
-			// about to be appended to the DOM in IE 6/7 (#8060)
-			var len;
-			if ( !jQuery.support.appendChecked ) {
-				if ( elem[0] && typeof (len = elem.length) === "number" ) {
-					for ( j = 0; j < len; j++ ) {
-						findInputs( elem[j] );
-					}
-				} else {
-					findInputs( elem );
-				}
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			checkScriptType = function( elem ) {
-				return !elem.type || rscriptType.test( elem.type );
-			};
-			for ( i = 0; ret[i]; i++ ) {
-				script = ret[i];
-				if ( scripts && jQuery.nodeName( script, "script" ) && (!script.type || rscriptType.test( script.type )) ) {
-					scripts.push( script.parentNode ? script.parentNode.removeChild( script ) : script );
-
-				} else {
-					if ( script.nodeType === 1 ) {
-						var jsTags = jQuery.grep( script.getElementsByTagName( "script" ), checkScriptType );
-
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-					}
-					fragment.appendChild( script );
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	cleanData: function( elems ) {
-		var data, id,
-			cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-				continue;
-			}
-
-			id = elem[ jQuery.expando ];
-
-			if ( id ) {
-				data = cache[ id ];
-
-				if ( data && data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						// This is a shortcut to avoid jQuery.event.remove's overhead
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
-						}
-					}
-
-					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
-					if ( data.handle ) {
-						data.handle.elem = null;
-					}
-				}
-
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-
-				delete cache[ id ];
-			}
-		}
-	}
-});
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	// fixed for IE9, see #8346
-	rupper = /([A-Z]|^ms)/g,
-	rnum = /^[\-+]?(?:\d*\.)?\d+$/i,
-	rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
-	rrelNum = /^([\-+])=([\-+.\de]+)/,
-	rmargin = /^margin/,
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-
-	// order is important!
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-
-	curCSS,
-
-	getComputedStyle,
-	currentStyle;
-
-jQuery.fn.css = function( name, value ) {
-	return jQuery.access( this, function( elem, name, value ) {
-		return value !== undefined ?
-			jQuery.style( elem, name, value ) :
-			jQuery.css( elem, name );
-	}, name, value, arguments.length > 1 );
-};
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-
-				} else {
-					return elem.style.opacity;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, origName = jQuery.camelCase( name ),
-			style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra ) {
-		var ret, hooks;
-
-		// Make sure that we're working with the right name
-		name = jQuery.camelCase( name );
-		hooks = jQuery.cssHooks[ name ];
-		name = jQuery.cssProps[ name ] || name;
-
-		// cssFloat needs a special treatment
-		if ( name === "cssFloat" ) {
-			name = "float";
-		}
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
-			return ret;
-
-		// Otherwise, if a way to get the computed value exists, use that
-		} else if ( curCSS ) {
-			return curCSS( elem, name );
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {},
-			ret, name;
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.call( elem );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// DEPRECATED in 1.3, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, name ) {
-		var ret, defaultView, computedStyle, width,
-			style = elem.style;
-
-		name = name.replace( rupper, "-$1" ).toLowerCase();
-
-		if ( (defaultView = elem.ownerDocument.defaultView) &&
-				(computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-
-			ret = computedStyle.getPropertyValue( name );
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-		}
-
-		// A tribute to the "awesome hack by Dean Edwards"
-		// WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
-		// which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) {
-			width = style.width;
-			style.width = ret;
-			ret = computedStyle.width;
-			style.width = width;
-		}
-
-		return ret;
-	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
-		var left, rsLeft, uncomputed,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && (uncomputed = style[ name ]) ) {
-			ret = uncomputed;
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		if ( rnumnonpx.test( ret ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property
-	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		i = name === "width" ? 1 : 0,
-		len = 4;
-
-	if ( val > 0 ) {
-		if ( extra !== "border" ) {
-			for ( ; i < len; i += 2 ) {
-				if ( !extra ) {
-					val -= parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
-				}
-				if ( extra === "margin" ) {
-					val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
-				} else {
-					val -= parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-				}
-			}
-		}
-
-		return val + "px";
-	}
-
-	// Fall back to computed then uncomputed css if necessary
-	val = curCSS( elem, name );
-	if ( val < 0 || val == null ) {
-		val = elem.style[ name ];
-	}
-
-	// Computed unit is not pixels. Stop here and return.
-	if ( rnumnonpx.test(val) ) {
-		return val;
-	}
-
-	// Normalize "", auto, and prepare for extra
-	val = parseFloat( val ) || 0;
-
-	// Add padding, border, margin
-	if ( extra ) {
-		for ( ; i < len; i += 2 ) {
-			val += parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
-			if ( extra !== "padding" ) {
-				val += parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-			}
-			if ( extra === "margin" ) {
-				val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ]) ) || 0;
-			}
-		}
-	}
-
-	return val + "px";
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				if ( elem.offsetWidth !== 0 ) {
-					return getWidthOrHeight( elem, name, extra );
-				} else {
-					return jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					});
-				}
-			}
-		},
-
-		set: function( elem, value ) {
-			return rnum.test( value ) ?
-				value + "px" :
-				value;
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( parseFloat( RegExp.$1 ) / 100 ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there there is no filter style applied in a css rule, we are done
-				if ( currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery(function() {
-	// This hook cannot be added until DOM ready because the support test
-	// for it is not run until after DOM ready
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				return jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						return curCSS( elem, "margin-right" );
-					} else {
-						return elem.style.marginRight;
-					}
-				});
-			}
-		};
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth,
-			height = elem.offsetHeight;
-
-		return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i,
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ],
-				expanded = {};
-
-			for ( i = 0; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-});
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rspacesAjax = /\s+/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Document location
-	ajaxLocation,
-
-	// Document location segments
-	ajaxLocParts,
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = ["*/"] + ["*"];
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		if ( jQuery.isFunction( func ) ) {
-			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
-				i = 0,
-				length = dataTypes.length,
-				dataType,
-				list,
-				placeBefore;
-
-			// For each dataType in the dataTypeExpression
-			for ( ; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters ),
-		selection;
-
-	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
-			}
-		}
-	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-}
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" && _load ) {
-			return _load.apply( this, arguments );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf( " " );
-		if ( off >= 0 ) {
-			var selector = url.slice( off, url.length );
-			url = url.slice( 0, off );
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = undefined;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			// Complete callback (responseText is used internally)
-			complete: function( jqXHR, status, responseText ) {
-				// Store the response as specified by the jqXHR object
-				responseText = jqXHR.responseText;
-				// If successful, inject the HTML into all the matched elements
-				if ( jqXHR.isResolved() ) {
-					// #4825: Get the actual response in case
-					// a dataFilter is present in ajaxSettings
-					jqXHR.done(function( r ) {
-						responseText = r;
-					});
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [ responseText, status, jqXHR ] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-
-	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.on( o, f );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			type: method,
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	};
-});
-
-jQuery.extend({
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		if ( settings ) {
-			// Building a settings object
-			ajaxExtend( target, jQuery.ajaxSettings );
-		} else {
-			// Extending ajaxSettings
-			settings = target;
-			target = jQuery.ajaxSettings;
-		}
-		ajaxExtend( target, settings );
-		return target;
-	},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": allTypes
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			context: true,
-			url: true
-		}
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// ifModified key
-			ifModifiedKey,
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// The jqXHR state
-			state = 0,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Fake xhr
-			jqXHR = {
-
-				readyState: 0,
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || "abort";
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
-				}
-			};
-
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, nativeStatusText, responses, headers ) {
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			var isSuccess,
-				success,
-				error,
-				statusText = nativeStatusText,
-				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
-				lastModified,
-				etag;
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-
-					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
-						jQuery.lastModified[ ifModifiedKey ] = lastModified;
-					}
-					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
-						jQuery.etag[ ifModifiedKey ] = etag;
-					}
-				}
-
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
-
-				// If we have data
-				} else {
-
-					try {
-						success = ajaxConvert( s, response );
-						statusText = "success";
-						isSuccess = true;
-					} catch(e) {
-						// We have a parsererror
-						statusText = "parsererror";
-						error = e;
-					}
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = "" + ( nativeStatusText || statusText );
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.add;
-
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for ( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.then( tmp, tmp );
-				}
-			}
-			return this;
-		};
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
-
-		// Determine if a cross-domain request is in order
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return false;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
-
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-				// Abort if not done already
-				jqXHR.abort();
-				return false;
-
-		}
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [],
-			add = function( key, value ) {
-				// If value is a function, invoke it and return its value
-				value = jQuery.isFunction( value ) ? value() : value;
-				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-			};
-
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[ prefix ], traditional, add );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join( "&" ).replace( r20, "+" );
-	}
-});
-
-function buildParams( prefix, obj, traditional, add ) {
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( var name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields,
-		ct,
-		type,
-		finalDataType,
-		firstDataType;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	var dataTypes = s.dataTypes,
-		converters = {},
-		i,
-		key,
-		length = dataTypes.length,
-		tmp,
-		// Current and previous dataTypes
-		current = dataTypes[ 0 ],
-		prev,
-		// Conversion expression
-		conversion,
-		// Conversion function
-		conv,
-		// Conversion functions (transitive conversion)
-		conv1,
-		conv2;
-
-	// For each dataType in the chain
-	for ( i = 1; i < length; i++ ) {
-
-		// Create converters map
-		// with lowercased keys
-		if ( i === 1 ) {
-			for ( key in s.converters ) {
-				if ( typeof key === "string" ) {
-					converters[ key.toLowerCase() ] = s.converters[ key ];
-				}
-			}
-		}
-
-		// Get the dataTypes
-		prev = current;
-		current = dataTypes[ i ];
-
-		// If current is auto dataType, update it to prev
-		if ( current === "*" ) {
-			current = prev;
-		// If no auto and dataTypes are actually different
-		} else if ( prev !== "*" && prev !== current ) {
-
-			// Get the converter
-			conversion = prev + " " + current;
-			conv = converters[ conversion ] || converters[ "* " + current ];
-
-			// If there is no direct converter, search transitively
-			if ( !conv ) {
-				conv2 = undefined;
-				for ( conv1 in converters ) {
-					tmp = conv1.split( " " );
-					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
-						conv2 = converters[ tmp[1] + " " + current ];
-						if ( conv2 ) {
-							conv1 = converters[ conv1 ];
-							if ( conv1 === true ) {
-								conv = conv2;
-							} else if ( conv2 === true ) {
-								conv = conv1;
-							}
-							break;
-						}
-					}
-				}
-			}
-			// If we found no converter, dispatch an error
-			if ( !( conv || conv2 ) ) {
-				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
-			}
-			// If found converter is not an equivalence
-			if ( conv !== true ) {
-				// Convert with 1 or 2 converters accordingly
-				response = conv ? conv( response ) : conv2( conv1(response) );
-			}
-		}
-	}
-	return response;
-}
-
-
-
-
-var jsc = jQuery.now(),
-	jsre = /(\=)\?(&|$)|\?\?/i;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		return jQuery.expando + "_" + ( jsc++ );
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var inspectData = ( typeof s.data === "string" ) && /^application\/x\-www\-form\-urlencoded/.test( s.contentType );
-
-	if ( s.dataTypes[ 0 ] === "jsonp" ||
-		s.jsonp !== false && ( jsre.test( s.url ) ||
-				inspectData && jsre.test( s.data ) ) ) {
-
-		var responseContainer,
-			jsonpCallback = s.jsonpCallback =
-				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-			previous = window[ jsonpCallback ],
-			url = s.url,
-			data = s.data,
-			replace = "$1" + jsonpCallback + "$2";
-
-		if ( s.jsonp !== false ) {
-			url = url.replace( jsre, replace );
-			if ( s.url === url ) {
-				if ( inspectData ) {
-					data = data.replace( jsre, replace );
-				}
-				if ( s.data === data ) {
-					// Add callback manually
-					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
-				}
-			}
-		}
-
-		s.url = url;
-		s.data = data;
-
-		// Install callback
-		window[ jsonpCallback ] = function( response ) {
-			responseContainer = [ response ];
-		};
-
-		// Clean-up function
-		jqXHR.always(function() {
-			// Set callback back to previous value
-			window[ jsonpCallback ] = previous;
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( previous ) ) {
-				window[ jsonpCallback ]( responseContainer[ 0 ] );
-			}
-		});
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( jsonpCallback + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = "async";
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-
-						// Dereference the script
-						script = undefined;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0,
-	xhrCallbacks;
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var xhr = s.xhr(),
-						handle,
-						i;
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( _ ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									try {
-										responses.text = xhr.responseText;
-									} catch( _ ) {
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					// if we're in sync mode or it's in cache
-					// and has been retrieved directly (IE6 & IE7)
-					// we need to manually fire the callback
-					if ( !s.async || xhr.readyState === 4 ) {
-						callback();
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
-					}
-				}
-			};
-		}
-	});
-}
-
-
-
-
-var elemdisplay = {},
-	iframe, iframeDoc,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	],
-	fxNow;
-
-jQuery.fn.extend({
-	show: function( speed, easing, callback ) {
-		var elem, display;
-
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("show", 3), speed, easing, callback );
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				elem = this[ i ];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					// Reset the inline display of this element to learn if it is
-					// being hidden by cascaded rules or not
-					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
-						display = elem.style.display = "";
-					}
-
-					// Set elements which have been overridden with display: none
-					// in a stylesheet to whatever the default browser style is
-					// for such an element
-					if ( (display === "" && jQuery.css(elem, "display") === "none") ||
-						!jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-						jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-					}
-				}
-			}
-
-			// Set the display of most of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				elem = this[ i ];
-
-				if ( elem.style ) {
-					display = elem.style.display;
-
-					if ( display === "" || display === "none" ) {
-						elem.style.display = jQuery._data( elem, "olddisplay" ) || "";
-					}
-				}
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, easing, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, easing, callback);
-
-		} else {
-			var elem, display,
-				i = 0,
-				j = this.length;
-
-			for ( ; i < j; i++ ) {
-				elem = this[i];
-				if ( elem.style ) {
-					display = jQuery.css( elem, "display" );
-
-					if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) {
-						jQuery._data( elem, "olddisplay", display );
-					}
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				if ( this[i].style ) {
-					this[i].style.display = "none";
-				}
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2, callback ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2, callback);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, easing, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, easing, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed( speed, easing, callback );
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete, [ false ] );
-		}
-
-		// Do not change referenced properties as per-property easing will be lost
-		prop = jQuery.extend( {}, prop );
-
-		function doAnimation() {
-			// XXX 'this' does not always have a nodeName when running the
-			// test suite
-
-			if ( optall.queue === false ) {
-				jQuery._mark( this );
-			}
-
-			var opt = jQuery.extend( {}, optall ),
-				isElement = this.nodeType === 1,
-				hidden = isElement && jQuery(this).is(":hidden"),
-				name, val, p, e, hooks, replace,
-				parts, start, end, unit,
-				method;
-
-			// will store per property easing and be used to determine when an animation is complete
-			opt.animatedProperties = {};
-
-			// first pass over propertys to expand / normalize
-			for ( p in prop ) {
-				name = jQuery.camelCase( p );
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-				}
-
-				if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) {
-					replace = hooks.expand( prop[ name ] );
-					delete prop[ name ];
-
-					// not quite $.extend, this wont overwrite keys already present.
-					// also - reusing 'p' from above because we have the correct "name"
-					for ( p in replace ) {
-						if ( ! ( p in prop ) ) {
-							prop[ p ] = replace[ p ];
-						}
-					}
-				}
-			}
-
-			for ( name in prop ) {
-				val = prop[ name ];
-				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
-				if ( jQuery.isArray( val ) ) {
-					opt.animatedProperties[ name ] = val[ 1 ];
-					val = prop[ name ] = val[ 0 ];
-				} else {
-					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
-				}
-
-				if ( val === "hide" && hidden || val === "show" && !hidden ) {
-					return opt.complete.call( this );
-				}
-
-				if ( isElement && ( name === "height" || name === "width" ) ) {
-					// Make sure that nothing sneaks out
-					// Record all 3 overflow attributes because IE does not
-					// change the overflow attribute when overflowX and
-					// overflowY are set to the same value
-					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
-					// Set display property to inline-block for height/width
-					// animations on inline elements that are having width/height animated
-					if ( jQuery.css( this, "display" ) === "inline" &&
-							jQuery.css( this, "float" ) === "none" ) {
-
-						// inline-level elements accept inline-block;
-						// block-level elements need to be inline with layout
-						if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) {
-							this.style.display = "inline-block";
-
-						} else {
-							this.style.zoom = 1;
-						}
-					}
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			for ( p in prop ) {
-				e = new jQuery.fx( this, opt, p );
-				val = prop[ p ];
-
-				if ( rfxtypes.test( val ) ) {
-
-					// Tracks whether to show or hide based on private
-					// data attached to the element
-					method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 );
-					if ( method ) {
-						jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" );
-						e[ method ]();
-					} else {
-						e[ val ]();
-					}
-
-				} else {
-					parts = rfxnum.exec( val );
-					start = e.cur();
-
-					if ( parts ) {
-						end = parseFloat( parts[2] );
-						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							jQuery.style( this, p, (end || 1) + unit);
-							start = ( (end || 1) / e.cur() ) * start;
-							jQuery.style( this, p, start + unit);
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			}
-
-			// For JS strict compliance
-			return true;
-		}
-
-		return optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-
-	stop: function( type, clearQueue, gotoEnd ) {
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var index,
-				hadTimers = false,
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			// clear marker counters if we know they won't be
-			if ( !gotoEnd ) {
-				jQuery._unmark( true, this );
-			}
-
-			function stopQueue( elem, data, index ) {
-				var hooks = data[ index ];
-				jQuery.removeData( elem, index, true );
-				hooks.stop( gotoEnd );
-			}
-
-			if ( type == null ) {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) {
-						stopQueue( this, data, index );
-					}
-				}
-			} else if ( data[ index = type + ".run" ] && data[ index ].stop ){
-				stopQueue( this, data, index );
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					if ( gotoEnd ) {
-
-						// force the next step to be the last
-						timers[ index ]( true );
-					} else {
-						timers[ index ].saveState();
-					}
-					hadTimers = true;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( !( gotoEnd && hadTimers ) ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	}
-
-});
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout( clearFxNow, 0 );
-	return ( fxNow = jQuery.now() );
-}
-
-function clearFxNow() {
-	fxNow = undefined;
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx( "show", 1 ),
-	slideUp: genFx( "hide", 1 ),
-	slideToggle: genFx( "toggle", 1 ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-		// normalize opt.queue - true/undefined/null -> "fx"
-		if ( opt.queue == null || opt.queue === true ) {
-			opt.queue = "fx";
-		}
-
-		// Queueing
-		opt.old = opt.complete;
-
-		opt.complete = function( noUnmark ) {
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
-			}
-
-			if ( opt.queue ) {
-				jQuery.dequeue( this, opt.queue );
-			} else if ( noUnmark !== false ) {
-				jQuery._unmark( this );
-			}
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p ) {
-			return p;
-		},
-		swing: function( p ) {
-			return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5;
-		}
-	},
-
-	timers: [],
-
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		options.orig = options.orig || {};
-	}
-
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this );
-	},
-
-	// Get the current size
-	cur: function() {
-		if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var parsed,
-			r = jQuery.css( this.elem, this.prop );
-		// Empty strings, null, undefined and "auto" are converted to 0,
-		// complex values such as "rotate(1rad)" are returned as is,
-		// simple values such as "10px" are parsed to Float.
-		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		var self = this,
-			fx = jQuery.fx;
-
-		this.startTime = fxNow || createFxNow();
-		this.end = to;
-		this.now = this.start = from;
-		this.pos = this.state = 0;
-		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
-
-		function t( gotoEnd ) {
-			return self.step( gotoEnd );
-		}
-
-		t.queue = this.options.queue;
-		t.elem = this.elem;
-		t.saveState = function() {
-			if ( jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
-				if ( self.options.hide ) {
-					jQuery._data( self.elem, "fxshow" + self.prop, self.start );
-				} else if ( self.options.show ) {
-					jQuery._data( self.elem, "fxshow" + self.prop, self.end );
-				}
-			}
-		};
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval( fx.tick, fx.interval );
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		var dataShow = jQuery._data( this.elem, "fxshow" + this.prop );
-
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any flash of content
-		if ( dataShow !== undefined ) {
-			// This show is picking up where a previous hide or show left off
-			this.custom( this.cur(), dataShow );
-		} else {
-			this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() );
-		}
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom( this.cur(), 0 );
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var p, n, complete,
-			t = fxNow || createFxNow(),
-			done = true,
-			elem = this.elem,
-			options = this.options;
-
-		if ( gotoEnd || t >= options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			options.animatedProperties[ this.prop ] = true;
-
-			for ( p in options.animatedProperties ) {
-				if ( options.animatedProperties[ p ] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				// Reset the overflow
-				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-
-					jQuery.each( [ "", "X", "Y" ], function( index, value ) {
-						elem.style[ "overflow" + value ] = options.overflow[ index ];
-					});
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( options.hide ) {
-					jQuery( elem ).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( options.hide || options.show ) {
-					for ( p in options.animatedProperties ) {
-						jQuery.style( elem, p, options.orig[ p ] );
-						jQuery.removeData( elem, "fxshow" + p, true );
-						// Toggle data is no longer needed
-						jQuery.removeData( elem, "toggle" + p, true );
-					}
-				}
-
-				// Execute the complete function
-				// in the event that the complete function throws an exception
-				// we must ensure it won't be called twice. #5684
-
-				complete = options.complete;
-				if ( complete ) {
-
-					options.complete = false;
-					complete.call( elem );
-				}
-			}
-
-			return false;
-
-		} else {
-			// classical easing cannot be used with an Infinity duration
-			if ( options.duration == Infinity ) {
-				this.now = t;
-			} else {
-				n = t - this.startTime;
-				this.state = n / options.duration;
-
-				// Perform the easing function, defaults to swing
-				this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration );
-				this.now = this.start + ( (this.end - this.start) * this.pos );
-			}
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-};
-
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		var timer,
-			timers = jQuery.timers,
-			i = 0;
-
-		for ( ; i < timers.length; i++ ) {
-			timer = timers[ i ];
-			// Checks the timer has not already been removed
-			if ( !timer() && timers[ i ] === timer ) {
-				timers.splice( i--, 1 );
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-
-	interval: 13,
-
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-
-	speeds: {
-		slow: 600,
-		fast: 200,
-		// Default speed
-		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style( fx.elem, "opacity", fx.now );
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-// Ensure props that can't be negative don't go there on undershoot easing
-jQuery.each( fxAttrs.concat.apply( [], fxAttrs ), function( i, prop ) {
-	// exclude marginTop, marginLeft, marginBottom and marginRight from this list
-	if ( prop.indexOf( "margin" ) ) {
-		jQuery.fx.step[ prop ] = function( fx ) {
-			jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
-		};
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-// Try to restore the default display value of an element
-function defaultDisplay( nodeName ) {
-
-	if ( !elemdisplay[ nodeName ] ) {
-
-		var body = document.body,
-			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
-			display = elem.css( "display" );
-		elem.remove();
-
-		// If the simple way fails,
-		// get element's real default display by attaching it to a temp iframe
-		if ( display === "none" || display === "" ) {
-			// No iframe to use yet, so create it
-			if ( !iframe ) {
-				iframe = document.createElement( "iframe" );
-				iframe.frameBorder = iframe.width = iframe.height = 0;
-			}
-
-			body.appendChild( iframe );
-
-			// Create a cacheable copy of the iframe document on first call.
-			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-			// document to it; WebKit & Firefox won't allow reusing the iframe document.
-			if ( !iframeDoc || !iframe.createElement ) {
-				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-				iframeDoc.write( ( jQuery.support.boxModel ? "<!doctype html>" : "" ) + "<html><body>" );
-				iframeDoc.close();
-			}
-
-			elem = iframeDoc.createElement( nodeName );
-
-			iframeDoc.body.appendChild( elem );
-
-			display = jQuery.css( elem, "display" );
-			body.removeChild( iframe );
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return elemdisplay[ nodeName ];
-}
-
-
-
-
-var getOffset,
-	rtable = /^t(?:able|d|h)$/i,
-	rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
-	getOffset = function( elem, doc, docElem, box ) {
-		try {
-			box = elem.getBoundingClientRect();
-		} catch(e) {}
-
-		// Make sure we're not dealing with a disconnected DOM node
-		if ( !box || !jQuery.contains( docElem, elem ) ) {
-			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
-		}
-
-		var body = doc.body,
-			win = getWindow( doc ),
-			clientTop  = docElem.clientTop  || body.clientTop  || 0,
-			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
-			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
-			top  = box.top  + scrollTop  - clientTop,
-			left = box.left + scrollLeft - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	getOffset = function( elem, doc, docElem ) {
-		var computedStyle,
-			offsetParent = elem.offsetParent,
-			prevOffsetParent = elem,
-			body = doc.body,
-			defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop,
-			left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent;
-				offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var elem = this[0],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return null;
-	}
-
-	if ( elem === doc.body ) {
-		return jQuery.offset.bodyOffset( elem );
-	}
-
-	return getOffset( elem, doc, doc.documentElement );
-};
-
-jQuery.offset = {
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					jQuery.support.boxModel && win.document.documentElement[ method ] ||
-						win.document.body[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					 top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-
-
-
-// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	var clientProp = "client" + name,
-		scrollProp = "scroll" + name,
-		offsetProp = "offset" + name;
-
-	// innerHeight and innerWidth
-	jQuery.fn[ "inner" + name ] = function() {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, "padding" ) ) :
-			this[ type ]() :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn[ "outer" + name ] = function( margin ) {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
-			this[ type ]() :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( value ) {
-		return jQuery.access( this, function( elem, type, value ) {
-			var doc, docElemProp, orig, ret;
-
-			if ( jQuery.isWindow( elem ) ) {
-				// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
-				doc = elem.document;
-				docElemProp = doc.documentElement[ clientProp ];
-				return jQuery.support.boxModel && docElemProp ||
-					doc.body && doc.body[ clientProp ] || docElemProp;
-			}
-
-			// Get document width or height
-			if ( elem.nodeType === 9 ) {
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				doc = elem.documentElement;
-
-				// when a window > document, IE6 reports a offset[Width/Height] > client[Width/Height]
-				// so we can't use max, as it'll choose the incorrect offset[Width/Height]
-				// instead we use the correct client[Width/Height]
-				// support:IE6
-				if ( doc[ clientProp ] >= doc[ scrollProp ] ) {
-					return doc[ clientProp ];
-				}
-
-				return Math.max(
-					elem.body[ scrollProp ], doc[ scrollProp ],
-					elem.body[ offsetProp ], doc[ offsetProp ]
-				);
-			}
-
-			// Get width or height on the element
-			if ( value === undefined ) {
-				orig = jQuery.css( elem, type );
-				ret = parseFloat( orig );
-				return jQuery.isNumeric( ret ) ? ret : orig;
-			}
-
-			// Set the width or height on the element
-			jQuery( elem ).css( type, value );
-		}, type, value, arguments.length, null );
-	};
-});
-
-
-
-
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
-
-
-})( window );
diff --git a/web/skins/classic/js/jquery.js b/web/skins/classic/js/jquery.js
index 7fd8dd581..f5f467b53 120000
--- a/web/skins/classic/js/jquery.js
+++ b/web/skins/classic/js/jquery.js
@@ -1 +1 @@
-jquery-1.7.2.js
\ No newline at end of file
+jquery-1.11.3.js
\ No newline at end of file
diff --git a/web/skins/classic/js/jquery.url b/web/skins/classic/js/jquery.url
index 71bd33d91..7aad66a58 100644
--- a/web/skins/classic/js/jquery.url
+++ b/web/skins/classic/js/jquery.url
@@ -1 +1 @@
-http://code.jquery.com/jquery-1.7.2.js
+http://code.jquery.com/jquery-1.11.3.js

From 3a512f87a56c986154bc92ecc47197575ab79d57 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 10:57:52 -0500
Subject: [PATCH 258/362] Log the reason for croaking before croaking.

---
 .../lib/ZoneMinder/Trigger/Channel/Unix.pm    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
index 71d6e89fc..ea74c957e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
@@ -63,9 +63,18 @@ sub open
     local *sfh;
     unlink( $self->{path} );
     my $saddr = sockaddr_un( $self->{path} );
-    socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" );
-    bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-    listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
+    if ( ! socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) ) {
+		Error( "Can't open unix socket at $$self{path}: $!" );
+		croak( "Can't open unix socket at $$self{path}: $!" );
+	}
+    if ( ! bind( *sfh, $saddr ) ) {
+		Error( "Can't bind unix socket at $$self{path}: $!" );
+		croak( "Can't bind unix socket at $$self{path}: $!" );
+	}
+    if ( ! listen( *sfh, SOMAXCONN ) ) {
+		Error( "Can't listen: $!" );
+		croak( "Can't listen: $!" );
+	}
     $self->{handle} = *sfh;
 }
 
@@ -93,12 +102,11 @@ __END__
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Trigger::Channel::Unix - Object for Unix socket channel
 
 =head1 SYNOPSIS
 
-  use ZoneMinder::Database;
-  blah blah blah
+See zmtrigger.pl 
 
 =head1 DESCRIPTION
 

From 327a01cb2003538f308031401c0fb8b49724118b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 10:59:40 -0500
Subject: [PATCH 259/362] Log error before croaking and show path to file in
 the error message

---
 scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
index 6c4254a7e..0a4bdea8a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
@@ -62,7 +62,10 @@ sub open
     local *sfh;
     #sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
     #open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
-    open( *sfh, "+<", $self->{path} ) or croak( "Can't open: $!" );
+    if ( ! open( *sfh, "+<", $self->{path} ) ) {
+		Error( "Can't open file at $$self{path}: $!" );
+		croak( "Can't open file at $$self{path}: $!" );
+	}
     $self->{state} = 'open';
     $self->{handle} = *sfh;
 }
@@ -73,7 +76,7 @@ __END__
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Trigger::Channel::File - ZOneMinder object for a file based trigger channel
 
 =head1 SYNOPSIS
 

From 64c5b64068b72a22e9030a67ebd351d63f83fce3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 11:04:02 -0500
Subject: [PATCH 260/362] Log error before croaking and include port# in the
 error message

---
 .../lib/ZoneMinder/Trigger/Channel/Inet.pm    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
index 6c5f21961..0f977f3da 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
@@ -61,12 +61,21 @@ sub open
 {
     my $self = shift;
     local *sfh;
-    my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
-    socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') )
-        or croak( "Can't open socket: $!" );
+    if ( ! socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) ) {
+        Error( "Can't open socket: $!" );
+        croak( "Can't open socket: $!" );
+	}
     setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
-    bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-    listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
+
+    my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
+    if ( ! bind( *sfh, $saddr ) ) {
+		Error( "Can't bind to port $$self{port}: $!" );
+		croak( "Can't bind to port $$self{port}: $!" );
+	}
+    if ( ! listen( *sfh, SOMAXCONN ) ) {
+		Error( "Can't listen: $!" );
+		croak( "Can't listen: $!" );
+	}
     $self->{state} = 'open';
     $self->{handle} = *sfh;
 }
@@ -95,7 +104,7 @@ __END__
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Trigger::Channel::Inet
 
 =head1 SYNOPSIS
 

From 3b07b5640018094b3e639eaa0cb2ea7019d8424f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 11:05:55 -0500
Subject: [PATCH 261/362] Use more descriptive names for the channels

---
 scripts/zmtrigger.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 55166a492..68bcbde93 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -135,14 +135,14 @@ use ZoneMinder::Trigger::Connection;
 my @connections;
 push( @connections,
       ZoneMinder::Trigger::Connection->new(
-        name=>"Chan1",
+        name=>"Chan1 TCP on port 6802",
         channel=>ZoneMinder::Trigger::Channel::Inet->new( port=>6802 ),
         mode=>"rw"
       )
 );
 push( @connections,
       ZoneMinder::Trigger::Connection->new(
-        name=>"Chan2",
+        name=>"Chan2 Unix Socket at " $Config{ZM_PATH_SOCKS}.'/zmtrigger.sock',
         channel=>ZoneMinder::Trigger::Channel::Unix->new(
                     path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock'
                  ),

From 826a22a2a8cc33effb5c9080b612280de433fcd8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 11:07:06 -0500
Subject: [PATCH 262/362] add missing .

---
 scripts/zmtrigger.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 68bcbde93..222e42f79 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -142,7 +142,7 @@ push( @connections,
 );
 push( @connections,
       ZoneMinder::Trigger::Connection->new(
-        name=>"Chan2 Unix Socket at " $Config{ZM_PATH_SOCKS}.'/zmtrigger.sock',
+        name=>"Chan2 Unix Socket at " . $Config{ZM_PATH_SOCKS}.'/zmtrigger.sock',
         channel=>ZoneMinder::Trigger::Channel::Unix->new(
                     path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock'
                  ),

From 5b047dc74b4105b39cacc675eabb8ed9f033cee3 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Sat, 20 Feb 2016 23:58:07 +0200
Subject: [PATCH 263/362] zm_event: fix overlap in memcpy buffers

---
 src/zm_event.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 1f1fb0f0b..a34ce50a0 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -1121,7 +1121,7 @@ void EventStream::processCommand( const CmdMsg *msg )
 
     DataMsg status_msg;
     status_msg.msg_type = MSG_DATA_EVENT;
-    memcpy( &status_msg.msg_data, &status_data, sizeof(status_msg.msg_data) );
+    memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
     if ( sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) ) < 0 )
     {
         //if ( errno != EAGAIN )

From 2fc1fc4380d7e4592b0175a3914776310ba03670 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 22 Feb 2016 09:18:46 -0600
Subject: [PATCH 264/362] use debian control file to auto-install deps

---
 docs/installationguide/ubuntu.rst | 4 +---
 utils/do_debian_package.sh        | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 54df8529a..bad2b651d 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -294,14 +294,12 @@ Harder Way: Build Package From Source
 	chmod a+x do_debian_package.sh
 
 
-**Step 2:** Install some core dependencies
+**Step 2:** Update the system
 
 ::
 
 	sudo apt-get update
 
-	sudo apt-get install git cmake pbuilder debhelper sphinx-common apache2-dev dh-linktree dh-systemd libavcodec-ffmpeg-dev libavformat-ffmpeg-dev libswscale-ffmpeg-dev libavutil-ffmpeg-dev libavdevice-ffmpeg-dev libbz2-dev libdate-manip-perl libdbd-mysql-perl libgcrypt-dev libcurl4-gnutls-dev libgnutls-openssl-dev libjpeg-dev libmysqlclient-dev libpcre3-dev libphp-serialization-perl libpolkit-gobject-1-dev libsys-mmap-perl libv4l-dev libvlc-dev libjs-mootools mysql-server apache2 libapache2-mod-php5 gdebi
-
 
 **Step 3** Create the package
 
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 2b4e88f54..6fff59967 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -52,6 +52,10 @@ else
 ln -sf distros/ubuntu1504_cmake debian
 fi;
 
+# Auto-install all ZoneMinder's depedencies using the Debian control file
+sudo apt-get install devscripts equivs
+sudo mk-build-deps -ir ./debian/control
+
 if [ -z `hostname -d` ] ; then
     AUTHOR="`getent passwd $USER | cut -d ':' -f 5 | cut -d ',' -f 1` <`whoami`@`hostname`.local>"
 else

From 7a42a8c3f96dfffdc360b297d6b26157b8bd5b97 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Wed, 24 Feb 2016 10:15:59 -0600
Subject: [PATCH 265/362] add Netcat ONVIF compatible ptz control

---
 db/zm_create.sql.in                           |   1 +
 .../lib/ZoneMinder/Control/Netcat.pm          | 483 ++++++++++++++++++
 2 files changed, 484 insertions(+)
 create mode 100644 scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 7b0a370ee..3614bfedd 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -593,6 +593,7 @@ INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWP
 INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
 INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Libvlc','IPCC7210W', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
 INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 
 --
 -- Add some monitor preset values
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
new file mode 100644
index 000000000..0e273b5b7
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
@@ -0,0 +1,483 @@
+# ==========================================================================
+#
+# ZoneMinder Netcat IP Control Protocol Module, $Date: 2009-11-25 09:20:00 +0000 (Wed, 04 Nov 2009) $, $Revision: 0001 $
+# Copyright (C) 2001-2008 Philip Coombes
+# Converted for use with Netcat IP Camera by Andrew Bauer (knnniggett@users.sourceforge.net)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the first implementation of the Netcat IP camera control
+# protocol
+#
+package ZoneMinder::Control::Netcat;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+our %CamParams = ();
+
+# ==========================================================================
+#
+# Netcat IP Control Protocol
+# This script sends ONVIF compliant commands and may work with other cameras
+#
+# The Netcat camera gladly accepts any command with or without authentication,
+# which prevented me from developing Onvif authentication in this control script.
+#
+# Basic preset functions are supported, but more advanced features, which make
+# use of abnormally high preset numbers (ir lamp control, tours, pan speed, etc)
+# may or may not work.
+# 
+#
+# Possible future improvements (for anyone to improve upon):
+#    - Onvif authentication
+#    - Build the SOAP commands at runtime rather than use templates
+#    - Implement previously mentioned advanced features
+#
+# Implementing the first two will require additional Perl modules, and adding
+# more dependencies to ZoneMinder is always a concern.
+#
+# On ControlAddress use the format :
+#   ADDRESS:PORT
+#   eg : 10.1.2.1:8899
+#        10.0.100.1:8899
+#
+# Use port 8899 for the Netcat camera
+#
+# Make sure and place a value in the Auto Stop Timeout field.
+# Recommend starting with a value of 1 second, and adjust accordingly.
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{ 
+
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    my $logindetails = "";
+    bless( $self, $class );
+    srand( time() );
+    return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref( ) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+        Fatal( "Can't access $name member of object of class $class" );
+    }
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub close
+{ 
+    my $self = shift;
+    $self->{state} = 'closed';
+}
+
+sub printMsg
+{
+    my $self = shift;
+    my $msg = shift;
+    my $msg_len = length($msg);
+
+    Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+    my $msg = shift;
+    my $content_type = shift;
+    my $result = undef;
+
+    printMsg( $cmd, "Tx" );
+
+    my $server_endpoint = "http://".$self->{Monitor}->{ControlAddress}."/$cmd";
+    my $req = HTTP::Request->new( POST => $server_endpoint );
+    $req->header('content-type' => $content_type);
+    $req->header('Host' => $self->{Monitor}->{ControlAddress});
+    $req->header('content-length' => length($msg));
+    $req->header('accept-encoding' => 'gzip, deflate');
+    $req->header('connection' => 'Close');
+    $req->content($msg);
+
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success ) {
+        $result = !undef;
+    } else {
+        Error( "After sending PTZ command, camera returned the following error:'".$res->status_line()."'" );
+    }
+    return( $result );
+}
+
+sub getCamParams
+{
+    my $self = shift;
+    my $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><GetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken></GetImagingSettings></s:Body></s:Envelope>';
+    my $server_endpoint = "http://".$self->{Monitor}->{ControlAddress}."/onvif/imaging";
+    my $req = HTTP::Request->new( POST => $server_endpoint );
+    $req->header('content-type' => 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/GetImagingSettings"');
+    $req->header('Host' => $self->{Monitor}->{ControlAddress});
+    $req->header('content-length' => length($msg));
+    $req->header('accept-encoding' => 'gzip, deflate');
+    $req->header('connection' => 'Close');
+    $req->content($msg);
+
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success ) {
+        # We should really use an xml or soap library to parse the xml tags
+        my $content = $res->decoded_content;
+
+        if ($content =~ /.*<tt:(Brightness)>(.+)<\/tt:Brightness>.*/) {
+            $CamParams{$1} = $2;
+        }
+        if ($content =~ /.*<tt:(Contrast)>(.+)<\/tt:Contrast>.*/) {
+            $CamParams{$1} = $2;
+        }
+    } 
+    else
+    {
+        Error( "Unable to retrieve camera image settings:'".$res->status_line()."'" );
+    }
+}
+
+#autoStop
+#This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
+sub autoStop
+{
+    my $self = shift;
+    my $autostop = shift;
+
+    if( $autostop ) {
+        Debug( "Auto Stop" );
+        my $cmd = 'onvif/PTZ';
+        my $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><PanTilt>true</PanTilt><Zoom>false</Zoom></Stop></s:Body></s:Envelope>';
+        my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+        usleep( $autostop );
+        $self->sendCmd( $cmd, $msg, $content_type );
+    }
+}
+
+# Reset the Camera
+sub reset
+{
+    Debug( "Camera Reset" );
+    my $self = shift;
+    my $cmd = "";
+    my $msg = '<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SystemReboot xmlns="http://www.onvif.org/ver10/device/wsdl"/></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver10/device/wsdl/SystemReboot"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+#Up Arrow
+sub moveConUp
+{
+    Debug( "Move Up" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="0" y="0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Down Arrow
+sub moveConDown
+{
+    Debug( "Move Down" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="0" y="-0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Left Arrow
+sub moveConLeft
+{
+    Debug( "Move Left" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="-0.49" y="0" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Right Arrow
+sub moveConRight
+{
+    Debug( "Move Right" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="0.49" y="0" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Zoom In
+sub zoomConTele
+{
+    Debug( "Zoom Tele" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><Zoom x="0.49" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Zoom Out
+sub zoomConWide
+{
+    Debug( "Zoom Wide" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><Zoom x="-0.49" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Diagonally Up Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpRight
+{
+    Debug( "Move Diagonally Up Right" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="0.5" y="0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Diagonally Down Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownRight
+{
+    Debug( "Move Diagonally Down Right" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="0.5" y="-0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Diagonally Up Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpLeft
+{
+    Debug( "Move Diagonally Up Left" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="-0.5" y="0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Diagonally Down Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownLeft
+{
+    Debug( "Move Diagonally Down Left" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><Velocity><PanTilt x="-0.5" y="-0.5" xmlns="http://www.onvif.org/ver10/schema"/></Velocity></ContinuousMove></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+    $self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Stop
+sub moveStop
+{
+    Debug( "Move Stop" );
+    my $self = shift;
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><PanTilt>true</PanTilt><Zoom>false</Zoom></Stop></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+#Set Camera Preset
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Set Preset $preset" );
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetPreset xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><PresetToken>'.$preset.'</PresetToken></SetPreset></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/SetPreset"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+#Recall Camera Preset
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Goto Preset $preset" );
+    my $cmd = 'onvif/PTZ';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><GotoPreset xmlns="http://www.onvif.org/ver20/ptz/wsdl"><ProfileToken>000</ProfileToken><PresetToken>'.$preset.'</PresetToken></GotoPreset></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+#Horizontal Patrol
+#To be determined if this camera supports this feature
+sub horizontalPatrol
+{
+    Debug( "Horizontal Patrol" );
+    my $self = shift;
+    my $cmd = '';
+    my $msg ='';
+    my $content_type = '';
+#    $self->sendCmd( $cmd, $msg, $content_type );
+    Error( "PTZ Command not implemented in control script." );
+}
+
+#Horizontal Patrol Stop
+#To be determined if this camera supports this feature
+sub horizontalPatrolStop
+{
+    Debug( "Horizontal Patrol Stop" );
+    my $self = shift;
+    my $cmd = '';
+    my $msg ='';
+    my $content_type = '';
+#    $self->sendCmd( $cmd, $msg, $content_type );
+    Error( "PTZ Command not implemented in control script." );
+}
+
+# Increase Brightness
+sub irisAbsOpen
+{
+    Debug( "Iris $CamParams{'Brightness'}" );
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'Brightness'});
+    my $step = $self->getParam( $params, 'step' );
+    my $max = 100;
+
+    $CamParams{'Brightness'} += $step;
+    $CamParams{'Brightness'} = $max if ($CamParams{'Brightness'} > $max);
+
+    my $cmd = 'onvif/imaging';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{'Brightness'}.'</Brightness></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+# Decrease Brightness
+sub irisAbsClose
+{
+    Debug( "Iris $CamParams{'Brightness'}" );
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'brightness'});
+    my $step = $self->getParam( $params, 'step' );
+    my $min = 0;
+
+    $CamParams{'Brightness'} -= $step;
+    $CamParams{'Brightness'} = $min if ($CamParams{'Brightness'} < $min);
+
+    my $cmd = 'onvif/imaging';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{'Brightness'}.'</Brightness></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+    $self->sendCmd( $cmd, $msg, $content_type );
+}
+
+# Increase Contrast
+sub whiteAbsIn
+{
+    Debug( "Iris $CamParams{'Contrast'}" );
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'Contrast'});
+    my $step = $self->getParam( $params, 'step' );
+    my $max = 100;
+
+    $CamParams{'Contrast'} += $step;
+    $CamParams{'Contrast'} = $max if ($CamParams{'Contrast'} > $max);
+
+    my $cmd = 'onvif/imaging';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{'Contrast'}.'</Contrast></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+}
+
+# Decrease Contrast
+sub whiteAbsOut
+{
+    Debug( "Iris $CamParams{'Contrast'}" );
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'Contrast'});
+    my $step = $self->getParam( $params, 'step' );
+    my $min = 0;
+
+    $CamParams{'Contrast'} -= $step;
+    $CamParams{'Contrast'} = $min if ($CamParams{'Contrast'} < $min);
+
+    my $cmd = 'onvif/imaging';
+    my $msg ='<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope"><s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl"><VideoSourceToken>000</VideoSourceToken><ImagingSettings><Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{'Contrast'}.'</Contrast></ImagingSettings><ForcePersistence>true</ForcePersistence></SetImagingSettings></s:Body></s:Envelope>';
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+}
+
+1;
+

From 4fd984f30b23fc86e6ddf28d16fe5cea16259266 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 25 Feb 2016 22:32:18 +1100
Subject: [PATCH 266/362] ffmpeg 3.0.0 build

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eeb99bd96..c4bd95bc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
 install:
-  - git clone -b n2.8.6 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n3.0.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 

From b53e9e7dadfbd09d754408046aebce3a49133fc5 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 25 Feb 2016 22:38:19 +1100
Subject: [PATCH 267/362] ffmpeg 3.0 too many 0000s

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c4bd95bc9..03fcb2c2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
 install:
-  - git clone -b n3.0.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n3.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 

From b294f210dc765a6a06df5dd92614d8eb53f1ea22 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 25 Feb 2016 23:25:24 +1100
Subject: [PATCH 268/362] Update to CakePHP 2.8.0 copy in lib folder

---
 web/api/lib/Cake/Cache/Cache.php              |  228 +--
 web/api/lib/Cake/Cache/CacheEngine.php        |   34 +-
 web/api/lib/Cake/Cache/Engine/ApcEngine.php   |   54 +-
 web/api/lib/Cake/Cache/Engine/FileEngine.php  |   67 +-
 .../lib/Cake/Cache/Engine/MemcacheEngine.php  |   48 +-
 .../lib/Cake/Cache/Engine/MemcachedEngine.php |   69 +-
 web/api/lib/Cake/Cache/Engine/RedisEngine.php |   73 +-
 .../lib/Cake/Cache/Engine/WincacheEngine.php  |   37 +-
 .../lib/Cake/Cache/Engine/XcacheEngine.php    |   43 +-
 web/api/lib/Cake/Config/routes.php            |   13 +-
 .../Cake/Configure/ConfigReaderInterface.php  |    4 +-
 web/api/lib/Cake/Configure/IniReader.php      |   13 +-
 web/api/lib/Cake/Configure/PhpReader.php      |   10 +-
 web/api/lib/Cake/Console/Command/AclShell.php |   14 +-
 .../Cake/Console/Command/CommandListShell.php |    4 +-
 .../Cake/Console/Command/CompletionShell.php  |    2 +-
 .../lib/Cake/Console/Command/ConsoleShell.php |   28 +-
 .../lib/Cake/Console/Command/SchemaShell.php  |   56 +-
 .../lib/Cake/Console/Command/ServerShell.php  |   12 +-
 .../Cake/Console/Command/Task/BakeTask.php    |    2 +-
 .../Cake/Console/Command/Task/CommandTask.php |   12 +-
 .../Console/Command/Task/ControllerTask.php   |   27 +-
 .../Console/Command/Task/DbConfigTask.php     |    8 +-
 .../Cake/Console/Command/Task/ExtractTask.php |  173 ++-
 .../Cake/Console/Command/Task/FixtureTask.php |   25 +-
 .../Cake/Console/Command/Task/ModelTask.php   |   42 +-
 .../Cake/Console/Command/Task/PluginTask.php  |   29 +-
 .../Cake/Console/Command/Task/ProjectTask.php |   33 +-
 .../Cake/Console/Command/Task/TestTask.php    |   14 +-
 .../Cake/Console/Command/Task/ViewTask.php    |   16 +-
 .../lib/Cake/Console/Command/TestShell.php    |   13 +-
 .../lib/Cake/Console/Command/UpgradeShell.php |   33 +-
 .../lib/Cake/Console/ConsoleErrorHandler.php  |   26 +-
 web/api/lib/Cake/Console/ConsoleInput.php     |    8 +-
 .../lib/Cake/Console/ConsoleInputArgument.php |   12 +-
 .../lib/Cake/Console/ConsoleInputOption.php   |   12 +-
 .../Cake/Console/ConsoleInputSubcommand.php   |    2 +-
 .../lib/Cake/Console/ConsoleOptionParser.php  |   47 +-
 web/api/lib/Cake/Console/ConsoleOutput.php    |  103 +-
 web/api/lib/Cake/Console/HelpFormatter.php    |   26 +-
 .../Cake/Console/Helper/BaseShellHelper.php   |   82 +
 .../Console/Helper/ProgressShellHelper.php    |  122 ++
 .../Cake/Console/Helper/TableShellHelper.php  |  124 ++
 web/api/lib/Cake/Console/Shell.php            |  159 +-
 web/api/lib/Cake/Console/ShellDispatcher.php  |   23 +-
 web/api/lib/Cake/Console/TaskCollection.php   |    6 +-
 .../default/actions/controller_actions.ctp    |   12 +-
 .../Templates/default/classes/controller.ctp  |    6 +-
 .../Templates/default/classes/fixture.ctp     |    3 +-
 .../Templates/default/classes/model.ctp       |    2 +-
 .../Templates/default/classes/test.ctp        |    1 -
 .../Console/Templates/default/views/form.ctp  |    6 +-
 .../Console/Templates/default/views/index.ctp |   10 +-
 .../Console/Templates/default/views/view.ctp  |   10 +-
 .../lib/Cake/Console/Templates/skel/.htaccess |    6 +-
 .../Templates/skel/Config/Schema/db_acl.php   |   26 +-
 .../Templates/skel/Config/Schema/db_acl.sql   |   13 +-
 .../Templates/skel/Config/Schema/i18n.php     |   32 +-
 .../Templates/skel/Config/Schema/sessions.php |   35 +-
 .../Templates/skel/Config/bootstrap.php       |    5 +-
 .../Console/Templates/skel/Config/core.php    |    5 -
 .../skel/Config/database.php.default          |    2 -
 .../Templates/skel/Config/email.php.default   |    1 -
 .../Console/Templates/skel/Console/cake.php   |   23 +-
 .../skel/Controller/PagesController.php       |    3 +-
 .../Templates/skel/Test/Case/AllTestsTest.php |    5 +
 .../skel/View/Elements/Flash/default.ctp      |    1 +
 .../skel/View/Emails/html/default.ctp         |    5 +-
 .../skel/View/Emails/text/default.ctp         |    2 -
 .../Templates/skel/View/Errors/error400.ctp   |    3 -
 .../Templates/skel/View/Errors/error500.ctp   |    3 -
 .../skel/View/Layouts/Emails/html/default.ctp |    2 -
 .../skel/View/Layouts/Emails/text/default.ctp |    2 -
 .../Templates/skel/View/Layouts/ajax.ctp      |    2 -
 .../Templates/skel/View/Layouts/default.ctp   |    2 -
 .../Templates/skel/View/Layouts/error.ctp     |    2 -
 .../Templates/skel/View/Layouts/flash.ctp     |    6 +-
 .../Templates/skel/View/Pages/home.ctp        |    8 +-
 .../lib/Cake/Console/Templates/skel/index.php |    2 -
 .../Console/Templates/skel/webroot/.htaccess  |    8 +-
 .../skel/webroot/css/cake.generic.css         |   33 +-
 .../Console/Templates/skel/webroot/index.php  |   34 +-
 .../Console/Templates/skel/webroot/test.php   |   15 +-
 web/api/lib/Cake/Console/cake                 |    4 +-
 web/api/lib/Cake/Console/cake.bat             |    3 -
 web/api/lib/Cake/Console/cake.php             |   19 +-
 .../Cake/Controller/CakeErrorController.php   |    4 +-
 web/api/lib/Cake/Controller/Component.php     |    8 +-
 .../Controller/Component/Acl/AclInterface.php |   10 +-
 .../Cake/Controller/Component/Acl/DbAcl.php   |   21 +-
 .../Cake/Controller/Component/Acl/IniAcl.php  |   10 +-
 .../Cake/Controller/Component/Acl/PhpAcl.php  |   30 +-
 .../Controller/Component/AclComponent.php     |   28 +-
 .../Component/Auth/AbstractPasswordHasher.php |    6 +-
 .../Component/Auth/ActionsAuthorize.php       |    4 +-
 .../Component/Auth/BaseAuthenticate.php       |   24 +-
 .../Component/Auth/BaseAuthorize.php          |   22 +-
 .../Component/Auth/BasicAuthenticate.php      |   29 +-
 .../Component/Auth/BlowfishAuthenticate.php   |    8 +-
 .../Component/Auth/BlowfishPasswordHasher.php |    6 +-
 .../Component/Auth/ControllerAuthorize.php    |   10 +-
 .../Component/Auth/CrudAuthorize.php          |    4 +-
 .../Component/Auth/DigestAuthenticate.php     |   12 +-
 .../Component/Auth/FormAuthenticate.php       |   10 +-
 .../Component/Auth/SimplePasswordHasher.php   |    6 +-
 .../Controller/Component/AuthComponent.php    |  125 +-
 .../Controller/Component/CookieComponent.php  |   25 +-
 .../Controller/Component/EmailComponent.php   |   13 +-
 .../Controller/Component/FlashComponent.php   |  118 ++
 .../Component/PaginatorComponent.php          |   41 +-
 .../Component/RequestHandlerComponent.php     |   76 +-
 .../Component/SecurityComponent.php           |   77 +-
 .../Controller/Component/SessionComponent.php |   33 +-
 .../Cake/Controller/ComponentCollection.php   |    4 +-
 web/api/lib/Cake/Controller/Controller.php    |  143 +-
 web/api/lib/Cake/Controller/Scaffold.php      |   25 +-
 web/api/lib/Cake/Core/App.php                 |  231 +--
 web/api/lib/Cake/Core/CakePlugin.php          |  123 +-
 web/api/lib/Cake/Core/Configure.php           |  149 +-
 web/api/lib/Cake/Core/Object.php              |   13 +-
 web/api/lib/Cake/Error/ErrorHandler.php       |   72 +-
 web/api/lib/Cake/Error/ExceptionRenderer.php  |   36 +-
 web/api/lib/Cake/Error/exceptions.php         |   34 +-
 web/api/lib/Cake/Event/CakeEvent.php          |   21 +-
 web/api/lib/Cake/Event/CakeEventListener.php  |    6 +-
 web/api/lib/Cake/Event/CakeEventManager.php   |   31 +-
 web/api/lib/Cake/I18n/I18n.php                |  102 +-
 web/api/lib/Cake/I18n/L10n.php                |    6 +-
 web/api/lib/Cake/I18n/Multibyte.php           |   87 +-
 web/api/lib/Cake/LICENSE.txt                  |    2 +-
 web/api/lib/Cake/Log/CakeLog.php              |  172 +--
 web/api/lib/Cake/Log/CakeLogInterface.php     |    4 +-
 web/api/lib/Cake/Log/Engine/ConsoleLog.php    |    6 +-
 web/api/lib/Cake/Log/Engine/FileLog.php       |   13 +-
 web/api/lib/Cake/Log/Engine/SyslogLog.php     |   22 +-
 web/api/lib/Cake/Model/AclNode.php            |   21 +-
 web/api/lib/Cake/Model/Aco.php                |    2 -
 web/api/lib/Cake/Model/AcoAction.php          |    2 -
 web/api/lib/Cake/Model/Aro.php                |    2 -
 .../lib/Cake/Model/Behavior/AclBehavior.php   |   16 +-
 .../Model/Behavior/ContainableBehavior.php    |   12 +-
 .../Cake/Model/Behavior/TranslateBehavior.php |   45 +-
 .../lib/Cake/Model/Behavior/TreeBehavior.php  |  541 ++++---
 web/api/lib/Cake/Model/BehaviorCollection.php |   24 +-
 web/api/lib/Cake/Model/CakeSchema.php         |  145 +-
 web/api/lib/Cake/Model/ConnectionManager.php  |   92 +-
 .../lib/Cake/Model/Datasource/CakeSession.php |  319 ++--
 .../lib/Cake/Model/Datasource/DataSource.php  |   50 +-
 .../Cake/Model/Datasource/Database/Mysql.php  |   66 +-
 .../Model/Datasource/Database/Postgres.php    |   81 +-
 .../Cake/Model/Datasource/Database/Sqlite.php |   63 +-
 .../Model/Datasource/Database/Sqlserver.php   |   77 +-
 .../lib/Cake/Model/Datasource/DboSource.php   |  400 ++---
 .../Model/Datasource/Session/CacheSession.php |   29 +-
 .../Session/CakeSessionHandlerInterface.php   |   16 +-
 .../Datasource/Session/DatabaseSession.php    |   53 +-
 web/api/lib/Cake/Model/Model.php              |  808 ++++++----
 web/api/lib/Cake/Model/ModelBehavior.php      |   18 +-
 web/api/lib/Cake/Model/ModelValidator.php     |   48 +-
 web/api/lib/Cake/Model/Permission.php         |   10 +-
 .../Model/Validator/CakeValidationRule.php    |   40 +-
 .../Model/Validator/CakeValidationSet.php     |   53 +-
 web/api/lib/Cake/Network/CakeRequest.php      |  203 ++-
 web/api/lib/Cake/Network/CakeResponse.php     |  145 +-
 web/api/lib/Cake/Network/CakeSocket.php       |  147 +-
 .../Cake/Network/Email/AbstractTransport.php  |    6 +-
 web/api/lib/Cake/Network/Email/CakeEmail.php  |  312 ++--
 .../lib/Cake/Network/Email/SmtpTransport.php  |   37 +-
 .../Cake/Network/Http/BasicAuthentication.php |   16 +-
 .../Network/Http/DigestAuthentication.php     |   18 +-
 .../lib/Cake/Network/Http/HttpResponse.php    |    2 +-
 web/api/lib/Cake/Network/Http/HttpSocket.php  |  141 +-
 .../Cake/Network/Http/HttpSocketResponse.php  |   63 +-
 web/api/lib/Cake/Routing/Dispatcher.php       |   14 +-
 web/api/lib/Cake/Routing/DispatcherFilter.php |    8 +-
 .../Cake/Routing/Filter/AssetDispatcher.php   |   23 +-
 .../Cake/Routing/Filter/CacheDispatcher.php   |    4 +-
 web/api/lib/Cake/Routing/Route/CakeRoute.php  |   30 +-
 .../lib/Cake/Routing/Route/RedirectRoute.php  |    6 +-
 web/api/lib/Cake/Routing/Router.php           |  262 ++--
 web/api/lib/Cake/Test/Case/BasicsTest.php     |   37 +-
 .../lib/Cake/Test/Case/Cache/CacheTest.php    |   19 +
 .../Test/Case/Cache/Engine/ApcEngineTest.php  |   21 +-
 .../Test/Case/Cache/Engine/FileEngineTest.php |   18 +
 .../Case/Cache/Engine/MemcacheEngineTest.php  |   30 +
 .../Case/Cache/Engine/MemcachedEngineTest.php |   64 +-
 .../Case/Cache/Engine/RedisEngineTest.php     |   19 +
 .../Case/Cache/Engine/WincacheEngineTest.php  |   19 +
 .../Case/Cache/Engine/XcacheEngineTest.php    |   20 +
 .../Console/Command/CompletionShellTest.php   |    2 +-
 .../Case/Console/Command/SchemaShellTest.php  |   12 +-
 .../Console/Command/Task/CommandTaskTest.php  |    6 +-
 .../Command/Task/ControllerTaskTest.php       |    6 +-
 .../Console/Command/Task/ExtractTaskTest.php  |   59 +-
 .../Console/Command/Task/FixtureTaskTest.php  |   11 +-
 .../Console/Command/Task/ModelTaskTest.php    |   34 +-
 .../Console/Command/Task/PluginTaskTest.php   |   35 +-
 .../Console/Command/Task/ProjectTaskTest.php  |    1 -
 .../Console/Command/Task/ViewTaskTest.php     |    3 +-
 .../Case/Console/Command/TestShellTest.php    |   18 +
 .../Case/Console/ConsoleErrorHandlerTest.php  |   27 +
 .../Case/Console/ConsoleOptionParserTest.php  |   25 +-
 .../Test/Case/Console/ConsoleOutputTest.php   |   32 +
 .../Helper/ProgressShellHelperTest.php        |  223 +++
 .../Console/Helper/TableShellHelperTest.php   |  201 +++
 .../Test/Case/Console/ShellDispatcherTest.php |    8 +
 .../lib/Cake/Test/Case/Console/ShellTest.php  |  101 +-
 .../Controller/Component/Acl/DbAclTest.php    |   11 +-
 .../Controller/Component/AclComponentTest.php |    2 +-
 .../Component/Auth/BasicAuthenticateTest.php  |  107 +-
 .../Auth/BlowfishAuthenticateTest.php         |    2 +-
 .../Auth/ControllerAuthorizeTest.php          |   11 +-
 .../Component/Auth/DigestAuthenticateTest.php |   27 +-
 .../Component/Auth/FormAuthenticateTest.php   |   35 +-
 .../Component/AuthComponentTest.php           |  280 +++-
 .../Component/EmailComponentTest.php          |   53 +-
 .../Component/FlashComponentTest.php          |  181 +++
 .../Component/PaginatorComponentTest.php      |   43 +-
 .../Component/RequestHandlerComponentTest.php |   19 +-
 .../Component/SecurityComponentTest.php       |  160 +-
 .../Component/SessionComponentTest.php        |    5 +-
 .../Test/Case/Controller/ComponentTest.php    |    2 +-
 .../Test/Case/Controller/ControllerTest.php   |   50 +-
 .../Test/Case/Controller/ScaffoldTest.php     |   75 +-
 web/api/lib/Cake/Test/Case/Core/AppTest.php   |   53 +-
 .../Cake/Test/Case/Core/CakePluginTest.php    |    1 -
 .../lib/Cake/Test/Case/Core/ConfigureTest.php |   53 +-
 .../lib/Cake/Test/Case/Core/ObjectTest.php    |    9 +-
 .../Cake/Test/Case/Error/ErrorHandlerTest.php |   66 +
 .../Test/Case/Error/ExceptionRendererTest.php |   67 +
 .../Test/Case/Event/CakeEventManagerTest.php  |   15 +-
 .../Cake/Test/Case/Event/CakeEventTest.php    |    7 +-
 web/api/lib/Cake/Test/Case/I18n/I18nTest.php  |  202 ++-
 .../Test/Case/Log/Engine/ConsoleLogTest.php   |    6 +-
 .../Test/Case/Log/Engine/SyslogLogTest.php    |    2 -
 .../lib/Cake/Test/Case/Model/AclNodeTest.php  |    7 +-
 .../Model/Behavior/TranslateBehaviorTest.php  |   52 +-
 .../Model/Behavior/TreeBehaviorAfterTest.php  |    2 +-
 .../Model/Behavior/TreeBehaviorNumberTest.php |  176 ++-
 .../Model/Behavior/TreeBehaviorScopedTest.php |   12 +-
 .../Model/Behavior/TreeBehaviorUuidTest.php   |    6 +-
 .../Case/Model/BehaviorCollectionTest.php     |   12 +-
 .../Cake/Test/Case/Model/CakeSchemaTest.php   |   20 +-
 .../Case/Model/Datasource/CakeSessionTest.php |   78 +-
 .../Case/Model/Datasource/DataSourceTest.php  |    2 +-
 .../Model/Datasource/Database/MysqlTest.php   |  177 ++-
 .../Datasource/Database/PostgresTest.php      |  120 +-
 .../Model/Datasource/Database/SqliteTest.php  |   69 +-
 .../Datasource/Database/SqlserverTest.php     |   21 +-
 .../Case/Model/Datasource/DboSourceTest.php   |  401 ++++-
 .../Datasource/Session/CacheSessionTest.php   |    6 +-
 .../Session/DatabaseSessionTest.php           |   86 +-
 .../Case/Model/ModelCrossSchemaHabtmTest.php  |    6 +-
 .../Test/Case/Model/ModelIntegrationTest.php  |   48 +-
 .../Cake/Test/Case/Model/ModelReadTest.php    |  314 +++-
 .../Cake/Test/Case/Model/ModelTestBase.php    |    4 +-
 .../Test/Case/Model/ModelValidationTest.php   |  244 ++-
 .../Cake/Test/Case/Model/ModelWriteTest.php   | 1317 ++++++++++++++---
 .../Validator/CakeValidationRuleTest.php      |   18 +-
 .../Model/Validator/CakeValidationSetTest.php |   78 +-
 web/api/lib/Cake/Test/Case/Model/models.php   |  207 ++-
 .../Test/Case/Network/CakeRequestTest.php     |  256 +++-
 .../Test/Case/Network/CakeResponseTest.php    |  229 ++-
 .../Cake/Test/Case/Network/CakeSocketTest.php |   54 +-
 .../Test/Case/Network/Email/CakeEmailTest.php |  361 +++--
 .../Case/Network/Email/DebugTransportTest.php |    1 -
 .../Case/Network/Email/MailTransportTest.php  |    1 -
 .../Case/Network/Email/SmtpTransportTest.php  |   97 +-
 .../Network/Http/BasicAuthenticationTest.php  |   41 +
 .../Network/Http/DigestAuthenticationTest.php |    2 +-
 .../Case/Network/Http/HttpResponseTest.php    |   10 +-
 .../Test/Case/Network/Http/HttpSocketTest.php |  243 ++-
 .../Cake/Test/Case/Routing/DispatcherTest.php |   28 +-
 .../Routing/Filter/AssetDispatcherTest.php    |   90 +-
 .../Test/Case/Routing/Route/CakeRouteTest.php |   47 +
 .../Case/Routing/Route/RedirectRouteTest.php  |   20 +-
 .../lib/Cake/Test/Case/Routing/RouterTest.php |   23 +-
 .../Test/Case/TestSuite/CakeTestCaseTest.php  |   72 +-
 .../Case/TestSuite/CakeTestFixtureTest.php    |    4 +-
 .../Case/TestSuite/ControllerTestCaseTest.php |   30 +-
 .../Case/TestSuite/HtmlCoverageReportTest.php |    8 +-
 .../TestSuite/Stub/ConsoleOutputStubTest.php  |   62 +
 .../Cake/Test/Case/Utility/CakeTextTest.php   |  874 +++++++++++
 .../Cake/Test/Case/Utility/CakeTimeTest.php   |   86 +-
 .../Test/Case/Utility/ClassRegistryTest.php   |    2 +-
 .../Cake/Test/Case/Utility/DebuggerTest.php   |   13 +-
 .../lib/Cake/Test/Case/Utility/FileTest.php   |   70 +-
 .../lib/Cake/Test/Case/Utility/FolderTest.php |   49 +-
 .../lib/Cake/Test/Case/Utility/HashTest.php   |  295 +++-
 .../Cake/Test/Case/Utility/InflectorTest.php  |  191 ++-
 .../Case/Utility/ObjectCollectionTest.php     |   35 +-
 .../Cake/Test/Case/Utility/SanitizeTest.php   |    4 +-
 .../Cake/Test/Case/Utility/SecurityTest.php   |   40 +-
 .../lib/Cake/Test/Case/Utility/SetTest.php    |    1 -
 .../Cake/Test/Case/Utility/ValidationTest.php |  300 ++--
 .../lib/Cake/Test/Case/Utility/XmlTest.php    |   26 +-
 .../Test/Case/View/Helper/FlashHelperTest.php |  157 ++
 .../Test/Case/View/Helper/FormHelperTest.php  |  575 ++++++-
 .../Test/Case/View/Helper/HtmlHelperTest.php  |   62 +-
 .../Case/View/Helper/PaginatorHelperTest.php  |  489 ++++--
 .../Test/Case/View/Helper/TextHelperTest.php  |  173 ++-
 .../Test/Case/View/Helper/TimeHelperTest.php  |    2 +-
 .../lib/Cake/Test/Case/View/HelperTest.php    |    8 +-
 .../lib/Cake/Test/Case/View/JsonViewTest.php  |   98 ++
 .../lib/Cake/Test/Case/View/MediaViewTest.php |   10 -
 web/api/lib/Cake/Test/Case/View/ViewTest.php  |  118 +-
 .../lib/Cake/Test/Case/View/XmlViewTest.php   |   70 +
 .../Cake/Test/Fixture/AfterTreeFixture.php    |    2 +-
 .../lib/Cake/Test/Fixture/ArmorFixture.php    |    2 +-
 .../Cake/Test/Fixture/ArmorsPlayerFixture.php |    2 +-
 .../Cake/Test/Fixture/DependencyFixture.php   |    3 +-
 .../lib/Cake/Test/Fixture/JoinABFixture.php   |    2 +-
 .../lib/Cake/Test/Fixture/JoinACFixture.php   |    2 +-
 .../Cake/Test/Fixture/NumberTreeFixture.php   |    3 +-
 web/api/lib/Cake/Test/Fixture/TagFixture.php  |    4 +-
 .../Test/Fixture/TranslateArticleFixture.php  |    2 +-
 .../Cake/Test/Fixture/TranslateFixture.php    |    2 +-
 .../Test/Fixture/TranslateTableFixture.php    |    2 +-
 .../Fixture/TranslateWithPrefixFixture.php    |    5 +-
 .../Controller/ActionsUsingSessions.ctp       |   12 +-
 .../Test/bake_compare/Controller/Scaffold.ctp |    1 -
 .../lib/Cake/Test/bake_compare/View/index.ctp |   58 +
 .../Controller/TestsAppsController.php        |    4 +
 .../Lib/Cache/Engine/TestAppCacheEngine.php   |    3 +
 .../Locale/nld/LC_MESSAGES/default.po         |   32 +
 .../Locale/nld_mo/LC_MESSAGES/default.mo      |  Bin 0 -> 392 bytes
 .../Locale/po/LC_MESSAGES/test_plugin.po      |   21 +
 .../Locale/rule_15_mo/LC_MESSAGES/core.mo     |  Bin 0 -> 875 bytes
 .../Locale/rule_15_mo/LC_MESSAGES/default.mo  |  Bin 0 -> 769 bytes
 .../Locale/rule_15_po/LC_MESSAGES/core.po     |   25 +
 .../Locale/rule_15_po/LC_MESSAGES/default.po  |   25 +
 .../Datasource/Session/TestAppLibSession.php  |    6 +-
 .../lib/Cake/Test/test_app/Model/Extract.php  |    2 +-
 .../Cake/Test/test_app/Model/PersisterOne.php |    2 +-
 .../Console/Command/TestPluginShell.php       |   31 +
 .../Cache/Engine/TestPluginCacheEngine.php    |    3 +
 .../Routing/Filter/Test2DispatcherFilter.php  |    2 -
 .../Routing/Filter/TestDispatcherFilter.php   |    2 -
 .../TestPluginPersisterOneBehavior.php        |    3 -
 .../TestPluginPersisterTwoBehavior.php        |    3 -
 .../Datasource/Session/TestPluginSession.php  |    5 +
 .../TestPlugin/Model/TestPluginAuthUser.php   |    2 +-
 .../TestPlugin/Model/TestPluginAuthors.php    |    7 +-
 .../TestPlugin/Model/TestPluginComment.php    |    3 -
 .../TestPlugin/View/Errors/error500.ctp       |   10 +
 .../test_app/View/Elements/Flash/default.ctp  |    1 +
 .../test_app/View/Elements/flash_classy.ctp   |    1 +
 .../test_app/View/Elements/flash_helper.ctp   |    5 +
 .../Test/test_app/View/Elements/html_call.ctp |    3 +-
 .../test_app/View/Emails/html/default.ctp     |    3 +-
 .../test_app/View/Emails/html/long_line.ctp   |   14 +
 .../Cake/Test/test_app/View/Layouts/ajax2.ctp |    3 +-
 .../Cake/Test/test_app/View/Layouts/flash.ctp |    4 +-
 .../test_app/View/Layouts/rss/default.ctp     |    4 +-
 .../Cake/Test/test_app/View/Pages/extract.ctp |   10 +
 .../test_app/View/Posts/helper_overwrite.ctp  |    3 +-
 .../Test/test_app/View/Posts/parent_view.ctp  |    2 +-
 .../test_app/View/Posts/test_nocache_tags.ctp |    2 +-
 .../Themed/TestTheme/Emails/text/themed.ctp   |    2 +-
 .../View/Themed/TestTheme/Layouts/default.ctp |    2 +-
 web/api/lib/Cake/TestSuite/CakeTestCase.php   |  156 +-
 web/api/lib/Cake/TestSuite/CakeTestLoader.php |   18 +-
 web/api/lib/Cake/TestSuite/CakeTestRunner.php |   14 +-
 .../Cake/TestSuite/CakeTestSuiteCommand.php   |   12 +-
 .../TestSuite/CakeTestSuiteDispatcher.php     |   34 +-
 .../lib/Cake/TestSuite/ControllerTestCase.php |   28 +-
 .../TestSuite/Coverage/BaseCoverageReport.php |    9 +-
 .../TestSuite/Coverage/HtmlCoverageReport.php |   23 +-
 .../TestSuite/Fixture/CakeFixtureManager.php  |    6 +-
 .../TestSuite/Fixture/CakeTestFixture.php     |   26 +-
 .../Cake/TestSuite/Fixture/CakeTestModel.php  |   10 +-
 .../TestSuite/Reporter/CakeBaseReporter.php   |   44 +-
 .../TestSuite/Reporter/CakeHtmlReporter.php   |   55 +-
 .../Cake/TestSuite/Stub/ConsoleOutputStub.php |   89 ++
 .../lib/Cake/TestSuite/templates/header.php   |    2 +-
 .../lib/Cake/TestSuite/templates/phpunit.php  |    7 +-
 web/api/lib/Cake/Utility/CakeNumber.php       |   68 +-
 web/api/lib/Cake/Utility/CakeText.php         |  710 +++++++++
 web/api/lib/Cake/Utility/CakeTime.php         |  490 +++---
 web/api/lib/Cake/Utility/ClassRegistry.php    |   29 +-
 web/api/lib/Cake/Utility/Debugger.php         |   88 +-
 web/api/lib/Cake/Utility/File.php             |   67 +-
 web/api/lib/Cake/Utility/Folder.php           |  119 +-
 web/api/lib/Cake/Utility/Hash.php             |  259 ++--
 web/api/lib/Cake/Utility/Inflector.php        |  289 ++--
 web/api/lib/Cake/Utility/ObjectCollection.php |   23 +-
 web/api/lib/Cake/Utility/Sanitize.php         |    4 +-
 web/api/lib/Cake/Utility/Security.php         |   47 +-
 web/api/lib/Cake/Utility/Set.php              |   53 +-
 web/api/lib/Cake/Utility/String.php           |  671 +--------
 web/api/lib/Cake/Utility/Validation.php       |  394 ++---
 web/api/lib/Cake/Utility/Xml.php              |   48 +-
 web/api/lib/Cake/VERSION.txt                  |    2 +-
 .../lib/Cake/View/Elements/Flash/default.ctp  |    7 +
 .../lib/Cake/View/Elements/Flash/error.ctp    |    1 +
 .../lib/Cake/View/Elements/Flash/success.ctp  |    1 +
 .../View/Elements/exception_stack_trace.ctp   |    2 +-
 web/api/lib/Cake/View/Errors/fatal_error.ctp  |    7 +-
 .../lib/Cake/View/Errors/missing_action.ctp   |    6 +-
 .../lib/Cake/View/Errors/missing_behavior.ctp |    6 +-
 .../Cake/View/Errors/missing_component.ctp    |    8 +-
 .../Cake/View/Errors/missing_connection.ctp   |    2 -
 .../Cake/View/Errors/missing_controller.ctp   |    6 +-
 .../lib/Cake/View/Errors/missing_database.ctp |    6 +-
 .../Cake/View/Errors/missing_datasource.ctp   |    8 +-
 .../View/Errors/missing_datasource_config.ctp |    6 +-
 .../lib/Cake/View/Errors/missing_helper.ctp   |    6 +-
 .../lib/Cake/View/Errors/missing_layout.ctp   |   25 +-
 .../lib/Cake/View/Errors/missing_plugin.ctp   |    6 +-
 .../lib/Cake/View/Errors/missing_table.ctp    |    8 +-
 web/api/lib/Cake/View/Errors/missing_view.ctp |   23 +-
 web/api/lib/Cake/View/Errors/pdo_error.ctp    |    6 +-
 .../lib/Cake/View/Errors/private_action.ctp   |    6 +-
 .../lib/Cake/View/Errors/scaffold_error.ctp   |    8 +-
 web/api/lib/Cake/View/Helper.php              |   86 +-
 web/api/lib/Cake/View/Helper/CacheHelper.php  |   28 +-
 web/api/lib/Cake/View/Helper/FlashHelper.php  |   91 ++
 web/api/lib/Cake/View/Helper/FormHelper.php   |  333 +++--
 web/api/lib/Cake/View/Helper/HtmlHelper.php   |  131 +-
 .../Cake/View/Helper/JqueryEngineHelper.php   |    4 +-
 .../Cake/View/Helper/JsBaseEngineHelper.php   |    7 +-
 web/api/lib/Cake/View/Helper/JsHelper.php     |   13 +-
 .../Cake/View/Helper/MootoolsEngineHelper.php |    8 +-
 web/api/lib/Cake/View/Helper/NumberHelper.php |   39 +-
 .../lib/Cake/View/Helper/PaginatorHelper.php  |  139 +-
 .../View/Helper/PrototypeEngineHelper.php     |    8 +-
 web/api/lib/Cake/View/Helper/RssHelper.php    |    6 +-
 .../lib/Cake/View/Helper/SessionHelper.php    |   42 +-
 web/api/lib/Cake/View/Helper/TextHelper.php   |   75 +-
 web/api/lib/Cake/View/Helper/TimeHelper.php   |  168 +--
 web/api/lib/Cake/View/HelperCollection.php    |   11 +-
 web/api/lib/Cake/View/JsonView.php            |   31 +-
 web/api/lib/Cake/View/MediaView.php           |   16 +-
 web/api/lib/Cake/View/ScaffoldView.php        |    2 +-
 web/api/lib/Cake/View/Scaffolds/form.ctp      |   14 +-
 web/api/lib/Cake/View/Scaffolds/index.ctp     |   24 +-
 web/api/lib/Cake/View/Scaffolds/view.ctp      |    6 +-
 web/api/lib/Cake/View/ThemeView.php           |    2 +-
 web/api/lib/Cake/View/View.php                |  130 +-
 web/api/lib/Cake/View/ViewBlock.php           |   18 +-
 web/api/lib/Cake/View/XmlView.php             |   16 +-
 web/api/lib/Cake/basics.php                   |  485 ++++--
 web/api/lib/Cake/bootstrap.php                |   71 +-
 443 files changed, 19245 insertions(+), 7546 deletions(-)
 mode change 100755 => 100644 web/api/lib/Cake/Cache/Engine/MemcachedEngine.php
 create mode 100644 web/api/lib/Cake/Console/Helper/BaseShellHelper.php
 create mode 100644 web/api/lib/Cake/Console/Helper/ProgressShellHelper.php
 create mode 100644 web/api/lib/Cake/Console/Helper/TableShellHelper.php
 create mode 100644 web/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp
 create mode 100644 web/api/lib/Cake/Controller/Component/FlashComponent.php
 mode change 100755 => 100644 web/api/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/Utility/CakeTextTest.php
 create mode 100644 web/api/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
 mode change 100755 => 100644 web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
 create mode 100644 web/api/lib/Cake/Test/bake_compare/View/index.ctp
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/nld/LC_MESSAGES/default.po
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/test_plugin.po
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po
 create mode 100644 web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po
 create mode 100644 web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
 create mode 100644 web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp
 create mode 100644 web/api/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp
 create mode 100644 web/api/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp
 create mode 100644 web/api/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp
 create mode 100644 web/api/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp
 create mode 100644 web/api/lib/Cake/TestSuite/Stub/ConsoleOutputStub.php
 create mode 100644 web/api/lib/Cake/Utility/CakeText.php
 create mode 100644 web/api/lib/Cake/View/Elements/Flash/default.ctp
 create mode 100644 web/api/lib/Cake/View/Elements/Flash/error.ctp
 create mode 100644 web/api/lib/Cake/View/Elements/Flash/success.ctp
 create mode 100644 web/api/lib/Cake/View/Helper/FlashHelper.php
 mode change 100755 => 100644 web/api/lib/Cake/View/Helper/FormHelper.php

diff --git a/web/api/lib/Cake/Cache/Cache.php b/web/api/lib/Cake/Cache/Cache.php
index a75f0acfd..a7a01d0a1 100644
--- a/web/api/lib/Cake/Cache/Cache.php
+++ b/web/api/lib/Cake/Cache/Cache.php
@@ -26,12 +26,12 @@ App::uses('CacheEngine', 'Cache');
  * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would
  * be
  *
- * {{{
+ * ```
  *	Cache::config('shared', array(
  *		'engine' => 'Apc',
  *		'prefix' => 'my_app_'
  *  ));
- * }}}
+ * ```
  *
  * This would configure an APC cache engine to the 'shared' alias. You could then read and write
  * to that cache alias by using it for the `$config` parameter in the various Cache methods. In
@@ -113,11 +113,11 @@ class Cache {
  * - `user` Used by Xcache. Username for XCache
  * - `password` Used by Xcache/Redis. Password for XCache/Redis
  *
- * @see app/Config/core.php for configuration settings
  * @param string $name Name of the configuration
  * @param array $settings Optional associative array of settings passed to the engine
  * @return array array(engine, settings) on success, false on failure
  * @throws CacheException
+ * @see app/Config/core.php for configuration settings
  */
 	public static function config($name = null, $settings = array()) {
 		if (is_array($name)) {
@@ -125,33 +125,33 @@ class Cache {
 		}
 
 		$current = array();
-		if (isset(self::$_config[$name])) {
-			$current = self::$_config[$name];
+		if (isset(static::$_config[$name])) {
+			$current = static::$_config[$name];
 		}
 
 		if (!empty($settings)) {
-			self::$_config[$name] = $settings + $current;
+			static::$_config[$name] = $settings + $current;
 		}
 
-		if (empty(self::$_config[$name]['engine'])) {
+		if (empty(static::$_config[$name]['engine'])) {
 			return false;
 		}
 
-		if (!empty(self::$_config[$name]['groups'])) {
-			foreach (self::$_config[$name]['groups'] as $group) {
-				self::$_groups[$group][] = $name;
-				sort(self::$_groups[$group]);
-				self::$_groups[$group] = array_unique(self::$_groups[$group]);
+		if (!empty(static::$_config[$name]['groups'])) {
+			foreach (static::$_config[$name]['groups'] as $group) {
+				static::$_groups[$group][] = $name;
+				sort(static::$_groups[$group]);
+				static::$_groups[$group] = array_unique(static::$_groups[$group]);
 			}
 		}
 
-		$engine = self::$_config[$name]['engine'];
+		$engine = static::$_config[$name]['engine'];
 
-		if (!isset(self::$_engines[$name])) {
-			self::_buildEngine($name);
-			$settings = self::$_config[$name] = self::settings($name);
-		} elseif ($settings = self::set(self::$_config[$name], null, $name)) {
-			self::$_config[$name] = $settings;
+		if (!isset(static::$_engines[$name])) {
+			static::_buildEngine($name);
+			$settings = static::$_config[$name] = static::settings($name);
+		} elseif ($settings = static::set(static::$_config[$name], null, $name)) {
+			static::$_config[$name] = $settings;
 		}
 		return compact('engine', 'settings');
 	}
@@ -160,11 +160,11 @@ class Cache {
  * Finds and builds the instance of the required engine class.
  *
  * @param string $name Name of the config array that needs an engine instance built
- * @return boolean
+ * @return bool
  * @throws CacheException
  */
 	protected static function _buildEngine($name) {
-		$config = self::$_config[$name];
+		$config = static::$_config[$name];
 
 		list($plugin, $class) = pluginSplit($config['engine'], true);
 		$cacheClass = $class . 'Engine';
@@ -176,12 +176,17 @@ class Cache {
 		if (!is_subclass_of($cacheClass, 'CacheEngine')) {
 			throw new CacheException(__d('cake_dev', 'Cache engines must use %s as a base class.', 'CacheEngine'));
 		}
-		self::$_engines[$name] = new $cacheClass();
-		if (!self::$_engines[$name]->init($config)) {
-			throw new CacheException(__d('cake_dev', 'Cache engine %s is not properly configured.', $name));
+		static::$_engines[$name] = new $cacheClass();
+		if (!static::$_engines[$name]->init($config)) {
+			$msg = __d(
+				'cake_dev',
+				'Cache engine "%s" is not properly configured. Ensure required extensions are installed, and credentials/permissions are correct',
+				$name
+			);
+			throw new CacheException($msg);
 		}
-		if (self::$_engines[$name]->settings['probability'] && time() % self::$_engines[$name]->settings['probability'] === 0) {
-			self::$_engines[$name]->gc();
+		if (static::$_engines[$name]->settings['probability'] && time() % static::$_engines[$name]->settings['probability'] === 0) {
+			static::$_engines[$name]->gc();
 		}
 		return true;
 	}
@@ -192,22 +197,22 @@ class Cache {
  * @return array Array of configured Cache config names.
  */
 	public static function configured() {
-		return array_keys(self::$_config);
+		return array_keys(static::$_config);
 	}
 
 /**
  * Drops a cache engine. Deletes the cache configuration information
- * If the deleted configuration is the last configuration using an certain engine,
+ * If the deleted configuration is the last configuration using a certain engine,
  * the Engine instance is also unset.
  *
  * @param string $name A currently configured cache config you wish to remove.
- * @return boolean success of the removal, returns false when the config does not exist.
+ * @return bool success of the removal, returns false when the config does not exist.
  */
 	public static function drop($name) {
-		if (!isset(self::$_config[$name])) {
+		if (!isset(static::$_config[$name])) {
 			return false;
 		}
-		unset(self::$_config[$name], self::$_engines[$name]);
+		unset(static::$_config[$name], static::$_engines[$name]);
 		return true;
 	}
 
@@ -238,29 +243,29 @@ class Cache {
 		if (is_array($settings) && $value !== null) {
 			$config = $value;
 		}
-		if (!isset(self::$_config[$config]) || !isset(self::$_engines[$config])) {
+		if (!isset(static::$_config[$config]) || !isset(static::$_engines[$config])) {
 			return false;
 		}
 		if (!empty($settings)) {
-			self::$_reset = true;
+			static::$_reset = true;
 		}
 
-		if (self::$_reset === true) {
+		if (static::$_reset === true) {
 			if (empty($settings)) {
-				self::$_reset = false;
-				$settings = self::$_config[$config];
+				static::$_reset = false;
+				$settings = static::$_config[$config];
 			} else {
 				if (is_string($settings) && $value !== null) {
 					$settings = array($settings => $value);
 				}
-				$settings += self::$_config[$config];
+				$settings += static::$_config[$config];
 				if (isset($settings['duration']) && !is_numeric($settings['duration'])) {
 					$settings['duration'] = strtotime($settings['duration']) - time();
 				}
 			}
-			self::$_engines[$config]->settings = $settings;
+			static::$_engines[$config]->settings = $settings;
 		}
-		return self::settings($config);
+		return static::settings($config);
 	}
 
 /**
@@ -269,11 +274,11 @@ class Cache {
  * Permanently remove all expired and deleted data
  *
  * @param string $config [optional] The config name you wish to have garbage collected. Defaults to 'default'
- * @param integer $expires [optional] An expires timestamp. Defaults to NULL
- * @return void
+ * @param int $expires [optional] An expires timestamp. Defaults to NULL
+ * @return bool
  */
 	public static function gc($config = 'default', $expires = null) {
-		self::$_engines[$config]->gc($expires);
+		return static::$_engines[$config]->gc($expires);
 	}
 
 /**
@@ -292,32 +297,32 @@ class Cache {
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached - anything except a resource
  * @param string $config Optional string configuration name to write to. Defaults to 'default'
- * @return boolean True if the data was successfully cached, false on failure
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public static function write($key, $value, $config = 'default') {
-		$settings = self::settings($config);
+		$settings = static::settings($config);
 
 		if (empty($settings)) {
 			return false;
 		}
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$key = self::$_engines[$config]->key($key);
+		$key = static::$_engines[$config]->key($key);
 
 		if (!$key || is_resource($value)) {
 			return false;
 		}
 
-		$success = self::$_engines[$config]->write($settings['prefix'] . $key, $value, $settings['duration']);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->write($settings['prefix'] . $key, $value, $settings['duration']);
+		static::set(null, $config);
 		if ($success === false && $value !== '') {
 			trigger_error(
 				__d('cake_dev',
 					"%s cache was unable to write '%s' to %s cache",
 					$config,
 					$key,
-					self::$_engines[$config]->settings['engine']
+					static::$_engines[$config]->settings['engine']
 				),
 				E_USER_WARNING
 			);
@@ -343,46 +348,46 @@ class Cache {
  * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
  */
 	public static function read($key, $config = 'default') {
-		$settings = self::settings($config);
+		$settings = static::settings($config);
 
 		if (empty($settings)) {
 			return false;
 		}
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$key = self::$_engines[$config]->key($key);
+		$key = static::$_engines[$config]->key($key);
 		if (!$key) {
 			return false;
 		}
-		return self::$_engines[$config]->read($settings['prefix'] . $key);
+		return static::$_engines[$config]->read($settings['prefix'] . $key);
 	}
 
 /**
  * Increment a number under the key and return incremented value.
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to add
+ * @param int $offset How much to add
  * @param string $config Optional string configuration name. Defaults to 'default'
  * @return mixed new value, or false if the data doesn't exist, is not integer,
  *    or if there was an error fetching it.
  */
 	public static function increment($key, $offset = 1, $config = 'default') {
-		$settings = self::settings($config);
+		$settings = static::settings($config);
 
 		if (empty($settings)) {
 			return false;
 		}
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$key = self::$_engines[$config]->key($key);
+		$key = static::$_engines[$config]->key($key);
 
 		if (!$key || !is_int($offset) || $offset < 0) {
 			return false;
 		}
-		$success = self::$_engines[$config]->increment($settings['prefix'] . $key, $offset);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->increment($settings['prefix'] . $key, $offset);
+		static::set(null, $config);
 		return $success;
 	}
 
@@ -390,27 +395,27 @@ class Cache {
  * Decrement a number under the key and return decremented value.
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @param string $config Optional string configuration name. Defaults to 'default'
  * @return mixed new value, or false if the data doesn't exist, is not integer,
  *   or if there was an error fetching it
  */
 	public static function decrement($key, $offset = 1, $config = 'default') {
-		$settings = self::settings($config);
+		$settings = static::settings($config);
 
 		if (empty($settings)) {
 			return false;
 		}
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$key = self::$_engines[$config]->key($key);
+		$key = static::$_engines[$config]->key($key);
 
 		if (!$key || !is_int($offset) || $offset < 0) {
 			return false;
 		}
-		$success = self::$_engines[$config]->decrement($settings['prefix'] . $key, $offset);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->decrement($settings['prefix'] . $key, $offset);
+		static::set(null, $config);
 		return $success;
 	}
 
@@ -429,40 +434,40 @@ class Cache {
  *
  * @param string $key Identifier for the data
  * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public static function delete($key, $config = 'default') {
-		$settings = self::settings($config);
+		$settings = static::settings($config);
 
 		if (empty($settings)) {
 			return false;
 		}
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$key = self::$_engines[$config]->key($key);
+		$key = static::$_engines[$config]->key($key);
 		if (!$key) {
 			return false;
 		}
 
-		$success = self::$_engines[$config]->delete($settings['prefix'] . $key);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->delete($settings['prefix'] . $key);
+		static::set(null, $config);
 		return $success;
 	}
 
 /**
  * Delete all keys from the cache.
  *
- * @param boolean $check if true will check expiration, otherwise delete all
+ * @param bool $check if true will check expiration, otherwise delete all
  * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	public static function clear($check = false, $config = 'default') {
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$success = self::$_engines[$config]->clear($check);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->clear($check);
+		static::set(null, $config);
 		return $success;
 	}
 
@@ -471,14 +476,14 @@ class Cache {
  *
  * @param string $group name of the group to be cleared
  * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean True if the cache group was successfully cleared, false otherwise
+ * @return bool True if the cache group was successfully cleared, false otherwise
  */
 	public static function clearGroup($group, $config = 'default') {
-		if (!self::isInitialized($config)) {
+		if (!static::isInitialized($config)) {
 			return false;
 		}
-		$success = self::$_engines[$config]->clearGroup($group);
-		self::set(null, $config);
+		$success = static::$_engines[$config]->clearGroup($group);
+		static::set(null, $config);
 		return $success;
 	}
 
@@ -486,13 +491,13 @@ class Cache {
  * Check if Cache has initialized a working config for the given name.
  *
  * @param string $config name of the configuration to use. Defaults to 'default'
- * @return boolean Whether or not the config name has been initialized.
+ * @return bool Whether or not the config name has been initialized.
  */
 	public static function isInitialized($config = 'default') {
 		if (Configure::read('Cache.disable')) {
 			return false;
 		}
-		return isset(self::$_engines[$config]);
+		return isset(static::$_engines[$config]);
 	}
 
 /**
@@ -503,8 +508,8 @@ class Cache {
  * @see Cache::config()
  */
 	public static function settings($name = 'default') {
-		if (!empty(self::$_engines[$name])) {
-			return self::$_engines[$name]->settings();
+		if (!empty(static::$_engines[$name])) {
+			return static::$_engines[$name]->settings();
 		}
 		return array();
 	}
@@ -512,7 +517,7 @@ class Cache {
 /**
  * Retrieve group names to config mapping.
  *
- * {{{
+ * ```
  *	Cache::config('daily', array(
  *		'duration' => '1 day', 'groups' => array('posts')
  *	));
@@ -520,7 +525,7 @@ class Cache {
  *		'duration' => '1 week', 'groups' => array('posts', 'archive')
  *	));
  *	$configs = Cache::groupConfigs('posts');
- * }}}
+ * ```
  *
  * $config will equal to `array('posts' => array('daily', 'weekly'))`
  *
@@ -530,10 +535,10 @@ class Cache {
  */
 	public static function groupConfigs($group = null) {
 		if ($group === null) {
-			return self::$_groups;
+			return static::$_groups;
 		}
-		if (isset(self::$_groups[$group])) {
-			return array($group => self::$_groups[$group]);
+		if (isset(static::$_groups[$group])) {
+			return array($group => static::$_groups[$group]);
 		}
 		throw new CacheException(__d('cake_dev', 'Invalid cache group %s', $group));
 	}
@@ -549,27 +554,66 @@ class Cache {
  *
  * Using a Closure to provide data, assume $this is a Model:
  *
- * {{{
+ * ```
  * $model = $this;
  * $results = Cache::remember('all_articles', function() use ($model) {
  *      return $model->find('all');
  * });
- * }}}
+ * ```
  *
  * @param string $key The cache key to read/store data at.
  * @param callable $callable The callable that provides data in the case when
  *   the cache key is empty. Can be any callable type supported by your PHP.
  * @param string $config The cache configuration to use for this operation.
  *   Defaults to default.
+ * @return mixed The results of the callable or unserialized results.
  */
 	public static function remember($key, $callable, $config = 'default') {
-		$existing = self::read($key, $config);
+		$existing = static::read($key, $config);
 		if ($existing !== false) {
 			return $existing;
 		}
 		$results = call_user_func($callable);
-		self::write($key, $results, $config);
+		static::write($key, $results, $config);
 		return $results;
 	}
 
+/**
+ * Write data for key into a cache engine if it doesn't exist already.
+ *
+ * ### Usage:
+ *
+ * Writing to the active cache config:
+ *
+ * `Cache::add('cached_data', $data);`
+ *
+ * Writing to a specific cache config:
+ *
+ * `Cache::add('cached_data', $data, 'long_term');`
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached - anything except a resource.
+ * @param string $config Optional string configuration name to write to. Defaults to 'default'.
+ * @return bool True if the data was successfully cached, false on failure.
+ *   Or if the key existed already.
+ */
+	public static function add($key, $value, $config = 'default') {
+		$settings = self::settings($config);
+
+		if (empty($settings)) {
+			return false;
+		}
+		if (!self::isInitialized($config)) {
+			return false;
+		}
+		$key = self::$_engines[$config]->key($key);
+
+		if (!$key || is_resource($value)) {
+			return false;
+		}
+
+		$success = self::$_engines[$config]->add($settings['prefix'] . $key, $value, $settings['duration']);
+		self::set(null, $config);
+		return $success;
+	}
 }
diff --git a/web/api/lib/Cake/Cache/CacheEngine.php b/web/api/lib/Cake/Cache/CacheEngine.php
index 5d19bdeaf..6bad9f7ad 100644
--- a/web/api/lib/Cake/Cache/CacheEngine.php
+++ b/web/api/lib/Cake/Cache/CacheEngine.php
@@ -42,7 +42,7 @@ abstract class CacheEngine {
  * Called automatically by the cache frontend
  *
  * @param array $settings Associative array of parameters for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
 		$settings += $this->settings + array(
@@ -67,7 +67,7 @@ abstract class CacheEngine {
  *
  * Permanently remove all expired and deleted data
  *
- * @param integer $expires [optional] An expires timestamp, invalidating all data before.
+ * @param int $expires [optional] An expires timestamp, invalidating all data before.
  * @return void
  */
 	public function gc($expires = null) {
@@ -78,11 +78,22 @@ abstract class CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache for.
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache for.
+ * @return bool True if the data was successfully cached, false on failure
  */
 	abstract public function write($key, $value, $duration);
 
+/**
+ * Write value for a key into cache if it doesn't already exist
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param int $duration How long to cache for.
+ * @return bool True if the data was successfully cached, false on failure
+ */
+	public function add($key, $value, $duration) {
+	}
+
 /**
  * Read a key from the cache
  *
@@ -95,7 +106,7 @@ abstract class CacheEngine {
  * Increment a number under the key and return incremented value
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to add
+ * @param int $offset How much to add
  * @return New incremented value, false otherwise
  */
 	abstract public function increment($key, $offset = 1);
@@ -104,7 +115,7 @@ abstract class CacheEngine {
  * Decrement a number under the key and return decremented value
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New incremented value, false otherwise
  */
 	abstract public function decrement($key, $offset = 1);
@@ -113,15 +124,15 @@ abstract class CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	abstract public function delete($key);
 
 /**
  * Delete all keys from the cache
  *
- * @param boolean $check if true will check expiration, otherwise delete all
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check if true will check expiration, otherwise delete all
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	abstract public function clear($check);
 
@@ -130,8 +141,8 @@ abstract class CacheEngine {
  * to decide whether actually delete the keys or just simulate it to achieve
  * the same result.
  *
- * @param string $groups name of the group to be cleared
- * @return boolean
+ * @param string $group name of the group to be cleared
+ * @return bool
  */
 	public function clearGroup($group) {
 		return false;
@@ -176,5 +187,4 @@ abstract class CacheEngine {
 		$key = preg_replace('/[\s]+/', '_', strtolower(trim(str_replace(array(DS, '/', '.'), '_', strval($key)))));
 		return $prefix . $key;
 	}
-
 }
diff --git a/web/api/lib/Cake/Cache/Engine/ApcEngine.php b/web/api/lib/Cake/Cache/Engine/ApcEngine.php
index 8fd0ff1ad..da31651e3 100644
--- a/web/api/lib/Cake/Cache/Engine/ApcEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/ApcEngine.php
@@ -38,7 +38,7 @@ class ApcEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  * @see CacheEngine::__defaults
  */
 	public function init($settings = array()) {
@@ -55,8 +55,8 @@ class ApcEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
 		$expires = 0;
@@ -75,7 +75,7 @@ class ApcEngine extends CacheEngine {
  */
 	public function read($key) {
 		$time = time();
-		$cachetime = intval(apc_fetch($key . '_expires'));
+		$cachetime = (int)apc_fetch($key . '_expires');
 		if ($cachetime !== 0 && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
 			return false;
 		}
@@ -86,7 +86,7 @@ class ApcEngine extends CacheEngine {
  * Increments the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  */
 	public function increment($key, $offset = 1) {
@@ -97,7 +97,7 @@ class ApcEngine extends CacheEngine {
  * Decrements the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  */
 	public function decrement($key, $offset = 1) {
@@ -108,7 +108,7 @@ class ApcEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return apc_delete($key);
@@ -117,18 +117,25 @@ class ApcEngine extends CacheEngine {
 /**
  * Delete all keys from the cache. This will clear every cache config using APC.
  *
- * @param boolean $check If true, nothing will be cleared, as entries are removed
+ * @param bool $check If true, nothing will be cleared, as entries are removed
  *    from APC as they expired. This flag is really only used by FileEngine.
- * @return boolean True Returns true.
+ * @return bool True Returns true.
  */
 	public function clear($check) {
 		if ($check) {
 			return true;
 		}
-		$info = apc_cache_info('user');
-		$cacheKeys = $info['cache_list'];
-		unset($info);
-		foreach ($cacheKeys as $key) {
+		if (class_exists('APCIterator', false)) {
+			$iterator = new APCIterator(
+				'user',
+				'/^' . preg_quote($this->settings['prefix'], '/') . '/',
+				APC_ITER_NONE
+			);
+			apc_delete($iterator);
+			return true;
+		}
+		$cache = apc_cache_info('user');
+		foreach ($cache['cache_list'] as $key) {
 			if (strpos($key['info'], $this->settings['prefix']) === 0) {
 				apc_delete($key['info']);
 			}
@@ -173,11 +180,30 @@ class ApcEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		apc_inc($this->settings['prefix'] . $group, 1, $success);
 		return $success;
 	}
 
+/**
+ * Write data for key into cache if it doesn't exist already. 
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ * @link http://php.net/manual/en/function.apc-add.php
+ */
+	public function add($key, $value, $duration) {
+		$expires = 0;
+		if ($duration) {
+			$expires = time() + $duration;
+		}
+		apc_add($key . '_expires', $expires, $duration);
+		return apc_add($key, $value, $duration);
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/FileEngine.php b/web/api/lib/Cake/Cache/Engine/FileEngine.php
index b93d6c1a8..d650e60ee 100644
--- a/web/api/lib/Cake/Cache/Engine/FileEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/FileEngine.php
@@ -53,7 +53,7 @@ class FileEngine extends CacheEngine {
 /**
  * True unless FileEngine::__active(); fails
  *
- * @var boolean
+ * @var bool
  */
 	protected $_init = true;
 
@@ -64,7 +64,7 @@ class FileEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
 		$settings += array(
@@ -93,8 +93,8 @@ class FileEngine extends CacheEngine {
 /**
  * Garbage collection. Permanently remove all expired and deleted data
  *
- * @param integer $expires [optional] An expires timestamp, invalidating all data before.
- * @return boolean True if garbage collection was successful, false on failure
+ * @param int $expires [optional] An expires timestamp, invalidating all data before.
+ * @return bool True if garbage collection was successful, false on failure
  */
 	public function gc($expires = null) {
 		return $this->clear(true);
@@ -105,11 +105,11 @@ class FileEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $data Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public function write($key, $data, $duration) {
-		if ($data === '' || !$this->_init) {
+		if (!$this->_init) {
 			return false;
 		}
 
@@ -165,7 +165,7 @@ class FileEngine extends CacheEngine {
 
 		$this->_File->rewind();
 		$time = time();
-		$cachetime = intval($this->_File->current());
+		$cachetime = (int)$this->_File->current();
 
 		if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
 			if ($this->settings['lock']) {
@@ -200,7 +200,7 @@ class FileEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		if ($this->_setKey($key) === false || !$this->_init) {
@@ -217,8 +217,8 @@ class FileEngine extends CacheEngine {
 /**
  * Delete all values from the cache
  *
- * @param boolean $check Optional - only delete expired cache items
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check Optional - only delete expired cache items
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
 		if (!$this->_init) {
@@ -255,8 +255,8 @@ class FileEngine extends CacheEngine {
  * Used to clear a directory of matching files.
  *
  * @param string $path The path to search.
- * @param integer $now The current timestamp
- * @param integer $threshold Any file not modified after this value will be deleted.
+ * @param int $now The current timestamp
+ * @param int $threshold Any file not modified after this value will be deleted.
  * @return void
  */
 	protected function _clearDirectory($path, $now, $threshold) {
@@ -271,11 +271,12 @@ class FileEngine extends CacheEngine {
 			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
 				continue;
 			}
-			$filePath = $path . $entry;
-			if (!file_exists($filePath) || is_dir($filePath)) {
+
+			try {
+				$file = new SplFileObject($path . $entry, 'r');
+			} catch (Exception $e) {
 				continue;
 			}
-			$file = new SplFileObject($path . $entry, 'r');
 
 			if ($threshold) {
 				$mtime = $file->getMTime();
@@ -303,8 +304,8 @@ class FileEngine extends CacheEngine {
 /**
  * Not implemented
  *
- * @param string $key
- * @param integer $offset
+ * @param string $key The key to decrement
+ * @param int $offset The number to offset
  * @return void
  * @throws CacheException
  */
@@ -315,8 +316,8 @@ class FileEngine extends CacheEngine {
 /**
  * Not implemented
  *
- * @param string $key
- * @param integer $offset
+ * @param string $key The key to decrement
+ * @param int $offset The number to offset
  * @return void
  * @throws CacheException
  */
@@ -329,8 +330,8 @@ class FileEngine extends CacheEngine {
  * for the cache file the key is referring to.
  *
  * @param string $key The key
- * @param boolean $createKey Whether the key should be created if it doesn't exists, or not
- * @return boolean true if the cache key could be set, false otherwise
+ * @param bool $createKey Whether the key should be created if it doesn't exists, or not
+ * @return bool true if the cache key could be set, false otherwise
  */
 	protected function _setKey($key, $createKey = false) {
 		$groups = null;
@@ -369,7 +370,7 @@ class FileEngine extends CacheEngine {
 /**
  * Determine is cache directory is writable
  *
- * @return boolean
+ * @return bool
  */
 	protected function _active() {
 		$dir = new SplFileInfo($this->settings['path']);
@@ -405,7 +406,8 @@ class FileEngine extends CacheEngine {
 /**
  * Recursively deletes all files under any directory named as $group
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		$this->_File = null;
@@ -427,4 +429,21 @@ class FileEngine extends CacheEngine {
 		}
 		return true;
 	}
+
+/**
+ * Write data for key into cache if it doesn't exist already.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ */
+	public function add($key, $value, $duration) {
+		$cachedValue = $this->read($key);
+		if ($cachedValue === false) {
+			return $this->write($key, $value, $duration);
+		}
+		return false;
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/MemcacheEngine.php b/web/api/lib/Cake/Cache/Engine/MemcacheEngine.php
index facaedf0e..eba2ec451 100644
--- a/web/api/lib/Cake/Cache/Engine/MemcacheEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -22,7 +22,7 @@
  * more information.
  *
  * @package Cake.Cache.Engine
- * @deprecated You should use the Memcached adapter instead.
+ * @deprecated 3.0.0 You should use the Memcached adapter instead.
  */
 class MemcacheEngine extends CacheEngine {
 
@@ -59,7 +59,7 @@ class MemcacheEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
 		if (!class_exists('Memcache')) {
@@ -104,7 +104,7 @@ class MemcacheEngine extends CacheEngine {
  * @return array Array containing host, port
  */
 	protected function _parseServerString($server) {
-		if ($server[0] === 'u') {
+		if (strpos($server, 'unix://') === 0) {
 			return array($server, 0);
 		}
 		if (substr($server, 0, 1) === '[') {
@@ -131,8 +131,8 @@ class MemcacheEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  * @see http://php.net/manual/en/memcache.set.php
  */
 	public function write($key, $value, $duration) {
@@ -156,7 +156,7 @@ class MemcacheEngine extends CacheEngine {
  * Increments the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  * @throws CacheException when you try to increment with compress = true
  */
@@ -173,7 +173,7 @@ class MemcacheEngine extends CacheEngine {
  * Decrements the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  * @throws CacheException when you try to decrement with compress = true
  */
@@ -190,7 +190,7 @@ class MemcacheEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return $this->_Memcache->delete($key);
@@ -199,8 +199,9 @@ class MemcacheEngine extends CacheEngine {
 /**
  * Delete all keys from the cache
  *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check If true no deletes will occur and instead CakePHP will rely
+ *   on key TTL values.
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
 		if ($check) {
@@ -231,8 +232,8 @@ class MemcacheEngine extends CacheEngine {
  * Connects to a server in connection pool
  *
  * @param string $host host ip address or name
- * @param integer $port Server port
- * @return boolean True if memcache server was connected
+ * @param int $port Server port
+ * @return bool True if memcache server was connected
  */
 	public function connect($host, $port = 11211) {
 		if ($this->_Memcache->getServerStatus($host, $port) === 0) {
@@ -282,9 +283,30 @@ class MemcacheEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		return (bool)$this->_Memcache->increment($this->settings['prefix'] . $group);
 	}
+
+/**
+ * Write data for key into cache if it doesn't exist already. When using memcached as your cache engine
+ * remember that the Memcached PECL extension does not support cache expiry times greater
+ * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ * @link http://php.net/manual/en/memcache.add.php
+ */
+	public function add($key, $value, $duration) {
+		if ($duration > 30 * DAY) {
+			$duration = 0;
+		}
+
+		return $this->_Memcache->add($key, $value, $this->settings['compress'], $duration);
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/MemcachedEngine.php b/web/api/lib/Cake/Cache/Engine/MemcachedEngine.php
old mode 100755
new mode 100644
index 9c50186fe..cc101a2bf
--- a/web/api/lib/Cake/Cache/Engine/MemcachedEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/MemcachedEngine.php
@@ -45,6 +45,8 @@ class MemcachedEngine extends CacheEngine {
  *  - serialize = string, default => php. The serializer engine used to serialize data.
  *    Available engines are php, igbinary and json. Beside php, the memcached extension
  *    must be compiled with the appropriate serializer support.
+ *  - options - Additional options for the memcached client. Should be an array of option => value.
+ *    Use the Memcached::OPT_* constants as keys.
  *
  * @var array
  */
@@ -70,7 +72,7 @@ class MemcachedEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  * @throws CacheException when you try use authentication without Memcached compiled with SASL support
  */
 	public function init($settings = array()) {
@@ -92,7 +94,8 @@ class MemcachedEngine extends CacheEngine {
 			'persistent' => false,
 			'login' => null,
 			'password' => null,
-			'serialize' => 'php'
+			'serialize' => 'php',
+			'options' => array()
 		);
 		parent::init($settings);
 
@@ -104,7 +107,11 @@ class MemcachedEngine extends CacheEngine {
 			return true;
 		}
 
-		$this->_Memcached = new Memcached($this->settings['persistent'] ? (string)$this->settings['persistent'] : null);
+		if (!$this->settings['persistent']) {
+			$this->_Memcached = new Memcached();
+		} else {
+			$this->_Memcached = new Memcached((string)$this->settings['persistent']);
+		}
 		$this->_setOptions();
 
 		if (count($this->_Memcached->getServerList())) {
@@ -126,8 +133,14 @@ class MemcachedEngine extends CacheEngine {
 					__d('cake_dev', 'Memcached extension is not build with SASL support')
 				);
 			}
+			$this->_Memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
 			$this->_Memcached->setSaslAuthData($this->settings['login'], $this->settings['password']);
 		}
+		if (is_array($this->settings['options'])) {
+			foreach ($this->settings['options'] as $opt => $value) {
+				$this->_Memcached->setOption($opt, $value);
+			}
+		}
 
 		return true;
 	}
@@ -136,6 +149,7 @@ class MemcachedEngine extends CacheEngine {
  * Settings the memcached instance
  *
  * @throws CacheException when the Memcached extension is not built with the desired serializer engine
+ * @return void
  */
 	protected function _setOptions() {
 		$this->_Memcached->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
@@ -171,8 +185,9 @@ class MemcachedEngine extends CacheEngine {
  * @return array Array containing host, port
  */
 	protected function _parseServerString($server) {
-		if ($server[0] === 'u') {
-			return array($server, 0);
+		$socketTransport = 'unix://';
+		if (strpos($server, $socketTransport) === 0) {
+			return array(substr($server, strlen($socketTransport)), 0);
 		}
 		if (substr($server, 0, 1) === '[') {
 			$position = strpos($server, ']:');
@@ -193,13 +208,13 @@ class MemcachedEngine extends CacheEngine {
 
 /**
  * Write data for key into cache. When using memcached as your cache engine
- * remember that the Memcached pecl extension does not support cache expiry times greater
+ * remember that the Memcached PECL extension does not support cache expiry times greater
  * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  * @see http://php.net/manual/en/memcache.set.php
  */
 	public function write($key, $value, $duration) {
@@ -224,7 +239,7 @@ class MemcachedEngine extends CacheEngine {
  * Increments the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  * @throws CacheException when you try to increment with compress = true
  */
@@ -236,7 +251,7 @@ class MemcachedEngine extends CacheEngine {
  * Decrements the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  * @throws CacheException when you try to decrement with compress = true
  */
@@ -248,7 +263,7 @@ class MemcachedEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return $this->_Memcached->delete($key);
@@ -257,8 +272,10 @@ class MemcachedEngine extends CacheEngine {
 /**
  * Delete all keys from the cache
  *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check If true no deletes will occur and instead CakePHP will rely
+ *   on key TTL values.
+ * @return bool True if the cache was successfully cleared, false otherwise. Will
+ *   also return false if you are using a binary protocol.
  */
 	public function clear($check) {
 		if ($check) {
@@ -266,6 +283,9 @@ class MemcachedEngine extends CacheEngine {
 		}
 
 		$keys = $this->_Memcached->getAllKeys();
+		if ($keys === false) {
+			return false;
+		}
 
 		foreach ($keys as $key) {
 			if (strpos($key, $this->settings['prefix']) === 0) {
@@ -314,9 +334,30 @@ class MemcachedEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		return (bool)$this->_Memcached->increment($this->settings['prefix'] . $group);
 	}
+
+/**
+ * Write data for key into cache if it doesn't exist already. When using memcached as your cache engine
+ * remember that the Memcached pecl extension does not support cache expiry times greater
+ * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ * @link http://php.net/manual/en/memcached.add.php
+ */
+	public function add($key, $value, $duration) {
+		if ($duration > 30 * DAY) {
+			$duration = 0;
+		}
+
+		return $this->_Memcached->add($key, $value, $duration);
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/RedisEngine.php b/web/api/lib/Cake/Cache/Engine/RedisEngine.php
index 09415c95d..8dd98fb99 100644
--- a/web/api/lib/Cake/Cache/Engine/RedisEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/RedisEngine.php
@@ -38,6 +38,7 @@ class RedisEngine extends CacheEngine {
  *  - port = integer port number to the Redis server (default: 6379)
  *  - timeout = float timeout in seconds (default: 0)
  *  - persistent = boolean Connects to the Redis server with a persistent connection (default: true)
+ *  - unix_socket = path to the unix socket file (default: false)
  *
  * @var array
  */
@@ -50,7 +51,7 @@ class RedisEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
 		if (!class_exists('Redis')) {
@@ -58,13 +59,14 @@ class RedisEngine extends CacheEngine {
 		}
 		parent::init(array_merge(array(
 			'engine' => 'Redis',
-			'prefix' => null,
+			'prefix' => Inflector::slug(APP_DIR) . '_',
 			'server' => '127.0.0.1',
 			'database' => 0,
 			'port' => 6379,
 			'password' => false,
 			'timeout' => 0,
-			'persistent' => true
+			'persistent' => true,
+			'unix_socket' => false
 			), $settings)
 		);
 
@@ -74,28 +76,29 @@ class RedisEngine extends CacheEngine {
 /**
  * Connects to a Redis server
  *
- * @return boolean True if Redis server was connected
+ * @return bool True if Redis server was connected
  */
 	protected function _connect() {
-		$return = false;
 		try {
 			$this->_Redis = new Redis();
-			if (empty($this->settings['persistent'])) {
+			if (!empty($this->settings['unix_socket'])) {
+				$return = $this->_Redis->connect($this->settings['unix_socket']);
+			} elseif (empty($this->settings['persistent'])) {
 				$return = $this->_Redis->connect($this->settings['server'], $this->settings['port'], $this->settings['timeout']);
 			} else {
 				$persistentId = $this->settings['port'] . $this->settings['timeout'] . $this->settings['database'];
 				$return = $this->_Redis->pconnect($this->settings['server'], $this->settings['port'], $this->settings['timeout'], $persistentId);
 			}
 		} catch (RedisException $e) {
+			$return = false;
+		}
+		if (!$return) {
 			return false;
 		}
-		if ($return && $this->settings['password']) {
-			$return = $this->_Redis->auth($this->settings['password']);
+		if ($this->settings['password'] && !$this->_Redis->auth($this->settings['password'])) {
+			return false;
 		}
-		if ($return) {
-			$return = $this->_Redis->select($this->settings['database']);
-		}
-		return $return;
+		return $this->_Redis->select($this->settings['database']);
 	}
 
 /**
@@ -103,13 +106,18 @@ class RedisEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
 		if (!is_int($value)) {
 			$value = serialize($value);
 		}
+
+		if (!$this->_Redis->isConnected()) {
+			$this->_connect();
+		}
+
 		if ($duration === 0) {
 			return $this->_Redis->set($key, $value);
 		}
@@ -138,7 +146,7 @@ class RedisEngine extends CacheEngine {
  * Increments the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  * @throws CacheException when you try to increment with compress = true
  */
@@ -150,7 +158,7 @@ class RedisEngine extends CacheEngine {
  * Decrements the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  * @throws CacheException when you try to decrement with compress = true
  */
@@ -162,7 +170,7 @@ class RedisEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return $this->_Redis->delete($key) > 0;
@@ -171,8 +179,9 @@ class RedisEngine extends CacheEngine {
 /**
  * Delete all keys from the cache
  *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check Whether or not expiration keys should be checked. If
+ *   true, no keys will be removed as cache will rely on redis TTL's.
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
 		if ($check) {
@@ -208,7 +217,8 @@ class RedisEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group name to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		return (bool)$this->_Redis->incr($this->settings['prefix'] . $group);
@@ -222,4 +232,27 @@ class RedisEngine extends CacheEngine {
 			$this->_Redis->close();
 		}
 	}
+
+/**
+ * Write data for key into cache if it doesn't exist already.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ * @link https://github.com/phpredis/phpredis#setnx
+ */
+	public function add($key, $value, $duration) {
+		if (!is_int($value)) {
+			$value = serialize($value);
+		}
+
+		$result = $this->_Redis->setnx($key, $value);
+		// setnx() doesn't have an expiry option, so overwrite the key with one
+		if ($result) {
+			return $this->_Redis->setex($key, $duration, $value);
+		}
+		return false;
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/WincacheEngine.php b/web/api/lib/Cake/Cache/Engine/WincacheEngine.php
index bfba803d2..e5c9d7bd7 100644
--- a/web/api/lib/Cake/Cache/Engine/WincacheEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/WincacheEngine.php
@@ -40,7 +40,7 @@ class WincacheEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  * @see CacheEngine::__defaults
  */
 	public function init($settings = array()) {
@@ -57,8 +57,8 @@ class WincacheEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
 		$expires = time() + $duration;
@@ -80,7 +80,7 @@ class WincacheEngine extends CacheEngine {
  */
 	public function read($key) {
 		$time = time();
-		$cachetime = intval(wincache_ucache_get($key . '_expires'));
+		$cachetime = (int)wincache_ucache_get($key . '_expires');
 		if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
 			return false;
 		}
@@ -91,7 +91,7 @@ class WincacheEngine extends CacheEngine {
  * Increments the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  */
 	public function increment($key, $offset = 1) {
@@ -102,7 +102,7 @@ class WincacheEngine extends CacheEngine {
  * Decrements the value of an integer cached key
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  */
 	public function decrement($key, $offset = 1) {
@@ -113,7 +113,7 @@ class WincacheEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return wincache_ucache_delete($key);
@@ -123,9 +123,9 @@ class WincacheEngine extends CacheEngine {
  * Delete all keys from the cache. This will clear every
  * item in the cache matching the cache config prefix.
  *
- * @param boolean $check If true, nothing will be cleared, as entries will
+ * @param bool $check If true, nothing will be cleared, as entries will
  *   naturally expire in wincache..
- * @return boolean True Returns true.
+ * @return bool True Returns true.
  */
 	public function clear($check) {
 		if ($check) {
@@ -179,7 +179,8 @@ class WincacheEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		$success = null;
@@ -187,4 +188,20 @@ class WincacheEngine extends CacheEngine {
 		return $success;
 	}
 
+/**
+ * Write data for key into cache if it doesn't exist already.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ */
+	public function add($key, $value, $duration) {
+		$cachedValue = $this->read($key);
+		if ($cachedValue === false) {
+			return $this->write($key, $value, $duration);
+		}
+		return false;
+	}
 }
diff --git a/web/api/lib/Cake/Cache/Engine/XcacheEngine.php b/web/api/lib/Cake/Cache/Engine/XcacheEngine.php
index 12e19c786..c46a7b9c5 100644
--- a/web/api/lib/Cake/Cache/Engine/XcacheEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/XcacheEngine.php
@@ -41,10 +41,10 @@ class XcacheEngine extends CacheEngine {
  * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
  *
  * @param array $settings array of setting for the engine
- * @return boolean True if the engine has been successfully initialized, false if not
+ * @return bool True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
-		if (php_sapi_name() !== 'cli') {
+		if (PHP_SAPI !== 'cli') {
 			parent::init(array_merge(array(
 				'engine' => 'Xcache',
 				'prefix' => Inflector::slug(APP_DIR) . '_',
@@ -62,8 +62,8 @@ class XcacheEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param integer $duration How long to cache the data, in seconds
- * @return boolean True if the data was successfully cached, false on failure
+ * @param int $duration How long to cache the data, in seconds
+ * @return bool True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
 		$expires = time() + $duration;
@@ -80,7 +80,7 @@ class XcacheEngine extends CacheEngine {
 	public function read($key) {
 		if (xcache_isset($key)) {
 			$time = time();
-			$cachetime = intval(xcache_get($key . '_expires'));
+			$cachetime = (int)xcache_get($key . '_expires');
 			if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
 				return false;
 			}
@@ -94,7 +94,7 @@ class XcacheEngine extends CacheEngine {
  * If the cache key is not an integer it will be treated as 0
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to increment
+ * @param int $offset How much to increment
  * @return New incremented value, false otherwise
  */
 	public function increment($key, $offset = 1) {
@@ -106,7 +106,7 @@ class XcacheEngine extends CacheEngine {
  * If the cache key is not an integer it will be treated as 0
  *
  * @param string $key Identifier for the data
- * @param integer $offset How much to subtract
+ * @param int $offset How much to subtract
  * @return New decremented value, false otherwise
  */
 	public function decrement($key, $offset = 1) {
@@ -117,7 +117,7 @@ class XcacheEngine extends CacheEngine {
  * Delete a key from the cache
  *
  * @param string $key Identifier for the data
- * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @return bool True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
 		return xcache_unset($key);
@@ -126,8 +126,9 @@ class XcacheEngine extends CacheEngine {
 /**
  * Delete all keys from the cache
  *
- * @param boolean $check
- * @return boolean True if the cache was successfully cleared, false otherwise
+ * @param bool $check If true no deletes will occur and instead CakePHP will rely
+ *   on key TTL values.
+ * @return bool True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
 		$this->_auth();
@@ -163,7 +164,8 @@ class XcacheEngine extends CacheEngine {
  * Increments the group value to simulate deletion of all keys under a group
  * old values will remain in storage until they expire.
  *
- * @return boolean success
+ * @param string $group The group to clear.
+ * @return bool success
  */
 	public function clearGroup($group) {
 		return (bool)xcache_inc($this->settings['prefix'] . $group, 1);
@@ -176,7 +178,7 @@ class XcacheEngine extends CacheEngine {
  * This has to be done because xcache_clear_cache() needs to pass Basic Http Auth
  * (see xcache.admin configuration settings)
  *
- * @param boolean $reverse Revert changes
+ * @param bool $reverse Revert changes
  * @return void
  */
 	protected function _auth($reverse = false) {
@@ -205,4 +207,21 @@ class XcacheEngine extends CacheEngine {
 			}
 		}
 	}
+
+/**
+ * Write data for key into cache if it doesn't exist already.
+ * If it already exists, it fails and returns false.
+ *
+ * @param string $key Identifier for the data.
+ * @param mixed $value Data to be cached.
+ * @param int $duration How long to cache the data, in seconds.
+ * @return bool True if the data was successfully cached, false on failure.
+ */
+	public function add($key, $value, $duration) {
+		$cachedValue = $this->read($key);
+		if ($cachedValue === false) {
+			return $this->write($key, $value, $duration);
+		}
+		return false;
+	}
 }
diff --git a/web/api/lib/Cake/Config/routes.php b/web/api/lib/Cake/Config/routes.php
index e27ba3a40..7bcc0c06b 100644
--- a/web/api/lib/Cake/Config/routes.php
+++ b/web/api/lib/Cake/Config/routes.php
@@ -48,8 +48,8 @@ if ($plugins = CakePlugin::loaded()) {
 		$plugins[$key] = Inflector::underscore($value);
 	}
 	$pluginPattern = implode('|', $plugins);
-	$match = array('plugin' => $pluginPattern);
-	$shortParams = array('routeClass' => 'PluginShortRoute', 'plugin' => $pluginPattern);
+	$match = array('plugin' => $pluginPattern, 'defaultRoute' => true);
+	$shortParams = array('routeClass' => 'PluginShortRoute', 'plugin' => $pluginPattern, 'defaultRoute' => true);
 
 	foreach ($prefixes as $prefix) {
 		$params = array('prefix' => $prefix, $prefix => true);
@@ -66,11 +66,11 @@ if ($plugins = CakePlugin::loaded()) {
 foreach ($prefixes as $prefix) {
 	$params = array('prefix' => $prefix, $prefix => true);
 	$indexParams = $params + array('action' => 'index');
-	Router::connect("/{$prefix}/:controller", $indexParams);
-	Router::connect("/{$prefix}/:controller/:action/*", $params);
+	Router::connect("/{$prefix}/:controller", $indexParams, array('defaultRoute' => true));
+	Router::connect("/{$prefix}/:controller/:action/*", $params, array('defaultRoute' => true));
 }
-Router::connect('/:controller', array('action' => 'index'));
-Router::connect('/:controller/:action/*');
+Router::connect('/:controller', array('action' => 'index'), array('defaultRoute' => true));
+Router::connect('/:controller/:action/*', array(), array('defaultRoute' => true));
 
 $namedConfig = Router::namedConfig();
 if ($namedConfig['rules'] === false) {
@@ -79,3 +79,4 @@ if ($namedConfig['rules'] === false) {
 
 unset($namedConfig, $params, $indexParams, $prefix, $prefixes, $shortParams, $match,
 	$pluginPattern, $plugins, $key, $value);
+
diff --git a/web/api/lib/Cake/Configure/ConfigReaderInterface.php b/web/api/lib/Cake/Configure/ConfigReaderInterface.php
index e36f05697..ddea4e2d3 100644
--- a/web/api/lib/Cake/Configure/ConfigReaderInterface.php
+++ b/web/api/lib/Cake/Configure/ConfigReaderInterface.php
@@ -26,7 +26,7 @@ interface ConfigReaderInterface {
  * These sources can either be static resources like files, or dynamic ones like
  * a database, or other datasource.
  *
- * @param string $key
+ * @param string $key Key to read.
  * @return array An array of data to merge into the runtime configuration
  */
 	public function read($key);
@@ -36,7 +36,7 @@ interface ConfigReaderInterface {
  *
  * @param string $key The identifier to write to.
  * @param array $data The data to dump.
- * @return boolean True on success or false on failure.
+ * @return bool True on success or false on failure.
  */
 	public function dump($key, $data);
 
diff --git a/web/api/lib/Cake/Configure/IniReader.php b/web/api/lib/Cake/Configure/IniReader.php
index 886ab1779..ad3b88145 100644
--- a/web/api/lib/Cake/Configure/IniReader.php
+++ b/web/api/lib/Cake/Configure/IniReader.php
@@ -17,6 +17,7 @@
  */
 
 App::uses('Hash', 'Utility');
+App::uses('CakePlugin', 'Core');
 
 /**
  * Ini file configuration engine.
@@ -33,10 +34,10 @@ App::uses('Hash', 'Utility');
  * You can nest properties as deeply as needed using `.`'s. In addition to using `.` you
  * can use standard ini section notation to create nested structures:
  *
- * {{{
+ * ```
  * [section]
  * key = value
- * }}}
+ * ```
  *
  * Once loaded into Configure, the above would be accessed using:
  *
@@ -101,7 +102,7 @@ class IniReader implements ConfigReaderInterface {
 		}
 
 		$file = $this->_getFilePath($key);
-		if (!is_file($file)) {
+		if (!is_file(realpath($file))) {
 			throw new ConfigureException(__d('cake_dev', 'Could not load configuration file: %s', $file));
 		}
 
@@ -152,7 +153,7 @@ class IniReader implements ConfigReaderInterface {
  * @param string $key The identifier to write to. If the key has a . it will be treated
  *  as a plugin prefix.
  * @param array $data The data to convert to ini file.
- * @return integer Bytes saved.
+ * @return int Bytes saved.
  */
 	public function dump($key, $data) {
 		$result = array();
@@ -181,7 +182,7 @@ class IniReader implements ConfigReaderInterface {
 /**
  * Converts a value into the ini equivalent
  *
- * @param mixed $value to export.
+ * @param mixed $val Value to export.
  * @return string String value for ini file.
  */
 	protected function _value($val) {
@@ -218,7 +219,7 @@ class IniReader implements ConfigReaderInterface {
 		}
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
+			$file = CakePlugin::path($plugin) . 'Config' . DS . $key;
 		} else {
 			$file = $this->_path . $key;
 		}
diff --git a/web/api/lib/Cake/Configure/PhpReader.php b/web/api/lib/Cake/Configure/PhpReader.php
index 175168a39..d15a41b83 100644
--- a/web/api/lib/Cake/Configure/PhpReader.php
+++ b/web/api/lib/Cake/Configure/PhpReader.php
@@ -15,6 +15,8 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
+App::uses('CakePlugin', 'Core');
+
 /**
  * PHP Reader allows Configure to load configuration values from
  * files containing simple PHP arrays.
@@ -49,7 +51,7 @@ class PhpReader implements ConfigReaderInterface {
  * Read a config file and return its contents.
  *
  * Files with `.` in the name will be treated as values in plugins. Instead of reading from
- * the initialized path, plugin keys will be located using App::pluginPath().
+ * the initialized path, plugin keys will be located using CakePlugin::path().
  *
  * @param string $key The identifier to read from. If the key has a . it will be treated
  *  as a plugin prefix.
@@ -63,7 +65,7 @@ class PhpReader implements ConfigReaderInterface {
 		}
 
 		$file = $this->_getFilePath($key);
-		if (!is_file($file)) {
+		if (!is_file(realpath($file))) {
 			throw new ConfigureException(__d('cake_dev', 'Could not load configuration file: %s', $file));
 		}
 
@@ -81,7 +83,7 @@ class PhpReader implements ConfigReaderInterface {
  * @param string $key The identifier to write to. If the key has a . it will be treated
  *  as a plugin prefix.
  * @param array $data Data to dump.
- * @return integer Bytes saved.
+ * @return int Bytes saved.
  */
 	public function dump($key, $data) {
 		$contents = '<?php' . "\n" . '$config = ' . var_export($data, true) . ';';
@@ -105,7 +107,7 @@ class PhpReader implements ConfigReaderInterface {
 		$key .= '.php';
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
+			$file = CakePlugin::path($plugin) . 'Config' . DS . $key;
 		} else {
 			$file = $this->_path . $key;
 		}
diff --git a/web/api/lib/Cake/Console/Command/AclShell.php b/web/api/lib/Cake/Console/Command/AclShell.php
index ac5b3cdfe..15536ebb6 100644
--- a/web/api/lib/Cake/Console/Command/AclShell.php
+++ b/web/api/lib/Cake/Console/Command/AclShell.php
@@ -220,7 +220,7 @@ class AclShell extends AppShell {
  *
  * @param string $class Class name that is being used.
  * @param array $node Array of node information.
- * @param integer $indent indent level.
+ * @param int $indent indent level.
  * @return void
  */
 	protected function _outputNode($class, $node, $indent) {
@@ -519,7 +519,7 @@ class AclShell extends AppShell {
 /**
  * Checks that given node exists
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function nodeExists() {
 		if (!isset($this->args[0]) || !isset($this->args[1])) {
@@ -558,8 +558,8 @@ class AclShell extends AppShell {
  * or an array of properties to use in AcoNode::node()
  *
  * @param string $class Class type you want (Aro/Aco)
- * @param string|array $identifier A mixed identifier for finding the node.
- * @return integer Integer of NodeId. Will trigger an error if nothing is found.
+ * @param string|array|null $identifier A mixed identifier for finding the node, otherwise null.
+ * @return int Integer of NodeId. Will trigger an error if nothing is found.
  */
 	protected function _getNodeId($class, $identifier) {
 		$node = $this->Acl->{$class}->node($identifier);
@@ -568,7 +568,7 @@ class AclShell extends AppShell {
 				$identifier = var_export($identifier, true);
 			}
 			$this->error(__d('cake_console', 'Could not find node using reference "%s"', $identifier));
-			return;
+			return null;
 		}
 		return Hash::get($node, "0.{$class}.id");
 	}
@@ -579,8 +579,8 @@ class AclShell extends AppShell {
  * @return array aro, aco, action
  */
 	protected function _getParams() {
-		$aro = is_numeric($this->args[0]) ? intval($this->args[0]) : $this->args[0];
-		$aco = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
+		$aro = is_numeric($this->args[0]) ? (int)$this->args[0] : $this->args[0];
+		$aco = is_numeric($this->args[1]) ? (int)$this->args[1] : $this->args[1];
 		$aroName = $aro;
 		$acoName = $aco;
 
diff --git a/web/api/lib/Cake/Console/Command/CommandListShell.php b/web/api/lib/Cake/Console/Command/CommandListShell.php
index 755166f41..ca6620a5b 100644
--- a/web/api/lib/Cake/Console/Command/CommandListShell.php
+++ b/web/api/lib/Cake/Console/Command/CommandListShell.php
@@ -77,7 +77,7 @@ class CommandListShell extends AppShell {
 /**
  * Output text.
  *
- * @param array $shellList
+ * @param array $shellList The shell list.
  * @return void
  */
 	protected function _asText($shellList) {
@@ -95,7 +95,7 @@ class CommandListShell extends AppShell {
 /**
  * Output as XML
  *
- * @param array $shellList
+ * @param array $shellList The shell list.
  * @return void
  */
 	protected function _asXml($shellList) {
diff --git a/web/api/lib/Cake/Console/Command/CompletionShell.php b/web/api/lib/Cake/Console/Command/CompletionShell.php
index b57c84145..57e86f949 100644
--- a/web/api/lib/Cake/Console/Command/CompletionShell.php
+++ b/web/api/lib/Cake/Console/Command/CompletionShell.php
@@ -144,7 +144,7 @@ class CompletionShell extends AppShell {
 /**
  * Emit results as a string, space delimited
  *
- * @param array $options
+ * @param array $options The options to output
  * @return void
  */
 	protected function _output($options = array()) {
diff --git a/web/api/lib/Cake/Console/Command/ConsoleShell.php b/web/api/lib/Cake/Console/Command/ConsoleShell.php
index 917015a9f..ac270e19b 100644
--- a/web/api/lib/Cake/Console/Command/ConsoleShell.php
+++ b/web/api/lib/Cake/Console/Command/ConsoleShell.php
@@ -19,7 +19,7 @@ App::uses('AppShell', 'Console/Command');
  * Provides a very basic 'interactive' console for CakePHP apps.
  *
  * @package       Cake.Console.Command
- * @deprecated Deprecated since version 2.4, will be removed in 3.0
+ * @deprecated 3.0.0 Deprecated since version 2.4, will be removed in 3.0
  */
 class ConsoleShell extends AppShell {
 
@@ -193,7 +193,7 @@ class ConsoleShell extends AppShell {
 /**
  * Override main() to handle action
  *
- * @param string $command
+ * @param string $command The command to run.
  * @return void
  */
 	public function main($command = null) {
@@ -218,7 +218,7 @@ class ConsoleShell extends AppShell {
 /**
  * Determine the method to process the current command
  *
- * @param string $command
+ * @param string $command The command to run.
  * @return string or false
  */
 	protected function _method($command) {
@@ -256,7 +256,7 @@ class ConsoleShell extends AppShell {
 /**
  * Bind an association
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _bind($command) {
@@ -283,7 +283,7 @@ class ConsoleShell extends AppShell {
 /**
  * Unbind an association
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _unbind($command) {
@@ -303,7 +303,7 @@ class ConsoleShell extends AppShell {
 		$validCurrentAssociation = false;
 
 		foreach ($currentAssociations as $model => $currentAssociation) {
-			if ($model == $modelB && $association == $currentAssociation) {
+			if ($model === $modelB && $association === $currentAssociation) {
 				$validCurrentAssociation = true;
 			}
 		}
@@ -320,7 +320,7 @@ class ConsoleShell extends AppShell {
 /**
  * Perform a find
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _find($command) {
@@ -382,7 +382,7 @@ class ConsoleShell extends AppShell {
 /**
  * Save a record
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _save($command) {
@@ -406,7 +406,7 @@ class ConsoleShell extends AppShell {
 /**
  * Show the columns for a model
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _columns($command) {
@@ -455,7 +455,7 @@ class ConsoleShell extends AppShell {
 /**
  * Parse an array URL and show the equivalent URL as a string
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _routeToString($command) {
@@ -471,7 +471,7 @@ class ConsoleShell extends AppShell {
 /**
  * Parse a string URL and show as an array
  *
- * @param mixed $command
+ * @param mixed $command The command to run.
  * @return void
  */
 	protected function _routeToArray($command) {
@@ -483,8 +483,8 @@ class ConsoleShell extends AppShell {
 /**
  * Tells if the specified model is included in the list of available models
  *
- * @param string $modelToCheck
- * @return boolean true if is an available model, false otherwise
+ * @param string $modelToCheck The model to check.
+ * @return bool true if is an available model, false otherwise
  */
 	protected function _isValidModel($modelToCheck) {
 		return in_array($modelToCheck, $this->models);
@@ -494,7 +494,7 @@ class ConsoleShell extends AppShell {
  * Reloads the routes configuration from app/Config/routes.php, and compiles
  * all routes found
  *
- * @return boolean True if config reload was a success, otherwise false
+ * @return bool True if config reload was a success, otherwise false
  */
 	protected function _loadRoutes() {
 		Router::reload();
diff --git a/web/api/lib/Cake/Console/Command/SchemaShell.php b/web/api/lib/Cake/Console/Command/SchemaShell.php
index 6df8a32ea..a2ddfcc0a 100644
--- a/web/api/lib/Cake/Console/Command/SchemaShell.php
+++ b/web/api/lib/Cake/Console/Command/SchemaShell.php
@@ -39,7 +39,7 @@ class SchemaShell extends AppShell {
 /**
  * is this a dry run?
  *
- * @var boolean
+ * @var bool
  */
 	protected $_dry = null;
 
@@ -66,13 +66,10 @@ class SchemaShell extends AppShell {
 			list($this->params['plugin'], $splitName) = pluginSplit($name);
 			$name = $this->params['name'] = $splitName;
 		}
-
-		$defaultFile = 'schema.php';
-		if (empty($this->params['file'])) {
-			$this->params['file'] = $defaultFile;
-		}
-		if ($name && $this->params['file'] === $defaultFile) {
+		if ($name && empty($this->params['file'])) {
 			$this->params['file'] = Inflector::underscore($name);
+		} elseif (empty($this->params['file'])) {
+			$this->params['file'] = 'schema.php';
 		}
 		if (strpos($this->params['file'], '.php') === false) {
 			$this->params['file'] .= '.php';
@@ -92,7 +89,7 @@ class SchemaShell extends AppShell {
 				$name = $plugin;
 			}
 		}
-		$name = Inflector::classify($name);
+		$name = Inflector::camelize($name);
 		$this->Schema = new CakeSchema(compact('name', 'path', 'file', 'connection', 'plugin'));
 	}
 
@@ -125,7 +122,7 @@ class SchemaShell extends AppShell {
 		if ($this->params['force']) {
 			$options['models'] = false;
 		} elseif (!empty($this->params['models'])) {
-			$options['models'] = String::tokenize($this->params['models']);
+			$options['models'] = CakeText::tokenize($this->params['models']);
 		}
 
 		$snapshot = false;
@@ -154,14 +151,14 @@ class SchemaShell extends AppShell {
 		Configure::write('Cache.disable', $cacheDisable);
 
 		if (!empty($this->params['exclude']) && !empty($content)) {
-			$excluded = String::tokenize($this->params['exclude']);
+			$excluded = CakeText::tokenize($this->params['exclude']);
 			foreach ($excluded as $table) {
 				unset($content['tables'][$table]);
 			}
 		}
 
 		if ($snapshot === true) {
-			$fileName = rtrim($this->params['file'], '.php');
+			$fileName = basename($this->params['file'], '.php');
 			$Folder = new Folder($this->Schema->path);
 			$result = $Folder->read();
 
@@ -288,17 +285,17 @@ class SchemaShell extends AppShell {
 			'connection' => $this->params['connection'],
 		);
 		if (!empty($this->params['snapshot'])) {
-			$fileName = rtrim($this->Schema->file, '.php');
+			$fileName = basename($this->Schema->file, '.php');
 			$options['file'] = $fileName . '_' . $this->params['snapshot'] . '.php';
 		}
 
 		$Schema = $this->Schema->load($options);
 
 		if (!$Schema) {
-			$this->err(__d('cake_console', 'The chosen schema could not be loaded. Attempted to load:'));
-			$this->err(__d('cake_console', 'File: %s', $this->Schema->path . DS . $this->Schema->file));
-			$this->err(__d('cake_console', 'Name: %s', $this->Schema->name));
-			return $this->_stop();
+			$this->err(__d('cake_console', '<error>Error</error>: The chosen schema could not be loaded. Attempted to load:'));
+			$this->err(__d('cake_console', '- file: %s', $this->Schema->path . DS . $this->Schema->file));
+			$this->err(__d('cake_console', '- name: %s', $this->Schema->name));
+			return $this->_stop(2);
 		}
 		$table = null;
 		if (isset($this->args[1])) {
@@ -311,8 +308,8 @@ class SchemaShell extends AppShell {
  * Create database from Schema object
  * Should be called via the run method
  *
- * @param CakeSchema $Schema
- * @param string $table
+ * @param CakeSchema $Schema The schema instance to create.
+ * @param string $table The table name.
  * @return void
  */
 	protected function _create(CakeSchema $Schema, $table = null) {
@@ -337,8 +334,7 @@ class SchemaShell extends AppShell {
 		$this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.'));
 		$this->out(array_keys($drop));
 
-		if (
-			!empty($this->params['yes']) ||
+		if (!empty($this->params['yes']) ||
 			$this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n') === 'y'
 		) {
 			$this->out(__d('cake_console', 'Dropping table(s).'));
@@ -348,8 +344,7 @@ class SchemaShell extends AppShell {
 		$this->out("\n" . __d('cake_console', 'The following table(s) will be created.'));
 		$this->out(array_keys($create));
 
-		if (
-			!empty($this->params['yes']) ||
+		if (!empty($this->params['yes']) ||
 			$this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y') === 'y'
 		) {
 			$this->out(__d('cake_console', 'Creating table(s).'));
@@ -362,8 +357,8 @@ class SchemaShell extends AppShell {
  * Update database with Schema object
  * Should be called via the run method
  *
- * @param CakeSchema $Schema
- * @param string $table
+ * @param CakeSchema &$Schema The schema instance
+ * @param string $table The table name.
  * @return void
  */
 	protected function _update(&$Schema, $table = null) {
@@ -402,13 +397,15 @@ class SchemaShell extends AppShell {
 
 		$this->out("\n" . __d('cake_console', 'The following statements will run.'));
 		$this->out(array_map('trim', $contents));
-		if (
-			!empty($this->params['yes']) ||
+		if (!empty($this->params['yes']) ||
 			$this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n') === 'y'
 		) {
 			$this->out();
 			$this->out(__d('cake_console', 'Updating Database...'));
 			$this->_run($contents, 'update', $Schema);
+
+			Configure::write('Cache.disable', false);
+			Cache::clear(false, '_cake_model_');
 		}
 
 		$this->out(__d('cake_console', 'End update.'));
@@ -417,9 +414,9 @@ class SchemaShell extends AppShell {
 /**
  * Runs sql from _create() or _update()
  *
- * @param array $contents
- * @param string $event
- * @param CakeSchema $Schema
+ * @param array $contents The contents to execute.
+ * @param string $event The event to fire
+ * @param CakeSchema $Schema The schema instance.
  * @return void
  */
 	protected function _run($contents, $event, CakeSchema $Schema) {
@@ -483,7 +480,6 @@ class SchemaShell extends AppShell {
 		);
 		$file = array(
 			'help' => __d('cake_console', 'File name to read and write.'),
-			'default' => 'schema.php'
 		);
 		$name = array(
 			'help' => __d('cake_console',
diff --git a/web/api/lib/Cake/Console/Command/ServerShell.php b/web/api/lib/Cake/Console/Command/ServerShell.php
index ae46f6ef8..8c7d5e5e3 100644
--- a/web/api/lib/Cake/Console/Command/ServerShell.php
+++ b/web/api/lib/Cake/Console/Command/ServerShell.php
@@ -34,7 +34,7 @@ class ServerShell extends AppShell {
 /**
  * Default ListenPort
  *
- * @var integer
+ * @var int
  */
 	const DEFAULT_PORT = 80;
 
@@ -65,8 +65,8 @@ class ServerShell extends AppShell {
  * @return void
  */
 	public function initialize() {
-		$this->_host = self::DEFAULT_HOST;
-		$this->_port = self::DEFAULT_PORT;
+		$this->_host = static::DEFAULT_HOST;
+		$this->_port = static::DEFAULT_PORT;
 		$this->_documentRoot = WWW_ROOT;
 	}
 
@@ -91,8 +91,8 @@ class ServerShell extends AppShell {
 			$this->_documentRoot = $this->params['document_root'];
 		}
 
-		// for windows
-		if (substr($this->_documentRoot, -1, 1) == DIRECTORY_SEPARATOR) {
+		// for Windows
+		if (substr($this->_documentRoot, -1, 1) === DIRECTORY_SEPARATOR) {
 			$this->_documentRoot = substr($this->_documentRoot, 0, strlen($this->_documentRoot) - 1);
 		}
 		if (preg_match("/^([a-z]:)[\\\]+(.+)$/i", $this->_documentRoot, $m)) {
@@ -135,7 +135,7 @@ class ServerShell extends AppShell {
 			escapeshellarg($this->_documentRoot . '/index.php')
 		);
 
-		$port = ($this->_port == self::DEFAULT_PORT) ? '' : ':' . $this->_port;
+		$port = ($this->_port == static::DEFAULT_PORT) ? '' : ':' . $this->_port;
 		$this->out(__d('cake_console', 'built-in server is running in http://%s%s/', $this->_host, $port));
 		system($command);
 	}
diff --git a/web/api/lib/Cake/Console/Command/Task/BakeTask.php b/web/api/lib/Cake/Console/Command/Task/BakeTask.php
index 6b534f365..8298e112a 100644
--- a/web/api/lib/Cake/Console/Command/Task/BakeTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/BakeTask.php
@@ -41,7 +41,7 @@ class BakeTask extends AppShell {
 /**
  * Flag for interactive mode
  *
- * @var boolean
+ * @var bool
  */
 	public $interactive = false;
 
diff --git a/web/api/lib/Cake/Console/Command/Task/CommandTask.php b/web/api/lib/Cake/Console/Command/Task/CommandTask.php
index 9c90fc6be..fca006a72 100644
--- a/web/api/lib/Cake/Console/Command/Task/CommandTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/CommandTask.php
@@ -53,9 +53,9 @@ class CommandTask extends AppShell {
 /**
  * Scan the provided paths for shells, and append them into $shellList
  *
- * @param string $type
- * @param array $shells
- * @param array $shellList
+ * @param string $type The type of object.
+ * @param array $shells The shell name.
+ * @param array &$shellList List of shells.
  * @return void
  */
 	protected function _appendShells($type, $shells, &$shellList) {
@@ -90,7 +90,7 @@ class CommandTask extends AppShell {
 /**
  * Return a list of subcommands for a given command
  *
- * @param string $commandName
+ * @param string $commandName The command you want subcommands from.
  * @return array
  */
 	public function subCommands($commandName) {
@@ -127,7 +127,7 @@ class CommandTask extends AppShell {
 /**
  * Get Shell instance for the given command
  *
- * @param mixed $commandName
+ * @param mixed $commandName The command you want.
  * @return mixed
  */
 	public function getShell($commandName) {
@@ -157,7 +157,7 @@ class CommandTask extends AppShell {
 /**
  * Get Shell instance for the given command
  *
- * @param mixed $commandName
+ * @param mixed $commandName The command to get options for.
  * @return array
  */
 	public function options($commandName) {
diff --git a/web/api/lib/Cake/Console/Command/Task/ControllerTask.php b/web/api/lib/Cake/Console/Command/Task/ControllerTask.php
index 5a4553466..fc2d91343 100644
--- a/web/api/lib/Cake/Console/Command/Task/ControllerTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ControllerTask.php
@@ -188,6 +188,7 @@ class ControllerTask extends BakeTask {
 				if (strtolower($wannaUseSession) === 'y') {
 					array_push($components, 'Session');
 				}
+				array_unique($components);
 			}
 		} else {
 			list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
@@ -224,10 +225,10 @@ class ControllerTask extends BakeTask {
 /**
  * Confirm a to be baked controller with the user
  *
- * @param string $controllerName
- * @param string $useDynamicScaffold
- * @param array $helpers
- * @param array $components
+ * @param string $controllerName The name of the controller.
+ * @param string $useDynamicScaffold Whether or not to use dynamic scaffolds.
+ * @param array $helpers The list of helpers to include.
+ * @param array $components The list of components to include.
  * @return void
  */
 	public function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
@@ -247,10 +248,10 @@ class ControllerTask extends BakeTask {
 		);
 
 		foreach ($properties as $var => $title) {
-			if (count($$var)) {
+			if (count(${$var})) {
 				$output = '';
-				$length = count($$var);
-				foreach ($$var as $i => $propElement) {
+				$length = count(${$var});
+				foreach (${$var} as $i => $propElement) {
 					if ($i != $length - 1) {
 						$output .= ucfirst($propElement) . ', ';
 					} else {
@@ -285,7 +286,7 @@ class ControllerTask extends BakeTask {
  *
  * @param string $controllerName Controller name
  * @param string $admin Admin route to use
- * @param boolean $wannaUseSession Set to true to use sessions, false otherwise
+ * @param bool $wannaUseSession Set to true to use sessions, false otherwise
  * @return string Baked actions
  */
 	public function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
@@ -383,9 +384,9 @@ class ControllerTask extends BakeTask {
  * @return array Components the user wants to use.
  */
 	public function doComponents() {
-		$components = array('Paginator');
+		$components = array('Paginator', 'Flash');
 		return array_merge($components, $this->_doPropertyChoices(
-			__d('cake_console', "Would you like this controller to use other components\nbesides PaginatorComponent?"),
+			__d('cake_console', "Would you like this controller to use other components\nbesides PaginatorComponent and FlashComponent?"),
 			__d('cake_console', "Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'")
 		));
 	}
@@ -451,14 +452,14 @@ class ControllerTask extends BakeTask {
 				return $this->_stop();
 			}
 
-			if (!$enteredController || intval($enteredController) > count($controllers)) {
+			if (!$enteredController || (int)$enteredController > count($controllers)) {
 				$this->err(__d('cake_console', "The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again."));
 				$enteredController = '';
 			}
 		}
 
-		if (intval($enteredController) > 0 && intval($enteredController) <= count($controllers)) {
-			$controllerName = $controllers[intval($enteredController) - 1];
+		if ((int)$enteredController > 0 && (int)$enteredController <= count($controllers)) {
+			$controllerName = $controllers[(int)$enteredController - 1];
 		} else {
 			$controllerName = Inflector::camelize($enteredController);
 		}
diff --git a/web/api/lib/Cake/Console/Command/Task/DbConfigTask.php b/web/api/lib/Cake/Console/Command/Task/DbConfigTask.php
index 75c0c13b6..ee1aa6c99 100644
--- a/web/api/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -199,8 +199,8 @@ class DbConfigTask extends AppShell {
 /**
  * Output verification message and bake if it looks good
  *
- * @param array $config
- * @return boolean True if user says it looks good, false otherwise
+ * @param array $config The config data.
+ * @return bool True if user says it looks good, false otherwise
  */
 	protected function _verify($config) {
 		$config += $this->_defaultConfig;
@@ -247,7 +247,7 @@ class DbConfigTask extends AppShell {
  * Assembles and writes database.php
  *
  * @param array $configs Configuration settings to use
- * @return boolean Success
+ * @return bool Success
  */
 	public function bake($configs) {
 		if (!is_dir($this->path)) {
@@ -296,7 +296,7 @@ class DbConfigTask extends AppShell {
 
 		foreach ($oldConfigs as $key => $oldConfig) {
 			foreach ($configs as $config) {
-				if ($oldConfig['name'] == $config['name']) {
+				if ($oldConfig['name'] === $config['name']) {
 					unset($oldConfigs[$key]);
 				}
 			}
diff --git a/web/api/lib/Cake/Console/Command/Task/ExtractTask.php b/web/api/lib/Cake/Console/Command/Task/ExtractTask.php
index d60bc0e5c..740528f70 100644
--- a/web/api/lib/Cake/Console/Command/Task/ExtractTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ExtractTask.php
@@ -44,7 +44,7 @@ class ExtractTask extends AppShell {
 /**
  * Merge all domain and category strings into the default.pot file
  *
- * @var boolean
+ * @var bool
  */
 	protected $_merge = false;
 
@@ -70,7 +70,7 @@ class ExtractTask extends AppShell {
 	protected $_tokens = array();
 
 /**
- * Extracted strings indexed by category and domain.
+ * Extracted strings indexed by category, domain, msgid and context.
  *
  * @var array
  */
@@ -93,21 +93,21 @@ class ExtractTask extends AppShell {
 /**
  * Holds whether this call should extract model validation messages
  *
- * @var boolean
+ * @var bool
  */
 	protected $_extractValidation = true;
 
 /**
  * Holds the validation string domain to use for validation messages when extracting
  *
- * @var boolean
+ * @var bool
  */
 	protected $_validationDomain = 'default';
 
 /**
  * Holds whether this call should extract the CakePHP Lib messages
  *
- * @var boolean
+ * @var bool
  */
 	protected $_extractCore = false;
 
@@ -127,7 +127,7 @@ class ExtractTask extends AppShell {
 			);
 			$response = $this->in($message, null, $defaultPath);
 			if (strtoupper($response) === 'Q') {
-				$this->out(__d('cake_console', 'Extract Aborted'));
+				$this->err(__d('cake_console', 'Extract Aborted'));
 				return $this->_stop();
 			} elseif (strtoupper($response) === 'D' && count($this->_paths)) {
 				$this->out();
@@ -151,7 +151,7 @@ class ExtractTask extends AppShell {
  */
 	public function execute() {
 		if (!empty($this->params['exclude'])) {
-			$this->_exclude = explode(',', $this->params['exclude']);
+			$this->_exclude = explode(',', str_replace('/', DS, $this->params['exclude']));
 		}
 		if (isset($this->params['files']) && !is_array($this->params['files'])) {
 			$this->_files = explode(',', $this->params['files']);
@@ -204,7 +204,7 @@ class ExtractTask extends AppShell {
 			while (true) {
 				$response = $this->in($message, null, rtrim($this->_paths[0], DS) . DS . 'Locale');
 				if (strtoupper($response) === 'Q') {
-					$this->out(__d('cake_console', 'Extract Aborted'));
+					$this->err(__d('cake_console', 'Extract Aborted'));
 					return $this->_stop();
 				} elseif ($this->_isPathUsable($response)) {
 					$this->_output = $response . DS;
@@ -242,29 +242,33 @@ class ExtractTask extends AppShell {
  *
  * Takes care of duplicate translations
  *
- * @param string $category
- * @param string $domain
- * @param string $msgid
- * @param array $details
+ * @param string $category The category
+ * @param string $domain The domain
+ * @param string $msgid The message string
+ * @param array $details The file and line references
  * @return void
  */
 	protected function _addTranslation($category, $domain, $msgid, $details = array()) {
-		if (empty($this->_translations[$category][$domain][$msgid])) {
-			$this->_translations[$category][$domain][$msgid] = array(
-				'msgid_plural' => false
+		$context = '';
+		if (isset($details['msgctxt'])) {
+			$context = $details['msgctxt'];
+		}
+
+		if (empty($this->_translations[$category][$domain][$msgid][$context])) {
+			$this->_translations[$category][$domain][$msgid][$context] = array(
+				'msgid_plural' => false,
 			);
 		}
 
 		if (isset($details['msgid_plural'])) {
-			$this->_translations[$category][$domain][$msgid]['msgid_plural'] = $details['msgid_plural'];
+			$this->_translations[$category][$domain][$msgid][$context]['msgid_plural'] = $details['msgid_plural'];
 		}
-
 		if (isset($details['file'])) {
 			$line = 0;
 			if (isset($details['line'])) {
 				$line = $details['line'];
 			}
-			$this->_translations[$category][$domain][$msgid]['references'][$details['file']][] = $line;
+			$this->_translations[$category][$domain][$msgid][$context]['references'][$details['file']][] = $line;
 		}
 	}
 
@@ -312,6 +316,10 @@ class ExtractTask extends AppShell {
 		))->addOption('merge', array(
 			'help' => __d('cake_console', 'Merge all domain and category strings into the default.po file.'),
 			'choices' => array('yes', 'no')
+		))->addOption('no-location', array(
+			'boolean' => true,
+			'default' => false,
+			'help' => __d('cake_console', 'Do not write lines with locations'),
 		))->addOption('output', array(
 			'help' => __d('cake_console', 'Full path to output directory.')
 		))->addOption('files', array(
@@ -355,14 +363,14 @@ class ExtractTask extends AppShell {
 	protected function _extractTokens() {
 		foreach ($this->_files as $file) {
 			$this->_file = $file;
-			$this->out(__d('cake_console', 'Processing %s...', $file));
+			$this->out(__d('cake_console', 'Processing %s...', $file), 1, Shell::VERBOSE);
 
 			$code = file_get_contents($file);
 			$allTokens = token_get_all($code);
 
 			$this->_tokens = array();
 			foreach ($allTokens as $token) {
-				if (!is_array($token) || ($token[0] != T_WHITESPACE && $token[0] != T_INLINE_HTML)) {
+				if (!is_array($token) || ($token[0] !== T_WHITESPACE && $token[0] !== T_INLINE_HTML)) {
 					$this->_tokens[] = $token;
 				}
 			}
@@ -374,6 +382,15 @@ class ExtractTask extends AppShell {
 			$this->_parse('__dc', array('domain', 'singular', 'category'));
 			$this->_parse('__dn', array('domain', 'singular', 'plural'));
 			$this->_parse('__dcn', array('domain', 'singular', 'plural', 'count', 'category'));
+
+			$this->_parse('__x', array('context', 'singular'));
+			$this->_parse('__xn', array('context', 'singular', 'plural'));
+			$this->_parse('__dx', array('domain', 'context', 'singular'));
+			$this->_parse('__dxc', array('domain', 'context', 'singular', 'category'));
+			$this->_parse('__dxn', array('domain', 'context', 'singular', 'plural'));
+			$this->_parse('__dxcn', array('domain', 'context', 'singular', 'plural', 'count', 'category'));
+			$this->_parse('__xc', array('context', 'singular', 'category'));
+
 		}
 	}
 
@@ -398,7 +415,7 @@ class ExtractTask extends AppShell {
 			}
 
 			list($type, $string, $line) = $countToken;
-			if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis === '(')) {
+			if (($type == T_STRING) && ($string === $functionName) && ($firstParenthesis === '(')) {
 				$position = $count;
 				$depth = 0;
 
@@ -414,11 +431,12 @@ class ExtractTask extends AppShell {
 				$mapCount = count($map);
 				$strings = $this->_getStrings($position, $mapCount);
 
-				if ($mapCount == count($strings)) {
+				if ($mapCount === count($strings)) {
 					extract(array_combine($map, $strings));
 					$category = isset($category) ? $category : 6;
-					$category = intval($category);
+					$category = (int)$category;
 					$categoryName = $categories[$category];
+
 					$domain = isset($domain) ? $domain : 'default';
 					$details = array(
 						'file' => $this->_file,
@@ -427,8 +445,14 @@ class ExtractTask extends AppShell {
 					if (isset($plural)) {
 						$details['msgid_plural'] = $plural;
 					}
-					$this->_addTranslation($categoryName, $domain, $singular, $details);
-				} else {
+					if (isset($context)) {
+						$details['msgctxt'] = $context;
+					}
+					// Skip LC_TIME files as we use a special file format for them.
+					if ($categoryName !== 'LC_TIME') {
+						$this->_addTranslation($categoryName, $domain, $singular, $details);
+					}
+				} elseif (!is_array($this->_tokens[$count - 1]) || $this->_tokens[$count - 1][0] != T_FUNCTION) {
 					$this->_markerError($this->_file, $line, $functionName, $count);
 				}
 			}
@@ -547,32 +571,46 @@ class ExtractTask extends AppShell {
 	protected function _buildFiles() {
 		$paths = $this->_paths;
 		$paths[] = realpath(APP) . DS;
+
+		usort($paths, function ($a, $b) {
+			return strlen($b) - strlen($a);
+		});
+
 		foreach ($this->_translations as $category => $domains) {
 			foreach ($domains as $domain => $translations) {
-				foreach ($translations as $msgid => $details) {
-					$plural = $details['msgid_plural'];
-					$files = $details['references'];
-					$occurrences = array();
-					foreach ($files as $file => $lines) {
-						$lines = array_unique($lines);
-						$occurrences[] = $file . ':' . implode(';', $lines);
-					}
-					$occurrences = implode("\n#: ", $occurrences);
-					$header = '#: ' . str_replace(DS, '/', str_replace($paths, '', $occurrences)) . "\n";
+				foreach ($translations as $msgid => $contexts) {
+					foreach ($contexts as $context => $details) {
+						$plural = $details['msgid_plural'];
+						$header = '';
+						if (empty($this->params['no-location'])) {
+							$files = $details['references'];
+							$occurrences = array();
+							foreach ($files as $file => $lines) {
+								$lines = array_unique($lines);
+								$occurrences[] = $file . ':' . implode(';', $lines);
+							}
+							$occurrences = implode("\n#: ", $occurrences);
+							$header = '#: ' . str_replace(DS, '/', str_replace($paths, '', $occurrences)) . "\n";
+						}
 
-					if ($plural === false) {
-						$sentence = "msgid \"{$msgid}\"\n";
-						$sentence .= "msgstr \"\"\n\n";
-					} else {
-						$sentence = "msgid \"{$msgid}\"\n";
-						$sentence .= "msgid_plural \"{$plural}\"\n";
-						$sentence .= "msgstr[0] \"\"\n";
-						$sentence .= "msgstr[1] \"\"\n\n";
-					}
+						$sentence = '';
+						if ($context) {
+							$sentence .= "msgctxt \"{$context}\"\n";
+						}
+						if ($plural === false) {
+							$sentence .= "msgid \"{$msgid}\"\n";
+							$sentence .= "msgstr \"\"\n\n";
+						} else {
+							$sentence .= "msgid \"{$msgid}\"\n";
+							$sentence .= "msgid_plural \"{$plural}\"\n";
+							$sentence .= "msgstr[0] \"\"\n";
+							$sentence .= "msgstr[1] \"\"\n\n";
+						}
 
-					$this->_store($category, $domain, $header, $sentence);
-					if (($category !== 'LC_MESSAGES' || $domain !== 'default') && $this->_merge) {
-						$this->_store('LC_MESSAGES', 'default', $header, $sentence);
+						$this->_store($category, $domain, $header, $sentence);
+						if (($category !== 'LC_MESSAGES' || $domain !== 'default') && $this->_merge) {
+							$this->_store('LC_MESSAGES', 'default', $header, $sentence);
+						}
 					}
 				}
 			}
@@ -582,10 +620,10 @@ class ExtractTask extends AppShell {
 /**
  * Prepare a file to be stored
  *
- * @param string $category
- * @param string $domain
- * @param string $header
- * @param string $sentence
+ * @param string $category The category
+ * @param string $domain The domain
+ * @param string $header The header content.
+ * @param string $sentence The sentence to store.
  * @return void
  */
 	protected function _store($category, $domain, $header, $sentence) {
@@ -664,7 +702,6 @@ class ExtractTask extends AppShell {
 		$output .= "msgid \"\"\n";
 		$output .= "msgstr \"\"\n";
 		$output .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n";
-		$output .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
 		$output .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n";
 		$output .= "\"Last-Translator: NAME <EMAIL@ADDRESS>\\n\"\n";
 		$output .= "\"Language-Team: LANGUAGE <EMAIL@ADDRESS>\\n\"\n";
@@ -678,8 +715,8 @@ class ExtractTask extends AppShell {
 /**
  * Get the strings from the position forward
  *
- * @param integer $position Actual position on tokens array
- * @param integer $target Number of strings to extract
+ * @param int &$position Actual position on tokens array
+ * @param int $target Number of strings to extract
  * @return array Strings extracted
  */
 	protected function _getStrings(&$position, $target) {
@@ -728,22 +765,22 @@ class ExtractTask extends AppShell {
  * Indicate an invalid marker on a processed file
  *
  * @param string $file File where invalid marker resides
- * @param integer $line Line number
+ * @param int $line Line number
  * @param string $marker Marker found
- * @param integer $count Count
+ * @param int $count Count
  * @return void
  */
 	protected function _markerError($file, $line, $marker, $count) {
-		$this->out(__d('cake_console', "Invalid marker content in %s:%s\n* %s(", $file, $line, $marker));
+		$this->err(__d('cake_console', "Invalid marker content in %s:%s\n* %s(", $file, $line, $marker));
 		$count += 2;
 		$tokenCount = count($this->_tokens);
 		$parenthesis = 1;
 
 		while ((($tokenCount - $count) > 0) && $parenthesis) {
 			if (is_array($this->_tokens[$count])) {
-				$this->out($this->_tokens[$count][1], false);
+				$this->err($this->_tokens[$count][1], false);
 			} else {
-				$this->out($this->_tokens[$count], false);
+				$this->err($this->_tokens[$count], false);
 				if ($this->_tokens[$count] === '(') {
 					$parenthesis++;
 				}
@@ -754,7 +791,7 @@ class ExtractTask extends AppShell {
 			}
 			$count++;
 		}
-		$this->out("\n", true);
+		$this->err("\n", true);
 	}
 
 /**
@@ -774,26 +811,24 @@ class ExtractTask extends AppShell {
 			}
 			$pattern = '/' . implode('|', $exclude) . '/';
 		}
-		foreach ($this->_paths as $path) {
-			$Folder = new Folder($path);
+		foreach ($this->_paths as $i => $path) {
+			$this->_paths[$i] = realpath($path) . DS;
+			$Folder = new Folder($this->_paths[$i]);
 			$files = $Folder->findRecursive('.*\.(php|ctp|thtml|inc|tpl)', true);
 			if (!empty($pattern)) {
-				foreach ($files as $i => $file) {
-					if (preg_match($pattern, $file)) {
-						unset($files[$i]);
-					}
-				}
+				$files = preg_grep($pattern, $files, PREG_GREP_INVERT);
 				$files = array_values($files);
 			}
 			$this->_files = array_merge($this->_files, $files);
 		}
+		$this->_files = array_unique($this->_files);
 	}
 
 /**
  * Returns whether this execution is meant to extract string only from directories in folder represented by the
  * APP constant, i.e. this task is extracting strings from same application.
  *
- * @return boolean
+ * @return bool
  */
 	protected function _isExtractingApp() {
 		return $this->_paths === array(APP);
@@ -803,7 +838,7 @@ class ExtractTask extends AppShell {
  * Checks whether or not a given path is usable for writing.
  *
  * @param string $path Path to folder
- * @return boolean true if it exists and is writable, false otherwise
+ * @return bool true if it exists and is writable, false otherwise
  */
 	protected function _isPathUsable($path) {
 		return is_dir($path) && is_writable($path);
diff --git a/web/api/lib/Cake/Console/Command/Task/FixtureTask.php b/web/api/lib/Cake/Console/Command/Task/FixtureTask.php
index 0be6d36dd..1f578d083 100644
--- a/web/api/lib/Cake/Console/Command/Task/FixtureTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/FixtureTask.php
@@ -74,7 +74,7 @@ class FixtureTask extends BakeTask {
 		))->addOption('count', array(
 			'help' => __d('cake_console', 'When using generated data, the number of records to include in the fixture(s).'),
 			'short' => 'n',
-			'default' => 10
+			'default' => 1
 		))->addOption('connection', array(
 			'help' => __d('cake_console', 'Which database configuration to use for baking.'),
 			'short' => 'c',
@@ -210,7 +210,7 @@ class FixtureTask extends BakeTask {
  * @param string $model Name of model to bake.
  * @param string $useTable Name of table to use.
  * @param array $importOptions Options for public $import
- * @return string Baked fixture content
+ * @return string|null Baked fixture content, otherwise null.
  */
 	public function bake($model, $useTable = false, $importOptions = array()) {
 		App::uses('CakeSchema', 'Model');
@@ -242,8 +242,8 @@ class FixtureTask extends BakeTask {
 		$this->_Schema = new CakeSchema();
 		$data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
 		if (!isset($data['tables'][$useTable])) {
-			$this->error('Could not find your selected table ' . $useTable);
-			return false;
+			$this->err("<warning>Warning:</warning> Could not find the '${useTable}' table for ${model}.");
+			return null;
 		}
 
 		$tableInfo = $data['tables'][$useTable];
@@ -316,7 +316,7 @@ class FixtureTask extends BakeTask {
  * Generate String representation of Records
  *
  * @param array $tableInfo Table schema array
- * @param integer $recordCount
+ * @param int $recordCount The number of records to generate.
  * @return array Array of records to use in the fixture.
  */
 	protected function _generateRecords($tableInfo, $recordCount = 1) {
@@ -340,7 +340,7 @@ class FixtureTask extends BakeTask {
 							isset($fieldInfo['length']) && $fieldInfo['length'] == 36
 						);
 						if ($isPrimaryUuid) {
-							$insert = String::uuid();
+							$insert = CakeText::uuid();
 						} else {
 							$insert = "Lorem ipsum dolor sit amet";
 							if (!empty($fieldInfo['length'])) {
@@ -381,7 +381,7 @@ class FixtureTask extends BakeTask {
 	}
 
 /**
- * Convert a $records array into a a string.
+ * Convert a $records array into a string.
  *
  * @param array $records Array of records to be converted to string
  * @return string A string value of the $records array.
@@ -414,19 +414,26 @@ class FixtureTask extends BakeTask {
  * @return array Array of records.
  */
 	protected function _getRecordsFromTable($modelName, $useTable = null) {
+		$modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
 		if ($this->interactive) {
 			$condition = null;
 			$prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1");
 			while (!$condition) {
 				$condition = $this->in($prompt, null, 'WHERE 1=1');
 			}
+
+			$recordsFound = $modelObject->find('count', array(
+				'conditions' => $condition,
+				'recursive' => -1,
+			));
+
 			$prompt = __d('cake_console', "How many records do you want to import?");
-			$recordCount = $this->in($prompt, null, 10);
+			$recordCount = $this->in($prompt, null, ($recordsFound < 10 ) ? $recordsFound : 10);
 		} else {
 			$condition = 'WHERE 1=1';
 			$recordCount = (isset($this->params['count']) ? $this->params['count'] : 10);
 		}
-		$modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
+
 		$records = $modelObject->find('all', array(
 			'conditions' => $condition,
 			'recursive' => -1,
diff --git a/web/api/lib/Cake/Console/Command/Task/ModelTask.php b/web/api/lib/Cake/Console/Command/Task/ModelTask.php
index 128674b5b..2dc03a5c3 100644
--- a/web/api/lib/Cake/Console/Command/Task/ModelTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ModelTask.php
@@ -161,8 +161,8 @@ class ModelTask extends BakeTask {
  *
  * @param array $options Array of options to use for the selections. indexes must start at 0
  * @param string $prompt Prompt to use for options list.
- * @param integer $default The default option for the given prompt.
- * @return integer Result of user choice.
+ * @param int $default The default option for the given prompt.
+ * @return int Result of user choice.
  */
 	public function inOptions($options, $prompt = null, $default = null) {
 		$valid = false;
@@ -176,7 +176,7 @@ class ModelTask extends BakeTask {
 				$prompt = __d('cake_console', 'Make a selection from the choices above');
 			}
 			$choice = $this->in($prompt, null, $default);
-			if (intval($choice) > 0 && intval($choice) <= $max) {
+			if ((int)$choice > 0 && (int)$choice <= $max) {
 				$valid = true;
 			}
 		}
@@ -186,7 +186,7 @@ class ModelTask extends BakeTask {
 /**
  * Handles interactive baking
  *
- * @return boolean
+ * @return bool
  */
 	protected function _interactive() {
 		$this->hr();
@@ -342,7 +342,7 @@ class ModelTask extends BakeTask {
  * Handles Generation and user interaction for creating validation.
  *
  * @param Model $model Model to have validations generated for.
- * @return array $validate Array of user selected validations.
+ * @return array validate Array of user selected validations.
  */
 	public function doValidation($model) {
 		if (!$model instanceof Model) {
@@ -383,6 +383,8 @@ class ModelTask extends BakeTask {
 		if (class_exists('Validation')) {
 			$options = get_class_methods('Validation');
 		}
+		$deprecatedOptions = array('notEmpty', 'between', 'ssn');
+		$options = array_diff($options, $deprecatedOptions);
 		sort($options);
 		$default = 1;
 		foreach ($options as $option) {
@@ -401,7 +403,7 @@ class ModelTask extends BakeTask {
  *
  * @param string $fieldName Name of field to be validated.
  * @param array $metaData metadata for field
- * @param string $primaryKey
+ * @param string $primaryKey The primary key field.
  * @return array Array of validation for the field.
  */
 	public function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
@@ -443,9 +445,9 @@ class ModelTask extends BakeTask {
 				} elseif ($metaData['type'] === 'string' && $metaData['length'] == 36) {
 					$guess = $methods['uuid'];
 				} elseif ($metaData['type'] === 'string') {
-					$guess = $methods['notEmpty'];
+					$guess = $methods['notBlank'];
 				} elseif ($metaData['type'] === 'text') {
-					$guess = $methods['notEmpty'];
+					$guess = $methods['notBlank'];
 				} elseif ($metaData['type'] === 'integer') {
 					$guess = $methods['numeric'];
 				} elseif ($metaData['type'] === 'float') {
@@ -460,6 +462,8 @@ class ModelTask extends BakeTask {
 					$guess = $methods['datetime'];
 				} elseif ($metaData['type'] === 'inet') {
 					$guess = $methods['ip'];
+				} elseif ($metaData['type'] === 'decimal') {
+					$guess = $methods['decimal'];
 				}
 			}
 
@@ -510,7 +514,7 @@ class ModelTask extends BakeTask {
 /**
  * Handles associations
  *
- * @param Model $model
+ * @param Model $model The model object
  * @return array Associations
  */
 	public function doAssociations($model) {
@@ -562,7 +566,7 @@ class ModelTask extends BakeTask {
 /**
  * Handles behaviors
  *
- * @param Model $model
+ * @param Model $model The model object.
  * @return array Behaviors
  */
 	public function doActsAs($model) {
@@ -632,13 +636,13 @@ class ModelTask extends BakeTask {
 			}
 			foreach ($tempFieldNames as $fieldName) {
 				$assoc = false;
-				if ($fieldName != $model->primaryKey && $fieldName == $foreignKey) {
+				if ($fieldName !== $model->primaryKey && $fieldName === $foreignKey) {
 					$assoc = array(
 						'alias' => $tempOtherModel->name,
 						'className' => $tempOtherModel->name,
 						'foreignKey' => $fieldName
 					);
-				} elseif ($otherTable == $model->table && $fieldName === 'parent_id') {
+				} elseif ($otherTable === $model->table && $fieldName === 'parent_id') {
 					$assoc = array(
 						'alias' => 'Child' . $model->name,
 						'className' => $model->name,
@@ -728,7 +732,7 @@ class ModelTask extends BakeTask {
 		while (strtolower($wannaDoMoreAssoc) === 'y') {
 			$assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
 			$this->out(__d('cake_console', 'What is the association type?'));
-			$assocType = intval($this->inOptions($assocs, __d('cake_console', 'Enter a number')));
+			$assocType = (int)$this->inOptions($assocs, __d('cake_console', 'Enter a number'));
 
 			$this->out(__d('cake_console', "For the following options be very careful to match your setup exactly.\n" .
 				"Any spelling mistakes will cause errors."));
@@ -765,7 +769,7 @@ class ModelTask extends BakeTask {
 			if (!empty($showKeys)) {
 				$this->out(__d('cake_console', 'A helpful List of possible keys'));
 				$foreignKey = $this->inOptions($showKeys, __d('cake_console', 'What is the foreignKey?'));
-				$foreignKey = $showKeys[intval($foreignKey)];
+				$foreignKey = $showKeys[(int)$foreignKey];
 			}
 			if (!isset($foreignKey)) {
 				$foreignKey = $this->in(__d('cake_console', 'What is the foreignKey? Specify your own.'), null, $suggestedForeignKey);
@@ -812,7 +816,7 @@ class ModelTask extends BakeTask {
  * Assembles and writes a Model file.
  *
  * @param string|object $name Model name or object
- * @param array|boolean $data if array and $name is not an object assume bake data, otherwise boolean.
+ * @param array|bool $data if array and $name is not an object assume bake data, otherwise boolean.
  * @return string
  */
 	public function bake($name, $data = array()) {
@@ -926,7 +930,7 @@ class ModelTask extends BakeTask {
 				$tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y', 'n'), 'y');
 			}
 			if (strtolower($tableIsGood) === 'n') {
-				$useTable = $this->in(__d('cake_console', 'What is the name of the table?'));
+				$useTable = $this->in(__d('cake_console', 'What is the name of the table (without prefix)?'));
 			}
 		}
 		return $useTable;
@@ -985,14 +989,14 @@ class ModelTask extends BakeTask {
 				return $this->_stop();
 			}
 
-			if (!$enteredModel || intval($enteredModel) > count($this->_modelNames)) {
+			if (!$enteredModel || (int)$enteredModel > count($this->_modelNames)) {
 				$this->err(__d('cake_console', "The model name you supplied was empty,\n" .
 					"or the number you selected was not an option. Please try again."));
 				$enteredModel = '';
 			}
 		}
-		if (intval($enteredModel) > 0 && intval($enteredModel) <= count($this->_modelNames)) {
-			return $this->_modelNames[intval($enteredModel) - 1];
+		if ((int)$enteredModel > 0 && (int)$enteredModel <= count($this->_modelNames)) {
+			return $this->_modelNames[(int)$enteredModel - 1];
 		}
 
 		return $enteredModel;
diff --git a/web/api/lib/Cake/Console/Command/Task/PluginTask.php b/web/api/lib/Cake/Console/Command/Task/PluginTask.php
index e37e437c3..7cd507942 100644
--- a/web/api/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/PluginTask.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * The Plugin Task handles creating an empty plugin, ready to be used
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -73,7 +71,7 @@ class PluginTask extends AppShell {
 /**
  * Interactive interface
  *
- * @param string $plugin
+ * @param string $plugin The plugin name.
  * @return void
  */
 	protected function _interactive($plugin = null) {
@@ -90,7 +88,7 @@ class PluginTask extends AppShell {
  * Bake the plugin, create directories and files
  *
  * @param string $plugin Name of the plugin in CamelCased format
- * @return boolean
+ * @return bool
  */
 	public function bake($plugin) {
 		$pathOptions = App::path('plugins');
@@ -108,18 +106,25 @@ class PluginTask extends AppShell {
 			$Folder = new Folder($this->path . $plugin);
 			$directories = array(
 				'Config' . DS . 'Schema',
-				'Model' . DS . 'Behavior',
-				'Model' . DS . 'Datasource',
 				'Console' . DS . 'Command' . DS . 'Task',
+				'Console' . DS . 'Templates',
 				'Controller' . DS . 'Component',
 				'Lib',
-				'View' . DS . 'Helper',
+				'Locale' . DS . 'eng' . DS . 'LC_MESSAGES',
+				'Model' . DS . 'Behavior',
+				'Model' . DS . 'Datasource',
 				'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
-				'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
+				'Test' . DS . 'Case' . DS . 'Lib',
 				'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
+				'Test' . DS . 'Case' . DS . 'Model' . DS . 'Datasource',
+				'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
 				'Test' . DS . 'Fixture',
-				'Vendor',
-				'webroot'
+				'View' . DS . 'Elements',
+				'View' . DS . 'Helper',
+				'View' . DS . 'Layouts',
+				'webroot' . DS . 'css',
+				'webroot' . DS . 'js',
+				'webroot' . DS . 'img',
 			);
 
 			foreach ($directories as $directory) {
@@ -184,7 +189,7 @@ class PluginTask extends AppShell {
 /**
  * find and change $this->path to the user selection
  *
- * @param array $pathOptions
+ * @param array $pathOptions The list of paths to look in.
  * @return void
  */
 	public function findPath($pathOptions) {
@@ -203,7 +208,7 @@ class PluginTask extends AppShell {
 			}
 			$prompt = __d('cake_console', 'Choose a plugin path from the paths above.');
 			$choice = $this->in($prompt, null, 1);
-			if (intval($choice) > 0 && intval($choice) <= $max) {
+			if ((int)$choice > 0 && (int)$choice <= $max) {
 				$valid = true;
 			}
 		}
diff --git a/web/api/lib/Cake/Console/Command/Task/ProjectTask.php b/web/api/lib/Cake/Console/Command/Task/ProjectTask.php
index c3225a99f..df1ab19db 100644
--- a/web/api/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ProjectTask.php
@@ -18,7 +18,7 @@
 App::uses('AppShell', 'Console/Command');
 App::uses('File', 'Utility');
 App::uses('Folder', 'Utility');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('Security', 'Utility');
 
 /**
@@ -142,7 +142,7 @@ class ProjectTask extends AppShell {
 /**
  * Checks PHP's include_path for CakePHP.
  *
- * @return boolean Indicates whether or not CakePHP exists on include_path
+ * @return bool Indicates whether or not CakePHP exists on include_path
  */
 	public function cakeOnIncludePath() {
 		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
@@ -212,7 +212,7 @@ class ProjectTask extends AppShell {
 				}
 
 				foreach ($Folder->messages() as $message) {
-					$this->out(String::wrap(' * ' . $message), 1, Shell::VERBOSE);
+					$this->out(CakeText::wrap(' * ' . $message), 1, Shell::VERBOSE);
 				}
 
 				return true;
@@ -231,14 +231,14 @@ class ProjectTask extends AppShell {
  * and points app/console/cake.php to the right place
  *
  * @param string $path Project path.
- * @return boolean success
+ * @return bool success
  */
 	public function consolePath($path) {
 		$File = new File($path . 'Console' . DS . 'cake.php');
 		$contents = $File->read();
 		if (preg_match('/(__CAKE_PATH__)/', $contents, $match)) {
-			$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " \$ds . '" : "'";
-			$replacement = $root . str_replace(DS, "' . \$ds . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
+			$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
+			$replacement = $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
 			$result = str_replace($match[0], $replacement, $contents);
 			if ($File->write($result)) {
 				return true;
@@ -252,7 +252,7 @@ class ProjectTask extends AppShell {
  * Generates and writes 'Security.salt'
  *
  * @param string $path Project path
- * @return boolean Success
+ * @return bool Success
  */
 	public function securitySalt($path) {
 		$File = new File($path . 'Config' . DS . 'core.php');
@@ -272,7 +272,7 @@ class ProjectTask extends AppShell {
  * Generates and writes 'Security.cipherSeed'
  *
  * @param string $path Project path
- * @return boolean Success
+ * @return bool Success
  */
 	public function securityCipherSeed($path) {
 		$File = new File($path . 'Config' . DS . 'core.php');
@@ -293,7 +293,7 @@ class ProjectTask extends AppShell {
  * Writes cache prefix using app's name
  *
  * @param string $dir Path to project
- * @return boolean Success
+ * @return bool Success
  */
 	public function cachePrefix($dir) {
 		$app = basename($dir);
@@ -310,8 +310,8 @@ class ProjectTask extends AppShell {
  * Generates and writes CAKE_CORE_INCLUDE_PATH
  *
  * @param string $path Project path
- * @param boolean $hardCode Whether or not define calls should be hardcoded.
- * @return boolean Success
+ * @param bool $hardCode Whether or not define calls should be hardcoded.
+ * @return bool Success
  */
 	public function corePath($path, $hardCode = true) {
 		if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {
@@ -331,8 +331,8 @@ class ProjectTask extends AppShell {
  * Replaces the __CAKE_PATH__ placeholder in the template files.
  *
  * @param string $filename The filename to operate on.
- * @param boolean $hardCode Whether or not the define should be uncommented.
- * @return boolean Success
+ * @param bool $hardCode Whether or not the define should be uncommented.
+ * @return bool Success
  */
 	protected function _replaceCorePath($filename, $hardCode) {
 		$contents = file_get_contents($filename);
@@ -340,6 +340,11 @@ class ProjectTask extends AppShell {
 		$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
 		$corePath = $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
 
+		$composer = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+		if (file_exists($composer)) {
+			$corePath = " ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib'";
+		}
+
 		$result = str_replace('__CAKE_PATH__', $corePath, $contents, $count);
 		if ($hardCode) {
 			$result = str_replace('//define(\'CAKE_CORE', 'define(\'CAKE_CORE', $result);
@@ -354,7 +359,7 @@ class ProjectTask extends AppShell {
  * Enables Configure::read('Routing.prefixes') in /app/Config/core.php
  *
  * @param string $name Name to use as admin routing
- * @return boolean Success
+ * @return bool Success
  */
 	public function cakeAdmin($name) {
 		$path = (empty($this->configPath)) ? APP . 'Config' . DS : $this->configPath;
diff --git a/web/api/lib/Cake/Console/Command/Task/TestTask.php b/web/api/lib/Cake/Console/Command/Task/TestTask.php
index f85d57cd0..a147951c2 100644
--- a/web/api/lib/Cake/Console/Command/Task/TestTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/TestTask.php
@@ -102,8 +102,8 @@ class TestTask extends BakeTask {
 /**
  * Handles interactive baking
  *
- * @param string $type
- * @return string|boolean
+ * @param string $type The type of object to bake a test for.
+ * @return string|bool
  */
 	protected function _interactive($type = null) {
 		$this->interactive = true;
@@ -129,7 +129,7 @@ class TestTask extends BakeTask {
  *
  * @param string $type Type of object to bake test case for ie. Model, Controller
  * @param string $className the 'cake name' for the class ie. Posts for the PostsController
- * @return string|boolean
+ * @return string|bool
  */
 	public function bake($type, $className) {
 		$plugin = null;
@@ -242,7 +242,7 @@ class TestTask extends BakeTask {
  * Currently only model, and controller are supported
  *
  * @param string $type The Type of object you are generating tests for eg. controller
- * @return boolean
+ * @return bool
  */
 	public function typeCanDetectFixtures($type) {
 		$type = strtolower($type);
@@ -254,7 +254,7 @@ class TestTask extends BakeTask {
  *
  * @param string $package The package of object you are generating tests for eg. controller
  * @param string $class the Classname of the class the test is being generated for.
- * @return boolean
+ * @return bool
  */
 	public function isLoadableClass($package, $class) {
 		App::uses($class, $package);
@@ -302,7 +302,7 @@ class TestTask extends BakeTask {
 
 		$position = strpos($class, $type);
 
-		if ($position !== false && strlen($class) - $position == strlen($type)) {
+		if ($position !== false && (strlen($class) - $position) === strlen($type)) {
 			return $class;
 		}
 		return $class . $type;
@@ -466,7 +466,7 @@ class TestTask extends BakeTask {
  * Controllers require a mock class.
  *
  * @param string $type The type of object tests are being generated for eg. controller.
- * @return boolean
+ * @return bool
  */
 	public function hasMockClass($type) {
 		$type = strtolower($type);
diff --git a/web/api/lib/Cake/Console/Command/Task/ViewTask.php b/web/api/lib/Cake/Console/Command/Task/ViewTask.php
index 8fc387aba..06ecf0013 100644
--- a/web/api/lib/Cake/Console/Command/Task/ViewTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ViewTask.php
@@ -89,7 +89,7 @@ class ViewTask extends BakeTask {
 			$this->_interactive();
 		}
 		if (empty($this->args[0])) {
-			return;
+			return null;
 		}
 		if (!isset($this->connection)) {
 			$this->connection = 'default';
@@ -151,7 +151,7 @@ class ViewTask extends BakeTask {
 					unset($methods[$i]);
 				}
 			}
-			if ($method[0] === '_' || $method == strtolower($this->controllerName . 'Controller')) {
+			if ($method[0] === '_' || $method === strtolower($this->controllerName . 'Controller')) {
 				unset($methods[$i]);
 			}
 		}
@@ -206,7 +206,7 @@ class ViewTask extends BakeTask {
 		$this->Controller->connection = $this->connection;
 		$this->controllerName = $this->Controller->getName();
 
-		$prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName);
+		$prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if they exist.", $this->controllerName);
 		$interactive = $this->in($prompt, array('y', 'n'), 'n');
 
 		if (strtolower($interactive) === 'n') {
@@ -248,7 +248,7 @@ class ViewTask extends BakeTask {
  *	'singularHumanName', 'pluralHumanName', 'fields', 'foreignKeys',
  *	'belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'
  *
- * @return array Returns an variables to be made available to a view template
+ * @return array Returns a variables to be made available to a view template
  */
 	protected function _loadController() {
 		if (!$this->controllerName) {
@@ -298,7 +298,7 @@ class ViewTask extends BakeTask {
  * Bake a view file for each of the supplied actions
  *
  * @param array $actions Array of actions to make files for.
- * @param array $vars
+ * @param array $vars The template variables.
  * @return void
  */
 	public function bakeActions($actions, $vars) {
@@ -342,7 +342,7 @@ class ViewTask extends BakeTask {
  *
  * @param string $action Action to bake
  * @param string $content Content to write
- * @return boolean Success
+ * @return bool Success
  */
 	public function bake($action, $content = '') {
 		if ($content === true) {
@@ -454,8 +454,8 @@ class ViewTask extends BakeTask {
 /**
  * Returns associations for controllers models.
  *
- * @param Model $model
- * @return array $associations
+ * @param Model $model The Model instance.
+ * @return array associations
  */
 	protected function _associations(Model $model) {
 		$keys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
diff --git a/web/api/lib/Cake/Console/Command/TestShell.php b/web/api/lib/Cake/Console/Command/TestShell.php
index bd7e9d277..4dfacfdfc 100644
--- a/web/api/lib/Cake/Console/Command/TestShell.php
+++ b/web/api/lib/Cake/Console/Command/TestShell.php
@@ -179,11 +179,11 @@ class TestShell extends Shell {
 /**
  * Parse the CLI options into an array CakeTestDispatcher can use.
  *
- * @return array Array of params for CakeTestDispatcher
+ * @return array|null Array of params for CakeTestDispatcher or null.
  */
 	protected function _parseArgs() {
 		if (empty($this->args)) {
-			return;
+			return null;
 		}
 		$params = array(
 			'core' => false,
@@ -222,6 +222,7 @@ class TestShell extends Shell {
 		$options = array();
 		$params = $this->params;
 		unset($params['help']);
+		unset($params['quiet']);
 
 		if (!empty($params['no-colors'])) {
 			unset($params['no-colors'], $params['colors']);
@@ -334,9 +335,9 @@ class TestShell extends Shell {
 /**
  * Find the test case for the passed file. The file could itself be a test.
  *
- * @param string $file
- * @param string $category
- * @param boolean $throwOnMissingFile
+ * @param string $file The file to map.
+ * @param string $category The test file category.
+ * @param bool $throwOnMissingFile Whether or not to throw an exception.
  * @return array array(type, case)
  * @throws Exception
  */
@@ -411,7 +412,7 @@ class TestShell extends Shell {
 /**
  * For the given file, what category of test is it? returns app, core or the name of the plugin
  *
- * @param string $file
+ * @param string $file The file to map.
  * @return string
  */
 	protected function _mapFileToCategory($file) {
diff --git a/web/api/lib/Cake/Console/Command/UpgradeShell.php b/web/api/lib/Cake/Console/Command/UpgradeShell.php
index 27d7561fe..12b3fbc9d 100644
--- a/web/api/lib/Cake/Console/Command/UpgradeShell.php
+++ b/web/api/lib/Cake/Console/Command/UpgradeShell.php
@@ -18,6 +18,7 @@
 
 App::uses('AppShell', 'Console/Command');
 App::uses('Folder', 'Utility');
+App::uses('CakePlugin', 'Core');
 
 /**
  * A shell class to help developers upgrade applications to CakePHP 2.0
@@ -102,7 +103,7 @@ class UpgradeShell extends AppShell {
 	public function tests() {
 		$this->_paths = array(APP . 'tests' . DS);
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']) . 'tests' . DS);
+			$this->_paths = array(CakePlugin::path($this->params['plugin']) . 'tests' . DS);
 		}
 		$patterns = array(
 			array(
@@ -128,7 +129,7 @@ class UpgradeShell extends AppShell {
 		$cwd = getcwd();
 
 		if (!empty($this->params['plugin'])) {
-			chdir(App::pluginPath($this->params['plugin']));
+			chdir(CakePlugin::path($this->params['plugin']));
 		}
 
 		if (is_dir('plugins')) {
@@ -215,7 +216,7 @@ class UpgradeShell extends AppShell {
 		$this->_paths = array_diff(App::path('views'), App::core('views'));
 
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']) . 'views' . DS);
+			$this->_paths = array(CakePlugin::path($this->params['plugin']) . 'views' . DS);
 		}
 
 		$patterns = array();
@@ -229,7 +230,7 @@ class UpgradeShell extends AppShell {
 			CakePlugin::load($plugin);
 			$pluginHelpers = array_merge(
 				$pluginHelpers,
-				App::objects('helper', App::pluginPath($plugin) . DS . 'views' . DS . 'helpers' . DS, false)
+				App::objects('helper', CakePlugin::path($plugin) . DS . 'views' . DS . 'helpers' . DS, false)
 			);
 		}
 		$helpers = array_merge($pluginHelpers, $helpers);
@@ -260,7 +261,7 @@ class UpgradeShell extends AppShell {
 			APP
 		);
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']));
+			$this->_paths = array(CakePlugin::path($this->params['plugin']));
 		}
 
 		$patterns = array(
@@ -299,7 +300,7 @@ class UpgradeShell extends AppShell {
 			APP
 		);
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']));
+			$this->_paths = array(CakePlugin::path($this->params['plugin']));
 		}
 		$patterns = array(
 			array(
@@ -354,7 +355,7 @@ class UpgradeShell extends AppShell {
 		$this->_paths = array_merge($views, $controllers, $components);
 
 		if (!empty($this->params['plugin'])) {
-			$pluginPath = App::pluginPath($this->params['plugin']);
+			$pluginPath = CakePlugin::path($this->params['plugin']);
 			$this->_paths = array(
 				$pluginPath . 'controllers' . DS,
 				$pluginPath . 'controllers' . DS . 'components' . DS,
@@ -411,7 +412,7 @@ class UpgradeShell extends AppShell {
 			APP
 		);
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']));
+			$this->_paths = array(CakePlugin::path($this->params['plugin']));
 		}
 		$patterns = array(
 			array(
@@ -433,7 +434,7 @@ class UpgradeShell extends AppShell {
 			APP
 		);
 		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']));
+			$this->_paths = array(CakePlugin::path($this->params['plugin']));
 		}
 		$patterns = array(
 			array(
@@ -554,6 +555,7 @@ class UpgradeShell extends AppShell {
 /**
  * Replace cakeError with built-in exceptions.
  * NOTE: this ignores calls where you've passed your own secondary parameters to cakeError().
+ *
  * @return void
  */
 	public function exceptions() {
@@ -563,7 +565,7 @@ class UpgradeShell extends AppShell {
 		$this->_paths = array_merge($controllers, $components);
 
 		if (!empty($this->params['plugin'])) {
-			$pluginPath = App::pluginPath($this->params['plugin']);
+			$pluginPath = CakePlugin::path($this->params['plugin']);
 			$this->_paths = array(
 				$pluginPath . 'controllers' . DS,
 				$pluginPath . 'controllers' . DS . 'components' . DS,
@@ -609,7 +611,7 @@ class UpgradeShell extends AppShell {
 
 			$new = 'View' . DS . Inflector::camelize($old);
 			$old = 'View' . DS . $old;
-			if ($new == $old) {
+			if ($new === $old) {
 				continue;
 			}
 
@@ -661,7 +663,7 @@ class UpgradeShell extends AppShell {
  * Find all php files in the folder (honoring recursive) and determine where CakePHP expects the file to be
  * If the file is not exactly where CakePHP expects it - move it.
  *
- * @param string $path
+ * @param string $path The path to move files in.
  * @param array $options array(recursive, checkFolder)
  * @return void
  */
@@ -763,7 +765,7 @@ class UpgradeShell extends AppShell {
 /**
  * Searches the paths and finds files based on extension.
  *
- * @param string $extensions
+ * @param string $extensions The extensions to include. Defaults to none.
  * @return void
  */
 	protected function _findFiles($extensions = '') {
@@ -839,8 +841,9 @@ class UpgradeShell extends AppShell {
 		);
 
 		$parser->description(
-			__d('cake_console', "A shell to help automate upgrading from CakePHP 1.3 to 2.0. \n" .
-			"Be sure to have a backup of your application before running these commands."
+			__d('cake_console', "A tool to help automate upgrading an application or plugin " .
+			"from CakePHP 1.3 to 2.0. Be sure to have a backup of your application before " .
+			"running these commands."
 		))->addSubcommand('all', array(
 			'help' => __d('cake_console', 'Run all upgrade commands.'),
 			'parser' => $subcommandParser
diff --git a/web/api/lib/Cake/Console/ConsoleErrorHandler.php b/web/api/lib/Cake/Console/ConsoleErrorHandler.php
index aa5c464f9..7cbb2df15 100644
--- a/web/api/lib/Cake/Console/ConsoleErrorHandler.php
+++ b/web/api/lib/Cake/Console/ConsoleErrorHandler.php
@@ -40,35 +40,37 @@ class ConsoleErrorHandler {
  * @return ConsoleOutput
  */
 	public static function getStderr() {
-		if (empty(self::$stderr)) {
-			self::$stderr = new ConsoleOutput('php://stderr');
+		if (empty(static::$stderr)) {
+			static::$stderr = new ConsoleOutput('php://stderr');
 		}
-		return self::$stderr;
+		return static::$stderr;
 	}
 
 /**
- * Handle a exception in the console environment. Prints a message to stderr.
+ * Handle an exception in the console environment. Prints a message to stderr.
  *
- * @param Exception $exception The exception to handle
+ * @param Exception|ParserError $exception The exception to handle
  * @return void
  */
-	public function handleException(Exception $exception) {
-		$stderr = self::getStderr();
+	public function handleException($exception) {
+		$stderr = static::getStderr();
 		$stderr->write(__d('cake_console', "<error>Error:</error> %s\n%s",
 			$exception->getMessage(),
 			$exception->getTraceAsString()
 		));
-		return $this->_stop($exception->getCode() ? $exception->getCode() : 1);
+		$code = $exception->getCode();
+		$code = ($code && is_int($code)) ? $code : 1;
+		return $this->_stop($code);
 	}
 
 /**
  * Handle errors in the console environment. Writes errors to stderr,
  * and logs messages if Configure::read('debug') is 0.
  *
- * @param integer $code Error code
+ * @param int $code Error code
  * @param string $description Description of the error.
  * @param string $file The file the error occurred in.
- * @param integer $line The line the error occurred on.
+ * @param int $line The line the error occurred on.
  * @param array $context The backtrace of the error.
  * @return void
  */
@@ -76,7 +78,7 @@ class ConsoleErrorHandler {
 		if (error_reporting() === 0) {
 			return;
 		}
-		$stderr = self::getStderr();
+		$stderr = static::getStderr();
 		list($name, $log) = ErrorHandler::mapErrorCode($code);
 		$message = __d('cake_console', '%s in [%s, line %s]', $description, $file, $line);
 		$stderr->write(__d('cake_console', "<error>%s Error:</error> %s\n", $name, $message));
@@ -93,7 +95,7 @@ class ConsoleErrorHandler {
 /**
  * Wrapper for exit(), used for testing.
  *
- * @param integer $code The exit code.
+ * @param int $code The exit code.
  * @return void
  */
 	protected function _stop($code = 0) {
diff --git a/web/api/lib/Cake/Console/ConsoleInput.php b/web/api/lib/Cake/Console/ConsoleInput.php
index e8af58bb0..551635b82 100644
--- a/web/api/lib/Cake/Console/ConsoleInput.php
+++ b/web/api/lib/Cake/Console/ConsoleInput.php
@@ -37,7 +37,7 @@ class ConsoleInput {
  * 2. Handle we are attached to must be stdin.
  * Allows rich editing with arrow keys and history when inputting a string.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_canReadline;
 
@@ -47,7 +47,7 @@ class ConsoleInput {
  * @param string $handle The location of the stream to use as input.
  */
 	public function __construct($handle = 'php://stdin') {
-		$this->_canReadline = extension_loaded('readline') && $handle == 'php://stdin' ? true : false;
+		$this->_canReadline = extension_loaded('readline') && $handle === 'php://stdin' ? true : false;
 		$this->_input = fopen($handle, 'r');
 	}
 
@@ -70,8 +70,8 @@ class ConsoleInput {
 /**
  * Checks if data is available on the stream
  *
- * @param integer $timeout An optional time to wait for data
- * @return boolean True for data available, false otherwise
+ * @param int $timeout An optional time to wait for data
+ * @return bool True for data available, false otherwise
  */
 	public function dataAvailable($timeout = 0) {
 		$readFds = array($this->_input);
diff --git a/web/api/lib/Cake/Console/ConsoleInputArgument.php b/web/api/lib/Cake/Console/ConsoleInputArgument.php
index 7380893bf..08dbc21e9 100644
--- a/web/api/lib/Cake/Console/ConsoleInputArgument.php
+++ b/web/api/lib/Cake/Console/ConsoleInputArgument.php
@@ -41,7 +41,7 @@ class ConsoleInputArgument {
 /**
  * Is this option required?
  *
- * @var boolean
+ * @var bool
  */
 	protected $_required;
 
@@ -57,7 +57,7 @@ class ConsoleInputArgument {
  *
  * @param string|array $name The long name of the option, or an array with all the properties.
  * @param string $help The help text for this option
- * @param boolean $required Whether this argument is required. Missing required args will trigger exceptions
+ * @param bool $required Whether this argument is required. Missing required args will trigger exceptions
  * @param array $choices Valid choices for this option.
  */
 	public function __construct($name, $help = '', $required = false, $choices = array()) {
@@ -85,7 +85,7 @@ class ConsoleInputArgument {
 /**
  * Generate the help for this argument.
  *
- * @param integer $width The width to make the name of the option.
+ * @param int $width The width to make the name of the option.
  * @return string
  */
 	public function help($width = 0) {
@@ -123,7 +123,7 @@ class ConsoleInputArgument {
 /**
  * Check if this argument is a required argument
  *
- * @return boolean
+ * @return bool
  */
 	public function isRequired() {
 		return (bool)$this->_required;
@@ -132,8 +132,8 @@ class ConsoleInputArgument {
 /**
  * Check that $value is a valid choice for this argument.
  *
- * @param string $value
- * @return boolean
+ * @param string $value The choice to validate.
+ * @return bool
  * @throws ConsoleException
  */
 	public function validChoice($value) {
diff --git a/web/api/lib/Cake/Console/ConsoleInputOption.php b/web/api/lib/Cake/Console/ConsoleInputOption.php
index 4d68c9f9e..3a4b7a1c9 100644
--- a/web/api/lib/Cake/Console/ConsoleInputOption.php
+++ b/web/api/lib/Cake/Console/ConsoleInputOption.php
@@ -48,7 +48,7 @@ class ConsoleInputOption {
 /**
  * Is the option a boolean option. Boolean options do not consume a parameter.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_boolean;
 
@@ -72,7 +72,7 @@ class ConsoleInputOption {
  * @param string|array $name The long name of the option, or an array with all the properties.
  * @param string $short The short alias for this option
  * @param string $help The help text for this option
- * @param boolean $boolean Whether this option is a boolean option. Boolean options don't consume extra tokens
+ * @param bool $boolean Whether this option is a boolean option. Boolean options don't consume extra tokens
  * @param string $default The default value for this option.
  * @param array $choices Valid choices for this option.
  * @throws ConsoleException
@@ -118,7 +118,7 @@ class ConsoleInputOption {
 /**
  * Generate the help for this this option.
  *
- * @param integer $width The width to make the name of the option.
+ * @param int $width The width to make the name of the option.
  * @return string
  */
 	public function help($width = 0) {
@@ -168,7 +168,7 @@ class ConsoleInputOption {
 /**
  * Check if this option is a boolean option
  *
- * @return boolean
+ * @return bool
  */
 	public function isBoolean() {
 		return (bool)$this->_boolean;
@@ -177,8 +177,8 @@ class ConsoleInputOption {
 /**
  * Check that a value is a valid choice for this option.
  *
- * @param string $value
- * @return boolean
+ * @param string $value The choice to validate.
+ * @return bool
  * @throws ConsoleException
  */
 	public function validChoice($value) {
diff --git a/web/api/lib/Cake/Console/ConsoleInputSubcommand.php b/web/api/lib/Cake/Console/ConsoleInputSubcommand.php
index 2ddcb955b..65c10db06 100644
--- a/web/api/lib/Cake/Console/ConsoleInputSubcommand.php
+++ b/web/api/lib/Cake/Console/ConsoleInputSubcommand.php
@@ -81,7 +81,7 @@ class ConsoleInputSubcommand {
 /**
  * Generate the help for this this subcommand.
  *
- * @param integer $width The width to make the name of the subcommand.
+ * @param int $width The width to make the name of the subcommand.
  * @return string
  */
 	public function help($width = 0) {
diff --git a/web/api/lib/Cake/Console/ConsoleOptionParser.php b/web/api/lib/Cake/Console/ConsoleOptionParser.php
index 589c27949..f54c5460d 100644
--- a/web/api/lib/Cake/Console/ConsoleOptionParser.php
+++ b/web/api/lib/Cake/Console/ConsoleOptionParser.php
@@ -136,7 +136,7 @@ class ConsoleOptionParser {
  * Construct an OptionParser so you can define its behavior
  *
  * @param string $command The command name this parser is for. The command name is used for generating help.
- * @param boolean $defaultOptions Whether you want the verbose and quiet options set. Setting
+ * @param bool $defaultOptions Whether you want the verbose and quiet options set. Setting
  *  this to false will prevent the addition of `--verbose` & `--quiet` options.
  */
 	public function __construct($command = null, $defaultOptions = true) {
@@ -165,7 +165,7 @@ class ConsoleOptionParser {
  * Static factory method for creating new OptionParsers so you can chain methods off of them.
  *
  * @param string $command The command name this parser is for. The command name is used for generating help.
- * @param boolean $defaultOptions Whether you want the verbose and quiet options set.
+ * @param bool $defaultOptions Whether you want the verbose and quiet options set.
  * @return ConsoleOptionParser
  */
 	public static function create($command, $defaultOptions = true) {
@@ -175,7 +175,7 @@ class ConsoleOptionParser {
 /**
  * Build a parser from an array. Uses an array like
  *
- * {{{
+ * ```
  * $spec = array(
  *		'description' => 'text',
  *		'epilog' => 'text',
@@ -189,7 +189,7 @@ class ConsoleOptionParser {
  *			// list of subcommands to add.
  *		)
  * );
- * }}}
+ * ```
  *
  * @param array $spec The spec to build the OptionParser with.
  * @return ConsoleOptionParser
@@ -218,7 +218,7 @@ class ConsoleOptionParser {
  * Get or set the command name for shell/task.
  *
  * @param string $text The text to set, or null if you want to read
- * @return mixed If reading, the value of the command. If setting $this will be returned
+ * @return string|self If reading, the value of the command. If setting $this will be returned.
  */
 	public function command($text = null) {
 		if ($text !== null) {
@@ -233,7 +233,7 @@ class ConsoleOptionParser {
  *
  * @param string|array $text The text to set, or null if you want to read. If an array the
  *   text will be imploded with "\n"
- * @return mixed If reading, the value of the description. If setting $this will be returned
+ * @return string|self If reading, the value of the description. If setting $this will be returned.
  */
 	public function description($text = null) {
 		if ($text !== null) {
@@ -251,7 +251,7 @@ class ConsoleOptionParser {
  * the options and arguments listing when help is generated.
  *
  * @param string|array $text Text when setting or null when reading. If an array the text will be imploded with "\n"
- * @return mixed If reading, the value of the epilog. If setting $this will be returned.
+ * @return string|self If reading, the value of the epilog. If setting $this will be returned.
  */
 	public function epilog($text = null) {
 		if ($text !== null) {
@@ -284,7 +284,7 @@ class ConsoleOptionParser {
  * @param ConsoleInputOption|string $name The long name you want to the value to be parsed out as when options are parsed.
  *   Will also accept an instance of ConsoleInputOption
  * @param array $options An array of parameters that define the behavior of the option
- * @return ConsoleOptionParser $this.
+ * @return self
  */
 	public function addOption($name, $options = array()) {
 		if (is_object($name) && $name instanceof ConsoleInputOption) {
@@ -324,7 +324,7 @@ class ConsoleOptionParser {
  *
  * @param ConsoleInputArgument|string $name The name of the argument. Will also accept an instance of ConsoleInputArgument
  * @param array $params Parameters for the argument, see above.
- * @return ConsoleOptionParser $this.
+ * @return self
  */
 	public function addArgument($name, $params = array()) {
 		if (is_object($name) && $name instanceof ConsoleInputArgument) {
@@ -354,7 +354,7 @@ class ConsoleOptionParser {
  *
  * @param array $args Array of arguments to add.
  * @see ConsoleOptionParser::addArgument()
- * @return ConsoleOptionParser $this
+ * @return self
  */
 	public function addArguments(array $args) {
 		foreach ($args as $name => $params) {
@@ -369,7 +369,7 @@ class ConsoleOptionParser {
  *
  * @param array $options Array of options to add.
  * @see ConsoleOptionParser::addOption()
- * @return ConsoleOptionParser $this
+ * @return self
  */
 	public function addOptions(array $options) {
 		foreach ($options as $name => $params) {
@@ -391,7 +391,7 @@ class ConsoleOptionParser {
  *
  * @param ConsoleInputSubcommand|string $name Name of the subcommand. Will also accept an instance of ConsoleInputSubcommand
  * @param array $options Array of params, see above.
- * @return ConsoleOptionParser $this.
+ * @return self
  */
 	public function addSubcommand($name, $options = array()) {
 		if (is_object($name) && $name instanceof ConsoleInputSubcommand) {
@@ -410,11 +410,22 @@ class ConsoleOptionParser {
 		return $this;
 	}
 
+/**
+ * Remove a subcommand from the option parser.
+ *
+ * @param string $name The subcommand name to remove.
+ * @return self
+ */
+	public function removeSubcommand($name) {
+		unset($this->_subcommands[$name]);
+		return $this;
+	}
+
 /**
  * Add multiple subcommands at once.
  *
  * @param array $commands Array of subcommands.
- * @return ConsoleOptionParser $this
+ * @return self
  */
 	public function addSubcommands(array $commands) {
 		foreach ($commands as $name => $params) {
@@ -458,7 +469,7 @@ class ConsoleOptionParser {
  * @param array $argv Array of args (argv) to parse.
  * @param string $command The subcommand to use. If this parameter is a subcommand, that has a parser,
  *    That parser will be used to parse $argv instead.
- * @return Array array($params, $args)
+ * @return array array($params, $args)
  * @throws ConsoleException When an invalid parameter is encountered.
  */
 	public function parse($argv, $command = null) {
@@ -506,12 +517,11 @@ class ConsoleOptionParser {
  * @param string $subcommand If present and a valid subcommand that has a linked parser.
  *    That subcommands help will be shown instead.
  * @param string $format Define the output format, can be text or xml
- * @param integer $width The width to format user content to. Defaults to 72
+ * @param int $width The width to format user content to. Defaults to 72
  * @return string Generated help.
  */
 	public function help($subcommand = null, $format = 'text', $width = 72) {
-		if (
-			isset($this->_subcommands[$subcommand]) &&
+		if (isset($this->_subcommands[$subcommand]) &&
 			$this->_subcommands[$subcommand]->parser() instanceof self
 		) {
 			$subparser = $this->_subcommands[$subcommand]->parser();
@@ -597,13 +607,14 @@ class ConsoleOptionParser {
 			$params[$name] = $value;
 			return $params;
 		}
+		return array();
 	}
 
 /**
  * Check to see if $name has an option (short/long) defined for it.
  *
  * @param string $name The name of the option.
- * @return boolean
+ * @return bool
  */
 	protected function _optionExists($name) {
 		if (substr($name, 0, 2) === '--') {
diff --git a/web/api/lib/Cake/Console/ConsoleOutput.php b/web/api/lib/Cake/Console/ConsoleOutput.php
index fa021b565..ec6fb3941 100644
--- a/web/api/lib/Cake/Console/ConsoleOutput.php
+++ b/web/api/lib/Cake/Console/ConsoleOutput.php
@@ -47,21 +47,21 @@ class ConsoleOutput {
 /**
  * Raw output constant - no modification of output text.
  *
- * @var integer
+ * @var int
  */
 	const RAW = 0;
 
 /**
  * Plain output - tags will be stripped.
  *
- * @var integer
+ * @var int
  */
 	const PLAIN = 1;
 
 /**
  * Color output - Convert known tags in to ANSI color escape codes.
  *
- * @var integer
+ * @var int
  */
 	const COLOR = 2;
 
@@ -79,10 +79,18 @@ class ConsoleOutput {
  */
 	protected $_output;
 
+/**
+ * The number of bytes last written to the output stream
+ * used when overwriting the previous message.
+ *
+ * @var int
+ */
+	protected $_lastWritten = 0;
+
 /**
  * The current output type. Manipulated with ConsoleOutput::outputAs();
  *
- * @var integer
+ * @var int
  */
 	protected $_outputAs = self::COLOR;
 
@@ -153,16 +161,19 @@ class ConsoleOutput {
 /**
  * Construct the output object.
  *
- * Checks for a pretty console environment. Ansicon allows pretty consoles
- * on windows, and is supported.
+ * Checks for a pretty console environment. Ansicon and ConEmu allows
+ * pretty consoles on Windows, and is supported.
  *
  * @param string $stream The identifier of the stream to write output to.
  */
 	public function __construct($stream = 'php://stdout') {
 		$this->_output = fopen($stream, 'w');
 
-		if (DS === '\\' && !(bool)env('ANSICON')) {
-			$this->_outputAs = self::PLAIN;
+		if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
+			$stream === 'php://output' ||
+			(function_exists('posix_isatty') && !posix_isatty($this->_output))
+		) {
+			$this->_outputAs = static::PLAIN;
 		}
 	}
 
@@ -170,15 +181,44 @@ class ConsoleOutput {
  * Outputs a single or multiple messages to stdout. If no parameters
  * are passed, outputs just a newline.
  *
- * @param string|array $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
- * @return integer Returns the number of bytes returned from writing to stdout.
+ * @param string|array $message A string or an array of strings to output
+ * @param int $newlines Number of newlines to append
+ * @return int Returns the number of bytes returned from writing to stdout.
  */
 	public function write($message, $newlines = 1) {
 		if (is_array($message)) {
-			$message = implode(self::LF, $message);
+			$message = implode(static::LF, $message);
+		}
+		return $this->_write($this->styleText($message . str_repeat(static::LF, $newlines)));
+	}
+
+/**
+ * Overwrite some already output text.
+ *
+ * Useful for building progress bars, or when you want to replace
+ * text already output to the screen with new text.
+ *
+ * **Warning** You cannot overwrite text that contains newlines.
+ *
+ * @param array|string $message The message to output.
+ * @param int $newlines Number of newlines to append.
+ * @param int|null $size The number of bytes to overwrite. Defaults to the
+ *    length of the last message output.
+ * @return void
+ */
+	public function overwrite($message, $newlines = 1, $size = null) {
+		$size = $size ?: $this->_lastWritten;
+		// Output backspaces.
+		$this->write(str_repeat("\x08", $size), 0);
+		$newBytes = $this->write($message, 0);
+		// Fill any remaining bytes with spaces.
+		$fill = $size - $newBytes;
+		if ($fill > 0) {
+			$this->write(str_repeat(' ', $fill), 0);
+		}
+		if ($newlines) {
+			$this->write("", $newlines);
 		}
-		return $this->_write($this->styleText($message . str_repeat(self::LF, $newlines)));
 	}
 
 /**
@@ -188,11 +228,11 @@ class ConsoleOutput {
  * @return string String with color codes added.
  */
 	public function styleText($text) {
-		if ($this->_outputAs == self::RAW) {
+		if ($this->_outputAs == static::RAW) {
 			return $text;
 		}
-		if ($this->_outputAs == self::PLAIN) {
-			$tags = implode('|', array_keys(self::$_styles));
+		if ($this->_outputAs == static::PLAIN) {
+			$tags = implode('|', array_keys(static::$_styles));
 			return preg_replace('#</?(?:' . $tags . ')>#', '', $text);
 		}
 		return preg_replace_callback(
@@ -203,7 +243,7 @@ class ConsoleOutput {
 /**
  * Replace tags with color codes.
  *
- * @param array $matches.
+ * @param array $matches An array of matches to replace.
  * @return string
  */
 	protected function _replaceTags($matches) {
@@ -213,16 +253,16 @@ class ConsoleOutput {
 		}
 
 		$styleInfo = array();
-		if (!empty($style['text']) && isset(self::$_foregroundColors[$style['text']])) {
-			$styleInfo[] = self::$_foregroundColors[$style['text']];
+		if (!empty($style['text']) && isset(static::$_foregroundColors[$style['text']])) {
+			$styleInfo[] = static::$_foregroundColors[$style['text']];
 		}
-		if (!empty($style['background']) && isset(self::$_backgroundColors[$style['background']])) {
-			$styleInfo[] = self::$_backgroundColors[$style['background']];
+		if (!empty($style['background']) && isset(static::$_backgroundColors[$style['background']])) {
+			$styleInfo[] = static::$_backgroundColors[$style['background']];
 		}
 		unset($style['text'], $style['background']);
 		foreach ($style as $option => $value) {
 			if ($value) {
-				$styleInfo[] = self::$_options[$option];
+				$styleInfo[] = static::$_options[$option];
 			}
 		}
 		return "\033[" . implode($styleInfo, ';') . 'm' . $matches['text'] . "\033[0m";
@@ -232,10 +272,11 @@ class ConsoleOutput {
  * Writes a message to the output stream.
  *
  * @param string $message Message to write.
- * @return boolean success
+ * @return bool success
  */
 	protected function _write($message) {
-		return fwrite($this->_output, $message);
+		$this->_lastWritten = fwrite($this->_output, $message);
+		return $this->_lastWritten;
 	}
 
 /**
@@ -265,23 +306,23 @@ class ConsoleOutput {
  */
 	public function styles($style = null, $definition = null) {
 		if ($style === null && $definition === null) {
-			return self::$_styles;
+			return static::$_styles;
 		}
 		if (is_string($style) && $definition === null) {
-			return isset(self::$_styles[$style]) ? self::$_styles[$style] : null;
+			return isset(static::$_styles[$style]) ? static::$_styles[$style] : null;
 		}
 		if ($definition === false) {
-			unset(self::$_styles[$style]);
+			unset(static::$_styles[$style]);
 			return true;
 		}
-		self::$_styles[$style] = $definition;
+		static::$_styles[$style] = $definition;
 		return true;
 	}
 
 /**
  * Get/Set the output type to use. The output type how formatting tags are treated.
  *
- * @param integer $type The output type to use. Should be one of the class constants.
+ * @param int $type The output type to use. Should be one of the class constants.
  * @return mixed Either null or the value if getting.
  */
 	public function outputAs($type = null) {
@@ -295,7 +336,9 @@ class ConsoleOutput {
  * Clean up and close handles
  */
 	public function __destruct() {
-		fclose($this->_output);
+		if (is_resource($this->_output)) {
+			fclose($this->_output);
+		}
 	}
 
 }
diff --git a/web/api/lib/Cake/Console/HelpFormatter.php b/web/api/lib/Cake/Console/HelpFormatter.php
index c3b40c354..3a8fac98f 100644
--- a/web/api/lib/Cake/Console/HelpFormatter.php
+++ b/web/api/lib/Cake/Console/HelpFormatter.php
@@ -14,7 +14,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 /**
  * HelpFormatter formats help for console shells. Can format to either
@@ -33,19 +33,19 @@ class HelpFormatter {
 /**
  * The maximum number of arguments shown when generating usage.
  *
- * @var integer
+ * @var int
  */
 	protected $_maxArgs = 6;
 
 /**
  * The maximum number of options shown when generating usage.
  *
- * @var integer
+ * @var int
  */
 	protected $_maxOptions = 6;
 
 /**
- * Build the help formatter for a an OptionParser
+ * Build the help formatter for an OptionParser
  *
  * @param ConsoleOptionParser $parser The option parser help is being generated for.
  */
@@ -56,7 +56,7 @@ class HelpFormatter {
 /**
  * Get the help as formatted text suitable for output on the command line.
  *
- * @param integer $width The width of the help output.
+ * @param int $width The width of the help output.
  * @return string
  */
 	public function text($width = 72) {
@@ -64,7 +64,7 @@ class HelpFormatter {
 		$out = array();
 		$description = $parser->description();
 		if (!empty($description)) {
-			$out[] = String::wrap($description, $width);
+			$out[] = CakeText::wrap($description, $width);
 			$out[] = '';
 		}
 		$out[] = __d('cake_console', '<info>Usage:</info>');
@@ -76,7 +76,7 @@ class HelpFormatter {
 			$out[] = '';
 			$max = $this->_getMaxLength($subcommands) + 2;
 			foreach ($subcommands as $command) {
-				$out[] = String::wrap($command->help($max), array(
+				$out[] = CakeText::wrap($command->help($max), array(
 					'width' => $width,
 					'indent' => str_repeat(' ', $max),
 					'indentAt' => 1
@@ -93,7 +93,7 @@ class HelpFormatter {
 			$out[] = __d('cake_console', '<info>Options:</info>');
 			$out[] = '';
 			foreach ($options as $option) {
-				$out[] = String::wrap($option->help($max), array(
+				$out[] = CakeText::wrap($option->help($max), array(
 					'width' => $width,
 					'indent' => str_repeat(' ', $max),
 					'indentAt' => 1
@@ -108,7 +108,7 @@ class HelpFormatter {
 			$out[] = __d('cake_console', '<info>Arguments:</info>');
 			$out[] = '';
 			foreach ($arguments as $argument) {
-				$out[] = String::wrap($argument->help($max), array(
+				$out[] = CakeText::wrap($argument->help($max), array(
 					'width' => $width,
 					'indent' => str_repeat(' ', $max),
 					'indentAt' => 1
@@ -118,7 +118,7 @@ class HelpFormatter {
 		}
 		$epilog = $parser->epilog();
 		if (!empty($epilog)) {
-			$out[] = String::wrap($epilog, $width);
+			$out[] = CakeText::wrap($epilog, $width);
 			$out[] = '';
 		}
 		return implode("\n", $out);
@@ -159,8 +159,8 @@ class HelpFormatter {
 /**
  * Iterate over a collection and find the longest named thing.
  *
- * @param array $collection
- * @return integer
+ * @param array $collection The collection to find a max length of.
+ * @return int
  */
 	protected function _getMaxLength($collection) {
 		$max = 0;
@@ -173,7 +173,7 @@ class HelpFormatter {
 /**
  * Get the help as an xml string.
  *
- * @param boolean $string Return the SimpleXml object or a string. Defaults to true.
+ * @param bool $string Return the SimpleXml object or a string. Defaults to true.
  * @return string|SimpleXmlElement See $string
  */
 	public function xml($string = true) {
diff --git a/web/api/lib/Cake/Console/Helper/BaseShellHelper.php b/web/api/lib/Cake/Console/Helper/BaseShellHelper.php
new file mode 100644
index 000000000..f06a17aac
--- /dev/null
+++ b/web/api/lib/Cake/Console/Helper/BaseShellHelper.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+abstract class BaseShellHelper {
+
+/**
+ * Default config for this helper.
+ *
+ * @var array
+ */
+	protected $_defaultConfig = array();
+
+/**
+ * ConsoleOutput instance.
+ *
+ * @var ConsoleOutput
+ */
+	protected $_consoleOutput;
+
+/**
+ * Runtime config
+ *
+ * @var array
+ */
+	protected $_config = array();
+
+/**
+ * Whether the config property has already been configured with defaults
+ *
+ * @var bool
+ */
+	protected $_configInitialized = false;
+
+/**
+ * Constructor.
+ *
+ * @param ConsoleOutput $consoleOutput The ConsoleOutput instance to use.
+ * @param array $config The settings for this helper.
+ */
+	public function __construct(ConsoleOutput $consoleOutput, array $config = array()) {
+		$this->_consoleOutput = $consoleOutput;
+		$this->config($config);
+	}
+
+/**
+ * Initialize config & store config values
+ *
+ * @param null $config Config values to set
+ * @return array|void
+ */
+	public function config($config = null) {
+		if ($config === null) {
+			return $this->_config;
+		}
+		if (!$this->_configInitialized) {
+			$this->_config = array_merge($this->_defaultConfig, $config);
+			$this->_configInitialized = true;
+		} else {
+			$this->_config = array_merge($this->_config, $config);
+		}
+	}
+
+/**
+ * This method should output content using `$this->_consoleOutput`.
+ *
+ * @param array $args The arguments for the helper.
+ * @return void
+ */
+	abstract public function output($args);
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Helper/ProgressShellHelper.php b/web/api/lib/Cake/Console/Helper/ProgressShellHelper.php
new file mode 100644
index 000000000..03b216963
--- /dev/null
+++ b/web/api/lib/Cake/Console/Helper/ProgressShellHelper.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("BaseShellHelper", "Console/Helper");
+
+/**
+ * Create a progress bar using a supplied callback.
+ */
+class ProgressShellHelper extends BaseShellHelper {
+
+/**
+ * The current progress.
+ *
+ * @var int
+ */
+	protected $_progress = 0;
+
+/**
+ * The total number of 'items' to progress through.
+ *
+ * @var int
+ */
+	protected $_total = 0;
+
+/**
+ * The width of the bar.
+ *
+ * @var int
+ */
+	protected $_width = 0;
+
+/**
+ * Output a progress bar.
+ *
+ * Takes a number of options to customize the behavior:
+ *
+ * - `total` The total number of items in the progress bar. Defaults
+ *   to 100.
+ * - `width` The width of the progress bar. Defaults to 80.
+ * - `callback` The callback that will be called in a loop to advance the progress bar.
+ *
+ * @param array $args The arguments/options to use when outputing the progress bar.
+ * @return void
+ * @throws RuntimeException
+ */
+	public function output($args) {
+		$args += array('callback' => null);
+		if (isset($args[0])) {
+			$args['callback'] = $args[0];
+		}
+		if (!$args['callback'] || !is_callable($args['callback'])) {
+			throw new RuntimeException('Callback option must be a callable.');
+		}
+		$this->init($args);
+		$callback = $args['callback'];
+		while ($this->_progress < $this->_total) {
+			$callback($this);
+			$this->draw();
+		}
+		$this->_consoleOutput->write('');
+	}
+
+/**
+ * Initialize the progress bar for use.
+ *
+ * - `total` The total number of items in the progress bar. Defaults
+ *   to 100.
+ * - `width` The width of the progress bar. Defaults to 80.
+ *
+ * @param array $args The initialization data.
+ * @return void
+ */
+	public function init(array $args = array()) {
+		$args += array('total' => 100, 'width' => 80);
+		$this->_progress = 0;
+		$this->_width = $args['width'];
+		$this->_total = $args['total'];
+	}
+
+/**
+ * Increment the progress bar.
+ *
+ * @param int $num The amount of progress to advance by.
+ * @return void
+ */
+	public function increment($num = 1) {
+		$this->_progress = min(max(0, $this->_progress + $num), $this->_total);
+	}
+
+/**
+ * Render the progress bar based on the current state.
+ *
+ * @return void
+ */
+	public function draw() {
+		$numberLen = strlen(' 100%');
+		$complete = round($this->_progress / $this->_total, 2);
+		$barLen = ($this->_width - $numberLen) * ($this->_progress / $this->_total);
+		$bar = '';
+		if ($barLen > 1) {
+			$bar = str_repeat('=', $barLen - 1) . '>';
+		}
+		$pad = ceil($this->_width - $numberLen - $barLen);
+		if ($pad > 0) {
+			$bar .= str_repeat(' ', $pad);
+		}
+		$percent = ($complete * 100) . '%';
+		$bar .= str_pad($percent, $numberLen, ' ', STR_PAD_LEFT);
+		$this->_consoleOutput->overwrite($bar, 0);
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Helper/TableShellHelper.php b/web/api/lib/Cake/Console/Helper/TableShellHelper.php
new file mode 100644
index 000000000..7cf6c799a
--- /dev/null
+++ b/web/api/lib/Cake/Console/Helper/TableShellHelper.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("BaseShellHelper", "Console/Helper");
+
+/**
+ * Create a visually pleasing ASCII art table
+ * from 2 dimensional array data.
+ */
+class TableShellHelper extends BaseShellHelper {
+
+/**
+ * Default config for this helper.
+ *
+ * @var array
+ */
+	protected $_defaultConfig = array(
+		'headers' => true,
+		'rowSeparator' => false,
+		'headerStyle' => 'info',
+	);
+
+/**
+ * Calculate the column widths
+ *
+ * @param array $rows The rows on which the columns width will be calculated on.
+ * @return array
+ */
+	protected function _calculateWidths($rows) {
+		$widths = array();
+		foreach ($rows as $line) {
+			for ($i = 0, $len = count($line); $i < $len; $i++) {
+				$columnLength = mb_strlen($line[$i]);
+				if ($columnLength > (isset($widths[$i]) ? $widths[$i] : 0)) {
+					$widths[$i] = $columnLength;
+				}
+			}
+		}
+		return $widths;
+	}
+
+/**
+ * Output a row separator.
+ *
+ * @param array $widths The widths of each column to output.
+ * @return void
+ */
+	protected function _rowSeparator($widths) {
+		$out = '';
+		foreach ($widths as $column) {
+			$out .= '+' . str_repeat('-', $column + 2);
+		}
+		$out .= '+';
+		$this->_consoleOutput->write($out);
+	}
+
+/**
+ * Output a row.
+ *
+ * @param array $row The row to output.
+ * @param array $widths The widths of each column to output.
+ * @param array $options Options to be passed.
+ * @return void
+ */
+	protected function _render($row, $widths, $options = array()) {
+		$out = '';
+		foreach ($row as $i => $column) {
+			$pad = $widths[$i] - mb_strlen($column);
+			if (!empty($options['style'])) {
+				$column = $this->_addStyle($column, $options['style']);
+			}
+			$out .= '| ' . $column . str_repeat(' ', $pad) . ' ';
+		}
+		$out .= '|';
+		$this->_consoleOutput->write($out);
+	}
+
+/**
+ * Output a table.
+ *
+ * @param array $rows The data to render out.
+ * @return void
+ */
+	public function output($rows) {
+		$config = $this->config();
+		$widths = $this->_calculateWidths($rows);
+		$this->_rowSeparator($widths);
+		if ($config['headers'] === true) {
+			$this->_render(array_shift($rows), $widths, array('style' => $config['headerStyle']));
+			$this->_rowSeparator($widths);
+		}
+		foreach ($rows as $line) {
+			$this->_render($line, $widths);
+			if ($config['rowSeparator'] === true) {
+				$this->_rowSeparator($widths);
+			}
+		}
+		if ($config['rowSeparator'] !== true) {
+			$this->_rowSeparator($widths);
+		}
+	}
+
+/**
+ * Add style tags
+ *
+ * @param string $text The text to be surrounded
+ * @param string $style The style to be applied
+ * @return string
+ */
+	protected function _addStyle($text, $style) {
+		return '<' . $style . '>' . $text . '</' . $style . '>';
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Shell.php b/web/api/lib/Cake/Console/Shell.php
index b6a6cbcf2..c446b9cd3 100644
--- a/web/api/lib/Cake/Console/Shell.php
+++ b/web/api/lib/Cake/Console/Shell.php
@@ -22,7 +22,6 @@ App::uses('ConsoleInputSubcommand', 'Console');
 App::uses('ConsoleOptionParser', 'Console');
 App::uses('ClassRegistry', 'Utility');
 App::uses('File', 'Utility');
-App::uses('ClassRegistry', 'Utility');
 
 /**
  * Base class for command-line utilities for automating programmer chores.
@@ -31,24 +30,31 @@ App::uses('ClassRegistry', 'Utility');
  */
 class Shell extends Object {
 
+/**
+ * Default error code
+ *
+ * @var int
+ */
+	const CODE_ERROR = 1;
+
 /**
  * Output constant making verbose shells.
  *
- * @var integer
+ * @var int
  */
 	const VERBOSE = 2;
 
 /**
  * Output constant for making normal shells.
  *
- * @var integer
+ * @var int
  */
 	const NORMAL = 1;
 
 /**
  * Output constants for making quiet shells.
  *
- * @var integer
+ * @var int
  */
 	const QUIET = 0;
 
@@ -62,7 +68,7 @@ class Shell extends Object {
 /**
  * If true, the script will ask for permission to perform actions.
  *
- * @var boolean
+ * @var bool
  */
 	public $interactive = true;
 
@@ -167,6 +173,21 @@ class Shell extends Object {
  */
 	public $stdin;
 
+/**
+ * The number of bytes last written to the output stream
+ * used when overwriting the previous message.
+ *
+ * @var int
+ */
+	protected $_lastWritten = 0;
+
+/**
+ * Contains helpers which have been previously instantiated
+ *
+ * @var array
+ */
+	protected $_helpers = array();
+
 /**
  *  Constructs this Shell instance.
  *
@@ -239,7 +260,7 @@ class Shell extends Object {
 /**
  * If $uses is an array load each of the models in the array
  *
- * @return boolean
+ * @return bool
  */
 	protected function _loadModels() {
 		if (is_array($this->uses)) {
@@ -254,7 +275,7 @@ class Shell extends Object {
 /**
  * Lazy loads models using the loadModel() method if declared in $uses
  *
- * @param string $name
+ * @param string $name The name of the model to look for.
  * @return void
  */
 	public function __isset($name) {
@@ -303,7 +324,7 @@ class Shell extends Object {
 /**
  * Loads tasks defined in public $tasks
  *
- * @return boolean
+ * @return bool
  */
 	public function loadTasks() {
 		if ($this->tasks === true || empty($this->tasks) || empty($this->Tasks)) {
@@ -318,7 +339,7 @@ class Shell extends Object {
  * Check to see if this shell has a task with the provided name.
  *
  * @param string $task The task name to check.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasTask
  */
 	public function hasTask($task) {
@@ -329,7 +350,7 @@ class Shell extends Object {
  * Check to see if this shell has a callable method by the given name.
  *
  * @param string $name The method name to check.
- * @return boolean
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hasMethod
  */
 	public function hasMethod($name) {
@@ -446,7 +467,7 @@ class Shell extends Object {
 /**
  * Display the help in the correct format
  *
- * @param string $command
+ * @param string $command The command to get help for.
  * @return void
  */
 	protected function _displayHelp($command) {
@@ -477,7 +498,7 @@ class Shell extends Object {
 /**
  * Overload get for lazy building of tasks
  *
- * @param string $name
+ * @param string $name The property name to access.
  * @return Shell Object of Task
  */
 	public function __get($name) {
@@ -492,6 +513,19 @@ class Shell extends Object {
 		return $this->{$name};
 	}
 
+/**
+ * Safely access the values in $this->params.
+ *
+ * @param string $name The name of the parameter to get.
+ * @return string|bool|null Value. Will return null if it doesn't exist.
+ */
+	public function param($name) {
+		if (!isset($this->params[$name])) {
+			return null;
+		}
+		return $this->params[$name];
+	}
+
 /**
  * Prompts the user for input, and returns it.
  *
@@ -553,7 +587,8 @@ class Shell extends Object {
 		$result = $this->stdin->read();
 
 		if ($result === false) {
-			return $this->_stop(1);
+			$this->_stop(self::CODE_ERROR);
+			return self::CODE_ERROR;
 		}
 		$result = trim($result);
 
@@ -574,13 +609,13 @@ class Shell extends Object {
  * - `indent` Indent the text with the string provided. Defaults to null.
  *
  * @param string $text Text the text to format.
- * @param string|integer|array $options Array of options to use, or an integer to wrap the text to.
+ * @param string|int|array $options Array of options to use, or an integer to wrap the text to.
  * @return string Wrapped / indented text
- * @see String::wrap()
+ * @see CakeText::wrap()
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::wrapText
  */
 	public function wrapText($text, $options = array()) {
-		return String::wrap($text, $options);
+		return CakeText::wrap($text, $options);
 	}
 
 /**
@@ -594,10 +629,10 @@ class Shell extends Object {
  * present in most shells. Using Shell::QUIET for a message means it will always display.
  * While using Shell::VERBOSE means it will only display when verbose output is toggled.
  *
- * @param string|array $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
- * @param integer $level The message's output level, see above.
- * @return integer|boolean Returns the number of bytes returned from writing to stdout.
+ * @param string|array $message A string or an array of strings to output
+ * @param int $newlines Number of newlines to append
+ * @param int $level The message's output level, see above.
+ * @return int|bool Returns the number of bytes returned from writing to stdout.
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::out
  */
 	public function out($message = null, $newlines = 1, $level = Shell::NORMAL) {
@@ -609,17 +644,49 @@ class Shell extends Object {
 			$currentLevel = Shell::QUIET;
 		}
 		if ($level <= $currentLevel) {
-			return $this->stdout->write($message, $newlines);
+			$this->_lastWritten = $this->stdout->write($message, $newlines);
+			return $this->_lastWritten;
 		}
 		return true;
 	}
 
+/**
+ * Overwrite some already output text.
+ *
+ * Useful for building progress bars, or when you want to replace
+ * text already output to the screen with new text.
+ *
+ * **Warning** You cannot overwrite text that contains newlines.
+ *
+ * @param array|string $message The message to output.
+ * @param int $newlines Number of newlines to append.
+ * @param int $size The number of bytes to overwrite. Defaults to the length of the last message output.
+ * @return int|bool Returns the number of bytes returned from writing to stdout.
+ */
+	public function overwrite($message, $newlines = 1, $size = null) {
+		$size = $size ? $size : $this->_lastWritten;
+
+		// Output backspaces.
+		$this->out(str_repeat("\x08", $size), 0);
+
+		$newBytes = $this->out($message, 0);
+
+		// Fill any remaining bytes with spaces.
+		$fill = $size - $newBytes;
+		if ($fill > 0) {
+			$this->out(str_repeat(' ', $fill), 0);
+		}
+		if ($newlines) {
+			$this->out($this->nl($newlines), 0);
+		}
+	}
+
 /**
  * Outputs a single or multiple error messages to stderr. If no parameters
  * are passed outputs just a newline.
  *
- * @param string|array $message A string or a an array of strings to output
- * @param integer $newlines Number of newlines to append
+ * @param string|array $message A string or an array of strings to output
+ * @param int $newlines Number of newlines to append
  * @return void
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::err
  */
@@ -630,7 +697,7 @@ class Shell extends Object {
 /**
  * Returns a single or multiple linefeeds sequences.
  *
- * @param integer $multiplier Number of times the linefeed sequence should be repeated
+ * @param int $multiplier Number of times the linefeed sequence should be repeated
  * @return string
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::nl
  */
@@ -641,8 +708,8 @@ class Shell extends Object {
 /**
  * Outputs a series of minus characters to the standard output, acts as a visual separator.
  *
- * @param integer $newlines Number of newlines to pre- and append
- * @param integer $width Width of the line, defaults to 63
+ * @param int $newlines Number of newlines to pre- and append
+ * @param int $width Width of the line, defaults to 63
  * @return void
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::hr
  */
@@ -667,7 +734,8 @@ class Shell extends Object {
 		if (!empty($message)) {
 			$this->err($message);
 		}
-		return $this->_stop(1);
+		$this->_stop(self::CODE_ERROR);
+		return self::CODE_ERROR;
 	}
 
 /**
@@ -691,7 +759,7 @@ class Shell extends Object {
  *
  * @param string $path Where to put the file.
  * @param string $contents Content to put in the file.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
  */
 	public function createFile($path, $contents) {
@@ -705,7 +773,8 @@ class Shell extends Object {
 
 			if (strtolower($key) === 'q') {
 				$this->out(__d('cake_console', '<error>Quitting</error>.'), 2);
-				return $this->_stop();
+				$this->_stop();
+				return true;
 			} elseif (strtolower($key) !== 'y') {
 				$this->out(__d('cake_console', 'Skip `%s`', $path), 2);
 				return false;
@@ -726,10 +795,32 @@ class Shell extends Object {
 		return false;
 	}
 
+/**
+ * Load given shell helper class
+ *
+ * @param string $name Name of the helper class. Supports plugin syntax.
+ * @return BaseShellHelper Instance of helper class
+ * @throws RuntimeException If invalid class name is provided
+ */
+	public function helper($name) {
+		if (isset($this->_helpers[$name])) {
+			return $this->_helpers[$name];
+		}
+		list($plugin, $helperClassName) = pluginSplit($name, true);
+		$helperClassName = Inflector::camelize($name) . "ShellHelper";
+		App::uses($helperClassName, $plugin . "Console/Helper");
+		if (!class_exists($helperClassName)) {
+			throw new RuntimeException("Class " . $helperClassName . " not found");
+		}
+		$helper = new $helperClassName($this->stdout);
+		$this->_helpers[$name] = $helper;
+		return $helper;
+	}
+
 /**
  * Action to create a Unit Test
  *
- * @return boolean Success
+ * @return bool Success
  */
 	protected function _checkUnitTest() {
 		if (class_exists('PHPUnit_Framework_TestCase')) {
@@ -819,8 +910,8 @@ class Shell extends Object {
 /**
  * creates the singular name for use in views.
  *
- * @param string $name
- * @return string $name
+ * @param string $name The plural underscored value.
+ * @return string name
  */
 	protected function _singularName($name) {
 		return Inflector::variable(Inflector::singularize($name));
@@ -860,7 +951,7 @@ class Shell extends Object {
  * Find the correct path for a plugin. Scans $pluginPaths for the plugin you want.
  *
  * @param string $pluginName Name of the plugin you want ie. DebugKit
- * @return string $path path to the correct plugin.
+ * @return string path path to the correct plugin.
  */
 	protected function _pluginPath($pluginName) {
 		if (CakePlugin::loaded($pluginName)) {
@@ -874,7 +965,7 @@ class Shell extends Object {
  * If you don't wish to see in your stdout or stderr everything that is logged
  * through CakeLog, call this function with first param as false
  *
- * @param boolean $enable whether to enable CakeLog output or not
+ * @param bool $enable whether to enable CakeLog output or not
  * @return void
  */
 	protected function _useLogger($enable = true) {
diff --git a/web/api/lib/Cake/Console/ShellDispatcher.php b/web/api/lib/Cake/Console/ShellDispatcher.php
index b284fcbe9..d53851127 100644
--- a/web/api/lib/Cake/Console/ShellDispatcher.php
+++ b/web/api/lib/Cake/Console/ShellDispatcher.php
@@ -43,7 +43,7 @@ class ShellDispatcher {
  * a status code of either 0 or 1 according to the result of the dispatch.
  *
  * @param array $args the argv from PHP
- * @param boolean $bootstrap Should the environment be bootstrapped.
+ * @param bool $bootstrap Should the environment be bootstrapped.
  */
 	public function __construct($args = array(), $bootstrap = true) {
 		set_time_limit(0);
@@ -79,9 +79,11 @@ class ShellDispatcher {
 		}
 
 		if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-			define('DS', DIRECTORY_SEPARATOR);
 			define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__))));
 			define('CAKEPHP_SHELL', true);
+			if (!defined('DS')) {
+				define('DS', DIRECTORY_SEPARATOR);
+			}
 			if (!defined('CORE_PATH')) {
 				define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
 			}
@@ -114,7 +116,7 @@ class ShellDispatcher {
 /**
  * Initializes the environment and loads the CakePHP core.
  *
- * @return boolean Success.
+ * @return bool Success.
  */
 	protected function _bootstrap() {
 		if (!defined('ROOT')) {
@@ -175,12 +177,15 @@ class ShellDispatcher {
 		}
 		set_exception_handler($exception['consoleHandler']);
 		set_error_handler($error['consoleHandler'], Configure::read('Error.level'));
+
+		App::uses('Debugger', 'Utility');
+		Debugger::getInstance()->output('txt');
 	}
 
 /**
  * Dispatches a CLI request
  *
- * @return boolean
+ * @return bool
  * @throws MissingShellMethodException
  */
 	public function dispatch() {
@@ -244,6 +249,11 @@ class ShellDispatcher {
 		App::uses('AppShell', 'Console/Command');
 		App::uses($class, $plugin . 'Console/Command');
 
+		if (!class_exists($class)) {
+			$plugin = Inflector::camelize($shell) . '.';
+			App::uses($class, $plugin . 'Console/Command');
+		}
+
 		if (!class_exists($class)) {
 			throw new MissingShellException(array(
 				'class' => $class
@@ -317,12 +327,13 @@ class ShellDispatcher {
 /**
  * Parses out the paths from from the argv
  *
- * @param array $args
+ * @param array $args The argv to parse.
  * @return void
  */
 	protected function _parsePaths($args) {
 		$parsed = array();
 		$keys = array('-working', '--working', '-app', '--app', '-root', '--root');
+		$args = (array)$args;
 		foreach ($keys as $key) {
 			while (($index = array_search($key, $args)) !== false) {
 				$keyname = str_replace('-', '', $key);
@@ -357,7 +368,7 @@ class ShellDispatcher {
 /**
  * Stop execution of the current script
  *
- * @param integer|string $status see http://php.net/exit for values
+ * @param int|string $status see http://php.net/exit for values
  * @return void
  */
 	protected function _stop($status = 0) {
diff --git a/web/api/lib/Cake/Console/TaskCollection.php b/web/api/lib/Cake/Console/TaskCollection.php
index ff1ddee67..3fafddd13 100644
--- a/web/api/lib/Cake/Console/TaskCollection.php
+++ b/web/api/lib/Cake/Console/TaskCollection.php
@@ -43,7 +43,7 @@ class TaskCollection extends ObjectCollection {
 /**
  * Constructor
  *
- * @param Shell $Shell
+ * @param Shell $Shell The shell this task collection is attached to.
  */
 	public function __construct(Shell $Shell) {
 		$this->_Shell = $Shell;
@@ -53,13 +53,13 @@ class TaskCollection extends ObjectCollection {
  * Loads/constructs a task. Will return the instance in the registry if it already exists.
  *
  * You can alias your task as an existing task by setting the 'className' key, i.e.,
- * {{{
+ * ```
  * public $tasks = array(
  * 'DbConfig' => array(
  * 'className' => 'Bakeplus.DbConfigure'
  * );
  * );
- * }}}
+ * ```
  * All calls to the `DbConfig` task would use `DbConfigure` found in the `Bakeplus` plugin instead.
  *
  * @param string $task Task name to load
diff --git a/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp b/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
index b6b89a993..dfc309215 100644
--- a/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
@@ -53,10 +53,10 @@
 			$this-><?php echo $currentModelName; ?>->create();
 			if ($this-><?php echo $currentModelName; ?>->save($this->request->data)) {
 <?php if ($wannaUseSession): ?>
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'));
+				$this->Flash->success(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+				$this->Flash->error(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
 <?php else: ?>
 				return $this->flash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'), array('action' => 'index'));
 <?php endif; ?>
@@ -94,10 +94,10 @@
 		if ($this->request->is(array('post', 'put'))) {
 			if ($this-><?php echo $currentModelName; ?>->save($this->request->data)) {
 <?php if ($wannaUseSession): ?>
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'));
+				$this->Flash->success(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+				$this->Flash->error(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
 <?php else: ?>
 				return $this->flash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'), array('action' => 'index'));
 <?php endif; ?>
@@ -138,9 +138,9 @@
 		$this->request->allowMethod('post', 'delete');
 		if ($this-><?php echo $currentModelName; ?>->delete()) {
 <?php if ($wannaUseSession): ?>
-			$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been deleted.'));
+			$this->Flash->success(__('The <?php echo strtolower($singularHumanName); ?> has been deleted.'));
 		} else {
-			$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be deleted. Please, try again.'));
+			$this->Flash->error(__('The <?php echo strtolower($singularHumanName); ?> could not be deleted. Please, try again.'));
 		}
 		return $this->redirect(array('action' => 'index'));
 <?php else: ?>
diff --git a/web/api/lib/Cake/Console/Templates/default/classes/controller.ctp b/web/api/lib/Cake/Console/Templates/default/classes/controller.ctp
index e290a8675..6beb4b401 100644
--- a/web/api/lib/Cake/Console/Templates/default/classes/controller.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/classes/controller.ctp
@@ -23,10 +23,10 @@ echo "App::uses('{$plugin}AppController', '{$pluginPath}Controller');\n";
 ?>
 /**
  * <?php echo $controllerName; ?> Controller
- *
 <?php
 if (!$isScaffold) {
 	$defaultModel = Inflector::singularize($controllerName);
+	echo " *\n";
 	echo " * @property {$defaultModel} \${$defaultModel}\n";
 	if (!empty($components)) {
 		foreach ($components as $component) {
@@ -74,7 +74,9 @@ class <?php echo $controllerName; ?>Controller extends <?php echo $plugin; ?>App
 		echo ");\n\n";
 	endif;
 
-	echo trim($actions);
+	if (!empty($actions)) {
+		echo trim($actions) . "\n";
+	}
 
 endif; ?>
 }
diff --git a/web/api/lib/Cake/Console/Templates/default/classes/fixture.ctp b/web/api/lib/Cake/Console/Templates/default/classes/fixture.ctp
index 0fb23e24f..7ac2c3987 100644
--- a/web/api/lib/Cake/Console/Templates/default/classes/fixture.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/classes/fixture.ctp
@@ -21,8 +21,7 @@
 echo "<?php\n";
 ?>
 /**
- * <?php echo $model; ?>Fixture
- *
+ * <?php echo $model; ?> Fixture
  */
 class <?php echo $model; ?>Fixture extends CakeTestFixture {
 
diff --git a/web/api/lib/Cake/Console/Templates/default/classes/model.ctp b/web/api/lib/Cake/Console/Templates/default/classes/model.ctp
index 0014e004e..6c3e64763 100644
--- a/web/api/lib/Cake/Console/Templates/default/classes/model.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/classes/model.ctp
@@ -106,7 +106,7 @@ foreach ($associations as $assoc):
 	if (!empty($assoc)):
 ?>
 
-	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	// The Associations below have been created with all possible keys, those that are not needed can be removed
 <?php
 		break;
 	endif;
diff --git a/web/api/lib/Cake/Console/Templates/default/classes/test.ctp b/web/api/lib/Cake/Console/Templates/default/classes/test.ctp
index 8e249f4f2..2c8daa372 100644
--- a/web/api/lib/Cake/Console/Templates/default/classes/test.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/classes/test.ctp
@@ -24,7 +24,6 @@ App::uses('<?php echo $dependency[0]; ?>', '<?php echo $dependency[1]; ?>');
 
 /**
  * <?php echo $fullClassName; ?> Test Case
- *
  */
 <?php if ($type === 'Controller'): ?>
 class <?php echo $fullClassName; ?>Test extends ControllerTestCase {
diff --git a/web/api/lib/Cake/Console/Templates/default/views/form.ctp b/web/api/lib/Cake/Console/Templates/default/views/form.ctp
index fa9c58315..4a21aabe3 100644
--- a/web/api/lib/Cake/Console/Templates/default/views/form.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/views/form.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -23,7 +21,7 @@
 <?php
 		echo "\t<?php\n";
 		foreach ($fields as $field) {
-			if (strpos($action, 'add') !== false && $field == $primaryKey) {
+			if (strpos($action, 'add') !== false && $field === $primaryKey) {
 				continue;
 			} elseif (!in_array($field, array('created', 'modified', 'updated'))) {
 				echo "\t\techo \$this->Form->input('{$field}');\n";
@@ -46,7 +44,7 @@
 	<ul>
 
 <?php if (strpos($action, 'add') === false): ?>
-		<li><?php echo "<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>"; ?></li>
+		<li><?php echo "<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), array('confirm' => __('Are you sure you want to delete # %s?', \$this->Form->value('{$modelClass}.{$primaryKey}')))); ?>"; ?></li>
 <?php endif; ?>
 		<li><?php echo "<?php echo \$this->Html->link(__('List " . $pluralHumanName . "'), array('action' => 'index')); ?>"; ?></li>
 <?php
diff --git a/web/api/lib/Cake/Console/Templates/default/views/index.ctp b/web/api/lib/Cake/Console/Templates/default/views/index.ctp
index f48f3f1e1..cf77c0ed9 100644
--- a/web/api/lib/Cake/Console/Templates/default/views/index.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/views/index.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -19,12 +17,15 @@
 <div class="<?php echo $pluralVar; ?> index">
 	<h2><?php echo "<?php echo __('{$pluralHumanName}'); ?>"; ?></h2>
 	<table cellpadding="0" cellspacing="0">
+	<thead>
 	<tr>
 	<?php foreach ($fields as $field): ?>
 		<th><?php echo "<?php echo \$this->Paginator->sort('{$field}'); ?>"; ?></th>
 	<?php endforeach; ?>
 		<th class="actions"><?php echo "<?php echo __('Actions'); ?>"; ?></th>
 	</tr>
+	</thead>
+	<tbody>
 	<?php
 	echo "<?php foreach (\${$pluralVar} as \${$singularVar}): ?>\n";
 	echo "\t<tr>\n";
@@ -47,17 +48,18 @@
 		echo "\t\t<td class=\"actions\">\n";
 		echo "\t\t\t<?php echo \$this->Html->link(__('View'), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
 		echo "\t\t\t<?php echo \$this->Html->link(__('Edit'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
-		echo "\t\t\t<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array(), __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+		echo "\t\t\t<?php echo \$this->Form->postLink(__('Delete'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('confirm' => __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}']))); ?>\n";
 		echo "\t\t</td>\n";
 	echo "\t</tr>\n";
 
 	echo "<?php endforeach; ?>\n";
 	?>
+	</tbody>
 	</table>
 	<p>
 	<?php echo "<?php
 	echo \$this->Paginator->counter(array(
-	'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')
+		'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')
 	));
 	?>"; ?>
 	</p>
diff --git a/web/api/lib/Cake/Console/Templates/default/views/view.ctp b/web/api/lib/Cake/Console/Templates/default/views/view.ctp
index d5b21acc4..3acfad8be 100644
--- a/web/api/lib/Cake/Console/Templates/default/views/view.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/views/view.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -45,7 +43,7 @@ foreach ($fields as $field) {
 	<ul>
 <?php
 	echo "\t\t<li><?php echo \$this->Html->link(__('Edit " . $singularHumanName ."'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
-	echo "\t\t<li><?php echo \$this->Form->postLink(__('Delete " . $singularHumanName . "'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+	echo "\t\t<li><?php echo \$this->Form->postLink(__('Delete " . $singularHumanName . "'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), array('confirm' => __('Are you sure you want to delete # %s?', \${$singularVar}['{$modelClass}']['{$primaryKey}']))); ?> </li>\n";
 	echo "\t\t<li><?php echo \$this->Html->link(__('List " . $pluralHumanName . "'), array('action' => 'index')); ?> </li>\n";
 	echo "\t\t<li><?php echo \$this->Html->link(__('New " . $singularHumanName . "'), array('action' => 'add')); ?> </li>\n";
 
@@ -119,7 +117,7 @@ echo "\t<?php foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}): ?
 			echo "\t\t\t<td class=\"actions\">\n";
 			echo "\t\t\t\t<?php echo \$this->Html->link(__('View'), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
 			echo "\t\t\t\t<?php echo \$this->Html->link(__('Edit'), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
-			echo "\t\t\t\t<?php echo \$this->Form->postLink(__('Delete'), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), null, __('Are you sure you want to delete # %s?', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+			echo "\t\t\t\t<?php echo \$this->Form->postLink(__('Delete'), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), array('confirm' => __('Are you sure you want to delete # %s?', \${$otherSingularVar}['{$details['primaryKey']}']))); ?>\n";
 			echo "\t\t\t</td>\n";
 		echo "\t\t</tr>\n";
 
@@ -133,4 +131,6 @@ echo "\t<?php endforeach; ?>\n";
 		</ul>
 	</div>
 </div>
-<?php endforeach; ?>
+<?php
+endforeach;
+?>
diff --git a/web/api/lib/Cake/Console/Templates/skel/.htaccess b/web/api/lib/Cake/Console/Templates/skel/.htaccess
index fc3aac4b2..128e7871b 100644
--- a/web/api/lib/Cake/Console/Templates/skel/.htaccess
+++ b/web/api/lib/Cake/Console/Templates/skel/.htaccess
@@ -1,5 +1,5 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$    webroot/    [L]
-    RewriteRule    (.*) webroot/$1    [L]
+	RewriteEngine on
+	RewriteRule ^$ webroot/ [L]
+	RewriteRule (.*) webroot/$1 [L]
 </IfModule>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
index b532fe370..9a4f54337 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@@ -9,21 +9,34 @@
  * @since         CakePHP(tm) v 0.2.9
  */
 
-/*
- *
+/**
  * Using the Schema command line utility
  * cake schema run create DbAcl
- *
  */
 class DbAclSchema extends CakeSchema {
 
+/**
+ * Before event.
+ *
+ * @param array $event The event data.
+ * @return bool success
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After event.
+ *
+ * @param array $event The event data.
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * ACO - Access Control Object - Something that is wanted
+ */
 	public $acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -35,6 +48,9 @@ class DbAclSchema extends CakeSchema {
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
 	);
 
+/**
+ * ARO - Access Request Object - Something that wants something
+ */
 	public $aros = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -46,6 +62,10 @@ class DbAclSchema extends CakeSchema {
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
 	);
 
+/**
+ * Used by the Cake::Model:Permission class.
+ * Checks if the given $aro has access to action $action in $aco.
+ */
 	public $aros_acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql
index 274780e26..0bf3f7687 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.sql
@@ -38,4 +38,15 @@ CREATE TABLE aros (
   lft INTEGER(10) DEFAULT NULL,
   rght INTEGER(10) DEFAULT NULL,
   PRIMARY KEY  (id)
-);
\ No newline at end of file
+);
+
+/* this indexes will improve acl perfomance */
+CREATE INDEX idx_acos_lft_rght ON `acos` (`lft`, `rght`);
+
+CREATE INDEX idx_acos_alias ON `acos` (`alias`);
+
+CREATE INDEX idx_aros_lft_rght ON `aros` (`lft`, `rght`);
+
+CREATE INDEX idx_aros_alias ON `aros` (`alias`);
+
+CREATE INDEX idx_aco_id ON `aros_acos` (`aco_id`);
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
index d09922e83..cd598b35e 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@@ -4,13 +4,21 @@
  *
  * Use it to configure database for i18n
  *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
- *
  * Using the Schema command line utility
  *
  * Use it to configure database for i18n
@@ -19,15 +27,37 @@
  */
 class I18nSchema extends CakeSchema {
 
+/**
+ * The name property
+ *
+ * @var string
+ */
 	public $name = 'i18n';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * The i18n table definition
+ *
+ * @var array
+ */
 	public $i18n = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'locale' => array('type' => 'string', 'null' => false, 'length' => 6, 'key' => 'index'),
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
index 078f5d531..bd7b1efc3 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
@@ -4,28 +4,57 @@
  *
  * Use it to configure database for Sessions
  *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-/*
- *
+/**
  * Using the Schema command line utility
  * cake schema run create Sessions
- *
  */
 class SessionsSchema extends CakeSchema {
 
+/**
+ * Name property
+ *
+ * @var string
+ */
 	public $name = 'Sessions';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * The cake_sessions table definition
+ *
+ * @var array
+ */
 	public $cake_sessions = array(
 		'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
 		'data' => array('type' => 'text', 'null' => true, 'default' => null),
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/web/api/lib/Cake/Console/Templates/skel/Config/bootstrap.php
index 7fe55949c..0cf81bec3 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/bootstrap.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/bootstrap.php
@@ -39,7 +39,6 @@ Cache::config('default', array('engine' => 'File'));
  *     'Vendor'                    => array('/path/to/vendors/', '/next/path/to/vendors/'),
  *     'Plugin'                    => array('/path/to/plugins/', '/next/path/to/plugins/'),
  * ));
- *
  */
 
 /**
@@ -48,7 +47,6 @@ Cache::config('default', array('engine' => 'File'));
  *
  * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
  * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
- *
  */
 
 /**
@@ -57,8 +55,7 @@ Cache::config('default', array('engine' => 'File'));
  * advanced ways of loading plugins
  *
  * CakePlugin::loadAll(); // Loads all plugins at once
- * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
- *
+ * CakePlugin::load('DebugKit'); // Loads a single plugin named DebugKit
  */
 
 /**
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/core.php b/web/api/lib/Cake/Console/Templates/skel/Config/core.php
index 957152d1e..18d645a33 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/core.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/core.php
@@ -138,13 +138,11 @@
  * Enables:
  *	`admin_index()` and `/admin/controller/index`
  *	`manager_index()` and `/manager/controller/index`
- *
  */
 	//Configure::write('Routing.prefixes', array('admin'));
 
 /**
  * Turn off all caching application-wide.
- *
  */
 	//Configure::write('Cache.disable', true);
 
@@ -155,7 +153,6 @@
  * public $cacheAction inside your controllers to define caching settings.
  * You can either set it controller-wide by setting public $cacheAction = true,
  * or in each action using $this->cacheAction = true.
- *
  */
 	//Configure::write('Cache.check', true);
 
@@ -204,7 +201,6 @@
  *
  * To use database sessions, run the app/Config/Schema/sessions.php schema using
  * the cake shell command: cake schema create Sessions
- *
  */
 	Configure::write('Session', array(
 		'defaults' => 'php'
@@ -261,7 +257,6 @@
 	//date_default_timezone_set('UTC');
 
 /**
- *
  * Cache Engine Configuration
  * Default settings provided below
  *
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/database.php.default b/web/api/lib/Cake/Console/Templates/skel/Config/database.php.default
index 00ad15507..cc549a5f6 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/database.php.default
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/database.php.default
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/web/api/lib/Cake/Console/Templates/skel/Config/email.php.default b/web/api/lib/Cake/Console/Templates/skel/Config/email.php.default
index 6dea00b00..0a01e38d0 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Config/email.php.default
+++ b/web/api/lib/Cake/Console/Templates/skel/Config/email.php.default
@@ -24,7 +24,6 @@
  *
  * from =>
  * The origin email. See CakeEmail::from() about the valid values
- *
  */
 class EmailConfig {
 
diff --git a/web/api/lib/Cake/Console/Templates/skel/Console/cake.php b/web/api/lib/Cake/Console/Templates/skel/Console/cake.php
index e3afb675c..f5b262a2a 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Console/cake.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Console/cake.php
@@ -16,20 +16,33 @@
  * @since         CakePHP(tm) v 2.0
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+	$appDir = basename(dirname(dirname(__FILE__)));
+	$install = $root . DS . 'lib';
+	$composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
 
-	// the following line differs from its sibling
+	// the following lines differ from its sibling
 	// /app/Console/cake.php
-	ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
+	if (file_exists($composerInstall . DS . $dispatcher)) {
+		$install = $composerInstall;
+	} elseif (!file_exists($install . DS . $dispatcher)) {
+		$install = $root . PATH_SEPARATOR . __CAKE_PATH__;
+	}
+
+	ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+	unset($root, $appDir, $install, $composerInstall);
 }
 
 if (!include $dispatcher) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
-unset($paths, $path, $dispatcher, $root, $ds);
+unset($dispatcher);
 
 return ShellDispatcher::run($argv);
diff --git a/web/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php b/web/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php
index 87fb589af..eb023a573 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php
@@ -31,10 +31,9 @@ class PagesController extends AppController {
 /**
  * Displays a view
  *
- * @param mixed What page to display
  * @return void
  * @throws NotFoundException When the view file could not be found
- *	or MissingViewException in debug mode.
+ *   or MissingViewException in debug mode.
  */
 	public function display() {
 		$path = func_get_args();
diff --git a/web/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php b/web/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php
index 904bc3b50..9929fa582 100644
--- a/web/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php
+++ b/web/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php
@@ -18,6 +18,11 @@
 
 class AllTestsTest extends CakeTestSuite {
 
+/**
+ * Get the suite object.
+ *
+ * @return CakeTestSuite Suite class instance.
+ */
 	public static function suite() {
 		$suite = new CakeTestSuite('All application tests');
 		$suite->addTestDirectoryRecursive(TESTS . 'Case');
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp
new file mode 100644
index 000000000..ce0f61355
--- /dev/null
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp
@@ -0,0 +1 @@
+<div id="<?php echo $key; ?>Message" class="<?php echo !empty($params['class']) ? $params['class'] : 'message'; ?>"><?php echo $message; ?></div>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
index e2bff19c0..a1333dc19 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -21,5 +19,4 @@ $content = explode("\n", $content);
 
 foreach ($content as $line):
 	echo '<p> ' . $line . "</p>\n";
-endforeach;
-?>
\ No newline at end of file
+endforeach;
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp
index 090b5c403..7f8832498 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Errors/error400.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
index 2600be9bd..6c84d88fa 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -19,4 +17,3 @@
 if (Configure::read('debug') > 0):
 	echo $this->element('exception_stack_trace');
 endif;
-?>
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Errors/error500.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
index 51734d10f..339e140da 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -16,4 +14,3 @@
 if (Configure::read('debug') > 0):
 	echo $this->element('exception_stack_trace');
 endif;
-?>
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
index 9521a6d01..c98487509 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts.Email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
index ee624de45..539615895 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
index 8e1807bd5..f2338e66e 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
index 45e6a16c3..a2c303825 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
index 45e6a16c3..a2c303825 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
index 020f32d12..e6e63cab8 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -11,9 +9,9 @@
 <html>
 <head>
 <?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
+<title><?php echo $pageTitle; ?></title>
 
-<?php if (Configure::read('debug') == 0): ?>
+<?php if (!Configure::read('debug')): ?>
 <meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
 <?php endif ?>
 <style><!--
diff --git a/web/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp b/web/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
index 082cc99b0..ad84a2553 100644
--- a/web/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.View.Pages
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -64,7 +62,7 @@ endif;
 		$settings = Cache::settings();
 		if (!empty($settings)):
 			echo '<span class="notice success">';
-				echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>'. $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
+				echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>' . $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
@@ -143,7 +141,7 @@ if (isset($filePresent)):
 			echo '<span class="notice">';
 				echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
 				echo '<br/>';
-				echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit'));
+				echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit/tree/2.2'));
 			echo '</span>';
 		endif;
 	?>
@@ -183,7 +181,7 @@ You can also add some CSS styles for your pages at: %s.',
 <p>
 <ul>
 	<li>
-		<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit') ?>:
+		<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit/tree/2.2') ?>:
 		<?php echo __d('cake_dev', 'provides a debugging toolbar and enhanced debugging tools for CakePHP applications.'); ?>
 	</li>
 	<li>
diff --git a/web/api/lib/Cake/Console/Templates/skel/index.php b/web/api/lib/Cake/Console/Templates/skel/index.php
index 23606e318..e8a49a26f 100644
--- a/web/api/lib/Cake/Console/Templates/skel/index.php
+++ b/web/api/lib/Cake/Console/Templates/skel/index.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess b/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess
index 1f19e4c06..1d499ba73 100644
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess
@@ -1,6 +1,6 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
+	RewriteEngine On
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule ^ index.php [L]
 </IfModule>
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css b/web/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
index 9bdf5307a..ddfda2b4b 100644
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
@@ -1,6 +1,5 @@
 @charset "utf-8";
 /**
- *
  * Generic CSS for CakePHP
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -84,7 +83,7 @@ p {
 	line-height:20px;
 	background: #003d4c url('../img/cake.icon.png') no-repeat left;
 	color: #fff;
-	padding: 0px 30px;
+	padding: 0 30px;
 }
 #header h1 a {
 	color: #fff;
@@ -172,7 +171,7 @@ td.actions {
 	white-space: nowrap;
 }
 table td.actions a {
-	margin: 0px 6px;
+	margin: 0 6px;
 	padding:2px 5px;
 }
 
@@ -334,7 +333,7 @@ option {
 input[type=checkbox] {
 	clear: left;
 	float: left;
-	margin: 0px 6px 7px 2px;
+	margin: 0 6px 7px 2px;
 	width: auto;
 }
 div.checkbox label {
@@ -363,7 +362,7 @@ form .submit input[type=submit] {
 	background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
 	border-color: #2d6324;
 	color: #fff;
-	text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px;
+	text-shadow: rgba(0, 0, 0, 0.5) 0 -1px 0;
 	padding: 8px 10px;
 }
 form .submit input[type=submit]:hover {
@@ -525,11 +524,11 @@ input[type=submit],
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 	text-decoration: none;
-	text-shadow: #fff 0px 1px 0px;
+	text-shadow: #fff 0 1px 0;
 	min-width: 0;
-	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
 	-webkit-user-select: none;
 	user-select: none;
 }
@@ -549,7 +548,7 @@ input[type=submit]:active,
 	background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
 	background-image: -o-linear-gradient(top, #dfdfdf, #eee);
 	background-image: linear-gradient(top, #dfdfdf, #eee);
-	text-shadow: #eee 0px 1px 0px;
+	text-shadow: #eee 0 1px 0;
 	-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
 	-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
 	box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
@@ -625,15 +624,15 @@ pre {
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 	border-radius: 10px;
-	margin: 0px 4px 10px 2px;
+	margin: 0 4px 10px 2px;
 	font-family: sans-serif;
 	font-size: 14px;
 	line-height: 14px;
 	display: inline-block;
 	text-decoration: none;
-	-moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
-	-webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
+	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
 }
 .cake-code-dump pre {
 	position: relative;
@@ -645,13 +644,13 @@ pre {
 .cake-stack-trace pre {
 	color: #000;
 	background-color: #F0F0F0;
-	margin: 0px 0 10px 0;
+	margin: 0 0 10px 0;
 	padding: 1em;
 	overflow: auto;
 	text-shadow: none;
 }
 .cake-stack-trace li {
-	padding: 10px 5px 0px;
+	padding: 10px 5px 0;
 	margin: 0 0 4px 0;
 	font-family: monospace;
 	border: 1px solid #bbb;
@@ -707,7 +706,7 @@ pre {
 }
 .code-coverage-results div.start {
 	border:1px solid #aaa;
-	border-width:1px 1px 0px 1px;
+	border-width:1px 1px 0 1px;
 	margin-top:30px;
 	padding-top:5px;
 }
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/index.php b/web/api/lib/Cake/Console/Templates/skel/webroot/index.php
index 61737e61b..0944ac51b 100644
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/index.php
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/index.php
@@ -1,12 +1,19 @@
 <?php
 /**
- * Index
- *
  * The Front Controller for handling every request
  *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
@@ -24,7 +31,6 @@ if (!defined('DS')) {
 
 /**
  * The full path to the directory which holds "app", WITHOUT a trailing DS.
- *
  */
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
@@ -32,7 +38,6 @@ if (!defined('ROOT')) {
 
 /**
  * The actual directory name for the "app".
- *
  */
 if (!defined('APP_DIR')) {
 	define('APP_DIR', basename(dirname(dirname(__FILE__))));
@@ -54,10 +59,19 @@ if (!defined('APP_DIR')) {
  */
 //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
 
+/**
+ * This auto-detects CakePHP as a composer installed library.
+ * You may remove this if you are not planning to use composer (not recommended, though).
+ */
+$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
+}
+
 /**
  * Editing below this line should NOT be necessary.
  * Change at your own risk.
- *
  */
 if (!defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
@@ -66,8 +80,8 @@ if (!defined('WWW_ROOT')) {
 	define('WWW_ROOT', dirname(__FILE__) . DS);
 }
 
-// for built-in server
-if (php_sapi_name() === 'cli-server') {
+// For the built-in server
+if (PHP_SAPI === 'cli-server') {
 	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}
@@ -81,10 +95,8 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (!include 'Cake' . DS . 'bootstrap.php') {
 		$failed = true;
 	}
-} else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
-		$failed = true;
-	}
+} elseif (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+	$failed = true;
 }
 if (!empty($failed)) {
 	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/test.php b/web/api/lib/Cake/Console/Templates/skel/webroot/test.php
index 95ee89a5f..08eb92f3a 100644
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/test.php
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/test.php
@@ -18,14 +18,13 @@ if (!defined('DS')) {
 }
 
 /**
- * These defines should only be edited if you have cake installed in
+ * These defines should only be edited if you have CakePHP installed in
  * a directory layout other than the way it is distributed.
  * When using custom settings be sure to use the DS and do not add a trailing DS.
  */
 
 /**
  * The full path to the directory which holds "app", WITHOUT a trailing DS.
- *
  */
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
@@ -33,7 +32,6 @@ if (!defined('ROOT')) {
 
 /**
  * The actual directory name for the "app".
- *
  */
 if (!defined('APP_DIR')) {
 	define('APP_DIR', basename(dirname(dirname(__FILE__))));
@@ -52,10 +50,19 @@ if (!defined('APP_DIR')) {
  */
 //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
 
+/**
+ * This auto-detects CakePHP as a composer installed library.
+ * You may remove this if you are not planning to use composer (not recommended, though).
+ */
+$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
+}
+
 /**
  * Editing below this line should not be necessary.
  * Change at your own risk.
- *
  */
 if (!defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
diff --git a/web/api/lib/Cake/Console/cake b/web/api/lib/Cake/Console/cake
index 3bdf2281d..a3b4ba791 100755
--- a/web/api/lib/Cake/Console/cake
+++ b/web/api/lib/Cake/Console/cake
@@ -24,12 +24,12 @@ canonicalize() {
 	if [ -f "$NAME" ]
 	then
 		DIR=$(dirname -- "$NAME")
-		NAME=$(cd -P "$DIR" && pwd -P)/$(basename -- "$NAME")
+		NAME=$(cd -P "$DIR" > /dev/null && pwd -P)/$(basename -- "$NAME")
 	fi
 	while [ -h "$NAME" ]; do
 		DIR=$(dirname -- "$NAME")
 		SYM=$(readlink "$NAME")
-		NAME=$(cd "$DIR" && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
+		NAME=$(cd "$DIR" > /dev/null && cd $(dirname -- "$SYM") > /dev/null && pwd)/$(basename -- "$SYM")
 	done
 	echo "$NAME"
 }
diff --git a/web/api/lib/Cake/Console/cake.bat b/web/api/lib/Cake/Console/cake.bat
index 3ca534331..905cc39fb 100644
--- a/web/api/lib/Cake/Console/cake.bat
+++ b/web/api/lib/Cake/Console/cake.bat
@@ -16,9 +16,6 @@
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
-:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
-
-@echo.
 @echo off
 
 SET app=%0
diff --git a/web/api/lib/Cake/Console/cake.php b/web/api/lib/Cake/Console/cake.php
index 671b96c24..91fe8bf3e 100644
--- a/web/api/lib/Cake/Console/cake.php
+++ b/web/api/lib/Cake/Console/cake.php
@@ -17,21 +17,24 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 $found = false;
 $paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 
 foreach ($paths as $path) {
-	if (file_exists($path . $ds . $dispatcher)) {
+	if (file_exists($path . DS . $dispatcher)) {
 		$found = $path;
 		break;
 	}
 }
 
 if (!$found) {
-	$rootInstall = dirname(dirname(dirname(__FILE__))) . $ds . $dispatcher;
-	$composerInstall = dirname(dirname(__FILE__)) . $ds . $dispatcher;
+	$rootInstall = dirname(dirname(dirname(__FILE__))) . DS . $dispatcher;
+	$composerInstall = dirname(dirname(__FILE__)) . DS . $dispatcher;
 
 	if (file_exists($composerInstall)) {
 		include $composerInstall;
@@ -40,10 +43,12 @@ if (!$found) {
 	} else {
 		trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 	}
+	unset($rootInstall, $composerInstall);
+
 } else {
-	include $found . $ds . $dispatcher;
+	include $found . DS . $dispatcher;
 }
 
-unset($paths, $path, $found, $dispatcher, $root, $ds);
+unset($paths, $path, $found, $dispatcher);
 
 return ShellDispatcher::run($argv);
diff --git a/web/api/lib/Cake/Controller/CakeErrorController.php b/web/api/lib/Cake/Controller/CakeErrorController.php
index 8978713c5..445e5d672 100644
--- a/web/api/lib/Cake/Controller/CakeErrorController.php
+++ b/web/api/lib/Cake/Controller/CakeErrorController.php
@@ -39,8 +39,8 @@ class CakeErrorController extends AppController {
 /**
  * Constructor
  *
- * @param CakeRequest $request
- * @param CakeResponse $response
+ * @param CakeRequest $request Request instance.
+ * @param CakeResponse $response Response instance.
  */
 	public function __construct($request = null, $response = null) {
 		parent::__construct($request, $response);
diff --git a/web/api/lib/Cake/Controller/Component.php b/web/api/lib/Cake/Controller/Component.php
index 5187d4535..e395aded2 100644
--- a/web/api/lib/Cake/Controller/Component.php
+++ b/web/api/lib/Cake/Controller/Component.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -155,9 +153,9 @@ class Component extends Object {
  *
  * @param Controller $controller Controller with components to beforeRedirect
  * @param string|array $url Either the string or URL array that is being redirected to.
- * @param integer $status The status code of the redirect
- * @param boolean $exit Will the script exit.
- * @return array|void Either an array or null.
+ * @param int $status The status code of the redirect
+ * @param bool $exit Will the script exit.
+ * @return array|null Either an array or null.
  * @link http://book.cakephp.org/2.0/en/controllers/components.html#Component::beforeRedirect
  */
 	public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) {
diff --git a/web/api/lib/Cake/Controller/Component/Acl/AclInterface.php b/web/api/lib/Cake/Controller/Component/Acl/AclInterface.php
index f6794e9e2..25fd8709d 100644
--- a/web/api/lib/Cake/Controller/Component/Acl/AclInterface.php
+++ b/web/api/lib/Cake/Controller/Component/Acl/AclInterface.php
@@ -28,7 +28,7 @@ interface AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function check($aro, $aco, $action = "*");
 
@@ -38,7 +38,7 @@ interface AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function allow($aro, $aco, $action = "*");
 
@@ -48,7 +48,7 @@ interface AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function deny($aro, $aco, $action = "*");
 
@@ -58,14 +58,14 @@ interface AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function inherit($aro, $aco, $action = "*");
 
 /**
  * Initialization method for the Acl implementation
  *
- * @param AclComponent $component
+ * @param Component $component The AclComponent instance.
  * @return void
  */
 	public function initialize(Component $component);
diff --git a/web/api/lib/Cake/Controller/Component/Acl/DbAcl.php b/web/api/lib/Cake/Controller/Component/Acl/DbAcl.php
index b3ef229d5..7d7db6522 100644
--- a/web/api/lib/Cake/Controller/Component/Acl/DbAcl.php
+++ b/web/api/lib/Cake/Controller/Component/Acl/DbAcl.php
@@ -29,11 +29,11 @@ App::uses('ClassRegistry', 'Utility');
  *
  * Would point to a tree structure like
  *
- * {{{
+ * ```
  *	controllers
  *		Users
  *			edit
- * }}}
+ * ```
  *
  * @package       Cake.Controller.Component.Acl
  */
@@ -41,7 +41,6 @@ class DbAcl extends Object implements AclInterface {
 
 /**
  * Constructor
- *
  */
 	public function __construct() {
 		parent::__construct();
@@ -53,7 +52,7 @@ class DbAcl extends Object implements AclInterface {
 /**
  * Initializes the containing component and sets the Aro/Aco objects to it.
  *
- * @param AclComponent $component
+ * @param AclComponent $component The AclComponent instance.
  * @return void
  */
 	public function initialize(Component $component) {
@@ -67,7 +66,7 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success (true if ARO has access to action in ACO, false otherwise)
+ * @return bool Success (true if ARO has access to action in ACO, false otherwise)
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#checking-permissions-the-acl-component
  */
 	public function check($aro, $aco, $action = "*") {
@@ -80,8 +79,8 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $actions Action (defaults to *)
- * @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
- * @return boolean Success
+ * @param int $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#assigning-permissions
  */
 	public function allow($aro, $aco, $actions = "*", $value = 1) {
@@ -94,7 +93,7 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#assigning-permissions
  */
 	public function deny($aro, $aco, $action = "*") {
@@ -107,7 +106,7 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function inherit($aro, $aco, $action = "*") {
 		return $this->allow($aro, $aco, $action, 0);
@@ -119,7 +118,7 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  * @see allow()
  */
 	public function grant($aro, $aco, $action = "*") {
@@ -132,7 +131,7 @@ class DbAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  * @see deny()
  */
 	public function revoke($aro, $aco, $action = "*") {
diff --git a/web/api/lib/Cake/Controller/Component/Acl/IniAcl.php b/web/api/lib/Cake/Controller/Component/Acl/IniAcl.php
index f212938c4..fa1ac69d7 100644
--- a/web/api/lib/Cake/Controller/Component/Acl/IniAcl.php
+++ b/web/api/lib/Cake/Controller/Component/Acl/IniAcl.php
@@ -43,7 +43,7 @@ class IniAcl extends Object implements AclInterface {
 /**
  * Initialize method
  *
- * @param AclBase $component
+ * @param Component $component The AclComponent instance.
  * @return void
  */
 	public function initialize(Component $component) {
@@ -55,7 +55,7 @@ class IniAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function allow($aro, $aco, $action = "*") {
 	}
@@ -66,7 +66,7 @@ class IniAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function deny($aro, $aco, $action = "*") {
 	}
@@ -77,7 +77,7 @@ class IniAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function inherit($aro, $aco, $action = "*") {
 	}
@@ -90,7 +90,7 @@ class IniAcl extends Object implements AclInterface {
  * @param string $aro ARO
  * @param string $aco ACO
  * @param string $action Action
- * @return boolean Success
+ * @return bool Success
  */
 	public function check($aro, $aco, $action = null) {
 		if (!$this->config) {
diff --git a/web/api/lib/Cake/Controller/Component/Acl/PhpAcl.php b/web/api/lib/Cake/Controller/Component/Acl/PhpAcl.php
index be2884871..40d2a77ae 100644
--- a/web/api/lib/Cake/Controller/Component/Acl/PhpAcl.php
+++ b/web/api/lib/Cake/Controller/Component/Acl/PhpAcl.php
@@ -27,14 +27,14 @@ class PhpAcl extends Object implements AclInterface {
 /**
  * Constant for deny
  *
- * @var boolean
+ * @var bool
  */
 	const DENY = false;
 
 /**
  * Constant for allow
  *
- * @var boolean
+ * @var bool
  */
 	const ALLOW = true;
 
@@ -68,7 +68,7 @@ class PhpAcl extends Object implements AclInterface {
  */
 	public function __construct() {
 		$this->options = array(
-			'policy' => self::DENY,
+			'policy' => static::DENY,
 			'config' => APP . 'Config' . DS . 'acl.php',
 		);
 	}
@@ -124,7 +124,7 @@ class PhpAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function allow($aro, $aco, $action = "*") {
 		return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'allow');
@@ -136,7 +136,7 @@ class PhpAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function deny($aro, $aco, $action = "*") {
 		return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'deny');
@@ -148,7 +148,7 @@ class PhpAcl extends Object implements AclInterface {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function inherit($aro, $aco, $action = "*") {
 		return false;
@@ -161,7 +161,7 @@ class PhpAcl extends Object implements AclInterface {
  * @param string $aro ARO
  * @param string $aco ACO
  * @param string $action Action
- * @return boolean true if access is granted, false otherwise
+ * @return bool true if access is granted, false otherwise
  */
 	public function check($aro, $aco, $action = "*") {
 		$allow = $this->options['policy'];
@@ -196,7 +196,6 @@ class PhpAcl extends Object implements AclInterface {
 
 /**
  * Access Control Object
- *
  */
 class PhpAco {
 
@@ -252,7 +251,7 @@ class PhpAco {
 			}
 
 			foreach ($root as $node => $elements) {
-				$pattern = '/^' . str_replace(array_keys(self::$modifiers), array_values(self::$modifiers), $node) . '$/';
+				$pattern = '/^' . str_replace(array_keys(static::$modifiers), array_values(static::$modifiers), $node) . '$/';
 
 				if ($node == $aco[$level] || preg_match($pattern, $aco[$level])) {
 					// merge allow/denies with $path of current level
@@ -361,7 +360,6 @@ class PhpAco {
 
 /**
  * Access Request Object
- *
  */
 class PhpAro {
 
@@ -407,9 +405,9 @@ class PhpAro {
 /**
  * Constructor
  *
- * @param array $aro
- * @param array $map
- * @param array $aliases
+ * @param array $aro The aro data
+ * @param array $map The identifier mappings
+ * @param array $aliases The aliases to map.
  */
 	public function __construct(array $aro = array(), array $map = array(), array $aliases = array()) {
 		if (!empty($map)) {
@@ -462,7 +460,7 @@ class PhpAro {
 			$mapped = '';
 
 			if (is_array($aro)) {
-				if (isset($aro['model']) && isset($aro['foreign_key']) && $aro['model'] == $aroGroup) {
+				if (isset($aro['model']) && isset($aro['foreign_key']) && $aro['model'] === $aroGroup) {
 					$mapped = $aroGroup . '/' . $aro['foreign_key'];
 				} elseif (isset($aro[$model][$field])) {
 					$mapped = $aroGroup . '/' . $aro[$model][$field];
@@ -479,7 +477,7 @@ class PhpAro {
 
 					$aroModel = Inflector::camelize($aroModel);
 
-					if ($aroModel == $model || $aroModel == $aroGroup) {
+					if ($aroModel === $model || $aroModel === $aroGroup) {
 						$mapped = $aroGroup . '/' . $aroValue;
 					}
 				}
@@ -494,7 +492,7 @@ class PhpAro {
 				return $this->aliases[$mapped];
 			}
 		}
-		return self::DEFAULT_ROLE;
+		return static::DEFAULT_ROLE;
 	}
 
 /**
diff --git a/web/api/lib/Cake/Controller/Component/AclComponent.php b/web/api/lib/Cake/Controller/Component/AclComponent.php
index 6d0f3b8b4..cc74f24cc 100644
--- a/web/api/lib/Cake/Controller/Component/AclComponent.php
+++ b/web/api/lib/Cake/Controller/Component/AclComponent.php
@@ -21,8 +21,8 @@ App::uses('AclInterface', 'Controller/Component/Acl');
  * Access Control List factory class.
  *
  * Uses a strategy pattern to allow custom ACL implementations to be used with the same component interface.
- * You can define by changing `Configure::write('Acl.classname', 'DbAcl');` in your core.php. Concrete ACL
- * implementations should extend `AclBase` and implement the methods it defines.
+ * You can define by changing `Configure::write('Acl.classname', 'DbAcl');` in your core.php. The adapter
+ * you specify must implement `AclInterface`
  *
  * @package       Cake.Controller.Component
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html
@@ -53,8 +53,8 @@ class AclComponent extends Component {
 /**
  * Constructor. Will return an instance of the correct ACL class as defined in `Configure::read('Acl.classname')`
  *
- * @param ComponentCollection $collection
- * @param array $settings
+ * @param ComponentCollection $collection Collection instance.
+ * @param array $settings Settings list.
  * @throws CakeException when Acl.classname could not be loaded.
  */
 	public function __construct(ComponentCollection $collection, $settings = array()) {
@@ -79,7 +79,7 @@ class AclComponent extends Component {
  * Will call the initialize method on the adapter if setting a new one.
  *
  * @param AclInterface|string $adapter Instance of AclInterface or a string name of the class to use. (optional)
- * @return AclInterface|void either null, or the adapter implementation.
+ * @return AclInterface|null Either null, or the adapter implementation.
  * @throws CakeException when the given class is not an instance of AclInterface
  */
 	public function adapter($adapter = null) {
@@ -92,7 +92,7 @@ class AclComponent extends Component {
 			}
 			$this->_Instance = $adapter;
 			$this->_Instance->initialize($this);
-			return;
+			return null;
 		}
 		return $this->_Instance;
 	}
@@ -104,7 +104,7 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function check($aro, $aco, $action = "*") {
 		return $this->_Instance->check($aro, $aco, $action);
@@ -117,7 +117,7 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function allow($aro, $aco, $action = "*") {
 		return $this->_Instance->allow($aro, $aco, $action);
@@ -130,7 +130,7 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function deny($aro, $aco, $action = "*") {
 		return $this->_Instance->deny($aro, $aco, $action);
@@ -143,7 +143,7 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return bool Success
  */
 	public function inherit($aro, $aco, $action = "*") {
 		return $this->_Instance->inherit($aro, $aco, $action);
@@ -155,8 +155,8 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
- * @deprecated Will be removed in 3.0.
+ * @return bool Success
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	public function grant($aro, $aco, $action = "*") {
 		trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::grant()', 'allow()'), E_USER_WARNING);
@@ -169,8 +169,8 @@ class AclComponent extends Component {
  * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
  * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
  * @param string $action Action (defaults to *)
- * @return boolean Success
- * @deprecated Will be removed in 3.0.
+ * @return bool Success
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	public function revoke($aro, $aco, $action = "*") {
 		trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::revoke()', 'deny()'), E_USER_WARNING);
diff --git a/web/api/lib/Cake/Controller/Component/Auth/AbstractPasswordHasher.php b/web/api/lib/Cake/Controller/Component/Auth/AbstractPasswordHasher.php
index 4173a5ca6..22b82bf0f 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/AbstractPasswordHasher.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/AbstractPasswordHasher.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -66,8 +64,8 @@ abstract class AbstractPasswordHasher {
  * and check against existing hash.
  *
  * @param string|array $password Plain text password to hash or data array.
- * @param string Existing hashed password.
- * @return boolean True if hashes match else false.
+ * @param string $hashedPassword Existing hashed password.
+ * @return bool True if hashes match else false.
  */
 	abstract public function check($password, $hashedPassword);
 
diff --git a/web/api/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php b/web/api/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php
index d820c179b..12f17a2c2 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -32,7 +30,7 @@ class ActionsAuthorize extends BaseAuthorize {
  *
  * @param array $user The user to authorize
  * @param CakeRequest $request The request needing authorization.
- * @return boolean
+ * @return bool
  */
 	public function authorize($user, CakeRequest $request) {
 		$Acl = $this->_Collection->load('Acl');
diff --git a/web/api/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php b/web/api/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
index 65a0b80d3..df9d3c06e 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
@@ -14,19 +14,21 @@
 
 App::uses('Security', 'Utility');
 App::uses('Hash', 'Utility');
+App::uses('CakeEventListener', 'Event');
 
 /**
  * Base Authentication class with common methods and properties.
  *
  * @package       Cake.Controller.Component.Auth
  */
-abstract class BaseAuthenticate {
+abstract class BaseAuthenticate implements CakeEventListener {
 
 /**
  * Settings for this object.
  *
  * - `fields` The fields to use to identify a user by.
  * - `userModel` The model name of the User, defaults to User.
+ * - `userFields` Array of fields to retrieve from User model, null to retrieve all. Defaults to null.
  * - `scope` Additional conditions to use when looking up and authenticating users,
  *    i.e. `array('User.is_active' => 1).`
  * - `recursive` The value of the recursive key passed to find(). Defaults to 0.
@@ -43,6 +45,7 @@ abstract class BaseAuthenticate {
 			'password' => 'password'
 		),
 		'userModel' => 'User',
+		'userFields' => null,
 		'scope' => array(),
 		'recursive' => 0,
 		'contain' => null,
@@ -63,6 +66,15 @@ abstract class BaseAuthenticate {
  */
 	protected $_passwordHasher;
 
+/**
+ * Implemented events
+ *
+ * @return array of events => callbacks.
+ */
+	public function implementedEvents() {
+		return array();
+	}
+
 /**
  * Constructor
  *
@@ -86,7 +98,7 @@ abstract class BaseAuthenticate {
  *
  * @param string|array $username The username/identifier, or an array of find conditions.
  * @param string $password The password, only used if $username param is string.
- * @return boolean|array Either false on failure, or an array of user data.
+ * @return bool|array Either false on failure, or an array of user data.
  */
 	protected function _findUser($username, $password = null) {
 		$userModel = $this->settings['userModel'];
@@ -105,9 +117,15 @@ abstract class BaseAuthenticate {
 			$conditions = array_merge($conditions, $this->settings['scope']);
 		}
 
+		$userFields = $this->settings['userFields'];
+		if ($password !== null && $userFields !== null) {
+			$userFields[] = $model . '.' . $fields['password'];
+		}
+
 		$result = ClassRegistry::init($userModel)->find('first', array(
 			'conditions' => $conditions,
 			'recursive' => $this->settings['recursive'],
+			'fields' => $userFields,
 			'contain' => $this->settings['contain'],
 		));
 		if (empty($result[$model])) {
@@ -166,7 +184,7 @@ abstract class BaseAuthenticate {
  *
  * @param string $password The plain text password.
  * @return string The hashed form of the password.
- * @deprecated Since 2.4. Use a PasswordHasher class instead.
+ * @deprecated 3.0.0 Since 2.4. Use a PasswordHasher class instead.
  */
 	protected function _password($password) {
 		return Security::hash($password, null, true);
diff --git a/web/api/lib/Cake/Controller/Component/Auth/BaseAuthorize.php b/web/api/lib/Cake/Controller/Component/Auth/BaseAuthorize.php
index cc4c5e807..efb470032 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/BaseAuthorize.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/BaseAuthorize.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -79,8 +77,8 @@ abstract class BaseAuthorize {
  * Checks user authorization.
  *
  * @param array $user Active user data
- * @param CakeRequest $request
- * @return boolean
+ * @param CakeRequest $request Request instance.
+ * @return bool
  */
 	abstract public function authorize($user, CakeRequest $request);
 
@@ -107,7 +105,7 @@ abstract class BaseAuthorize {
  * that need to get information about the plugin, controller, and action being invoked.
  *
  * @param CakeRequest $request The request a path is needed for.
- * @param string $path
+ * @param string $path Path format.
  * @return string the action path for the given request.
  */
 	public function action(CakeRequest $request, $path = '/:plugin/:controller/:action') {
@@ -126,25 +124,25 @@ abstract class BaseAuthorize {
  *
  * Create additional mappings for a standard CRUD operation:
  *
- * {{{
+ * ```
  * $this->Auth->mapActions(array('create' => array('add', 'register'));
- * }}}
+ * ```
  *
  * Or equivalently:
  *
- * {{{
+ * ```
  * $this->Auth->mapActions(array('register' => 'create', 'add' => 'create'));
- * }}}
+ * ```
  *
  * Create mappings for custom CRUD operations:
  *
- * {{{
+ * ```
  * $this->Auth->mapActions(array('range' => 'search'));
- * }}}
+ * ```
  *
  * You can use the custom CRUD operations to create additional generic permissions
  * that behave like CRUD operations. Doing this will require additional columns on the
- * permissions lookup. For example if one wanted an additional search CRUD operation 
+ * permissions lookup. For example if one wanted an additional search CRUD operation
  * one would create and additional column '_search' in the aros_acos table. One could
  * create a custom admin CRUD operation for administration functions similarly if needed.
  *
diff --git a/web/api/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php b/web/api/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
index e74662ffb..02144b171 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -19,24 +17,33 @@ App::uses('BaseAuthenticate', 'Controller/Component/Auth');
 /**
  * Basic Authentication adapter for AuthComponent.
  *
- * Provides Basic HTTP authentication support for AuthComponent. Basic Auth will authenticate users
- * against the configured userModel and verify the username and passwords match. Clients using Basic Authentication
- * must support cookies. Since AuthComponent identifies users based on Session contents, clients using Basic
- * Auth must support cookies.
+ * Provides Basic HTTP authentication support for AuthComponent. Basic Auth will
+ * authenticate users against the configured userModel and verify the username
+ * and passwords match.
  *
  * ### Using Basic auth
  *
  * In your controller's components array, add auth + the required settings.
- * {{{
+ * ```
  *	public $components = array(
  *		'Auth' => array(
  *			'authenticate' => array('Basic')
  *		)
  *	);
- * }}}
+ * ```
  *
- * In your login function just call `$this->Auth->login()` without any checks for POST data. This
- * will send the authentication headers, and trigger the login dialog in the browser/client.
+ * You should also set `AuthComponent::$sessionKey = false;` in your AppController's
+ * beforeFilter() to prevent CakePHP from sending a session cookie to the client.
+ *
+ * Since HTTP Basic Authentication is stateless you don't need a login() action
+ * in your controller. The user credentials will be checked on each request. If
+ * valid credentials are not provided, required authentication headers will be sent
+ * by this authentication provider which triggers the login dialog in the browser/client.
+ *
+ * You may also want to use `$this->Auth->unauthorizedRedirect = false;`.
+ * By default, unauthorized users are redirected to the referrer URL,
+ * `AuthComponent::$loginAction`, or '/'. If unauthorizedRedirect is set to
+ * false, a ForbiddenException exception is thrown instead of redirecting.
  *
  * @package       Cake.Controller.Component.Auth
  * @since 2.0
@@ -78,7 +85,7 @@ class BasicAuthenticate extends BaseAuthenticate {
 		$username = env('PHP_AUTH_USER');
 		$pass = env('PHP_AUTH_PW');
 
-		if (empty($username) || empty($pass)) {
+		if (!is_string($username) || $username === '' || !is_string($pass) || $pass === '') {
 			return false;
 		}
 		return $this->_findUser($username, $pass);
diff --git a/web/api/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php b/web/api/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
index d4870dd87..a25305656 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -20,13 +18,13 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth');
  * An authentication adapter for AuthComponent. Provides the ability to authenticate using POST data using Blowfish
  * hashing. Can be used by configuring AuthComponent to use it via the AuthComponent::$authenticate setting.
  *
- * {{{
+ * ```
  * 	$this->Auth->authenticate = array(
  * 		'Blowfish' => array(
  * 			'scope' => array('User.active' => 1)
  * 		)
  * 	)
- * }}}
+ * ```
  *
  * When configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions
  * are used. See FormAuthenticate::$settings for more information.
@@ -37,7 +35,7 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth');
  * @package	Cake.Controller.Component.Auth
  * @since CakePHP(tm) v 2.3
  * @see	AuthComponent::$authenticate
- * @deprecated Since 2.4. Just use FormAuthenticate with 'passwordHasher' setting set to 'Blowfish'
+ * @deprecated 3.0.0 Since 2.4. Just use FormAuthenticate with 'passwordHasher' setting set to 'Blowfish'
  */
 class BlowfishAuthenticate extends FormAuthenticate {
 
diff --git a/web/api/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php b/web/api/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php
index 0c15fdd16..dcc8d6837 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/BlowfishPasswordHasher.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -40,8 +38,8 @@ class BlowfishPasswordHasher extends AbstractPasswordHasher {
  * Check hash. Generate hash for user provided password and check against existing hash.
  *
  * @param string $password Plain text password to hash.
- * @param string Existing hashed password.
- * @return boolean True if hashes match else false.
+ * @param string $hashedPassword Existing hashed password.
+ * @return bool True if hashes match else false.
  */
 	public function check($password, $hashedPassword) {
 		return $hashedPassword === Security::hash($password, 'blowfish', $hashedPassword);
diff --git a/web/api/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php b/web/api/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
index 96ea4abd0..79ad66579 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -20,14 +18,14 @@ App::uses('BaseAuthorize', 'Controller/Component/Auth');
  * An authorization adapter for AuthComponent. Provides the ability to authorize using a controller callback.
  * Your controller's isAuthorized() method should return a boolean to indicate whether or not the user is authorized.
  *
- * {{{
+ * ```
  *	public function isAuthorized($user) {
  *		if (!empty($this->request->params['admin'])) {
  *			return $user['role'] === 'admin';
  *		}
  *		return !empty($user);
  *	}
- * }}}
+ * ```
  *
  * the above is simple implementation that would only authorize users of the 'admin' role to access
  * admin routing.
@@ -58,8 +56,8 @@ class ControllerAuthorize extends BaseAuthorize {
  * Checks user authorization using a controller callback.
  *
  * @param array $user Active user data
- * @param CakeRequest $request
- * @return boolean
+ * @param CakeRequest $request Request instance.
+ * @return bool
  */
 	public function authorize($user, CakeRequest $request) {
 		return (bool)$this->_Controller->isAuthorized($user);
diff --git a/web/api/lib/Cake/Controller/Component/Auth/CrudAuthorize.php b/web/api/lib/Cake/Controller/Component/Auth/CrudAuthorize.php
index 380ed1609..20fcb386f 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/CrudAuthorize.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/CrudAuthorize.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -78,7 +76,7 @@ class CrudAuthorize extends BaseAuthorize {
  *
  * @param array $user The user to authorize
  * @param CakeRequest $request The request needing authorization.
- * @return boolean
+ * @return bool
  */
 	public function authorize($user, CakeRequest $request) {
 		if (!isset($this->settings['actionMap'][$request->params['action']])) {
diff --git a/web/api/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/web/api/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
index 72fc95de3..93862919e 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -30,13 +28,13 @@ App::uses('BasicAuthenticate', 'Controller/Component/Auth');
  * ### Using Digest auth
  *
  * In your controller's components array, add auth + the required settings.
- * {{{
+ * ```
  *	public $components = array(
  *		'Auth' => array(
  *			'authenticate' => array('Digest')
  *		)
  *	);
- * }}}
+ * ```
  *
  * In your login function just call `$this->Auth->login()` without any checks for POST data. This
  * will send the authentication headers, and trigger the login dialog in the browser/client.
@@ -62,6 +60,7 @@ class DigestAuthenticate extends BasicAuthenticate {
  *
  * - `fields` The fields to use to identify a user by.
  * - `userModel` The model name of the User, defaults to User.
+ * - `userFields` Array of fields to retrieve from User model, null to retrieve all. Defaults to null.
  * - `scope` Additional conditions to use when looking up and authenticating users,
  *    i.e. `array('User.is_active' => 1).`
  * - `recursive` The value of the recursive key passed to find(). Defaults to 0.
@@ -80,6 +79,7 @@ class DigestAuthenticate extends BasicAuthenticate {
 			'password' => 'password'
 		),
 		'userModel' => 'User',
+		'userFields' => null,
 		'scope' => array(),
 		'recursive' => 0,
 		'contain' => null,
@@ -156,7 +156,7 @@ class DigestAuthenticate extends BasicAuthenticate {
  * Parse the digest authentication headers and split them up.
  *
  * @param string $digest The raw digest authentication headers.
- * @return array An array of digest authentication headers
+ * @return array|null An array of digest authentication headers
  */
 	public function parseAuthData($digest) {
 		if (substr($digest, 0, 7) === 'Digest ') {
@@ -164,7 +164,7 @@ class DigestAuthenticate extends BasicAuthenticate {
 		}
 		$keys = $match = array();
 		$req = array('nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1);
-		preg_match_all('/(\w+)=([\'"]?)([a-zA-Z0-9@=.\/_-]+)\2/', $digest, $match, PREG_SET_ORDER);
+		preg_match_all('/(\w+)=([\'"]?)([a-zA-Z0-9\:\#\%\?\&@=\.\/_-]+)\2/', $digest, $match, PREG_SET_ORDER);
 
 		foreach ($match as $i) {
 			$keys[$i[1]] = $i[3];
diff --git a/web/api/lib/Cake/Controller/Component/Auth/FormAuthenticate.php b/web/api/lib/Cake/Controller/Component/Auth/FormAuthenticate.php
index fb80730f0..151c92bdd 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/FormAuthenticate.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/FormAuthenticate.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -20,13 +18,13 @@ App::uses('BaseAuthenticate', 'Controller/Component/Auth');
  * An authentication adapter for AuthComponent. Provides the ability to authenticate using POST
  * data. Can be used by configuring AuthComponent to use it via the AuthComponent::$authenticate setting.
  *
- * {{{
+ * ```
  *	$this->Auth->authenticate = array(
  *		'Form' => array(
  *			'scope' => array('User.active' => 1)
  *		)
  *	)
- * }}}
+ * ```
  *
  * When configuring FormAuthenticate you can pass in settings to which fields, model and additional conditions
  * are used. See FormAuthenticate::$settings for more information.
@@ -43,7 +41,7 @@ class FormAuthenticate extends BaseAuthenticate {
  * @param CakeRequest $request The request that contains login information.
  * @param string $model The model used for login verification.
  * @param array $fields The fields to be checked.
- * @return boolean False if the fields have not been supplied. True if they exist.
+ * @return bool False if the fields have not been supplied. True if they exist.
  */
 	protected function _checkFields(CakeRequest $request, $model, $fields) {
 		if (empty($request->data[$model])) {
@@ -51,7 +49,7 @@ class FormAuthenticate extends BaseAuthenticate {
 		}
 		foreach (array($fields['username'], $fields['password']) as $field) {
 			$value = $request->data($model . '.' . $field);
-			if (empty($value) || !is_string($value)) {
+			if (empty($value) && $value !== '0' || !is_string($value)) {
 				return false;
 			}
 		}
diff --git a/web/api/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php b/web/api/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php
index 5a42312eb..74cc84d15 100644
--- a/web/api/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php
+++ b/web/api/lib/Cake/Controller/Component/Auth/SimplePasswordHasher.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -47,8 +45,8 @@ class SimplePasswordHasher extends AbstractPasswordHasher {
  * Check hash. Generate hash for user provided password and check against existing hash.
  *
  * @param string $password Plain text password to hash.
- * @param string Existing hashed password.
- * @return boolean True if hashes match else false.
+ * @param string $hashedPassword Existing hashed password.
+ * @return bool True if hashes match else false.
  */
 	public function check($password, $hashedPassword) {
 		return $hashedPassword === $this->hash($password);
diff --git a/web/api/lib/Cake/Controller/Component/AuthComponent.php b/web/api/lib/Cake/Controller/Component/AuthComponent.php
index 9263712bc..c6ac17b9c 100644
--- a/web/api/lib/Cake/Controller/Component/AuthComponent.php
+++ b/web/api/lib/Cake/Controller/Component/AuthComponent.php
@@ -26,6 +26,7 @@ App::uses('Hash', 'Utility');
 App::uses('CakeSession', 'Model/Datasource');
 App::uses('BaseAuthorize', 'Controller/Component/Auth');
 App::uses('BaseAuthenticate', 'Controller/Component/Auth');
+App::uses('CakeEvent', 'Event');
 
 /**
  * Authentication control component class
@@ -49,25 +50,25 @@ class AuthComponent extends Component {
  *
  * @var array
  */
-	public $components = array('Session', 'RequestHandler');
+	public $components = array('Session', 'Flash', 'RequestHandler');
 
 /**
  * An array of authentication objects to use for authenticating users. You can configure
  * multiple adapters and they will be checked sequentially when users are identified.
  *
- * {{{
+ * ```
  *	$this->Auth->authenticate = array(
  *		'Form' => array(
  *			'userModel' => 'Users.User'
  *		)
  *	);
- * }}}
+ * ```
  *
  * Using the class name without 'Authenticate' as the key, you can pass in an array of settings for each
  * authentication object. Additionally you can define settings that should be set to all authentications objects
  * using the 'all' key:
  *
- * {{{
+ * ```
  *	$this->Auth->authenticate = array(
  *		'all' => array(
  *			'userModel' => 'Users.User',
@@ -76,7 +77,7 @@ class AuthComponent extends Component {
  *		'Form',
  *		'Basic'
  *	);
- * }}}
+ * ```
  *
  * You can also use AuthComponent::ALL instead of the string 'all'.
  *
@@ -88,7 +89,7 @@ class AuthComponent extends Component {
 /**
  * Objects that will be used for authentication checks.
  *
- * @var array
+ * @var BaseAuthenticate[]
  */
 	protected $_authenticateObjects = array();
 
@@ -96,19 +97,19 @@ class AuthComponent extends Component {
  * An array of authorization objects to use for authorizing users. You can configure
  * multiple adapters and they will be checked sequentially when authorization checks are done.
  *
- * {{{
+ * ```
  *	$this->Auth->authorize = array(
  *		'Crud' => array(
  *			'actionPath' => 'controllers/'
  *		)
  *	);
- * }}}
+ * ```
  *
  * Using the class name without 'Authorize' as the key, you can pass in an array of settings for each
  * authorization object. Additionally you can define settings that should be set to all authorization objects
  * using the 'all' key:
  *
- * {{{
+ * ```
  *	$this->Auth->authorize = array(
  *		'all' => array(
  *			'actionPath' => 'controllers/'
@@ -116,7 +117,7 @@ class AuthComponent extends Component {
  *		'Crud',
  *		'CustomAuth'
  *	);
- * }}}
+ * ```
  *
  * You can also use AuthComponent::ALL instead of the string 'all'
  *
@@ -128,7 +129,7 @@ class AuthComponent extends Component {
 /**
  * Objects that will be used for authorization checks.
  *
- * @var array
+ * @var BaseAuthorize[]
  */
 	protected $_authorizeObjects = array();
 
@@ -211,7 +212,7 @@ class AuthComponent extends Component {
  * Error to display when user attempts to access an object or action to which they do not have
  * access.
  *
- * @var string|boolean Error message or boolean false to suppress flash message
+ * @var string|bool
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#AuthComponent::$authError
  */
 	public $authError = null;
@@ -277,7 +278,7 @@ class AuthComponent extends Component {
  * of login form data.
  *
  * @param Controller $controller A reference to the instantiating controller object
- * @return boolean
+ * @return bool
  */
 	public function startup(Controller $controller) {
 		$methods = array_flip(array_map('strtolower', $controller->methods));
@@ -318,7 +319,7 @@ class AuthComponent extends Component {
  * Checks whether current action is accessible without authentication.
  *
  * @param Controller $controller A reference to the instantiating controller object
- * @return boolean True if action is accessible without authentication else false
+ * @return bool True if action is accessible without authentication else false
  */
 	protected function _isAllowed(Controller $controller) {
 		$action = strtolower($controller->request->params['action']);
@@ -338,7 +339,7 @@ class AuthComponent extends Component {
  * is returned.
  *
  * @param Controller $controller A reference to the controller object.
- * @return boolean True if current action is login action else false.
+ * @return bool True if current action is login action else false.
  */
 	protected function _unauthenticated(Controller $controller) {
 		if (empty($this->_authenticateObjects)) {
@@ -367,11 +368,14 @@ class AuthComponent extends Component {
 		if (!empty($this->ajaxLogin)) {
 			$controller->response->statusCode(403);
 			$controller->viewPath = 'Elements';
-			echo $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
+			$response = $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
+			$response->send();
 			$this->_stop();
 			return false;
 		}
-		$controller->redirect(null, 403);
+		$controller->response->statusCode(403);
+		$controller->response->send();
+		$this->_stop();
 		return false;
 	}
 
@@ -379,7 +383,7 @@ class AuthComponent extends Component {
  * Normalizes $loginAction and checks if current request URL is same as login action.
  *
  * @param Controller $controller A reference to the controller object.
- * @return boolean True if current action is login action else false.
+ * @return bool True if current action is login action else false.
  */
 	protected function _isLoginAction(Controller $controller) {
 		$url = '';
@@ -396,7 +400,7 @@ class AuthComponent extends Component {
  * Handle unauthorized access attempt
  *
  * @param Controller $controller A reference to the controller object
- * @return boolean Returns false
+ * @return bool Returns false
  * @throws ForbiddenException
  * @see AuthComponent::$unauthorizedRedirect
  */
@@ -415,14 +419,14 @@ class AuthComponent extends Component {
 		} else {
 			$url = $this->unauthorizedRedirect;
 		}
-		$controller->redirect($url, null, true);
+		$controller->redirect($url);
 		return false;
 	}
 
 /**
  * Attempts to introspect the correct values for object properties.
  *
- * @return boolean True
+ * @return bool True
  */
 	protected function _setDefaults() {
 		$defaults = array(
@@ -444,9 +448,9 @@ class AuthComponent extends Component {
  * Each adapter will be checked in sequence, if any of them return true, then the user will
  * be authorized for the request.
  *
- * @param array $user The user to check the authorization of. If empty the user in the session will be used.
- * @param CakeRequest $request The request to authenticate for. If empty, the current request will be used.
- * @return boolean True if $user is authorized, otherwise false
+ * @param array|null $user The user to check the authorization of. If empty the user in the session will be used.
+ * @param CakeRequest|null $request The request to authenticate for. If empty, the current request will be used.
+ * @return bool True if $user is authorized, otherwise false
  */
 	public function isAuthorized($user = null, CakeRequest $request = null) {
 		if (empty($user) && !$this->user()) {
@@ -477,7 +481,7 @@ class AuthComponent extends Component {
  */
 	public function constructAuthorize() {
 		if (empty($this->authorize)) {
-			return;
+			return null;
 		}
 		$this->_authorizeObjects = array();
 		$config = Hash::normalize((array)$this->authorize);
@@ -512,7 +516,7 @@ class AuthComponent extends Component {
  * `$this->Auth->allow('edit', 'add');` or
  * `$this->Auth->allow();` to allow all actions
  *
- * @param string|array $action,... Controller action name or array of actions
+ * @param string|array|null $action Controller action name or array of actions
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#making-actions-public
  */
@@ -537,7 +541,7 @@ class AuthComponent extends Component {
  * `$this->Auth->deny('edit', 'add');` or
  * `$this->Auth->deny();` to remove all items from the allowed list
  *
- * @param string|array $action,... Controller action name or array of actions
+ * @param string|array|null $action Controller action name or array of actions
  * @return void
  * @see AuthComponent::allow()
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#making-actions-require-authorization
@@ -568,17 +572,24 @@ class AuthComponent extends Component {
  * attached authorize objects.
  *
  * @param array $map Actions to map
- * @return void
+ * @return array
  * @see BaseAuthorize::mapActions()
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#mapping-actions-when-using-crudauthorize
+ * @deprecated 3.0.0 Map actions using `actionMap` config key on authorize objects instead
  */
 	public function mapActions($map = array()) {
 		if (empty($this->_authorizeObjects)) {
 			$this->constructAuthorize();
 		}
+		$mappedActions = array();
 		foreach ($this->_authorizeObjects as $auth) {
-			$auth->mapActions($map);
+			$mappedActions = Hash::merge($mappedActions, $auth->mapActions($map));
 		}
+		if (empty($map)) {
+			return $mappedActions;
+		}
+
+		return array();
 	}
 
 /**
@@ -589,8 +600,8 @@ class AuthComponent extends Component {
  * the user record is written to the session key specified in AuthComponent::$sessionKey. Logging in
  * will also change the session id in order to help mitigate session replays.
  *
- * @param array $user Either an array of user data, or null to identify a user using the current request.
- * @return boolean True on login success, false on failure
+ * @param array|null $user Either an array of user data, or null to identify a user using the current request.
+ * @return bool True on login success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#identifying-users-and-logging-them-in
  */
 	public function login($user = null) {
@@ -601,9 +612,11 @@ class AuthComponent extends Component {
 		}
 		if ($user) {
 			$this->Session->renew();
-			$this->Session->write(self::$sessionKey, $user);
+			$this->Session->write(static::$sessionKey, $user);
+			$event = new CakeEvent('Auth.afterIdentify', $this, array('user' => $user));
+			$this->_Collection->getController()->getEventManager()->dispatch($event);
 		}
-		return $this->loggedIn();
+		return (bool)$this->user();
 	}
 
 /**
@@ -628,7 +641,7 @@ class AuthComponent extends Component {
 		foreach ($this->_authenticateObjects as $auth) {
 			$auth->logout($user);
 		}
-		$this->Session->delete(self::$sessionKey);
+		$this->Session->delete(static::$sessionKey);
 		$this->Session->delete('Auth.redirect');
 		$this->Session->renew();
 		return Router::normalize($this->logoutRedirect);
@@ -641,15 +654,15 @@ class AuthComponent extends Component {
  * cache is primarily used for stateless authentication. For stateful authentication,
  * cookies + sessions will be used.
  *
- * @param string $key field to retrieve. Leave null to get entire User record
- * @return mixed User record. or null if no user is logged in.
+ * @param string|null $key field to retrieve. Leave null to get entire User record
+ * @return array|null User record. or null if no user is logged in.
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user
  */
 	public static function user($key = null) {
-		if (!empty(self::$_user)) {
-			$user = self::$_user;
-		} elseif (self::$sessionKey && CakeSession::check(self::$sessionKey)) {
-			$user = CakeSession::read(self::$sessionKey);
+		if (!empty(static::$_user)) {
+			$user = static::$_user;
+		} elseif (static::$sessionKey && CakeSession::check(static::$sessionKey)) {
+			$user = CakeSession::read(static::$sessionKey);
 		} else {
 			return null;
 		}
@@ -663,7 +676,7 @@ class AuthComponent extends Component {
  * Similar to AuthComponent::user() except if the session user cannot be found, connected authentication
  * objects will have their getUser() methods called. This lets stateless authentication methods function correctly.
  *
- * @return boolean true if a user can be found, false if one cannot.
+ * @return bool True if a user can be found, false if one cannot.
  */
 	protected function _getUser() {
 		$user = $this->user();
@@ -678,7 +691,7 @@ class AuthComponent extends Component {
 		foreach ($this->_authenticateObjects as $auth) {
 			$result = $auth->getUser($this->request);
 			if (!empty($result) && is_array($result)) {
-				self::$_user = $result;
+				static::$_user = $result;
 				return true;
 			}
 		}
@@ -689,9 +702,9 @@ class AuthComponent extends Component {
 /**
  * Backwards compatible alias for AuthComponent::redirectUrl().
  *
- * @param string|array $url Optional URL to write as the login redirect URL.
+ * @param string|array|null $url Optional URL to write as the login redirect URL.
  * @return string Redirect URL
- * @deprecated 2.3 Use AuthComponent::redirectUrl() instead
+ * @deprecated 3.0.0 Since 2.3.0, use AuthComponent::redirectUrl() instead
  */
 	public function redirect($url = null) {
 		return $this->redirectUrl($url);
@@ -712,7 +725,7 @@ class AuthComponent extends Component {
  *    value is returned.
  *  - If there is no session and no $loginRedirect, / is returned.
  *
- * @param string|array $url Optional URL to write as the login redirect URL.
+ * @param string|array|null $url Optional URL to write as the login redirect URL.
  * @return string Redirect URL
  */
 	public function redirectUrl($url = null) {
@@ -723,7 +736,7 @@ class AuthComponent extends Component {
 			$redir = $this->Session->read('Auth.redirect');
 			$this->Session->delete('Auth.redirect');
 
-			if (Router::normalize($redir) == Router::normalize($this->loginAction)) {
+			if (Router::normalize($redir) === Router::normalize($this->loginAction)) {
 				$redir = $this->loginRedirect;
 			}
 		} elseif ($this->loginRedirect) {
@@ -761,12 +774,12 @@ class AuthComponent extends Component {
 /**
  * Loads the configured authentication objects.
  *
- * @return mixed either null on empty authenticate value, or an array of loaded objects.
+ * @return mixed Either null on empty authenticate value, or an array of loaded objects.
  * @throws CakeException
  */
 	public function constructAuthenticate() {
 		if (empty($this->authenticate)) {
-			return;
+			return null;
 		}
 		$this->_authenticateObjects = array();
 		$config = Hash::normalize((array)$this->authenticate);
@@ -776,6 +789,10 @@ class AuthComponent extends Component {
 			unset($config[AuthComponent::ALL]);
 		}
 		foreach ($config as $class => $settings) {
+			if (!empty($settings['className'])) {
+				$class = $settings['className'];
+				unset($settings['className']);
+			}
 			list($plugin, $class) = pluginSplit($class, true);
 			$className = $class . 'Authenticate';
 			App::uses($className, $plugin . 'Controller/Component/Auth');
@@ -786,7 +803,9 @@ class AuthComponent extends Component {
 				throw new CakeException(__d('cake_dev', 'Authentication objects must implement an %s method.', 'authenticate()'));
 			}
 			$settings = array_merge($global, (array)$settings);
-			$this->_authenticateObjects[] = new $className($this->_Collection, $settings);
+			$auth = new $className($this->_Collection, $settings);
+			$this->_Collection->getController()->getEventManager()->attach($auth);
+			$this->_authenticateObjects[] = $auth;
 		}
 		return $this->_authenticateObjects;
 	}
@@ -799,7 +818,7 @@ class AuthComponent extends Component {
  *
  * @param string $password Password to hash
  * @return string Hashed password
- * @deprecated Since 2.4. Use Security::hash() directly or a password hasher object.
+ * @deprecated 3.0.0 Since 2.4. Use Security::hash() directly or a password hasher object.
  */
 	public static function password($password) {
 		return Security::hash($password, null, true);
@@ -808,8 +827,8 @@ class AuthComponent extends Component {
 /**
  * Check whether or not the current user has data in the session, and is considered logged in.
  *
- * @return boolean true if the user is logged in, false otherwise
- * @deprecated Since 2.5. Use AuthComponent::user() directly.
+ * @return bool true if the user is logged in, false otherwise
+ * @deprecated 3.0.0 Since 2.5. Use AuthComponent::user() directly.
  */
 	public function loggedIn() {
 		return (bool)$this->user();
@@ -825,7 +844,7 @@ class AuthComponent extends Component {
 		if ($message === false) {
 			return;
 		}
-		$this->Session->setFlash($message, $this->flash['element'], $this->flash['params'], $this->flash['key']);
+		$this->Flash->set($message, $this->flash);
 	}
 
 }
diff --git a/web/api/lib/Cake/Controller/Component/CookieComponent.php b/web/api/lib/Cake/Controller/Component/CookieComponent.php
index d1aececd2..2bb75194d 100644
--- a/web/api/lib/Cake/Controller/Component/CookieComponent.php
+++ b/web/api/lib/Cake/Controller/Component/CookieComponent.php
@@ -27,7 +27,6 @@ App::uses('Hash', 'Utility');
  *
  * @package       Cake.Controller.Component
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html
- *
  */
 class CookieComponent extends Component {
 
@@ -92,7 +91,7 @@ class CookieComponent extends Component {
  * Indicates that the cookie should only be transmitted over a secure HTTPS connection.
  * When set to true, the cookie will only be set if a secure connection exists.
  *
- * @var boolean
+ * @var bool
  */
 	public $secure = false;
 
@@ -112,7 +111,7 @@ class CookieComponent extends Component {
  * Set to true to make HTTP only cookies. Cookies that are HTTP only
  * are not accessible in JavaScript.
  *
- * @var boolean
+ * @var bool
  */
 	public $httpOnly = false;
 
@@ -185,7 +184,7 @@ class CookieComponent extends Component {
 /**
  * Start CookieComponent for use in the controller
  *
- * @param Controller $controller
+ * @param Controller $controller Controller instance.
  * @return void
  */
 	public function startup(Controller $controller) {
@@ -208,8 +207,8 @@ class CookieComponent extends Component {
  *
  * @param string|array $key Key for the value
  * @param mixed $value Value
- * @param boolean $encrypt Set to true to encrypt value, false otherwise
- * @param integer|string $expires Can be either the number of seconds until a cookie
+ * @param bool $encrypt Set to true to encrypt value, false otherwise
+ * @param int|string $expires Can be either the number of seconds until a cookie
  *   expires, or a strtotime compatible time offset.
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::write
@@ -262,7 +261,7 @@ class CookieComponent extends Component {
  * $this->Cookie->read(Name.key);
  *
  * @param string $key Key of the value to be obtained. If none specified, obtain map key => values
- * @return string or null, value for specified key
+ * @return string|null Value for specified key
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::read
  */
 	public function read($key = null) {
@@ -284,7 +283,7 @@ class CookieComponent extends Component {
 			return null;
 		}
 
-		if (!empty($names[1])) {
+		if (!empty($names[1]) && is_array($this->_values[$this->name][$key])) {
 			return Hash::get($this->_values[$this->name][$key], $names[1]);
 		}
 		return $this->_values[$this->name][$key];
@@ -293,8 +292,8 @@ class CookieComponent extends Component {
 /**
  * Returns true if given variable is set in cookie.
  *
- * @param string $var Variable name to check for
- * @return boolean True if variable is there
+ * @param string $key Variable name to check for
+ * @return bool True if variable is there
  */
 	public function check($key = null) {
 		if (empty($key)) {
@@ -400,8 +399,8 @@ class CookieComponent extends Component {
  * CookieComponent::write(string, string, boolean, 8400);
  * CookieComponent::write(string, string, boolean, '5 Days');
  *
- * @param integer|string $expires Can be either Unix timestamp, or date string
- * @return integer Unix timestamp
+ * @param int|string $expires Can be either Unix timestamp, or date string
+ * @return int Unix timestamp
  */
 	protected function _expire($expires = null) {
 		if ($expires === null) {
@@ -414,7 +413,7 @@ class CookieComponent extends Component {
 		$now = new DateTime();
 
 		if (is_int($expires) || is_numeric($expires)) {
-			return $this->_expires = $now->format('U') + intval($expires);
+			return $this->_expires = $now->format('U') + (int)$expires;
 		}
 		$now->modify($expires);
 		return $this->_expires = $now->format('U');
diff --git a/web/api/lib/Cake/Controller/Component/EmailComponent.php b/web/api/lib/Cake/Controller/Component/EmailComponent.php
index 2e5ba1c38..d89099f7e 100644
--- a/web/api/lib/Cake/Controller/Component/EmailComponent.php
+++ b/web/api/lib/Cake/Controller/Component/EmailComponent.php
@@ -29,7 +29,7 @@ App::uses('CakeEmail', 'Network/Email');
  * @package       Cake.Controller.Component
  * @link          http://book.cakephp.org/2.0/en/core-libraries/components/email.html
  * @link          http://book.cakephp.org/2.0/en/core-utility-libraries/email.html
- * @deprecated    Will be removed in 3.0. Use Network/CakeEmail instead
+ * @deprecated    3.0.0 Will be removed in 3.0. Use Network/CakeEmail instead
  */
 class EmailComponent extends Component {
 
@@ -282,7 +282,7 @@ class EmailComponent extends Component {
  *  If you are rendering a template this variable will be sent to the templates as `$content`
  * @param string $template Template to use when sending email
  * @param string $layout Layout to use to enclose email body
- * @return boolean Success
+ * @return bool Success
  */
 	public function send($content = null, $template = null, $layout = null) {
 		$lib = new CakeEmail();
@@ -309,7 +309,8 @@ class EmailComponent extends Component {
 			$lib->readReceipt($this->_formatAddresses((array)$this->readReceipt));
 		}
 
-		$lib->subject($this->subject)->messageID($this->messageId);
+		$lib->subject($this->subject);
+		$lib->messageID($this->messageId);
 		$lib->helpers($this->_controller->helpers);
 
 		$headers = array('X-Mailer' => $this->xMailer);
@@ -405,7 +406,7 @@ class EmailComponent extends Component {
  * Find the specified attachment in the list of file paths
  *
  * @param string $attachment Attachment file name to find
- * @return string Path to located file
+ * @return string|null Path to located file
  */
 	protected function _findFiles($attachment) {
 		if (file_exists($attachment)) {
@@ -423,7 +424,7 @@ class EmailComponent extends Component {
 /**
  * Format addresses to be an array with email as key and alias as value
  *
- * @param array $addresses
+ * @param array $addresses Address to format.
  * @return array
  */
 	protected function _formatAddresses($addresses) {
@@ -444,7 +445,7 @@ class EmailComponent extends Component {
  * Helps prevent header injection / manipulation on user content.
  *
  * @param string $value Value to strip
- * @param boolean $message Set to true to indicate main message content
+ * @param bool $message Set to true to indicate main message content
  * @return string Stripped value
  */
 	protected function _strip($value, $message = false) {
diff --git a/web/api/lib/Cake/Controller/Component/FlashComponent.php b/web/api/lib/Cake/Controller/Component/FlashComponent.php
new file mode 100644
index 000000000..cab43f305
--- /dev/null
+++ b/web/api/lib/Cake/Controller/Component/FlashComponent.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Flash Component
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       Cake.Controller.Component
+ * @since         CakePHP(tm) v 2.7.0-dev
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('Component', 'Controller');
+App::uses('Inflector', 'Utility');
+App::uses('CakeSession', 'Model/Datasource');
+
+/**
+ * The CakePHP FlashComponent provides a way for you to write a flash variable
+ * to the session from your controllers, to be rendered in a view with the
+ * FlashHelper.
+ *
+ * @package       Cake.Controller.Component
+ */
+class FlashComponent extends Component {
+
+/**
+ * Default configuration
+ *
+ * @var array
+ */
+	protected $_defaultConfig = array(
+		'key' => 'flash',
+		'element' => 'default',
+		'params' => array(),
+	);
+
+/**
+ * Constructor
+ *
+ * @param ComponentCollection $collection The ComponentCollection object
+ * @param array $settings Settings passed via controller
+ */
+	public function __construct(ComponentCollection $collection, $settings = array()) {
+		$this->_defaultConfig = Hash::merge($this->_defaultConfig, $settings);
+	}
+
+/**
+ * Used to set a session variable that can be used to output messages in the view.
+ *
+ * In your controller: $this->Flash->set('This has been saved');
+ *
+ * ### Options:
+ *
+ * - `key` The key to set under the session's Flash key
+ * - `element` The element used to render the flash message. Default to 'default'.
+ * - `params` An array of variables to make available when using an element
+ *
+ * @param string $message Message to be flashed. If an instance
+ *   of Exception the exception message will be used and code will be set
+ *   in params.
+ * @param array $options An array of options.
+ * @return void
+ */
+
+	public function set($message, $options = array()) {
+		$options += $this->_defaultConfig;
+
+		if ($message instanceof Exception) {
+			$options['params'] += array('code' => $message->getCode());
+			$message = $message->getMessage();
+		}
+
+		list($plugin, $element) = pluginSplit($options['element'], true);
+		if (!empty($options['plugin'])) {
+			$plugin = $options['plugin'] . '.';
+		}
+		$options['element'] = $plugin . 'Flash/' . $element;
+
+		CakeSession::write('Message.' . $options['key'], array(
+			'message' => $message,
+			'key' => $options['key'],
+			'element' => $options['element'],
+			'params' => $options['params']
+		));
+	}
+
+/**
+ * Magic method for verbose flash methods based on element names.
+ *
+ * For example: $this->Flash->success('My message') would use the
+ * success.ctp element under `app/View/Element/Flash` for rendering the
+ * flash message.
+ *
+ * @param string $name Element name to use.
+ * @param array $args Parameters to pass when calling `FlashComponent::set()`.
+ * @return void
+ * @throws InternalErrorException If missing the flash message.
+ */
+	public function __call($name, $args) {
+		$options = array('element' => Inflector::underscore($name));
+
+		if (count($args) < 1) {
+			throw new InternalErrorException('Flash message missing.');
+		}
+
+		if (!empty($args[1])) {
+			$options += (array)$args[1];
+		}
+
+		$this->set($args[0], $options);
+	}
+}
diff --git a/web/api/lib/Cake/Controller/Component/PaginatorComponent.php b/web/api/lib/Cake/Controller/Component/PaginatorComponent.php
index 32107f413..6e34fa6d7 100644
--- a/web/api/lib/Cake/Controller/Component/PaginatorComponent.php
+++ b/web/api/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -29,17 +29,17 @@ App::uses('Hash', 'Utility');
  * the default pagination behavior in general or for a specific model. General settings are used when there
  * are no specific model configuration, or the model you are paginating does not have specific settings.
  *
- * {{{
+ * ```
  *	$this->Paginator->settings = array(
  *		'limit' => 20,
  *		'maxLimit' => 100
  *	);
- * }}}
+ * ```
  *
  * The above settings will be used to paginate any model. You can configure model specific settings by
  * keying the settings with the model name.
  *
- * {{{
+ * ```
  *	$this->Paginator->settings = array(
  *		'Post' => array(
  *			'limit' => 20,
@@ -47,7 +47,7 @@ App::uses('Hash', 'Utility');
  *		),
  *		'Comment' => array( ... )
  *	);
- * }}}
+ * ```
  *
  * This would allow you to have different pagination settings for `Comment` and `Post` models.
  *
@@ -55,13 +55,13 @@ App::uses('Hash', 'Utility');
  *
  * You can paginate with any find type defined on your model using the `findType` option.
  *
- * {{{
+ * ```
  * $this->Paginator->settings = array(
  *		'Post' => array(
  *			'findType' => 'popular'
  *		)
  * );
- * }}}
+ * ```
  *
  * Would paginate using the `find('popular')` method.
  *
@@ -179,7 +179,7 @@ class PaginatorComponent extends Component {
 			$extra['type'] = $type;
 		}
 
-		if (intval($page) < 1) {
+		if ((int)$page < 1) {
 			$page = 1;
 		}
 		$page = $options['page'] = (int)$page;
@@ -202,6 +202,8 @@ class PaginatorComponent extends Component {
 			$count = 0;
 		} elseif ($object->hasMethod('paginateCount')) {
 			$count = $object->paginateCount($conditions, $recursive, $extra);
+		} elseif ($page === 1 && count($results) < $limit) {
+			$count = count($results);
 		} else {
 			$parameters = compact('conditions');
 			if ($recursive != $object->recursive) {
@@ -209,7 +211,7 @@ class PaginatorComponent extends Component {
 			}
 			$count = $object->find('count', array_merge($parameters, $extra));
 		}
-		$pageCount = intval(ceil($count / $limit));
+		$pageCount = (int)ceil($count / $limit);
 		$requestedPage = $page;
 		$page = max(min($page, $pageCount), 1);
 
@@ -238,8 +240,7 @@ class PaginatorComponent extends Component {
 			throw new NotFoundException();
 		}
 
-		if (
-			!in_array('Paginator', $this->Controller->helpers) &&
+		if (!in_array('Paginator', $this->Controller->helpers) &&
 			!array_key_exists('Paginator', $this->Controller->helpers)
 		) {
 			$this->Controller->helpers[] = 'Paginator';
@@ -332,15 +333,13 @@ class PaginatorComponent extends Component {
 		if (isset($this->settings[$alias])) {
 			$defaults = $this->settings[$alias];
 		}
-		if (isset($defaults['limit']) &&
-			(empty($defaults['maxLimit']) || $defaults['limit'] > $defaults['maxLimit'])
-		) {
-			$defaults['maxLimit'] = $defaults['limit'];
-		}
-		return array_merge(
-			array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'),
-			$defaults
+		$defaults += array(
+			'page' => 1,
+			'limit' => 20,
+			'maxLimit' => 100,
+			'paramType' => 'named'
 		);
+		return $defaults;
 	}
 
 /**
@@ -387,12 +386,16 @@ class PaginatorComponent extends Component {
 		if (!empty($options['order']) && is_array($options['order'])) {
 			$order = array();
 			foreach ($options['order'] as $key => $value) {
+				if (is_int($key)) {
+					$key = $value;
+					$value = 'asc';
+				}
 				$field = $key;
 				$alias = $object->alias;
 				if (strpos($key, '.') !== false) {
 					list($alias, $field) = explode('.', $key);
 				}
-				$correctAlias = ($object->alias == $alias);
+				$correctAlias = ($object->alias === $alias);
 
 				if ($correctAlias && $object->hasField($field)) {
 					$order[$object->alias . '.' . $field] = $value;
diff --git a/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php b/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
index 904755bf3..ea1d72704 100644
--- a/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
+++ b/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -32,7 +32,6 @@ App::uses('Xml', 'Utility');
  *
  * @package       Cake.Controller.Component
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/request-handling.html
- *
  */
 class RequestHandlerComponent extends Component {
 
@@ -47,7 +46,7 @@ class RequestHandlerComponent extends Component {
 /**
  * Determines whether or not callbacks will be fired on this component
  *
- * @var boolean
+ * @var bool
  */
 	public $enabled = true;
 
@@ -162,7 +161,7 @@ class RequestHandlerComponent extends Component {
 		$accepts = $this->response->mapType($accept);
 		$preferedTypes = current($accepts);
 		if (array_intersect($preferedTypes, array('html', 'xhtml'))) {
-			return null;
+			return;
 		}
 
 		$extensions = Router::extensions();
@@ -224,12 +223,12 @@ class RequestHandlerComponent extends Component {
  * Helper method to parse xml input data, due to lack of anonymous functions
  * this lives here.
  *
- * @param string $xml
+ * @param string $xml XML string.
  * @return array Xml array data
  */
 	public function convertXml($xml) {
 		try {
-			$xml = Xml::build($xml);
+			$xml = Xml::build($xml, array('readFile' => false));
 			if (isset($xml->data)) {
 				return Xml::toArray($xml->data);
 			}
@@ -245,8 +244,8 @@ class RequestHandlerComponent extends Component {
  *
  * @param Controller $controller A reference to the controller
  * @param string|array $url A string or array containing the redirect location
- * @param integer|array $status HTTP Status for redirect
- * @param boolean $exit
+ * @param int|array $status HTTP Status for redirect
+ * @param bool $exit Whether to exit script, defaults to `true`.
  * @return void
  */
 	public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) {
@@ -279,8 +278,8 @@ class RequestHandlerComponent extends Component {
  * render process is skipped. And the client will get a blank response with a
  * "304 Not Modified" header.
  *
- * @params Controller $controller
- * @return boolean false if the render process should be aborted
+ * @param Controller $controller Controller instance.
+ * @return bool False if the render process should be aborted.
  */
 	public function beforeRender(Controller $controller) {
 		if ($this->settings['checkHttpCache'] && $this->response->checkNotModified($this->request)) {
@@ -291,8 +290,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current HTTP request is Ajax, false otherwise
  *
- * @return boolean True if call is Ajax
- * @deprecated use `$this->request->is('ajax')` instead.
+ * @return bool True if call is Ajax
+ * @deprecated 3.0.0 Use `$this->request->is('ajax')` instead.
  */
 	public function isAjax() {
 		return $this->request->is('ajax');
@@ -301,8 +300,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current HTTP request is coming from a Flash-based client
  *
- * @return boolean True if call is from Flash
- * @deprecated use `$this->request->is('flash')` instead.
+ * @return bool True if call is from Flash
+ * @deprecated 3.0.0 Use `$this->request->is('flash')` instead.
  */
 	public function isFlash() {
 		return $this->request->is('flash');
@@ -311,8 +310,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current request is over HTTPS, false otherwise.
  *
- * @return boolean True if call is over HTTPS
- * @deprecated use `$this->request->is('ssl')` instead.
+ * @return bool True if call is over HTTPS
+ * @deprecated 3.0.0 Use `$this->request->is('ssl')` instead.
  */
 	public function isSSL() {
 		return $this->request->is('ssl');
@@ -321,7 +320,7 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call accepts an XML response, false otherwise
  *
- * @return boolean True if client accepts an XML response
+ * @return bool True if client accepts an XML response
  */
 	public function isXml() {
 		return $this->prefers('xml');
@@ -330,7 +329,7 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call accepts an RSS response, false otherwise
  *
- * @return boolean True if client accepts an RSS response
+ * @return bool True if client accepts an RSS response
  */
 	public function isRss() {
 		return $this->prefers('rss');
@@ -339,7 +338,7 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call accepts an Atom response, false otherwise
  *
- * @return boolean True if client accepts an RSS response
+ * @return bool True if client accepts an RSS response
  */
 	public function isAtom() {
 		return $this->prefers('atom');
@@ -349,7 +348,7 @@ class RequestHandlerComponent extends Component {
  * Returns true if user agent string matches a mobile web browser, or if the
  * client accepts WAP content.
  *
- * @return boolean True if user agent is a mobile web browser
+ * @return bool True if user agent is a mobile web browser
  */
 	public function isMobile() {
 		return $this->request->is('mobile') || $this->accepts('wap');
@@ -358,7 +357,7 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the client accepts WAP content
  *
- * @return boolean
+ * @return bool
  */
 	public function isWap() {
 		return $this->prefers('wap');
@@ -367,8 +366,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call a POST request
  *
- * @return boolean True if call is a POST
- * @deprecated Use $this->request->is('post'); from your controller.
+ * @return bool True if call is a POST
+ * @deprecated 3.0.0 Use $this->request->is('post'); from your controller.
  */
 	public function isPost() {
 		return $this->request->is('post');
@@ -377,8 +376,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call a PUT request
  *
- * @return boolean True if call is a PUT
- * @deprecated Use $this->request->is('put'); from your controller.
+ * @return bool True if call is a PUT
+ * @deprecated 3.0.0 Use $this->request->is('put'); from your controller.
  */
 	public function isPut() {
 		return $this->request->is('put');
@@ -387,8 +386,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call a GET request
  *
- * @return boolean True if call is a GET
- * @deprecated Use $this->request->is('get'); from your controller.
+ * @return bool True if call is a GET
+ * @deprecated 3.0.0 Use $this->request->is('get'); from your controller.
  */
 	public function isGet() {
 		return $this->request->is('get');
@@ -397,8 +396,8 @@ class RequestHandlerComponent extends Component {
 /**
  * Returns true if the current call a DELETE request
  *
- * @return boolean True if call is a DELETE
- * @deprecated Use $this->request->is('delete'); from your controller.
+ * @return bool True if call is a DELETE
+ * @deprecated 3.0.0 Use $this->request->is('delete'); from your controller.
  */
 	public function isDelete() {
 		return $this->request->is('delete');
@@ -408,7 +407,7 @@ class RequestHandlerComponent extends Component {
  * Gets Prototype version if call is Ajax, otherwise empty string.
  * The Prototype library sets a special "Prototype version" HTTP header.
  *
- * @return string|boolean When Ajax the prototype version of component making the call otherwise false
+ * @return string|bool When Ajax the prototype version of component making the call otherwise false
  */
 	public function getAjaxVersion() {
 		$httpX = env('HTTP_X_PROTOTYPE_VERSION');
@@ -425,7 +424,7 @@ class RequestHandlerComponent extends Component {
  * @param string|array $type The Content-type or array of Content-types assigned to the name,
  *    i.e. "text/html", or "application/xml"
  * @return void
- * @deprecated use `$this->response->type()` instead.
+ * @deprecated 3.0.0 Use `$this->response->type()` instead.
  */
 	public function setContent($name, $type = null) {
 		$this->response->type(array($name => $type));
@@ -435,7 +434,7 @@ class RequestHandlerComponent extends Component {
  * Gets the server name from which this request was referred
  *
  * @return string Server address
- * @deprecated use $this->request->referer() from your controller instead
+ * @deprecated 3.0.0 Use $this->request->referer() from your controller instead
  */
 	public function getReferer() {
 		return $this->request->referer(false);
@@ -444,9 +443,10 @@ class RequestHandlerComponent extends Component {
 /**
  * Gets remote client IP
  *
- * @param boolean $safe
+ * @param bool $safe Use safe = false when you think the user might manipulate
+ *   their HTTP_CLIENT_IP header. Setting $safe = false will also look at HTTP_X_FORWARDED_FOR
  * @return string Client IP address
- * @deprecated use $this->request->clientIp() from your,  controller instead.
+ * @deprecated 3.0.0 Use $this->request->clientIp() from your, controller instead.
  */
 	public function getClientIP($safe = true) {
 		return $this->request->clientIp($safe);
@@ -505,7 +505,7 @@ class RequestHandlerComponent extends Component {
  *   in the request content type will be returned.
  */
 	public function requestedWith($type = null) {
-		if (!$this->request->is('post') && !$this->request->is('put')) {
+		if (!$this->request->is('post') && !$this->request->is('put') && !$this->request->is('delete')) {
 			return null;
 		}
 		if (is_array($type)) {
@@ -525,7 +525,7 @@ class RequestHandlerComponent extends Component {
 			return $this->mapType($contentType);
 		}
 		if (is_string($type)) {
-			return ($type == $this->mapType($contentType));
+			return ($type === $this->mapType($contentType));
 		}
 	}
 
@@ -658,7 +658,7 @@ class RequestHandlerComponent extends Component {
  *    like 'application/x-shockwave'.
  * @param array $options If $type is a friendly type name that is associated with
  *    more than one type of content, $index is used to select which content-type to use.
- * @return boolean Returns false if the friendly type name given in $type does
+ * @return bool Returns false if the friendly type name given in $type does
  *    not exist in the type map, or if the Content-type header has
  *    already been set by this method.
  * @see RequestHandlerComponent::setContent()
@@ -713,7 +713,7 @@ class RequestHandlerComponent extends Component {
  *
  * @param string|array $cType Either a string content type to map, or an array of types.
  * @return string|array Aliases for the types provided.
- * @deprecated Use $this->response->mapType() in your controller instead.
+ * @deprecated 3.0.0 Use $this->response->mapType() in your controller instead.
  */
 	public function mapType($cType) {
 		return $this->response->mapType($cType);
@@ -723,7 +723,7 @@ class RequestHandlerComponent extends Component {
  * Maps a content type alias back to its mime-type(s)
  *
  * @param string|array $alias String alias to convert back into a content type. Or an array of aliases to map.
- * @return string Null on an undefined alias. String value of the mapped alias type. If an
+ * @return string|null Null on an undefined alias. String value of the mapped alias type. If an
  *   alias maps to more than one content type, the first one will be returned.
  */
 	public function mapAlias($alias) {
diff --git a/web/api/lib/Cake/Controller/Component/SecurityComponent.php b/web/api/lib/Cake/Controller/Component/SecurityComponent.php
index 2f79c6a6c..31a14ef5c 100644
--- a/web/api/lib/Cake/Controller/Component/SecurityComponent.php
+++ b/web/api/lib/Cake/Controller/Component/SecurityComponent.php
@@ -17,7 +17,7 @@
  */
 
 App::uses('Component', 'Controller');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('Hash', 'Utility');
 App::uses('Security', 'Utility');
 
@@ -47,7 +47,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a POST request is required
  *
  * @var array
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead.
  * @see SecurityComponent::requirePost()
  */
 	public $requirePost = array();
@@ -56,7 +56,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a GET request is required
  *
  * @var array
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead.
  * @see SecurityComponent::requireGet()
  */
 	public $requireGet = array();
@@ -65,7 +65,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a PUT request is required
  *
  * @var array
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead.
  * @see SecurityComponent::requirePut()
  */
 	public $requirePut = array();
@@ -74,7 +74,7 @@ class SecurityComponent extends Component {
  * List of controller actions for which a DELETE request is required
  *
  * @var array
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::allowMethod() instead.
  * @see SecurityComponent::requireDelete()
  */
 	public $requireDelete = array();
@@ -117,7 +117,7 @@ class SecurityComponent extends Component {
  * Deprecated property, superseded by unlockedFields.
  *
  * @var array
- * @deprecated
+ * @deprecated 3.0.0 Superseded by unlockedFields.
  * @see SecurityComponent::$unlockedFields
  */
 	public $disabledFields = array();
@@ -145,14 +145,14 @@ class SecurityComponent extends Component {
  * Whether to validate POST data. Set to false to disable for data coming from 3rd party
  * services, etc.
  *
- * @var boolean
+ * @var bool
  */
 	public $validatePost = true;
 
 /**
  * Whether to use CSRF protected forms. Set to false to disable CSRF protection on forms.
  *
- * @var boolean
+ * @var bool
  * @see http://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)
  * @see SecurityComponent::$csrfExpires
  */
@@ -173,7 +173,7 @@ class SecurityComponent extends Component {
  * the chances of users getting invalid requests because of token consumption.
  * It has the side effect of making CSRF less secure, as tokens are reusable.
  *
- * @var boolean
+ * @var bool
  */
 	public $csrfUseOnce = true;
 
@@ -186,7 +186,7 @@ class SecurityComponent extends Component {
  * When tokens are evicted, the oldest ones will be removed, as they are the most likely
  * to be dead/expired.
  *
- * @var integer
+ * @var int
  */
 	public $csrfLimit = 100;
 
@@ -224,17 +224,17 @@ class SecurityComponent extends Component {
 		$this->_secureRequired($controller);
 		$this->_authRequired($controller);
 
-		$isPost = $this->request->is(array('post', 'put'));
+		$hasData = !empty($this->request->data);
 		$isNotRequestAction = (
 			!isset($controller->request->params['requested']) ||
 			$controller->request->params['requested'] != 1
 		);
 
-		if ($this->_action == $this->blackHoleCallback) {
+		if ($this->_action === $this->blackHoleCallback) {
 			return $this->blackHole($controller, 'auth');
 		}
 
-		if (!in_array($this->_action, (array)$this->unlockedActions) && $isPost && $isNotRequestAction) {
+		if (!in_array($this->_action, (array)$this->unlockedActions) && $hasData && $isNotRequestAction) {
 			if ($this->validatePost && $this->_validatePost($controller) === false) {
 				return $this->blackHole($controller, 'auth');
 			}
@@ -243,7 +243,7 @@ class SecurityComponent extends Component {
 			}
 		}
 		$this->generateToken($controller->request);
-		if ($isPost && is_array($controller->request->data)) {
+		if ($hasData && is_array($controller->request->data)) {
 			unset($controller->request->data['_Token']);
 		}
 	}
@@ -252,7 +252,7 @@ class SecurityComponent extends Component {
  * Sets the actions that require a POST request, or empty for all actions
  *
  * @return void
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost
  */
 	public function requirePost() {
@@ -263,7 +263,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a GET request, or empty for all actions
  *
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requireGet() {
@@ -274,7 +274,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a PUT request, or empty for all actions
  *
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requirePut() {
@@ -285,7 +285,7 @@ class SecurityComponent extends Component {
 /**
  * Sets the actions that require a DELETE request, or empty for all actions
  *
- * @deprecated Use CakeRequest::onlyAllow() instead.
+ * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
  * @return void
  */
 	public function requireDelete() {
@@ -355,17 +355,17 @@ class SecurityComponent extends Component {
  * Check if HTTP methods are required
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if $method is required
+ * @return bool True if $method is required
  */
 	protected function _methodsRequired(Controller $controller) {
 		foreach (array('Post', 'Get', 'Put', 'Delete') as $method) {
 			$property = 'require' . $method;
 			if (is_array($this->$property) && !empty($this->$property)) {
 				$require = $this->$property;
-				if (in_array($this->_action, $require) || $this->$property == array('*')) {
+				if (in_array($this->_action, $require) || $this->$property === array('*')) {
 					if (!$this->request->is($method)) {
 						if (!$this->blackHole($controller, $method)) {
-							return null;
+							return false;
 						}
 					}
 				}
@@ -378,16 +378,16 @@ class SecurityComponent extends Component {
  * Check if access requires secure connection
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if secure connection required
+ * @return bool True if secure connection required
  */
 	protected function _secureRequired(Controller $controller) {
 		if (is_array($this->requireSecure) && !empty($this->requireSecure)) {
 			$requireSecure = $this->requireSecure;
 
-			if (in_array($this->_action, $requireSecure) || $this->requireSecure == array('*')) {
+			if (in_array($this->_action, $requireSecure) || $this->requireSecure === array('*')) {
 				if (!$this->request->is('ssl')) {
 					if (!$this->blackHole($controller, 'secure')) {
-						return null;
+						return false;
 					}
 				}
 			}
@@ -399,13 +399,13 @@ class SecurityComponent extends Component {
  * Check if authentication is required
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if authentication required
+ * @return bool|null True if authentication required
  */
 	protected function _authRequired(Controller $controller) {
 		if (is_array($this->requireAuth) && !empty($this->requireAuth) && !empty($this->request->data)) {
 			$requireAuth = $this->requireAuth;
 
-			if (in_array($this->request->params['action'], $requireAuth) || $this->requireAuth == array('*')) {
+			if (in_array($this->request->params['action'], $requireAuth) || $this->requireAuth === array('*')) {
 				if (!isset($controller->request->data['_Token'])) {
 					if (!$this->blackHole($controller, 'auth')) {
 						return null;
@@ -415,8 +415,7 @@ class SecurityComponent extends Component {
 				if ($this->Session->check('_Token')) {
 					$tData = $this->Session->read('_Token');
 
-					if (
-						!empty($tData['allowedControllers']) &&
+					if (!empty($tData['allowedControllers']) &&
 						!in_array($this->request->params['controller'], $tData['allowedControllers']) ||
 						!empty($tData['allowedActions']) &&
 						!in_array($this->request->params['action'], $tData['allowedActions'])
@@ -439,7 +438,7 @@ class SecurityComponent extends Component {
  * Validate submitted form
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if submitted form is valid
+ * @return bool true if submitted form is valid
  */
 	protected function _validatePost(Controller $controller) {
 		if (empty($controller->request->data)) {
@@ -470,8 +469,8 @@ class SecurityComponent extends Component {
 		$multi = array();
 
 		foreach ($fieldList as $i => $key) {
-			if (preg_match('/(\.\d+)+$/', $key)) {
-				$multi[$i] = preg_replace('/(\.\d+)+$/', '', $key);
+			if (preg_match('/(\.\d+){1,10}$/', $key)) {
+				$multi[$i] = preg_replace('/(\.\d+){1,10}$/', '', $key);
 				unset($fieldList[$i]);
 			}
 		}
@@ -510,7 +509,13 @@ class SecurityComponent extends Component {
 
 		$fieldList += $lockedFields;
 		$unlocked = implode('|', $unlocked);
-		$check = Security::hash(serialize($fieldList) . $unlocked . Configure::read('Security.salt'), 'sha1');
+		$hashParts = array(
+			$this->request->here(),
+			serialize($fieldList),
+			$unlocked,
+			Configure::read('Security.salt')
+		);
+		$check = Security::hash(implode('', $hashParts), 'sha1');
 		return ($token === $check);
 	}
 
@@ -518,7 +523,7 @@ class SecurityComponent extends Component {
  * Manually add CSRF token information into the provided request object.
  *
  * @param CakeRequest $request The request object to add into.
- * @return boolean
+ * @return bool
  */
 	public function generateToken(CakeRequest $request) {
 		if (isset($request->params['requested']) && $request->params['requested'] === 1) {
@@ -548,7 +553,9 @@ class SecurityComponent extends Component {
 		}
 		if (!$this->csrfUseOnce) {
 			$csrfTokens = array_keys($token['csrfTokens']);
-			$token['key'] = $csrfTokens[0];
+			$authKey = $csrfTokens[0];
+			$token['key'] = $authKey;
+			$token['csrfTokens'][$authKey] = strtotime($this->csrfExpires);
 		}
 		$this->Session->write('_Token', $token);
 		$request->params['_Token'] = array(
@@ -564,7 +571,7 @@ class SecurityComponent extends Component {
  * it will be removed from the list of valid tokens.
  *
  * @param Controller $controller A controller to check
- * @return boolean Valid csrf token.
+ * @return bool Valid csrf token.
  */
 	protected function _validateCsrf(Controller $controller) {
 		$token = $this->Session->read('_Token');
diff --git a/web/api/lib/Cake/Controller/Component/SessionComponent.php b/web/api/lib/Cake/Controller/Component/SessionComponent.php
index ec20094f0..0a7dd062e 100644
--- a/web/api/lib/Cake/Controller/Component/SessionComponent.php
+++ b/web/api/lib/Cake/Controller/Component/SessionComponent.php
@@ -34,21 +34,21 @@ class SessionComponent extends Component {
  * Get / Set the userAgent
  *
  * @param string $userAgent Set the userAgent
- * @return void
+ * @return string Current user agent.
  */
 	public function userAgent($userAgent = null) {
 		return CakeSession::userAgent($userAgent);
 	}
 
 /**
- * Used to write a value to a session key.
+ * Writes a value to a session key.
  *
  * In your controller: $this->Session->write('Controller.sessKey', 'session value');
  *
  * @param string $name The name of the key your are setting in the session.
  * 							This should be in a Controller.key format for better organizing
  * @param string $value The value you want to store in a session.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#SessionComponent::write
  */
 	public function write($name, $value = null) {
@@ -56,7 +56,7 @@ class SessionComponent extends Component {
 	}
 
 /**
- * Used to read a session values for a key or return values for all keys.
+ * Reads a session value for a key or returns values for all keys.
  *
  * In your controller: $this->Session->read('Controller.sessKey');
  * Calling the method without a param will return all session vars
@@ -70,12 +70,12 @@ class SessionComponent extends Component {
 	}
 
 /**
- * Wrapper for SessionComponent::del();
+ * Deletes a session value for a key.
  *
  * In your controller: $this->Session->delete('Controller.sessKey');
  *
  * @param string $name the name of the session key you want to delete
- * @return boolean true is session variable is set and can be deleted, false is variable was not set.
+ * @return bool true is session variable is set and can be deleted, false is variable was not set.
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#SessionComponent::delete
  */
 	public function delete($name) {
@@ -83,12 +83,24 @@ class SessionComponent extends Component {
 	}
 
 /**
- * Used to check if a session variable is set
+ * Reads and deletes a session value for a key.
+ *
+ * In your controller: `$this->Session->consume('Controller.sessKey');`
+ *
+ * @param string $name the name of the session key you want to read
+ * @return mixed values from the session vars
+ */
+	public function consume($name) {
+		return CakeSession::consume($name);
+	}
+
+/**
+ * Checks if a session variable is set.
  *
  * In your controller: $this->Session->check('Controller.sessKey');
  *
  * @param string $name the name of the session key you want to check
- * @return boolean true is session variable is set, false if not
+ * @return bool true is session variable is set, false if not
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#SessionComponent::check
  */
 	public function check($name) {
@@ -121,6 +133,7 @@ class SessionComponent extends Component {
  * @param string $key Message key, default is 'flash'
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#creating-notification-messages
+ * @deprecated 3.0.0 Since 2.7, use the FlashComponent instead.
  */
 	public function setFlash($message, $element = 'default', $params = array(), $key = 'flash') {
 		CakeSession::write('Message.' . $key, compact('message', 'element', 'params'));
@@ -142,7 +155,7 @@ class SessionComponent extends Component {
  *
  * In your controller: $this->Session->valid();
  *
- * @return boolean true is session is valid, false is session is invalid
+ * @return bool true is session is valid, false is session is invalid
  */
 	public function valid() {
 		return CakeSession::valid();
@@ -180,7 +193,7 @@ class SessionComponent extends Component {
 /**
  * Returns a bool, whether or not the session has been started.
  *
- * @return boolean
+ * @return bool
  */
 	public function started() {
 		return CakeSession::started();
diff --git a/web/api/lib/Cake/Controller/ComponentCollection.php b/web/api/lib/Cake/Controller/ComponentCollection.php
index 8d92ff657..14a957f83 100644
--- a/web/api/lib/Cake/Controller/ComponentCollection.php
+++ b/web/api/lib/Cake/Controller/ComponentCollection.php
@@ -79,13 +79,13 @@ class ComponentCollection extends ObjectCollection implements CakeEventListener
  * Callbacks default to on. Disabled component methods work as normal, only callbacks are disabled.
  *
  * You can alias your component as an existing component by setting the 'className' key, i.e.,
- * {{{
+ * ```
  * public $components = array(
  *   'Email' => array(
  *     'className' => 'AliasedEmail'
  *   );
  * );
- * }}}
+ * ```
  * All calls to the `Email` component would use `AliasedEmail` instead.
  *
  * @param string $component Component name to load
diff --git a/web/api/lib/Cake/Controller/Controller.php b/web/api/lib/Cake/Controller/Controller.php
index 00b80fb2f..4dead1942 100644
--- a/web/api/lib/Cake/Controller/Controller.php
+++ b/web/api/lib/Cake/Controller/Controller.php
@@ -52,6 +52,7 @@ App::uses('CakeEventManager', 'Event');
  * @property      RequestHandlerComponent $RequestHandler
  * @property      SecurityComponent $Security
  * @property      SessionComponent $Session
+ * @property      FlashComponent $Flash
  * @link          http://book.cakephp.org/2.0/en/controllers.html
  */
 class Controller extends Object implements CakeEventListener {
@@ -79,7 +80,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * The default value is `true`.
  *
- * @var mixed A single name as a string or a list of names as an array.
+ * @var mixed
  * @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses
  */
 	public $uses = true;
@@ -90,7 +91,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');`
  *
- * @var mixed A single name as a string or a list of names as an array.
+ * @var mixed
  * @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses
  */
 	public $helpers = array();
@@ -162,14 +163,14 @@ class Controller extends Object implements CakeEventListener {
  * Set to true to automatically render the view
  * after action logic.
  *
- * @var boolean
+ * @var bool
  */
 	public $autoRender = true;
 
 /**
  * Set to true to automatically render the layout around views.
  *
- * @var boolean
+ * @var bool
  */
 	public $autoLayout = true;
 
@@ -189,7 +190,7 @@ class Controller extends Object implements CakeEventListener {
  * @var array
  * @link http://book.cakephp.org/2.0/en/controllers/components.html
  */
-	public $components = array('Session');
+	public $components = array('Session', 'Flash');
 
 /**
  * The name of the View class this controller sends output to.
@@ -227,12 +228,12 @@ class Controller extends Object implements CakeEventListener {
  *
  * Example:
  *
- * {{{
+ * ```
  * public $cacheAction = array(
  *		'view/23/' => 21600,
  *		'recalled/' => 86400
  *	);
- * }}}
+ * ```
  *
  * $cacheAction can also be set to a strtotime() compatible string. This
  * marks all the actions in the controller for view caching.
@@ -287,7 +288,7 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Holds any validation errors produced by the last call of the validateErrors() method.
  *
- * @var array Validation errors, or false if none
+ * @var array
  */
 	public $validationErrors = null;
 
@@ -346,8 +347,8 @@ class Controller extends Object implements CakeEventListener {
  * Provides backwards compatibility to avoid problems with empty and isset to alias properties.
  * Lazy loads models using the loadModel() method if declared in $uses
  *
- * @param string $name
- * @return boolean
+ * @param string $name Property name to check.
+ * @return bool
  */
 	public function __isset($name) {
 		switch ($name) {
@@ -412,8 +413,8 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Provides backwards compatibility access for setting values to the request object.
  *
- * @param string $name
- * @param mixed $value
+ * @param string $name Property name to set.
+ * @param mixed $value Value to set.
  * @return void
  */
 	public function __set($name, $value) {
@@ -448,7 +449,7 @@ class Controller extends Object implements CakeEventListener {
  * - $this->autoRender - To false if $request->params['return'] == 1
  * - $this->passedArgs - The the combined results of params['named'] and params['pass]
  *
- * @param CakeRequest $request
+ * @param CakeRequest $request Request instance.
  * @return void
  */
 	public function setRequest(CakeRequest $request) {
@@ -471,7 +472,7 @@ class Controller extends Object implements CakeEventListener {
  * Dispatches the controller action. Checks that the action
  * exists and isn't private.
  *
- * @param CakeRequest $request
+ * @param CakeRequest $request Request instance.
  * @return mixed The resulting response.
  * @throws PrivateActionException When actions are not public or prefixed by _
  * @throws MissingActionException When actions are not defined and scaffolding is
@@ -506,7 +507,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param ReflectionMethod $method The method to be invoked.
  * @param CakeRequest $request The request to check.
- * @return boolean
+ * @return bool
  */
 	protected function _isPrivateAction(ReflectionMethod $method, CakeRequest $request) {
 		$privateAction = (
@@ -514,12 +515,12 @@ class Controller extends Object implements CakeEventListener {
 			!$method->isPublic() ||
 			!in_array($method->name, $this->methods)
 		);
-		$prefixes = Router::prefixes();
+		$prefixes = array_map('strtolower', Router::prefixes());
 
 		if (!$privateAction && !empty($prefixes)) {
 			if (empty($request->params['prefix']) && strpos($request->params['action'], '_') > 0) {
 				list($prefix) = explode('_', $request->params['action']);
-				$privateAction = in_array($prefix, $prefixes);
+				$privateAction = in_array(strtolower($prefix), $prefixes);
 			}
 		}
 		return $privateAction;
@@ -528,7 +529,7 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Returns a scaffold object to use for dynamically scaffolded controllers.
  *
- * @param CakeRequest $request
+ * @param CakeRequest $request Request instance.
  * @return Scaffold
  */
 	protected function _getScaffold(CakeRequest $request) {
@@ -611,7 +612,7 @@ class Controller extends Object implements CakeEventListener {
 
 /**
  * Returns a list of all events that will fire in the controller during its lifecycle.
- * You can override this function to add you own listener callbacks
+ * You can override this function to add your own listener callbacks
  *
  * @return array
  */
@@ -669,6 +670,8 @@ class Controller extends Object implements CakeEventListener {
  * - triggers Component `startup` methods.
  *
  * @return void
+ * @triggers Controller.initialize $this
+ * @triggers Controller.startup $this
  */
 	public function startupProcess() {
 		$this->getEventManager()->dispatch(new CakeEvent('Controller.initialize', $this));
@@ -683,6 +686,7 @@ class Controller extends Object implements CakeEventListener {
  * - calls the Controller's `afterFilter` method.
  *
  * @return void
+ * @triggers Controller.shutdown $this
  */
 	public function shutdownProcess() {
 		$this->getEventManager()->dispatch(new CakeEvent('Controller.shutdown', $this));
@@ -691,7 +695,7 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Queries & sets valid HTTP response codes & messages.
  *
- * @param integer|array $code If $code is an integer, then the corresponding code/message is
+ * @param int|array $code If $code is an integer, then the corresponding code/message is
  *        returned if it exists, null if it does not exist. If $code is an array,
  *        then the 'code' and 'message' keys of each nested array are added to the default
  *        HTTP codes. Example:
@@ -705,7 +709,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * @return array Associative array of the HTTP codes as keys, and the message
  *    strings as values, or null of the given $code does not exist.
- * @deprecated Since 2.4. Will be removed in 3.0. Use CakeResponse::httpCodes().
+ * @deprecated 3.0.0 Since 2.4. Will be removed in 3.0. Use CakeResponse::httpCodes().
  */
 	public function httpCodes($code = null) {
 		return $this->response->httpCodes($code);
@@ -717,8 +721,8 @@ class Controller extends Object implements CakeEventListener {
  * dynamic models for the time being.
  *
  * @param string $modelClass Name of model class to load
- * @param integer|string $id Initial ID the instanced model class should have
- * @return boolean True if the model was found
+ * @param int|string $id Initial ID the instanced model class should have
+ * @return bool True if the model was found
  * @throws MissingModelException if the model class cannot be found.
  */
 	public function loadModel($modelClass = null, $id = null) {
@@ -748,9 +752,10 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param string|array $url A string or array-based URL pointing to another location within the app,
  *     or an absolute URL
- * @param integer $status Optional HTTP status code (eg: 404)
- * @param boolean $exit If true, exit() will be called after the redirect
- * @return void
+ * @param int|array|null $status HTTP status code (eg: 301). Defaults to 302 when null is passed.
+ * @param bool $exit If true, exit() will be called after the redirect
+ * @return \Cake\Network\Response|null
+ * @triggers Controller.beforeRedirect $this, array($url, $status, $exit)
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::redirect
  */
 	public function redirect($url, $status = null, $exit = true) {
@@ -765,7 +770,7 @@ class Controller extends Object implements CakeEventListener {
 		$this->getEventManager()->dispatch($event);
 
 		if ($event->isStopped()) {
-			return;
+			return null;
 		}
 		$response = $event->result;
 		extract($this->_parseBeforeRedirect($response, $url, $status, $exit), EXTR_OVERWRITE);
@@ -781,14 +786,17 @@ class Controller extends Object implements CakeEventListener {
 			}
 		}
 
-		if ($status) {
-			$this->response->statusCode($status);
+		if ($status === null) {
+			$status = 302;
 		}
+		$this->response->statusCode($status);
 
 		if ($exit) {
 			$this->response->send();
 			$this->_stop();
 		}
+
+		return $this->response;
 	}
 
 /**
@@ -796,8 +804,8 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param mixed $response Response from beforeRedirect callback
  * @param string|array $url The same value of beforeRedirect
- * @param integer $status The same value of beforeRedirect
- * @param boolean $exit The same value of beforeRedirect
+ * @param int $status The same value of beforeRedirect
+ * @param bool $exit The same value of beforeRedirect
  * @return array Array with keys url, status and exit
  */
 	protected function _parseBeforeRedirect($response, $url, $status, $exit) {
@@ -820,7 +828,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param string $status The header message that is being set.
  * @return void
- * @deprecated Will be removed in 3.0. Use CakeResponse::header().
+ * @deprecated 3.0.0 Will be removed in 3.0. Use CakeResponse::header().
  */
 	public function header($status) {
 		$this->response->header($status);
@@ -853,10 +861,10 @@ class Controller extends Object implements CakeEventListener {
  *
  * Examples:
  *
- * {{{
+ * ```
  * setAction('another_action');
  * setAction('action_with_parameters', $parameter1);
- * }}}
+ * ```
  *
  * @param string $action The new action to be 'redirected' to.
  *   Any other parameters passed to this method will be passed as parameters to the new action.
@@ -873,8 +881,8 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Returns number of errors in a submitted FORM.
  *
- * @return integer Number of errors
- * @deprecated This method will be removed in 3.0
+ * @return int Number of errors
+ * @deprecated 3.0.0 This method will be removed in 3.0
  */
 	public function validate() {
 		$args = func_get_args();
@@ -887,13 +895,13 @@ class Controller extends Object implements CakeEventListener {
 	}
 
 /**
- * Validates models passed by parameters. Example:
+ * Validates models passed by parameters. Takes a list of models as a variable argument.
+ * Example:
  *
  * `$errors = $this->validateErrors($this->Article, $this->User);`
  *
- * @param mixed A list of models as a variable argument
  * @return array Validation errors, or false if none
- * @deprecated This method will be removed in 3.0
+ * @deprecated 3.0.0 This method will be removed in 3.0
  */
 	public function validateErrors() {
 		$objects = func_get_args();
@@ -920,6 +928,7 @@ class Controller extends Object implements CakeEventListener {
  * @param string $view View to use for rendering
  * @param string $layout Layout to use
  * @return CakeResponse A response object containing the rendered view.
+ * @triggers Controller.beforeRender $this
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::render
  */
 	public function render($view = null, $layout = null) {
@@ -959,7 +968,7 @@ class Controller extends Object implements CakeEventListener {
  * Returns the referring URL for this request.
  *
  * @param string $default Default URL to use if HTTP_REFERER cannot be read from headers
- * @param boolean $local If true, restrict referring URLs to local server
+ * @param bool $local If true, restrict referring URLs to local server
  * @return string Referring URL
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::referer
  */
@@ -969,8 +978,8 @@ class Controller extends Object implements CakeEventListener {
 		}
 
 		$referer = $this->request->referer($local);
-		if ($referer === '/' && $default) {
-			return Router::url($default, true);
+		if ($referer === '/' && $default && $default !== $referer) {
+			return Router::url($default, !$local);
 		}
 		return $referer;
 	}
@@ -980,7 +989,7 @@ class Controller extends Object implements CakeEventListener {
  *
  * @return void
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::disableCache
- * @deprecated Will be removed in 3.0. Use CakeResponse::disableCache().
+ * @deprecated 3.0.0 Will be removed in 3.0. Use CakeResponse::disableCache().
  */
 	public function disableCache() {
 		$this->response->disableCache();
@@ -993,18 +1002,18 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param string $message Message to display to the user
  * @param string|array $url Relative string or array-based URL to redirect to after the time expires
- * @param integer $pause Time to show the message
+ * @param int $pause Time to show the message
  * @param string $layout Layout you want to use, defaults to 'flash'
  * @return void
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::flash
- * @deprecated Will be removed in 3.0. Use Session::setFlash().
+ * @deprecated 3.0.0 Will be removed in 3.0. Use Session::setFlash().
  */
 	public function flash($message, $url, $pause = 1, $layout = 'flash') {
 		$this->autoRender = false;
 		$this->set('url', Router::url($url));
 		$this->set('message', $message);
 		$this->set('pause', $pause);
-		$this->set('page_title', $message);
+		$this->set('pageTitle', $message);
 		$this->render(false, $layout);
 	}
 
@@ -1015,10 +1024,10 @@ class Controller extends Object implements CakeEventListener {
  * @param string|array $op A string containing an SQL comparison operator, or an array matching operators
  *        to fields
  * @param string $bool SQL boolean operator: AND, OR, XOR, etc.
- * @param boolean $exclusive If true, and $op is an array, fields not included in $op will not be
+ * @param bool $exclusive If true, and $op is an array, fields not included in $op will not be
  *        included in the returned conditions
- * @return array An array of model conditions
- * @deprecated Will be removed in 3.0.
+ * @return array|null An array of model conditions
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
 		if (!is_array($data) || empty($data)) {
@@ -1111,8 +1120,8 @@ class Controller extends Object implements CakeEventListener {
  *
  * @param string|array $url A string or array-based URL pointing to another location within the app,
  *     or an absolute URL
- * @param integer $status Optional HTTP status code (eg: 404)
- * @param boolean $exit If true, exit() will be called after the redirect
+ * @param int $status Optional HTTP status code (eg: 404)
+ * @param bool $exit If true, exit() will be called after the redirect
  * @return mixed
  *   false to stop redirection event,
  *   string controllers a new redirection URL or
@@ -1135,7 +1144,7 @@ class Controller extends Object implements CakeEventListener {
  * This method should be overridden in child classes.
  *
  * @param string $method name of method called example index, edit, etc.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/controllers.html#callbacks
  */
 	public function beforeScaffold($method) {
@@ -1145,10 +1154,10 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Alias to beforeScaffold()
  *
- * @param string $method
- * @return boolean
+ * @param string $method Method name.
+ * @return bool
  * @see Controller::beforeScaffold()
- * @deprecated Will be removed in 3.0.
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	protected function _beforeScaffold($method) {
 		return $this->beforeScaffold($method);
@@ -1158,7 +1167,7 @@ class Controller extends Object implements CakeEventListener {
  * This method should be overridden in child classes.
  *
  * @param string $method name of method called either edit or update.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/controllers.html#callbacks
  */
 	public function afterScaffoldSave($method) {
@@ -1168,10 +1177,10 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Alias to afterScaffoldSave()
  *
- * @param string $method
- * @return boolean
+ * @param string $method Method name.
+ * @return bool
  * @see Controller::afterScaffoldSave()
- * @deprecated Will be removed in 3.0.
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	protected function _afterScaffoldSave($method) {
 		return $this->afterScaffoldSave($method);
@@ -1181,7 +1190,7 @@ class Controller extends Object implements CakeEventListener {
  * This method should be overridden in child classes.
  *
  * @param string $method name of method called either edit or update.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/controllers.html#callbacks
  */
 	public function afterScaffoldSaveError($method) {
@@ -1191,10 +1200,10 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Alias to afterScaffoldSaveError()
  *
- * @param string $method
- * @return boolean
+ * @param string $method Method name.
+ * @return bool
  * @see Controller::afterScaffoldSaveError()
- * @deprecated Will be removed in 3.0.
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	protected function _afterScaffoldSaveError($method) {
 		return $this->afterScaffoldSaveError($method);
@@ -1206,7 +1215,7 @@ class Controller extends Object implements CakeEventListener {
  * Method MUST return true in child classes
  *
  * @param string $method name of method called example index, edit, etc.
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/controllers.html#callbacks
  */
 	public function scaffoldError($method) {
@@ -1216,10 +1225,10 @@ class Controller extends Object implements CakeEventListener {
 /**
  * Alias to scaffoldError()
  *
- * @param string $method
- * @return boolean
+ * @param string $method Method name.
+ * @return bool
  * @see Controller::scaffoldError()
- * @deprecated Will be removed in 3.0.
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	protected function _scaffoldError($method) {
 		return $this->scaffoldError($method);
diff --git a/web/api/lib/Cake/Controller/Scaffold.php b/web/api/lib/Cake/Controller/Scaffold.php
index fc99660d6..01e50879c 100644
--- a/web/api/lib/Cake/Controller/Scaffold.php
+++ b/web/api/lib/Cake/Controller/Scaffold.php
@@ -18,8 +18,6 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::uses('Scaffold', 'View');
-
 /**
  * Scaffolding is a set of automatic actions for starting web development work faster.
  *
@@ -29,7 +27,7 @@ App::uses('Scaffold', 'View');
  * scaffolded actions with custom-made ones.
  *
  * @package Cake.Controller
- * @deprecated Dynamic scaffolding will be removed and replaced in 3.0
+ * @deprecated 3.0.0 Dynamic scaffolding will be removed and replaced in 3.0
  */
 class Scaffold {
 
@@ -78,7 +76,7 @@ class Scaffold {
 /**
  * Valid session.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_validSession = null;
 
@@ -147,7 +145,9 @@ class Scaffold {
 			$this->controller->viewClass = 'Scaffold';
 		}
 		$this->_validSession = (
-			isset($this->controller->Session) && $this->controller->Session->valid()
+			isset($this->controller->Session) &&
+			$this->controller->Session->valid() &&
+			isset($this->controller->Flash)
 		);
 		$this->_scaffold($request);
 	}
@@ -248,12 +248,12 @@ class Scaffold {
 							Inflector::humanize($this->modelKey),
 							$success
 						);
-						return $this->_sendMessage($message);
+						return $this->_sendMessage($message, 'success');
 					}
 					return $this->controller->afterScaffoldSaveError($action);
 				}
 				if ($this->_validSession) {
-					$this->controller->Session->setFlash(__d('cake', 'Please correct errors below.'));
+					$this->controller->Flash->set(__d('cake', 'Please correct errors below.'));
 				}
 			}
 
@@ -305,7 +305,7 @@ class Scaffold {
 			}
 			if ($this->ScaffoldModel->delete()) {
 				$message = __d('cake', 'The %1$s with id: %2$s has been deleted.', Inflector::humanize($this->modelClass), $id);
-				return $this->_sendMessage($message);
+				return $this->_sendMessage($message, 'success');
 			}
 			$message = __d('cake',
 				'There was an error deleting the %1$s with id: %2$s',
@@ -323,11 +323,12 @@ class Scaffold {
  * on the availability of a session
  *
  * @param string $message Message to display
- * @return void
+ * @param string $element Flash template to use
+ * @return \Cake\Network\Response|null
  */
-	protected function _sendMessage($message) {
+	protected function _sendMessage($message, $element = 'default') {
 		if ($this->_validSession) {
-			$this->controller->Session->setFlash($message);
+			$this->controller->Flash->set($message, compact('element'));
 			return $this->controller->redirect($this->redirect);
 		}
 		$this->controller->flash($message, $this->redirect);
@@ -401,7 +402,7 @@ class Scaffold {
 				}
 			} else {
 				throw new MissingActionException(array(
-					'controller' => $this->controller->name,
+					'controller' => get_class($this->controller),
 					'action' => $request->action
 				));
 			}
diff --git a/web/api/lib/Cake/Core/App.php b/web/api/lib/Cake/Core/App.php
index c5674b3ec..45ef3ff5c 100644
--- a/web/api/lib/Cake/Core/App.php
+++ b/web/api/lib/Cake/Core/App.php
@@ -17,6 +17,7 @@
  */
 
 App::uses('Inflector', 'Utility');
+App::uses('CakePlugin', 'Core');
 
 /**
  * App is responsible for path management, class location and class loading.
@@ -32,7 +33,7 @@ App::uses('Inflector', 'Utility');
  * CakePHP is organized around the idea of packages, each class belongs to a package or folder where other
  * classes reside. You can configure each package location in your application using `App::build('APackage/SubPackage', $paths)`
  * to inform the framework where should each class be loaded. Almost every class in the CakePHP framework can be swapped
- * by your own compatible implementation. If you wish to use you own class instead of the classes the framework provides,
+ * by your own compatible implementation. If you wish to use your own class instead of the classes the framework provides,
  * just add the class to your libs folder mocking the directory location of where CakePHP expects to find it.
  *
  * For instance if you'd like to use your own HttpSocket class, put it under
@@ -87,7 +88,7 @@ class App {
 /**
  * Reset paths instead of merging
  *
- * @var boolean
+ * @var bool
  */
 	const RESET = true;
 
@@ -121,7 +122,7 @@ class App {
 /**
  * Whether or not to return the file that is loaded.
  *
- * @var boolean
+ * @var bool
  */
 	public static $return = false;
 
@@ -183,14 +184,14 @@ class App {
 /**
  * Indicates whether the class cache should be stored again because of an addition to it
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_cacheChange = false;
 
 /**
  * Indicates whether the object cache should be stored again because of an addition to it
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_objectCacheChange = false;
 
@@ -198,7 +199,7 @@ class App {
  * Indicates the the Application is in the bootstrapping process. Used to better cache
  * loaded classes while the cache libraries have not been yet initialized
  *
- * @var boolean
+ * @var bool
  */
 	public static $bootstrapping = false;
 
@@ -217,14 +218,14 @@ class App {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::path
  */
 	public static function path($type, $plugin = null) {
-		if (!empty(self::$legacy[$type])) {
-			$type = self::$legacy[$type];
+		if (!empty(static::$legacy[$type])) {
+			$type = static::$legacy[$type];
 		}
 
 		if (!empty($plugin)) {
 			$path = array();
-			$pluginPath = self::pluginPath($plugin);
-			$packageFormat = self::_packageFormat();
+			$pluginPath = CakePlugin::path($plugin);
+			$packageFormat = static::_packageFormat();
 			if (!empty($packageFormat[$type])) {
 				foreach ($packageFormat[$type] as $f) {
 					$path[] = sprintf($f, $pluginPath);
@@ -233,10 +234,10 @@ class App {
 			return $path;
 		}
 
-		if (!isset(self::$_packages[$type])) {
+		if (!isset(static::$_packages[$type])) {
 			return array();
 		}
-		return self::$_packages[$type];
+		return static::$_packages[$type];
 	}
 
 /**
@@ -248,7 +249,7 @@ class App {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::paths
  */
 	public static function paths() {
-		return self::$_packages;
+		return static::$_packages;
 	}
 
 /**
@@ -258,7 +259,7 @@ class App {
  *
  * Usage:
  *
- * `App::build(array(Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package`
+ * `App::build(array('Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package`
  *
  * `App::build(array('Model' => array('/path/to/models/')), App::RESET); will setup the path as the only valid path for searching models`
  *
@@ -269,7 +270,7 @@ class App {
  * If reset is set to true, all loaded plugins will be forgotten and they will be needed to be loaded again.
  *
  * @param array $paths associative array with package names as keys and a list of directories for new search paths
- * @param boolean|string $mode App::RESET will set paths, App::APPEND with append paths, App::PREPEND will prepend paths (default)
+ * @param bool|string $mode App::RESET will set paths, App::APPEND with append paths, App::PREPEND will prepend paths (default)
  * 	App::REGISTER will register new packages and their paths, %s in path will be replaced by APP path
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::build
@@ -278,8 +279,8 @@ class App {
 		//Provides Backwards compatibility for old-style package names
 		$legacyPaths = array();
 		foreach ($paths as $type => $path) {
-			if (!empty(self::$legacy[$type])) {
-				$type = self::$legacy[$type];
+			if (!empty(static::$legacy[$type])) {
+				$type = static::$legacy[$type];
 			}
 			$legacyPaths[$type] = $path;
 		}
@@ -287,17 +288,17 @@ class App {
 
 		if ($mode === App::RESET) {
 			foreach ($paths as $type => $new) {
-				self::$_packages[$type] = (array)$new;
-				self::objects($type, null, false);
+				static::$_packages[$type] = (array)$new;
+				static::objects($type, null, false);
 			}
 			return;
 		}
 
 		if (empty($paths)) {
-			self::$_packageFormat = null;
+			static::$_packageFormat = null;
 		}
 
-		$packageFormat = self::_packageFormat();
+		$packageFormat = static::_packageFormat();
 
 		if ($mode === App::REGISTER) {
 			foreach ($paths as $package => $formats) {
@@ -308,7 +309,7 @@ class App {
 					$packageFormat[$package] = array_values(array_unique($formats));
 				}
 			}
-			self::$_packageFormat = $packageFormat;
+			static::$_packageFormat = $packageFormat;
 		}
 
 		$defaults = array();
@@ -319,7 +320,7 @@ class App {
 		}
 
 		if (empty($paths)) {
-			self::$_packages = $defaults;
+			static::$_packages = $defaults;
 			return;
 		}
 
@@ -328,8 +329,8 @@ class App {
 		}
 
 		foreach ($defaults as $type => $default) {
-			if (!empty(self::$_packages[$type])) {
-				$path = self::$_packages[$type];
+			if (!empty(static::$_packages[$type])) {
+				$path = static::$_packages[$type];
 			} else {
 				$path = $default;
 			}
@@ -346,7 +347,7 @@ class App {
 				$path = array_values(array_unique($path));
 			}
 
-			self::$_packages[$type] = $path;
+			static::$_packages[$type] = $path;
 		}
 	}
 
@@ -360,6 +361,7 @@ class App {
  * @param string $plugin CamelCased/lower_cased plugin name to find the path of.
  * @return string full path to the plugin.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::pluginPath
+ * @deprecated 3.0.0 Use `CakePlugin::path()` instead.
  */
 	public static function pluginPath($plugin) {
 		return CakePlugin::path($plugin);
@@ -378,12 +380,12 @@ class App {
  */
 	public static function themePath($theme) {
 		$themeDir = 'Themed' . DS . Inflector::camelize($theme);
-		foreach (self::$_packages['View'] as $path) {
+		foreach (static::$_packages['View'] as $path) {
 			if (is_dir($path . $themeDir)) {
 				return $path . $themeDir . DS;
 			}
 		}
-		return self::$_packages['View'][0] . $themeDir . DS;
+		return static::$_packages['View'][0] . $themeDir . DS;
 	}
 
 /**
@@ -393,7 +395,7 @@ class App {
  *
  * `App::core('Cache/Engine'); will return the full path to the cache engines package`
  *
- * @param string $type
+ * @param string $type Package type.
  * @return array full path to package
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::core
  */
@@ -420,13 +422,13 @@ class App {
  *
  * @param string $type Type of object, i.e. 'Model', 'Controller', 'View/Helper', 'file', 'class' or 'plugin'
  * @param string|array $path Optional Scan only the path given. If null, paths for the chosen type will be used.
- * @param boolean $cache Set to false to rescan objects of the chosen type. Defaults to true.
+ * @param bool $cache Set to false to rescan objects of the chosen type. Defaults to true.
  * @return mixed Either false on incorrect / miss. Or an array of found objects.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::objects
  */
 	public static function objects($type, $path = null, $cache = true) {
-		if (empty(self::$_objects) && $cache === true) {
-			self::$_objects = (array)Cache::read('object_map', '_cake_core_');
+		if (empty(static::$_objects) && $cache === true) {
+			static::$_objects = (array)Cache::read('object_map', '_cake_core_');
 		}
 
 		$extension = '/\.php$/';
@@ -444,8 +446,8 @@ class App {
 
 		list($plugin, $type) = pluginSplit($type);
 
-		if (isset(self::$legacy[$type . 's'])) {
-			$type = self::$legacy[$type . 's'];
+		if (isset(static::$legacy[$type . 's'])) {
+			$type = static::$legacy[$type . 's'];
 		}
 
 		if ($type === 'file' && !$path) {
@@ -457,11 +459,11 @@ class App {
 
 		$cacheLocation = empty($plugin) ? 'app' : $plugin;
 
-		if ($cache !== true || !isset(self::$_objects[$cacheLocation][$name])) {
+		if ($cache !== true || !isset(static::$_objects[$cacheLocation][$name])) {
 			$objects = array();
 
 			if (empty($path)) {
-				$path = self::path($type, $plugin);
+				$path = static::path($type, $plugin);
 			}
 
 			foreach ((array)$path as $dir) {
@@ -492,13 +494,13 @@ class App {
 				return $objects;
 			}
 
-			self::$_objects[$cacheLocation][$name] = $objects;
+			static::$_objects[$cacheLocation][$name] = $objects;
 			if ($cache) {
-				self::$_objectCacheChange = true;
+				static::$_objectCacheChange = true;
 			}
 		}
 
-		return self::$_objects[$cacheLocation][$name];
+		return static::$_objects[$cacheLocation][$name];
 	}
 
 /**
@@ -517,7 +519,7 @@ class App {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::uses
  */
 	public static function uses($className, $location) {
-		self::$_classMap[$className] = $location;
+		static::$_classMap[$className] = $location;
 	}
 
 /**
@@ -527,32 +529,32 @@ class App {
  * if a class is name `MyCustomClass` the file name should be `MyCustomClass.php`
  *
  * @param string $className the name of the class to load
- * @return boolean
+ * @return bool
  */
 	public static function load($className) {
-		if (!isset(self::$_classMap[$className])) {
+		if (!isset(static::$_classMap[$className])) {
 			return false;
 		}
 		if (strpos($className, '..') !== false) {
 			return false;
 		}
 
-		$parts = explode('.', self::$_classMap[$className], 2);
+		$parts = explode('.', static::$_classMap[$className], 2);
 		list($plugin, $package) = count($parts) > 1 ? $parts : array(null, current($parts));
 
-		$file = self::_mapped($className, $plugin);
+		$file = static::_mapped($className, $plugin);
 		if ($file) {
 			return include $file;
 		}
-		$paths = self::path($package, $plugin);
+		$paths = static::path($package, $plugin);
 
 		if (empty($plugin)) {
-			$appLibs = empty(self::$_packages['Lib']) ? APPLIBS : current(self::$_packages['Lib']);
+			$appLibs = empty(static::$_packages['Lib']) ? APPLIBS : current(static::$_packages['Lib']);
 			$paths[] = $appLibs . $package . DS;
 			$paths[] = APP . $package . DS;
 			$paths[] = CAKE . $package . DS;
 		} else {
-			$pluginPath = self::pluginPath($plugin);
+			$pluginPath = CakePlugin::path($plugin);
 			$paths[] = $pluginPath . 'Lib' . DS . $package . DS;
 			$paths[] = $pluginPath . $package . DS;
 		}
@@ -561,7 +563,7 @@ class App {
 		foreach ($paths as $path) {
 			$file = $path . $normalizedClassName . '.php';
 			if (file_exists($file)) {
-				self::_map($file, $className, $plugin);
+				static::_map($file, $className, $plugin);
 				return include $file;
 			}
 		}
@@ -573,12 +575,12 @@ class App {
  * Returns the package name where a class was defined to be located at
  *
  * @param string $className name of the class to obtain the package name from
- * @return string package name or null if not declared
+ * @return string|null Package name, or null if not declared
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::location
  */
 	public static function location($className) {
-		if (!empty(self::$_classMap[$className])) {
-			return self::$_classMap[$className];
+		if (!empty(static::$_classMap[$className])) {
+			return static::$_classMap[$className];
 		}
 		return null;
 	}
@@ -587,19 +589,19 @@ class App {
  * Finds classes based on $name or specific file(s) to search. Calling App::import() will
  * not construct any classes contained in the files. It will only find and require() the file.
  *
- * @link          http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#including-files-with-app-import
  * @param string|array $type The type of Class if passed as a string, or all params can be passed as
- *                    an single array to $type,
+ *   a single array to $type.
  * @param string $name Name of the Class or a unique name for the file
- * @param boolean|array $parent boolean true if Class Parent should be searched, accepts key => value
- *              array('parent' => $parent, 'file' => $file, 'search' => $search, 'ext' => '$ext');
- *              $ext allows setting the extension of the file name
- *              based on Inflector::underscore($name) . ".$ext";
+ * @param bool|array $parent boolean true if Class Parent should be searched, accepts key => value
+ *   array('parent' => $parent, 'file' => $file, 'search' => $search, 'ext' => '$ext');
+ *   $ext allows setting the extension of the file name
+ *   based on Inflector::underscore($name) . ".$ext";
  * @param array $search paths to search for files, array('path 1', 'path 2', 'path 3');
  * @param string $file full name of the file to search for including extension
- * @param boolean $return Return the loaded file, the file must have a return
- *                         statement in it to work: return $variable;
- * @return boolean true if Class is already in memory or if file is found and loaded, false if not
+ * @param bool $return Return the loaded file, the file must have a return
+ *   statement in it to work: return $variable;
+ * @return bool true if Class is already in memory or if file is found and loaded, false if not
+ * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#including-files-with-app-import
  */
 	public static function import($type = null, $name = null, $parent = true, $search = array(), $file = null, $return = false) {
 		$ext = null;
@@ -627,8 +629,8 @@ class App {
 
 		$originalType = strtolower($type);
 		$specialPackage = in_array($originalType, array('file', 'vendor'));
-		if (!$specialPackage && isset(self::$legacy[$originalType . 's'])) {
-			$type = self::$legacy[$originalType . 's'];
+		if (!$specialPackage && isset(static::$legacy[$originalType . 's'])) {
+			$type = static::$legacy[$originalType . 's'];
 		}
 		list($plugin, $name) = pluginSplit($name);
 		if (!empty($plugin)) {
@@ -638,15 +640,15 @@ class App {
 		}
 
 		if (!$specialPackage) {
-			return self::_loadClass($name, $plugin, $type, $originalType, $parent);
+			return static::_loadClass($name, $plugin, $type, $originalType, $parent);
 		}
 
 		if ($originalType === 'file' && !empty($file)) {
-			return self::_loadFile($name, $plugin, $search, $file, $return);
+			return static::_loadFile($name, $plugin, $search, $file, $return);
 		}
 
 		if ($originalType === 'vendor') {
-			return self::_loadVendor($name, $plugin, $file, $ext);
+			return static::_loadVendor($name, $plugin, $file, $ext);
 		}
 
 		return false;
@@ -660,18 +662,18 @@ class App {
  * @param string $plugin camel cased plugin name if any
  * @param string $type name of the packed where the class is located
  * @param string $originalType type name as supplied initially by the user
- * @param boolean $parent whether to load the class parent or not
- * @return boolean true indicating the successful load and existence of the class
+ * @param bool $parent whether to load the class parent or not
+ * @return bool true indicating the successful load and existence of the class
  */
 	protected static function _loadClass($name, $plugin, $type, $originalType, $parent) {
 		if ($type === 'Console/Command' && $name === 'Shell') {
 			$type = 'Console';
-		} elseif (isset(self::$types[$originalType]['suffix'])) {
-			$suffix = self::$types[$originalType]['suffix'];
-			$name .= ($suffix == $name) ? '' : $suffix;
+		} elseif (isset(static::$types[$originalType]['suffix'])) {
+			$suffix = static::$types[$originalType]['suffix'];
+			$name .= ($suffix === $name) ? '' : $suffix;
 		}
-		if ($parent && isset(self::$types[$originalType]['extends'])) {
-			$extends = self::$types[$originalType]['extends'];
+		if ($parent && isset(static::$types[$originalType]['extends'])) {
+			$extends = static::$types[$originalType]['extends'];
 			$extendType = $type;
 			if (strpos($extends, '/') !== false) {
 				$parts = explode('/', $extends);
@@ -698,11 +700,11 @@ class App {
  * @param string $plugin camel cased plugin name if any
  * @param array $search list of paths to search the file into
  * @param string $file filename if known, the $name param will be used otherwise
- * @param boolean $return whether this function should return the contents of the file after being parsed by php or just a success notice
+ * @param bool $return whether this function should return the contents of the file after being parsed by php or just a success notice
  * @return mixed if $return contents of the file after php parses it, boolean indicating success otherwise
  */
 	protected static function _loadFile($name, $plugin, $search, $file, $return) {
-		$mapped = self::_mapped($name, $plugin);
+		$mapped = static::_mapped($name, $plugin);
 		if ($mapped) {
 			$file = $mapped;
 		} elseif (!empty($search)) {
@@ -719,7 +721,7 @@ class App {
 			}
 		}
 		if (!empty($file) && file_exists($file)) {
-			self::_map($file, $name, $plugin);
+			static::_map($file, $name, $plugin);
 			$returnValue = include $file;
 			if ($return) {
 				return $returnValue;
@@ -736,10 +738,10 @@ class App {
  * @param string $plugin camel cased plugin name if any
  * @param string $file file name if known
  * @param string $ext file extension if known
- * @return boolean true if the file was loaded successfully, false otherwise
+ * @return bool true if the file was loaded successfully, false otherwise
  */
 	protected static function _loadVendor($name, $plugin, $file, $ext) {
-		if ($mapped = self::_mapped($name, $plugin)) {
+		if ($mapped = static::_mapped($name, $plugin)) {
 			return (bool)include_once $mapped;
 		}
 		$fileTries = array();
@@ -757,7 +759,7 @@ class App {
 		foreach ($fileTries as $file) {
 			foreach ($paths as $path) {
 				if (file_exists($path . $file)) {
-					self::_map($path . $file, $name, $plugin);
+					static::_map($path . $file, $name, $plugin);
 					return (bool)include $path . $file;
 				}
 			}
@@ -771,7 +773,7 @@ class App {
  * @return void
  */
 	public static function init() {
-		self::$_map += (array)Cache::read('file_map', '_cake_core_');
+		static::$_map += (array)Cache::read('file_map', '_cake_core_');
 		register_shutdown_function(array('App', 'shutdown'));
 	}
 
@@ -788,14 +790,14 @@ class App {
 		if ($plugin) {
 			$key = 'plugin.' . $name;
 		}
-		if ($plugin && empty(self::$_map[$name])) {
-			self::$_map[$key] = $file;
+		if ($plugin && empty(static::$_map[$name])) {
+			static::$_map[$key] = $file;
 		}
-		if (!$plugin && empty(self::$_map['plugin.' . $name])) {
-			self::$_map[$key] = $file;
+		if (!$plugin && empty(static::$_map['plugin.' . $name])) {
+			static::$_map[$key] = $file;
 		}
-		if (!self::$bootstrapping) {
-			self::$_cacheChange = true;
+		if (!static::$bootstrapping) {
+			static::$_cacheChange = true;
 		}
 	}
 
@@ -811,7 +813,7 @@ class App {
 		if ($plugin) {
 			$key = 'plugin.' . $name;
 		}
-		return isset(self::$_map[$key]) ? self::$_map[$key] : false;
+		return isset(static::$_map[$key]) ? static::$_map[$key] : false;
 	}
 
 /**
@@ -820,8 +822,8 @@ class App {
  * @return array templates for each customizable package path
  */
 	protected static function _packageFormat() {
-		if (empty(self::$_packageFormat)) {
-			self::$_packageFormat = array(
+		if (empty(static::$_packageFormat)) {
+			static::$_packageFormat = array(
 				'Model' => array(
 					'%s' . 'Model' . DS
 				),
@@ -872,16 +874,47 @@ class App {
 				),
 				'Vendor' => array(
 					'%s' . 'Vendor' . DS,
-					dirname(dirname(CAKE)) . DS . 'vendors' . DS,
+					ROOT . DS . 'vendors' . DS,
+					dirname(dirname(CAKE)) . DS . 'vendors' . DS
 				),
 				'Plugin' => array(
 					APP . 'Plugin' . DS,
+					ROOT . DS . 'plugins' . DS,
 					dirname(dirname(CAKE)) . DS . 'plugins' . DS
 				)
 			);
 		}
 
-		return self::$_packageFormat;
+		return static::$_packageFormat;
+	}
+
+/**
+ * Increases the PHP "memory_limit" ini setting by the specified amount
+ * in kilobytes
+ *  
+ * @param string $additionalKb Number in kilobytes
+ * @return void
+ */
+	public static function increaseMemoryLimit($additionalKb) {
+		$limit = ini_get("memory_limit");
+		if (!is_string($limit) || !strlen($limit)) {
+			return;
+		}
+		$limit = trim($limit);
+		$units = strtoupper(substr($limit, -1));
+		$current = substr($limit, 0, strlen($limit) - 1);
+		if ($units === "M") {
+			$current = $current * 1024;
+			$units = "K";
+		}
+		if ($units === "G") {
+			$current = $current * 1024 * 1024;
+			$units = "K";
+		}
+
+		if ($units === "K") {
+			ini_set("memory_limit", ceil($current + $additionalKb) . "K");
+		}
 	}
 
 /**
@@ -893,13 +926,21 @@ class App {
  * @return void
  */
 	public static function shutdown() {
-		if (self::$_cacheChange) {
-			Cache::write('file_map', array_filter(self::$_map), '_cake_core_');
+		$megabytes = Configure::read('Error.extraFatalErrorMemory');
+		if ($megabytes === null) {
+			$megabytes = 4;
 		}
-		if (self::$_objectCacheChange) {
-			Cache::write('object_map', self::$_objects, '_cake_core_');
+		if ($megabytes !== false && $megabytes > 0) {
+			static::increaseMemoryLimit($megabytes * 1024);
 		}
-		self::_checkFatalError();
+
+		if (static::$_cacheChange) {
+			Cache::write('file_map', array_filter(static::$_map), '_cake_core_');
+		}
+		if (static::$_objectCacheChange) {
+			Cache::write('object_map', static::$_objects, '_cake_core_');
+		}
+		static::_checkFatalError();
 	}
 
 /**
diff --git a/web/api/lib/Cake/Core/CakePlugin.php b/web/api/lib/Cake/Core/CakePlugin.php
index 3515de8fa..426e22a94 100644
--- a/web/api/lib/Cake/Core/CakePlugin.php
+++ b/web/api/lib/Cake/Core/CakePlugin.php
@@ -33,32 +33,54 @@ class CakePlugin {
 	protected static $_plugins = array();
 
 /**
- * Loads a plugin and optionally loads bootstrapping, routing files or loads a initialization function
+ * Loads a plugin and optionally loads bootstrapping, routing files or loads an initialization function
  *
  * Examples:
  *
- * 	`CakePlugin::load('DebugKit')` will load the DebugKit plugin and will not load any bootstrap nor route files
- *	`CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))` will load the bootstrap.php and routes.php files
- * 	`CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))` will load routes.php file but not bootstrap.php
- * 	`CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))` will load config1.php and config2.php files
- *	`CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))` will run the aCallableMethod function to initialize it
+ * `CakePlugin::load('DebugKit')`
  *
- * Bootstrap initialization functions can be expressed as a PHP callback type, including closures. Callbacks will receive two
- * parameters (plugin name, plugin configuration)
+ * Will load the DebugKit plugin and will not load any bootstrap nor route files
+ *
+ * `CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))`
+ *
+ * will load the bootstrap.php and routes.php files
+ *
+ * `CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))`
+ *
+ * will load routes.php file but not bootstrap.php
+ *
+ * `CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))`
+ *
+ * will load config1.php and config2.php files
+ *
+ * `CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))`
+ *
+ * will run the aCallableMethod function to initialize it
+ *
+ * Bootstrap initialization functions can be expressed as a PHP callback type,
+ * including closures. Callbacks will receive two parameters
+ * (plugin name, plugin configuration)
  *
  * It is also possible to load multiple plugins at once. Examples:
  *
- * `CakePlugin::load(array('DebugKit', 'ApiGenerator'))` will load the DebugKit and ApiGenerator plugins
- * `CakePlugin::load(array('DebugKit', 'ApiGenerator'), array('bootstrap' => true))` will load bootstrap file for both plugins
+ * `CakePlugin::load(array('DebugKit', 'ApiGenerator'))`
  *
- * {{{
+ * will load the DebugKit and ApiGenerator plugins
+ *
+ * `CakePlugin::load(array('DebugKit', 'ApiGenerator'), array('bootstrap' => true))`
+ *
+ * will load bootstrap file for both plugins
+ *
+ * ```
  * 	CakePlugin::load(array(
  * 		'DebugKit' => array('routes' => true),
  * 		'ApiGenerator'
  * 		), array('bootstrap' => true))
- * }}}
+ * ```
  *
- * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit
+ * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit.
+ * By using the `path` option you can specify an absolute path to the plugin. Make
+ * sure that the path is slash terminated or your plugin will not be located properly.
  *
  * @param string|array $plugin name of the plugin to be loaded in CamelCase format or array or plugins to load
  * @param array $config configuration options for the plugin
@@ -69,7 +91,7 @@ class CakePlugin {
 		if (is_array($plugin)) {
 			foreach ($plugin as $name => $conf) {
 				list($name, $conf) = (is_numeric($name)) ? array($conf, $config) : array($name, $conf);
-				self::load($name, $conf);
+				static::load($name, $conf);
 			}
 			return;
 		}
@@ -77,26 +99,26 @@ class CakePlugin {
 		if (empty($config['path'])) {
 			foreach (App::path('plugins') as $path) {
 				if (is_dir($path . $plugin)) {
-					self::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS);
+					static::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS);
 					break;
 				}
 
 				//Backwards compatibility to make easier to migrate to 2.0
 				$underscored = Inflector::underscore($plugin);
 				if (is_dir($path . $underscored)) {
-					self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
+					static::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
 					break;
 				}
 			}
 		} else {
-			self::$_plugins[$plugin] = $config;
+			static::$_plugins[$plugin] = $config;
 		}
 
-		if (empty(self::$_plugins[$plugin]['path'])) {
+		if (empty(static::$_plugins[$plugin]['path'])) {
 			throw new MissingPluginException(array('plugin' => $plugin));
 		}
-		if (!empty(self::$_plugins[$plugin]['bootstrap'])) {
-			self::bootstrap($plugin);
+		if (!empty(static::$_plugins[$plugin]['bootstrap'])) {
+			static::bootstrap($plugin);
 		}
 	}
 
@@ -105,17 +127,30 @@ class CakePlugin {
  * If passed an options array, it will be used as a common default for all plugins to be loaded
  * It is possible to set specific defaults for each plugins in the options array. Examples:
  *
- * {{{
+ * ```
  * 	CakePlugin::loadAll(array(
- *		array('bootstrap' => true),
+ * 		array('bootstrap' => true),
  * 		'DebugKit' => array('routes' => true, 'bootstrap' => false),
  * 	))
- * }}}
+ * ```
  *
  * The above example will load the bootstrap file for all plugins, but for DebugKit it will only load
- * the routes file and will not look for any bootstrap script.
+ * the routes file and will not look for any bootstrap script. If you are loading
+ * many plugins that inconsistently support routes/bootstrap files, instead of detailing
+ * each plugin you can use the `ignoreMissing` option:
  *
- * @param array $options
+ * ```
+ * CakePlugin::loadAll(array(
+ *   'ignoreMissing' => true,
+ *   'bootstrap' => true,
+ *   'routes' => true,
+ * ));
+ * ```
+ *
+ * The ignoreMissing option will do additional file_exists() calls but is simpler
+ * to use.
+ *
+ * @param array $options Options list. See CakePlugin::load() for valid options.
  * @return void
  */
 	public static function loadAll($options = array()) {
@@ -125,7 +160,7 @@ class CakePlugin {
 			if (isset($options[0])) {
 				$opts += $options[0];
 			}
-			self::load($p, $opts);
+			static::load($p, $opts);
 		}
 	}
 
@@ -137,10 +172,10 @@ class CakePlugin {
  * @throws MissingPluginException if the folder for plugin was not found or plugin has not been loaded
  */
 	public static function path($plugin) {
-		if (empty(self::$_plugins[$plugin])) {
+		if (empty(static::$_plugins[$plugin])) {
 			throw new MissingPluginException(array('plugin' => $plugin));
 		}
-		return self::$_plugins[$plugin]['path'];
+		return static::$_plugins[$plugin]['path'];
 	}
 
 /**
@@ -151,7 +186,7 @@ class CakePlugin {
  * @see CakePlugin::load() for examples of bootstrap configuration
  */
 	public static function bootstrap($plugin) {
-		$config = self::$_plugins[$plugin];
+		$config = static::$_plugins[$plugin];
 		if ($config['bootstrap'] === false) {
 			return false;
 		}
@@ -159,9 +194,9 @@ class CakePlugin {
 			return call_user_func_array($config['bootstrap'], array($plugin, $config));
 		}
 
-		$path = self::path($plugin);
+		$path = static::path($plugin);
 		if ($config['bootstrap'] === true) {
-			return self::_includeFile(
+			return static::_includeFile(
 				$path . 'Config' . DS . 'bootstrap.php',
 				$config['ignoreMissing']
 			);
@@ -169,7 +204,7 @@ class CakePlugin {
 
 		$bootstrap = (array)$config['bootstrap'];
 		foreach ($bootstrap as $file) {
-			self::_includeFile(
+			static::_includeFile(
 				$path . 'Config' . DS . $file . '.php',
 				$config['ignoreMissing']
 			);
@@ -183,21 +218,21 @@ class CakePlugin {
  *
  * @param string $plugin name of the plugin, if null will operate on all plugins having enabled the
  * loading of routes files
- * @return boolean
+ * @return bool
  */
 	public static function routes($plugin = null) {
 		if ($plugin === null) {
-			foreach (self::loaded() as $p) {
-				self::routes($p);
+			foreach (static::loaded() as $p) {
+				static::routes($p);
 			}
 			return true;
 		}
-		$config = self::$_plugins[$plugin];
+		$config = static::$_plugins[$plugin];
 		if ($config['routes'] === false) {
 			return false;
 		}
-		return (bool)self::_includeFile(
-			self::path($plugin) . 'Config' . DS . 'routes.php',
+		return (bool)static::_includeFile(
+			static::path($plugin) . 'Config' . DS . 'routes.php',
 			$config['ignoreMissing']
 		);
 	}
@@ -206,15 +241,15 @@ class CakePlugin {
  * Returns true if the plugin $plugin is already loaded
  * If plugin is null, it will return a list of all loaded plugins
  *
- * @param string $plugin
+ * @param string $plugin Plugin name to check.
  * @return mixed boolean true if $plugin is already loaded.
  * If $plugin is null, returns a list of plugins that have been loaded
  */
 	public static function loaded($plugin = null) {
 		if ($plugin) {
-			return isset(self::$_plugins[$plugin]);
+			return isset(static::$_plugins[$plugin]);
 		}
-		$return = array_keys(self::$_plugins);
+		$return = array_keys(static::$_plugins);
 		sort($return);
 		return $return;
 	}
@@ -227,9 +262,9 @@ class CakePlugin {
  */
 	public static function unload($plugin = null) {
 		if ($plugin === null) {
-			self::$_plugins = array();
+			static::$_plugins = array();
 		} else {
-			unset(self::$_plugins[$plugin]);
+			unset(static::$_plugins[$plugin]);
 		}
 	}
 
@@ -237,7 +272,7 @@ class CakePlugin {
  * Include file, ignoring include error if needed if file is missing
  *
  * @param string $file File to include
- * @param boolean $ignoreMissing Whether to ignore include error for missing files
+ * @param bool $ignoreMissing Whether to ignore include error for missing files
  * @return mixed
  */
 	protected static function _includeFile($file, $ignoreMissing = false) {
diff --git a/web/api/lib/Cake/Core/Configure.php b/web/api/lib/Cake/Core/Configure.php
index 9c06cd777..36f29895b 100644
--- a/web/api/lib/Cake/Core/Configure.php
+++ b/web/api/lib/Cake/Core/Configure.php
@@ -62,12 +62,12 @@ class Configure {
  * - Include app/Config/bootstrap.php.
  * - Setup error/exception handlers.
  *
- * @param boolean $boot
+ * @param bool $boot Whether to do bootstrapping.
  * @return void
  */
 	public static function bootstrap($boot = true) {
 		if ($boot) {
-			self::_appDefaults();
+			static::_appDefaults();
 
 			if (!include APP . 'Config' . DS . 'core.php') {
 				trigger_error(__d('cake_dev',
@@ -87,7 +87,13 @@ class Configure {
 				'handler' => 'ErrorHandler::handleError',
 				'level' => E_ALL & ~E_DEPRECATED,
 			);
-			self::_setErrorHandlers($error, $exception);
+			if (PHP_SAPI === 'cli') {
+				App::uses('ConsoleErrorHandler', 'Console');
+				$console = new ConsoleErrorHandler();
+				$exception['handler'] = array($console, 'handleException');
+				$error['handler'] = array($console, 'handleError');
+			}
+			static::_setErrorHandlers($error, $exception);
 
 			if (!include APP . 'Config' . DS . 'bootstrap.php') {
 				trigger_error(__d('cake_dev',
@@ -98,25 +104,26 @@ class Configure {
 			}
 			restore_error_handler();
 
-			self::_setErrorHandlers(
-				self::$_values['Error'],
-				self::$_values['Exception']
+			static::_setErrorHandlers(
+				static::$_values['Error'],
+				static::$_values['Exception']
 			);
 
-			// Preload Debugger + String in case of E_STRICT errors when loading files.
-			if (self::$_values['debug'] > 0) {
+			// Preload Debugger + CakeText in case of E_STRICT errors when loading files.
+			if (static::$_values['debug'] > 0) {
 				class_exists('Debugger');
-				class_exists('String');
+				class_exists('CakeText');
 			}
 		}
 	}
 
 /**
  * Set app's default configs
+ *
  * @return void
  */
 	protected static function _appDefaults() {
-		self::write('App', (array)self::read('App') + array(
+		static::write('App', (array)static::read('App') + array(
 			'base' => false,
 			'baseUrl' => false,
 			'dir' => APP_DIR,
@@ -129,7 +136,7 @@ class Configure {
  * Used to store a dynamic variable in Configure.
  *
  * Usage:
- * {{{
+ * ```
  * Configure::write('One.key1', 'value of the Configure::One[key1]');
  * Configure::write(array('One.key1' => 'value of the Configure::One[key1]'));
  * Configure::write('One', array(
@@ -141,13 +148,13 @@ class Configure {
  *     'One.key1' => 'value of the Configure::One[key1]',
  *     'One.key2' => 'value of the Configure::One[key2]'
  * ));
- * }}}
+ * ```
  *
- * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::write
  * @param string|array $config The key to write, can be a dot notation value.
  * Alternatively can be an array containing key(s) and value(s).
  * @param mixed $value Value to set for var
- * @return boolean True if write was successful
+ * @return bool True if write was successful
+ * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::write
  */
 	public static function write($config, $value = null) {
 		if (!is_array($config)) {
@@ -155,11 +162,11 @@ class Configure {
 		}
 
 		foreach ($config as $name => $value) {
-			self::$_values = Hash::insert(self::$_values, $name, $value);
+			static::$_values = Hash::insert(static::$_values, $name, $value);
 		}
 
 		if (isset($config['debug']) && function_exists('ini_set')) {
-			if (self::$_values['debug']) {
+			if (static::$_values['debug']) {
 				ini_set('display_errors', 1);
 			} else {
 				ini_set('display_errors', 0);
@@ -173,50 +180,74 @@ class Configure {
  * possible to store `null` values in Configure.
  *
  * Usage:
- * {{{
+ * ```
  * Configure::read('Name'); will return all values for Name
  * Configure::read('Name.key'); will return only the value of Configure::Name[key]
- * }}}
+ * ```
  *
- * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::read
- * @param string $var Variable to obtain. Use '.' to access array elements.
+ * @param string|null $var Variable to obtain. Use '.' to access array elements.
  * @return mixed value stored in configure, or null.
+ * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::read
  */
 	public static function read($var = null) {
 		if ($var === null) {
-			return self::$_values;
+			return static::$_values;
 		}
-		return Hash::get(self::$_values, $var);
+		return Hash::get(static::$_values, $var);
+	}
+
+/**
+ * Used to read and delete a variable from Configure.
+ *
+ * This is primarily used during bootstrapping to move configuration data
+ * out of configure into the various other classes in CakePHP.
+ *
+ * @param string $var The key to read and remove.
+ * @return array|null
+ */
+	public static function consume($var) {
+		$simple = strpos($var, '.') === false;
+		if ($simple && !isset(static::$_values[$var])) {
+			return null;
+		}
+		if ($simple) {
+			$value = static::$_values[$var];
+			unset(static::$_values[$var]);
+			return $value;
+		}
+		$value = Hash::get(static::$_values, $var);
+		static::$_values = Hash::remove(static::$_values, $var);
+		return $value;
 	}
 
 /**
  * Returns true if given variable is set in Configure.
  *
  * @param string $var Variable name to check for
- * @return boolean True if variable is there
+ * @return bool True if variable is there
  */
-	public static function check($var = null) {
+	public static function check($var) {
 		if (empty($var)) {
 			return false;
 		}
-		return Hash::get(self::$_values, $var) !== null;
+		return Hash::get(static::$_values, $var) !== null;
 	}
 
 /**
  * Used to delete a variable from Configure.
  *
  * Usage:
- * {{{
+ * ```
  * Configure::delete('Name'); will delete the entire Configure::Name
  * Configure::delete('Name.key'); will delete only the Configure::Name[key]
- * }}}
+ * ```
  *
- * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::delete
  * @param string $var the var to be deleted
  * @return void
+ * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::delete
  */
-	public static function delete($var = null) {
-		self::$_values = Hash::remove(self::$_values, $var);
+	public static function delete($var) {
+		static::$_values = Hash::remove(static::$_values, $var);
 	}
 
 /**
@@ -234,20 +265,20 @@ class Configure {
  * @return void
  */
 	public static function config($name, ConfigReaderInterface $reader) {
-		self::$_readers[$name] = $reader;
+		static::$_readers[$name] = $reader;
 	}
 
 /**
  * Gets the names of the configured reader objects.
  *
- * @param string $name
+ * @param string|null $name Name to check. If null returns all configured reader names.
  * @return array Array of the configured reader objects.
  */
 	public static function configured($name = null) {
 		if ($name) {
-			return isset(self::$_readers[$name]);
+			return isset(static::$_readers[$name]);
 		}
-		return array_keys(self::$_readers);
+		return array_keys(static::$_readers);
 	}
 
 /**
@@ -255,13 +286,13 @@ class Configure {
  * and make any future attempts to use it cause an Exception.
  *
  * @param string $name Name of the reader to drop.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function drop($name) {
-		if (!isset(self::$_readers[$name])) {
+		if (!isset(static::$_readers[$name])) {
 			return false;
 		}
-		unset(self::$_readers[$name]);
+		unset(static::$_readers[$name]);
 		return true;
 	}
 
@@ -283,15 +314,15 @@ class Configure {
  * If using `default` config and no reader has been configured for it yet,
  * one will be automatically created using PhpReader
  *
- * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::load
  * @param string $key name of configuration resource to load.
  * @param string $config Name of the configured reader to use to read the resource identified by $key.
- * @param boolean $merge if config files should be merged instead of simply overridden
- * @return mixed false if file not found, void if load successful.
+ * @param bool $merge if config files should be merged instead of simply overridden
+ * @return bool False if file not found, true if load successful.
  * @throws ConfigureException Will throw any exceptions the reader raises.
+ * @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::load
  */
 	public static function load($key, $config = 'default', $merge = true) {
-		$reader = self::_getReader($config);
+		$reader = static::_getReader($config);
 		if (!$reader) {
 			return false;
 		}
@@ -300,13 +331,13 @@ class Configure {
 		if ($merge) {
 			$keys = array_keys($values);
 			foreach ($keys as $key) {
-				if (($c = self::read($key)) && is_array($values[$key]) && is_array($c)) {
+				if (($c = static::read($key)) && is_array($values[$key]) && is_array($c)) {
 					$values[$key] = Hash::merge($c, $values[$key]);
 				}
 			}
 		}
 
-		return self::write($values);
+		return static::write($values);
 	}
 
 /**
@@ -331,18 +362,18 @@ class Configure {
  * @param string $config The name of the configured adapter to dump data with.
  * @param array $keys The name of the top-level keys you want to dump.
  *   This allows you save only some data stored in Configure.
- * @return boolean success
+ * @return bool success
  * @throws ConfigureException if the adapter does not implement a `dump` method.
  */
 	public static function dump($key, $config = 'default', $keys = array()) {
-		$reader = self::_getReader($config);
+		$reader = static::_getReader($config);
 		if (!$reader) {
 			throw new ConfigureException(__d('cake_dev', 'There is no "%s" adapter.', $config));
 		}
 		if (!method_exists($reader, 'dump')) {
 			throw new ConfigureException(__d('cake_dev', 'The "%s" adapter, does not have a %s method.', $config, 'dump()'));
 		}
-		$values = self::$_values;
+		$values = static::$_values;
 		if (!empty($keys) && is_array($keys)) {
 			$values = array_intersect_key($values, array_flip($keys));
 		}
@@ -357,14 +388,14 @@ class Configure {
  * @return mixed Reader instance or false
  */
 	protected static function _getReader($config) {
-		if (!isset(self::$_readers[$config])) {
+		if (!isset(static::$_readers[$config])) {
 			if ($config !== 'default') {
 				return false;
 			}
 			App::uses('PhpReader', 'Configure');
-			self::config($config, new PhpReader());
+			static::config($config, new PhpReader());
 		}
-		return self::$_readers[$config];
+		return static::$_readers[$config];
 	}
 
 /**
@@ -375,11 +406,11 @@ class Configure {
  * @return string Current version of CakePHP
  */
 	public static function version() {
-		if (!isset(self::$_values['Cake']['version'])) {
+		if (!isset(static::$_values['Cake']['version'])) {
 			require CAKE . 'Config' . DS . 'config.php';
-			self::write($config);
+			static::write($config);
 		}
-		return self::$_values['Cake']['version'];
+		return static::$_values['Cake']['version'];
 	}
 
 /**
@@ -390,11 +421,11 @@ class Configure {
  * @param string $name The storage name for the saved configuration.
  * @param string $cacheConfig The cache configuration to save into. Defaults to 'default'
  * @param array $data Either an array of data to store, or leave empty to store all values.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function store($name, $cacheConfig = 'default', $data = null) {
 		if ($data === null) {
-			$data = self::$_values;
+			$data = static::$_values;
 		}
 		return Cache::write($name, $data, $cacheConfig);
 	}
@@ -405,12 +436,12 @@ class Configure {
  *
  * @param string $name Name of the stored config file to load.
  * @param string $cacheConfig Name of the Cache configuration to read from.
- * @return boolean Success.
+ * @return bool Success.
  */
 	public static function restore($name, $cacheConfig = 'default') {
 		$values = Cache::read($name, $cacheConfig);
 		if ($values) {
-			return self::write($values);
+			return static::write($values);
 		}
 		return false;
 	}
@@ -418,12 +449,13 @@ class Configure {
 /**
  * Clear all values stored in Configure.
  *
- * @return boolean success.
+ * @return bool Success.
  */
 	public static function clear() {
-		self::$_values = array();
+		static::$_values = array();
 		return true;
 	}
+
 /**
  * Set the error and exception handlers.
  *
@@ -444,4 +476,5 @@ class Configure {
 			set_exception_handler($exception['handler']);
 		}
 	}
+
 }
diff --git a/web/api/lib/Cake/Core/Object.php b/web/api/lib/Cake/Core/Object.php
index 4a735cf5c..ffc7f19dc 100644
--- a/web/api/lib/Cake/Core/Object.php
+++ b/web/api/lib/Cake/Core/Object.php
@@ -18,7 +18,6 @@ App::uses('CakeLog', 'Log');
 App::uses('Dispatcher', 'Routing');
 App::uses('Router', 'Routing');
 App::uses('Set', 'Utility');
-App::uses('CakeLog', 'Log');
 
 /**
  * Object class provides a few generic methods used in several subclasses.
@@ -32,7 +31,6 @@ class Object {
 
 /**
  * Constructor, no-op
- *
  */
 	public function __construct() {
 	}
@@ -139,7 +137,7 @@ class Object {
  * Stop execution of the current script. Wraps exit() making
  * testing easier.
  *
- * @param integer|string $status see http://php.net/exit for values
+ * @param int|string $status see http://php.net/exit for values
  * @return void
  */
 	protected function _stop($status = 0) {
@@ -151,10 +149,10 @@ class Object {
  * for more information on writing to logs.
  *
  * @param string $msg Log message
- * @param integer $type Error type constant. Defined in app/Config/core.php.
+ * @param int $type Error type constant. Defined in app/Config/core.php.
  * @param null|string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success of log write
+ * @return bool Success of log write
  */
 	public function log($msg, $type = LOG_ERR, $scope = null) {
 		if (!is_string($msg)) {
@@ -191,14 +189,13 @@ class Object {
  *
  * @param array $properties The name of the properties to merge.
  * @param string $class The class to merge the property with.
- * @param boolean $normalize Set to true to run the properties through Hash::normalize() before merging.
+ * @param bool $normalize Set to true to run the properties through Hash::normalize() before merging.
  * @return void
  */
 	protected function _mergeVars($properties, $class, $normalize = true) {
 		$classProperties = get_class_vars($class);
 		foreach ($properties as $var) {
-			if (
-				isset($classProperties[$var]) &&
+			if (isset($classProperties[$var]) &&
 				!empty($classProperties[$var]) &&
 				is_array($this->{$var}) &&
 				$this->{$var} != $classProperties[$var]
diff --git a/web/api/lib/Cake/Error/ErrorHandler.php b/web/api/lib/Cake/Error/ErrorHandler.php
index 3e6eca2a7..9da40a660 100644
--- a/web/api/lib/Cake/Error/ErrorHandler.php
+++ b/web/api/lib/Cake/Error/ErrorHandler.php
@@ -24,7 +24,6 @@ App::uses('ExceptionRenderer', 'Error');
 App::uses('Router', 'Routing');
 
 /**
- *
  * Error Handler provides basic error and exception handling for your application. It captures and
  * handles all unhandled exceptions and errors. Displays helpful framework errors when debug > 1.
  *
@@ -96,19 +95,27 @@ App::uses('Router', 'Routing');
  */
 class ErrorHandler {
 
+/**
+ * Whether to give up rendering an exception, if the renderer itself is
+ * throwing exceptions.
+ *
+ * @var bool
+ */
+	protected static $_bailExceptionRendering = false;
+
 /**
  * Set as the default exception handler by the CakePHP bootstrap process.
  *
  * This will either use custom exception renderer class if configured,
  * or use the default ExceptionRenderer.
  *
- * @param Exception $exception
+ * @param Exception|ParseError $exception The exception to render.
  * @return void
  * @see http://php.net/manual/en/function.set-exception-handler.php
  */
-	public static function handleException(Exception $exception) {
+	public static function handleException($exception) {
 		$config = Configure::read('Exception');
-		self::_log($exception, $config);
+		static::_log($exception, $config);
 
 		$renderer = isset($config['renderer']) ? $config['renderer'] : 'ExceptionRenderer';
 		if ($renderer !== 'ExceptionRenderer') {
@@ -126,12 +133,15 @@ class ErrorHandler {
 				$e->getMessage(),
 				$e->getTraceAsString()
 			);
+
+			static::$_bailExceptionRendering = true;
 			trigger_error($message, E_USER_ERROR);
 		}
 	}
 
 /**
  * Generates a formatted error message
+ *
  * @param Exception $exception Exception instance
  * @return string Formatted message
  */
@@ -146,7 +156,7 @@ class ErrorHandler {
 				$message .= "\nException Attributes: " . var_export($exception->getAttributes(), true);
 			}
 		}
-		if (php_sapi_name() !== 'cli') {
+		if (PHP_SAPI !== 'cli') {
 			$request = Router::getRequest();
 			if ($request) {
 				$message .= "\nRequest URL: " . $request->here();
@@ -159,11 +169,11 @@ class ErrorHandler {
 /**
  * Handles exception logging
  *
- * @param Exception $exception
- * @param array $config
- * @return boolean
+ * @param Exception|ParseError $exception The exception to render.
+ * @param array $config An array of configuration for logging.
+ * @return bool
  */
-	protected static function _log(Exception $exception, $config) {
+	protected static function _log($exception, $config) {
 		if (empty($config['log'])) {
 			return false;
 		}
@@ -175,7 +185,7 @@ class ErrorHandler {
 				}
 			}
 		}
-		return CakeLog::write(LOG_ERR, self::_getMessage($exception));
+		return CakeLog::write(LOG_ERR, static::_getMessage($exception));
 	}
 
 /**
@@ -186,21 +196,21 @@ class ErrorHandler {
  * You can use Configure::write('Error.level', $value); to set what type of errors will be handled here.
  * Stack traces for errors can be enabled with Configure::write('Error.trace', true);
  *
- * @param integer $code Code of error
+ * @param int $code Code of error
  * @param string $description Error description
  * @param string $file File on which error occurred
- * @param integer $line Line that triggered the error
+ * @param int $line Line that triggered the error
  * @param array $context Context
- * @return boolean true if error was handled
+ * @return bool true if error was handled
  */
 	public static function handleError($code, $description, $file = null, $line = null, $context = null) {
 		if (error_reporting() === 0) {
 			return false;
 		}
 		$errorConfig = Configure::read('Error');
-		list($error, $log) = self::mapErrorCode($code);
+		list($error, $log) = static::mapErrorCode($code);
 		if ($log === LOG_ERR) {
-			return self::handleFatalError($code, $description, $file, $line);
+			return static::handleFatalError($code, $description, $file, $line);
 		}
 
 		$debug = Configure::read('debug');
@@ -220,6 +230,16 @@ class ErrorHandler {
 		}
 		$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
 		if (!empty($errorConfig['trace'])) {
+			// https://bugs.php.net/bug.php?id=65322
+			if (version_compare(PHP_VERSION, '5.4.21', '<')) {
+				if (!class_exists('Debugger')) {
+					App::load('Debugger');
+				}
+				if (!class_exists('CakeText')) {
+					App::uses('CakeText', 'Utility');
+					App::load('CakeText');
+				}
+			}
 			$trace = Debugger::trace(array('start' => 1, 'format' => 'log'));
 			$message .= "\nTrace:\n" . $trace . "\n";
 		}
@@ -229,11 +249,13 @@ class ErrorHandler {
 /**
  * Generate an error page when some fatal error happens.
  *
- * @param integer $code Code of error
+ * @param int $code Code of error
  * @param string $description Error description
  * @param string $file File on which error occurred
- * @param integer $line Line that triggered the error
- * @return boolean
+ * @param int $line Line that triggered the error
+ * @return bool
+ * @throws FatalErrorException If the Exception renderer threw an exception during rendering, and debug > 0.
+ * @throws InternalErrorException If the Exception renderer threw an exception during rendering, and debug is 0.
  */
 	public static function handleFatalError($code, $description, $file, $line) {
 		$logMessage = 'Fatal Error (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
@@ -249,17 +271,25 @@ class ErrorHandler {
 		}
 
 		if (Configure::read('debug')) {
-			call_user_func($exceptionHandler, new FatalErrorException($description, 500, $file, $line));
+			$exception = new FatalErrorException($description, 500, $file, $line);
 		} else {
-			call_user_func($exceptionHandler, new InternalErrorException());
+			$exception = new InternalErrorException();
 		}
+
+		if (static::$_bailExceptionRendering) {
+			static::$_bailExceptionRendering = false;
+			throw $exception;
+		}
+
+		call_user_func($exceptionHandler, $exception);
+
 		return false;
 	}
 
 /**
  * Map an error code into an Error word, and log location.
  *
- * @param integer $code Error code to map
+ * @param int $code Error code to map
  * @return array Array of error word, and log location.
  */
 	public static function mapErrorCode($code) {
diff --git a/web/api/lib/Cake/Error/ExceptionRenderer.php b/web/api/lib/Cake/Error/ExceptionRenderer.php
index 40d474405..a245b64ee 100644
--- a/web/api/lib/Cake/Error/ExceptionRenderer.php
+++ b/web/api/lib/Cake/Error/ExceptionRenderer.php
@@ -35,7 +35,7 @@ App::uses('Controller', 'Controller');
  *
  * You can implement application specific exception handling in one of a few ways:
  *
- * - Create a AppController::appError();
+ * - Create an AppController::appError();
  * - Create a subclass of ExceptionRenderer and configure it to be the `Exception.renderer`
  *
  * #### Using AppController::appError();
@@ -86,13 +86,14 @@ class ExceptionRenderer {
  * If the error is a CakeException it will be converted to either a 400 or a 500
  * code error depending on the code used to construct the error.
  *
- * @param Exception $exception Exception
+ * @param Exception|ParseError $exception Exception
  */
-	public function __construct(Exception $exception) {
+	public function __construct($exception) {
 		$this->controller = $this->_getController($exception);
 
 		if (method_exists($this->controller, 'appError')) {
-			return $this->controller->appError($exception);
+			$this->controller->appError($exception);
+			return;
 		}
 		$method = $template = Inflector::variable(str_replace('Exception', '', get_class($exception)));
 		$code = $exception->getCode();
@@ -152,9 +153,20 @@ class ExceptionRenderer {
 			try {
 				$controller = new CakeErrorController($request, $response);
 				$controller->startupProcess();
+				$startup = true;
 			} catch (Exception $e) {
-				if (!empty($controller) && $controller->Components->enabled('RequestHandler')) {
+				$startup = false;
+			}
+			// Retry RequestHandler, as another aspect of startupProcess()
+			// could have failed. Ignore any exceptions out of startup, as
+			// there could be userland input data parsers.
+			if ($startup === false &&
+				!empty($controller) &&
+				$controller->Components->enabled('RequestHandler')
+			) {
+				try {
 					$controller->RequestHandler->startup($controller);
+				} catch (Exception $e) {
 				}
 			}
 		}
@@ -179,7 +191,7 @@ class ExceptionRenderer {
 /**
  * Generic handler for the internal framework errors CakePHP can generate.
  *
- * @param CakeException $error
+ * @param CakeException $error The exception to render.
  * @return void
  */
 	protected function _cakeError(CakeException $error) {
@@ -201,7 +213,7 @@ class ExceptionRenderer {
 /**
  * Convenience method to display a 400 series page.
  *
- * @param Exception $error
+ * @param Exception $error The exception to render.
  * @return void
  */
 	public function error400($error) {
@@ -224,7 +236,7 @@ class ExceptionRenderer {
 /**
  * Convenience method to display a 500 page.
  *
- * @param Exception $error
+ * @param Exception $error The exception to render.
  * @return void
  */
 	public function error500($error) {
@@ -248,7 +260,7 @@ class ExceptionRenderer {
 /**
  * Convenience method to display a PDOException.
  *
- * @param PDOException $error
+ * @param PDOException $error The exception to render.
  * @return void
  */
 	public function pdoError(PDOException $error) {
@@ -284,6 +296,12 @@ class ExceptionRenderer {
 			} else {
 				$this->_outputMessage('error500');
 			}
+		} catch (MissingPluginException $e) {
+			$attributes = $e->getAttributes();
+			if (isset($attributes['plugin']) && $attributes['plugin'] === $this->controller->plugin) {
+				$this->controller->plugin = null;
+			}
+			$this->_outputMessageSafe('error500');
 		} catch (Exception $e) {
 			$this->_outputMessageSafe('error500');
 		}
diff --git a/web/api/lib/Cake/Error/exceptions.php b/web/api/lib/Cake/Error/exceptions.php
index fbc5bdc9e..6e2cad481 100644
--- a/web/api/lib/Cake/Error/exceptions.php
+++ b/web/api/lib/Cake/Error/exceptions.php
@@ -34,9 +34,9 @@ class CakeBaseException extends RuntimeException {
 /**
  * Get/set the response header to be used
  *
- * @param string|array $header. An array of header strings or a single header string
- *	- an associative array of "header name" => "header value"
- *	- an array of string headers is also accepted
+ * @param string|array $header An array of header strings or a single header string
+ *  - an associative array of "header name" => "header value"
+ *  - an array of string headers is also accepted
  * @param string $value The header value.
  * @return array
  * @see CakeResponse::header()
@@ -76,7 +76,7 @@ class BadRequestException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Bad Request' will be the message
- * @param integer $code Status code, defaults to 400
+ * @param int $code Status code, defaults to 400
  */
 	public function __construct($message = null, $code = 400) {
 		if (empty($message)) {
@@ -98,7 +98,7 @@ class UnauthorizedException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Unauthorized' will be the message
- * @param integer $code Status code, defaults to 401
+ * @param int $code Status code, defaults to 401
  */
 	public function __construct($message = null, $code = 401) {
 		if (empty($message)) {
@@ -120,7 +120,7 @@ class ForbiddenException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Forbidden' will be the message
- * @param integer $code Status code, defaults to 403
+ * @param int $code Status code, defaults to 403
  */
 	public function __construct($message = null, $code = 403) {
 		if (empty($message)) {
@@ -142,7 +142,7 @@ class NotFoundException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Not Found' will be the message
- * @param integer $code Status code, defaults to 404
+ * @param int $code Status code, defaults to 404
  */
 	public function __construct($message = null, $code = 404) {
 		if (empty($message)) {
@@ -164,7 +164,7 @@ class MethodNotAllowedException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Method Not Allowed' will be the message
- * @param integer $code Status code, defaults to 405
+ * @param int $code Status code, defaults to 405
  */
 	public function __construct($message = null, $code = 405) {
 		if (empty($message)) {
@@ -186,7 +186,7 @@ class InternalErrorException extends HttpException {
  * Constructor
  *
  * @param string $message If no message is given 'Internal Server Error' will be the message
- * @param integer $code Status code, defaults to 500
+ * @param int $code Status code, defaults to 500
  */
 	public function __construct($message = null, $code = 500) {
 		if (empty($message)) {
@@ -228,7 +228,7 @@ class CakeException extends CakeBaseException {
  *
  * @param string|array $message Either the string of the error message, or an array of attributes
  *   that are made available in the view, and sprintf()'d into CakeException::$_messageTemplate
- * @param integer $code The code of the error, is also the HTTP status code for the error.
+ * @param int $code The code of the error, is also the HTTP status code for the error.
  */
 	public function __construct($message, $code = 500) {
 		if (is_array($message)) {
@@ -378,6 +378,12 @@ class MissingConnectionException extends CakeException {
 
 	protected $_messageTemplate = 'Database connection "%s" is missing, or could not be created.';
 
+/**
+ * Constructor
+ *
+ * @param string|array $message The error message.
+ * @param int $code The error code.
+ */
 	public function __construct($message, $code = 500) {
 		if (is_array($message)) {
 			$message += array('enabled' => true);
@@ -587,10 +593,10 @@ class FatalErrorException extends CakeException {
 /**
  * Constructor
  *
- * @param string $message
- * @param integer $code
- * @param string $file
- * @param integer $line
+ * @param string $message The error message.
+ * @param int $code The error code.
+ * @param string $file The file the error occurred in.
+ * @param int $line The line the error occurred on.
  */
 	public function __construct($message, $code = 500, $file = null, $line = null) {
 		parent::__construct($message, $code);
diff --git a/web/api/lib/Cake/Event/CakeEvent.php b/web/api/lib/Cake/Event/CakeEvent.php
index cdd737a30..7a97e579b 100644
--- a/web/api/lib/Cake/Event/CakeEvent.php
+++ b/web/api/lib/Cake/Event/CakeEvent.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -28,7 +26,7 @@ class CakeEvent {
 /**
  * Name of the event
  *
- * @var string $name
+ * @var string
  */
 	protected $_name = null;
 
@@ -42,21 +40,21 @@ class CakeEvent {
 /**
  * Custom data for the method that receives the event
  *
- * @var mixed $data
+ * @var mixed
  */
 	public $data = null;
 
 /**
  * Property used to retain the result value of the event listeners
  *
- * @var mixed $result
+ * @var mixed
  */
 	public $result = null;
 
 /**
  * Flags an event as stopped or not, default is false
  *
- * @var boolean
+ * @var bool
  */
 	protected $_stopped = false;
 
@@ -69,11 +67,10 @@ class CakeEvent {
  *
  * ## Examples of usage:
  *
- * {{{
+ * ```
  *	$event = new CakeEvent('Order.afterBuy', $this, array('buyer' => $userData));
  *	$event = new CakeEvent('User.afterRegister', $UserModel);
- * }}}
- *
+ * ```
  */
 	public function __construct($name, $subject = null, $data = null) {
 		$this->_name = $name;
@@ -84,7 +81,7 @@ class CakeEvent {
 /**
  * Dynamically returns the name and subject if accessed directly
  *
- * @param string $attribute
+ * @param string $attribute Attribute name.
  * @return mixed
  */
 	public function __get($attribute) {
@@ -105,7 +102,7 @@ class CakeEvent {
 /**
  * Returns the subject of this event
  *
- * @return string
+ * @return object
  */
 	public function subject() {
 		return $this->_subject;
@@ -123,7 +120,7 @@ class CakeEvent {
 /**
  * Check if the event is stopped
  *
- * @return boolean True if the event is stopped
+ * @return bool True if the event is stopped
  */
 	public function isStopped() {
 		return $this->_stopped;
diff --git a/web/api/lib/Cake/Event/CakeEventListener.php b/web/api/lib/Cake/Event/CakeEventListener.php
index 900b19578..bba20bd6e 100644
--- a/web/api/lib/Cake/Event/CakeEventListener.php
+++ b/web/api/lib/Cake/Event/CakeEventListener.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -30,7 +28,7 @@ interface CakeEventListener {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *	public function implementedEvents() {
  *		return array(
  *			'Order.complete' => 'sendEmail',
@@ -38,7 +36,7 @@ interface CakeEventListener {
  *			'User.onRegister' => array('callable' => 'logRegistration', 'priority' => 20, 'passParams' => true)
  *		);
  *	}
- * }}}
+ * ```
  *
  * @return array associative array or event key names pointing to the function
  * that should be called in the object when the respective event is fired
diff --git a/web/api/lib/Cake/Event/CakeEventManager.php b/web/api/lib/Cake/Event/CakeEventManager.php
index c75bc924c..f647fd941 100644
--- a/web/api/lib/Cake/Event/CakeEventManager.php
+++ b/web/api/lib/Cake/Event/CakeEventManager.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -31,7 +29,7 @@ class CakeEventManager {
 /**
  * The default priority queue value for new, attached listeners
  *
- * @var integer
+ * @var int
  */
 	public static $defaultPriority = 10;
 
@@ -45,14 +43,14 @@ class CakeEventManager {
 /**
  * List of listener callbacks associated to
  *
- * @var object $Listeners
+ * @var object
  */
 	protected $_listeners = array();
 
 /**
  * Internal flag to distinguish a common manager from the singleton
  *
- * @var boolean
+ * @var bool
  */
 	protected $_isGlobal = false;
 
@@ -64,19 +62,19 @@ class CakeEventManager {
  *
  * If called with the first parameter, it will be set as the globally available instance
  *
- * @param CakeEventManager $manager
+ * @param CakeEventManager $manager Optional event manager instance.
  * @return CakeEventManager the global event manager
  */
 	public static function instance($manager = null) {
 		if ($manager instanceof CakeEventManager) {
-			self::$_generalManager = $manager;
+			static::$_generalManager = $manager;
 		}
-		if (empty(self::$_generalManager)) {
-			self::$_generalManager = new CakeEventManager();
+		if (empty(static::$_generalManager)) {
+			static::$_generalManager = new CakeEventManager();
 		}
 
-		self::$_generalManager->_isGlobal = true;
-		return self::$_generalManager;
+		static::$_generalManager->_isGlobal = true;
+		return static::$_generalManager;
 	}
 
 /**
@@ -107,7 +105,7 @@ class CakeEventManager {
 			$this->_attachSubscriber($callable);
 			return;
 		}
-		$options = $options + array('priority' => self::$defaultPriority, 'passParams' => false);
+		$options = $options + array('priority' => static::$defaultPriority, 'passParams' => false);
 		$this->_listeners[$eventKey][$options['priority']][] = array(
 			'callable' => $callable,
 			'passParams' => $options['passParams'],
@@ -118,7 +116,7 @@ class CakeEventManager {
  * Auxiliary function to attach all implemented callbacks of a CakeEventListener class instance
  * as individual methods on this manager
  *
- * @param CakeEventListener $subscriber
+ * @param CakeEventListener $subscriber Event listener.
  * @return void
  */
 	protected function _attachSubscriber(CakeEventListener $subscriber) {
@@ -223,6 +221,7 @@ class CakeEventManager {
  *
  * @param string|CakeEvent $event the event key name or instance of CakeEvent
  * @return CakeEvent
+ * @triggers $event
  */
 	public function dispatch($event) {
 		if (is_string($event)) {
@@ -256,7 +255,7 @@ class CakeEventManager {
 /**
  * Returns a list of all listeners for an eventKey in the order they should be called
  *
- * @param string $eventKey
+ * @param string $eventKey Event key.
  * @return array
  */
 	public function listeners($eventKey) {
@@ -266,7 +265,7 @@ class CakeEventManager {
 			$localListeners = $this->prioritisedListeners($eventKey);
 			$localListeners = empty($localListeners) ? array() : $localListeners;
 		}
-		$globalListeners = self::instance()->prioritisedListeners($eventKey);
+		$globalListeners = static::instance()->prioritisedListeners($eventKey);
 		$globalListeners = empty($globalListeners) ? array() : $globalListeners;
 
 		$priorities = array_merge(array_keys($globalListeners), array_keys($localListeners));
@@ -288,7 +287,7 @@ class CakeEventManager {
 /**
  * Returns the listeners for the specified event key indexed by priority
  *
- * @param string $eventKey
+ * @param string $eventKey Event key.
  * @return array
  */
 	public function prioritisedListeners($eventKey) {
diff --git a/web/api/lib/Cake/I18n/I18n.php b/web/api/lib/Cake/I18n/I18n.php
index 16fb9983d..1b79fa2f8 100644
--- a/web/api/lib/Cake/I18n/I18n.php
+++ b/web/api/lib/Cake/I18n/I18n.php
@@ -74,7 +74,7 @@ class I18n {
  * Set to true when I18N::_bindTextDomain() is called for the first time.
  * If a translation file is found it is set to false again
  *
- * @var boolean
+ * @var bool
  */
 	protected $_noLocale = false;
 
@@ -93,9 +93,9 @@ class I18n {
  * The constants may be used in translation fetching
  * instead of hardcoded integers.
  * Example:
- * {{{
+ * ```
  *	I18n::translate('CakePHP is awesome.', null, null, I18n::LC_MESSAGES)
- * }}}
+ * ```
  *
  * To keep the code more readable, I18n constants are preferred over
  * hardcoded integers.
@@ -185,13 +185,16 @@ class I18n {
  * @param string $domain Domain The domain of the translation. Domains are often used by plugin translations.
  *    If null, the default domain will be used.
  * @param string $category Category The integer value of the category to use.
- * @param integer $count Count Count is used with $plural to choose the correct plural form.
+ * @param int $count Count Count is used with $plural to choose the correct plural form.
  * @param string $language Language to translate string to.
  *    If null it checks for language in session followed by Config.language configuration variable.
+ * @param string $context Context The context of the translation, e.g a verb or a noun.
  * @return string translated string.
  * @throws CakeException When '' is provided as a domain.
  */
-	public static function translate($singular, $plural = null, $domain = null, $category = self::LC_MESSAGES, $count = null, $language = null) {
+	public static function translate($singular, $plural = null, $domain = null, $category = self::LC_MESSAGES,
+		$count = null, $language = null, $context = null
+	) {
 		$_this = I18n::getInstance();
 
 		if (strpos($singular, "\r\n") !== false) {
@@ -220,7 +223,7 @@ class I18n {
 		}
 
 		if ($domain === null) {
-			$domain = self::$defaultDomain;
+			$domain = static::$defaultDomain;
 		}
 		if ($domain === '') {
 			throw new CakeException(__d('cake_dev', 'You cannot use "" as a domain.'));
@@ -254,8 +257,10 @@ class I18n {
 			}
 		}
 
-		if (!empty($_this->_domains[$domain][$_this->_lang][$_this->category][$singular])) {
-			if (($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$singular]) || ($plurals) && ($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$plural])) {
+		if (!empty($_this->_domains[$domain][$_this->_lang][$_this->category][$singular][$context])) {
+			if (($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$singular][$context]) ||
+				($plurals) && ($trans = $_this->_domains[$domain][$_this->_lang][$_this->category][$plural][$context])
+			) {
 				if (is_array($trans)) {
 					if (isset($trans[$plurals])) {
 						$trans = $trans[$plurals];
@@ -309,8 +314,10 @@ class I18n {
  * Attempts to find the plural form of a string.
  *
  * @param string $header Type
- * @param integer $n Number
- * @return integer plural match
+ * @param int $n Number
+ * @return int plural match
+ * @link http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
+ * @link https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_and_Plurals#List_of_Plural_Rules
  */
 	protected function _pluralGuess($header, $n) {
 		if (!is_string($header) || $header === "nplurals=1;plural=0;" || !isset($header[0])) {
@@ -351,7 +358,15 @@ class I18n {
 			}
 		} elseif (strpos($header, "plurals=5")) {
 			return $n == 1 ? 0 : ($n == 2 ? 1 : ($n >= 3 && $n <= 6 ? 2 : ($n >= 7 && $n <= 10 ? 3 : 4)));
+		} elseif (strpos($header, "plurals=6")) {
+			return $n == 0 ? 0 :
+				($n == 1 ? 1 :
+				($n == 2 ? 2 :
+				($n % 100 >= 3 && $n % 100 <= 10 ? 3 :
+				($n % 100 >= 11 ? 4 : 5))));
 		}
+
+		return 0;
 	}
 
 /**
@@ -372,7 +387,9 @@ class I18n {
 				$pluginDomain = Inflector::underscore($plugin);
 				if ($pluginDomain === $domain) {
 					$searchPaths[] = CakePlugin::path($plugin) . 'Locale' . DS;
-					$searchPaths = array_reverse($searchPaths);
+					if (!Configure::read('I18n.preferApp')) {
+						$searchPaths = array_reverse($searchPaths);
+					}
 					break;
 				}
 			}
@@ -382,7 +399,7 @@ class I18n {
 			foreach ($this->l10n->languagePath as $lang) {
 				$localeDef = $directory . $lang . DS . $this->category;
 				if (is_file($localeDef)) {
-					$definitions = self::loadLocaleDefinition($localeDef);
+					$definitions = static::loadLocaleDefinition($localeDef);
 					if ($definitions !== false) {
 						$this->_domains[$domain][$this->_lang][$this->category] = $definitions;
 						$this->_noLocale = false;
@@ -395,10 +412,10 @@ class I18n {
 					$translations = false;
 
 					if (is_file($app . '.mo')) {
-						$translations = self::loadMo($app . '.mo');
+						$translations = static::loadMo($app . '.mo');
 					}
 					if ($translations === false && is_file($app . '.po')) {
-						$translations = self::loadPo($app . '.po');
+						$translations = static::loadPo($app . '.po');
 					}
 
 					if ($translations !== false) {
@@ -413,10 +430,10 @@ class I18n {
 				$translations = false;
 
 				if (is_file($file . '.mo')) {
-					$translations = self::loadMo($file . '.mo');
+					$translations = static::loadMo($file . '.mo');
 				}
 				if ($translations === false && is_file($file . '.po')) {
-					$translations = self::loadPo($file . '.po');
+					$translations = static::loadPo($file . '.po');
 				}
 
 				if ($translations !== false) {
@@ -461,6 +478,7 @@ class I18n {
  *
  * @param string $filename Binary .mo file to load
  * @return mixed Array of translations on success or false on failure
+ * @link https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html
  */
 	public static function loadMo($filename) {
 		$translations = false;
@@ -478,7 +496,11 @@ class I18n {
 					$r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8));
 					$msgid = substr($data, $r["offs"], $r["len"]);
 					unset($msgid_plural);
+					$context = null;
 
+					if (strpos($msgid, "\x04") !== false) {
+						list($context, $msgid) = explode("\x04", $msgid);
+					}
 					if (strpos($msgid, "\000")) {
 						list($msgid, $msgid_plural) = explode("\000", $msgid);
 					}
@@ -488,7 +510,12 @@ class I18n {
 					if (strpos($msgstr, "\000")) {
 						$msgstr = explode("\000", $msgstr);
 					}
-					$translations[$msgid] = $msgstr;
+
+					if ($msgid != '') {
+						$translations[$msgid][$context] = $msgstr;
+					} else {
+						$translations[$msgid] = $msgstr;
+					}
 
 					if (isset($msgid_plural)) {
 						$translations[$msgid_plural] =& $translations[$msgid];
@@ -515,12 +542,15 @@ class I18n {
 		$type = 0;
 		$translations = array();
 		$translationKey = '';
+		$translationContext = null;
 		$plural = 0;
 		$header = '';
 
 		do {
 			$line = trim(fgets($file));
 			if ($line === '' || $line[0] === '#') {
+				$translationContext = null;
+
 				continue;
 			}
 			if (preg_match("/msgid[[:space:]]+\"(.+)\"$/i", $line, $regs)) {
@@ -529,31 +559,33 @@ class I18n {
 			} elseif (preg_match("/msgid[[:space:]]+\"\"$/i", $line, $regs)) {
 				$type = 2;
 				$translationKey = '';
+			} elseif (preg_match("/msgctxt[[:space:]]+\"(.+)\"$/i", $line, $regs)) {
+				$translationContext = $regs[1];
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && ($type == 1 || $type == 2 || $type == 3)) {
 				$type = 3;
 				$translationKey .= stripcslashes($regs[1]);
 			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && ($type == 1 || $type == 3) && $translationKey) {
-				$translations[$translationKey] = stripcslashes($regs[1]);
+				$translations[$translationKey][$translationContext] = stripcslashes($regs[1]);
 				$type = 4;
 			} elseif (preg_match("/msgstr[[:space:]]+\"\"$/i", $line, $regs) && ($type == 1 || $type == 3) && $translationKey) {
 				$type = 4;
-				$translations[$translationKey] = '';
+				$translations[$translationKey][$translationContext] = '';
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 4 && $translationKey) {
-				$translations[$translationKey] .= stripcslashes($regs[1]);
+				$translations[$translationKey][$translationContext] .= stripcslashes($regs[1]);
 			} elseif (preg_match("/msgid_plural[[:space:]]+\".*\"$/i", $line, $regs)) {
 				$type = 6;
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 6 && $translationKey) {
 				$type = 6;
 			} elseif (preg_match("/msgstr\[(\d+)\][[:space:]]+\"(.+)\"$/i", $line, $regs) && ($type == 6 || $type == 7) && $translationKey) {
 				$plural = $regs[1];
-				$translations[$translationKey][$plural] = stripcslashes($regs[2]);
+				$translations[$translationKey][$translationContext][$plural] = stripcslashes($regs[2]);
 				$type = 7;
 			} elseif (preg_match("/msgstr\[(\d+)\][[:space:]]+\"\"$/i", $line, $regs) && ($type == 6 || $type == 7) && $translationKey) {
 				$plural = $regs[1];
-				$translations[$translationKey][$plural] = '';
+				$translations[$translationKey][$translationContext][$plural] = '';
 				$type = 7;
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 7 && $translationKey) {
-				$translations[$translationKey][$plural] .= stripcslashes($regs[1]);
+				$translations[$translationKey][$translationContext][$plural] .= stripcslashes($regs[1]);
 			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && $type == 2 && !$translationKey) {
 				$header .= stripcslashes($regs[1]);
 				$type = 5;
@@ -563,9 +595,10 @@ class I18n {
 			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 5) {
 				$header .= stripcslashes($regs[1]);
 			} else {
-				unset($translations[$translationKey]);
+				unset($translations[$translationKey][$translationContext]);
 				$type = 0;
 				$translationKey = '';
+				$translationContext = null;
 				$plural = 0;
 			}
 		} while (!feof($file));
@@ -643,6 +676,27 @@ class I18n {
 		return $definitions;
 	}
 
+/**
+ * Puts the parameters in raw translated strings
+ *
+ * @param string $translated The raw translated string
+ * @param array $args The arguments to put in the translation
+ * @return string Translated string with arguments
+ */
+	public static function insertArgs($translated, array $args) {
+		$len = count($args);
+		if ($len === 0 || ($len === 1 && $args[0] === null)) {
+			return $translated;
+		}
+
+		if (is_array($args[0])) {
+			$args = $args[0];
+		}
+
+		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
+		return vsprintf($translated, $args);
+	}
+
 /**
  * Auxiliary function to parse a symbol from a locale definition file
  *
diff --git a/web/api/lib/Cake/I18n/L10n.php b/web/api/lib/Cake/I18n/L10n.php
index 646a03440..7769a8395 100644
--- a/web/api/lib/Cake/I18n/L10n.php
+++ b/web/api/lib/Cake/I18n/L10n.php
@@ -410,7 +410,7 @@ class L10n {
 /**
  * Attempts to find the locale settings based on the HTTP_ACCEPT_LANGUAGE variable
  *
- * @return boolean Success
+ * @return bool Success
  */
 	protected function _autoLanguage() {
 		$_detectableLanguages = CakeRequest::acceptLanguage();
@@ -434,7 +434,7 @@ class L10n {
  * Attempts to find locale for language, or language for locale
  *
  * @param string|array $mixed 2/3 char string (language/locale), array of those strings, or null
- * @return string|array|boolean string language/locale, array of those values, whole map as an array,
+ * @return string|array|bool string language/locale, array of those values, whole map as an array,
  *    or false when language/locale doesn't exist
  */
 	public function map($mixed = null) {
@@ -463,7 +463,7 @@ class L10n {
  * Attempts to find catalog record for requested language
  *
  * @param string|array $language string requested language, array of requested languages, or null for whole catalog
- * @return array|boolean array catalog record for requested language, array of catalog records, whole catalog,
+ * @return array|bool array catalog record for requested language, array of catalog records, whole catalog,
  *    or false when language doesn't exist
  */
 	public function catalog($language = null) {
diff --git a/web/api/lib/Cake/I18n/Multibyte.php b/web/api/lib/Cake/I18n/Multibyte.php
index 93a13f105..d11e15afa 100644
--- a/web/api/lib/Cake/I18n/Multibyte.php
+++ b/web/api/lib/Cake/I18n/Multibyte.php
@@ -48,7 +48,7 @@ class Multibyte {
  * Converts a multibyte character string
  * to the decimal value of the character
  *
- * @param string $string
+ * @param string $string String to convert.
  * @return array
  */
 	public static function utf8($string) {
@@ -87,7 +87,7 @@ class Multibyte {
  * Converts the decimal value of a multibyte character string
  * to a string
  *
- * @param array $array
+ * @param array $array Values array.
  * @return string
  */
 	public static function ascii($array) {
@@ -113,8 +113,8 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the position of the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string,
+ * @param int $offset The position in $haystack to start searching.
+ * @return int|bool The numeric position of the first occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  */
 	public static function stripos($haystack, $needle, $offset = 0) {
@@ -131,11 +131,11 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
- * @return integer|boolean The portion of $haystack, or false if $needle is not found.
+ * @return int|bool The portion of $haystack, or false if $needle is not found.
  */
 	public static function stristr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);
@@ -191,7 +191,7 @@ class Multibyte {
  * Get string length.
  *
  * @param string $string The string being checked for length.
- * @return integer The number of characters in string $string
+ * @return int The number of characters in string $string
  */
 	public static function strlen($string) {
 		if (Multibyte::checkMultibyte($string)) {
@@ -206,8 +206,8 @@ class Multibyte {
  *
  * @param string $haystack The string being checked.
  * @param string $needle The position counted from the beginning of haystack.
- * @param integer $offset The search offset. If it is not specified, 0 is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
+ * @param int $offset The search offset. If it is not specified, 0 is used.
+ * @return int|bool The numeric position of the first occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  */
 	public static function strpos($haystack, $needle, $offset = 0) {
@@ -249,11 +249,11 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|bool The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrchr($haystack, $needle, $part = false) {
 		$check = Multibyte::utf8($haystack);
@@ -309,11 +309,11 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|bool The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrichr($haystack, $needle, $part = false) {
 		$check = Multibyte::strtoupper($haystack);
@@ -371,8 +371,8 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the position of the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
+ * @param int $offset The position in $haystack to start searching.
+ * @return int|bool The numeric position of the last occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  */
 	public static function strripos($haystack, $needle, $offset = 0) {
@@ -421,9 +421,9 @@ class Multibyte {
  *
  * @param string $haystack The string being checked, for the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
+ * @param int $offset May be specified to begin searching an arbitrary number of characters into the string.
  *    Negative values will stop searching at an arbitrary point prior to the end of the string.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
+ * @return int|bool The numeric position of the last occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  */
 	public static function strrpos($haystack, $needle, $offset = 0) {
@@ -471,11 +471,11 @@ class Multibyte {
  *
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|bool The portion of $haystack, or true if $needle is not found.
  */
 	public static function strstr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);
@@ -550,7 +550,7 @@ class Multibyte {
 				$matched = true;
 			} else {
 				$matched = false;
-				$keys = self::_find($char, 'upper');
+				$keys = static::_find($char, 'upper');
 
 				if (!empty($keys)) {
 					foreach ($keys as $key => $value) {
@@ -596,7 +596,7 @@ class Multibyte {
 
 			} else {
 				$matched = false;
-				$keys = self::_find($char);
+				$keys = static::_find($char);
 				$keyCount = count($keys);
 
 				if (!empty($keys)) {
@@ -662,7 +662,7 @@ class Multibyte {
  *
  * @param string $haystack The string being checked.
  * @param string $needle The string being found.
- * @return integer The number of times the $needle substring occurs in the $haystack string.
+ * @return int The number of times the $needle substring occurs in the $haystack string.
  */
 	public static function substrCount($haystack, $needle) {
 		$count = 0;
@@ -696,8 +696,8 @@ class Multibyte {
  * Get part of string
  *
  * @param string $string The string being checked.
- * @param integer $start The first position used in $string.
- * @param integer $length The maximum length of the returned string.
+ * @param int $start The first position used in $string.
+ * @param int $length The maximum length of the returned string.
  * @return string The portion of $string specified by the $string and $length parameters.
  */
 	public static function substr($string, $start, $length = null) {
@@ -728,7 +728,7 @@ class Multibyte {
  *
  * @param string $string value to encode
  * @param string $charset charset to use for encoding. defaults to UTF-8
- * @param string $newline
+ * @param string $newline Newline string.
  * @return string
  */
 	public static function mimeEncode($string, $charset = null, $newline = "\r\n") {
@@ -774,7 +774,7 @@ class Multibyte {
 /**
  * Return the Code points range for Unicode characters
  *
- * @param integer $decimal
+ * @param int $decimal Decimal value.
  * @return string
  */
 	protected static function _codepoint($decimal) {
@@ -815,44 +815,44 @@ class Multibyte {
 		} else {
 			$return = false;
 		}
-		self::$_codeRange[$decimal] = $return;
+		static::$_codeRange[$decimal] = $return;
 		return $return;
 	}
 
 /**
  * Find the related code folding values for $char
  *
- * @param integer $char decimal value of character
- * @param string $type
+ * @param int $char decimal value of character
+ * @param string $type Type 'lower' or 'upper'. Defaults to 'lower'.
  * @return array
  */
 	protected static function _find($char, $type = 'lower') {
 		$found = array();
-		if (!isset(self::$_codeRange[$char])) {
-			$range = self::_codepoint($char);
+		if (!isset(static::$_codeRange[$char])) {
+			$range = static::_codepoint($char);
 			if ($range === false) {
-				return null;
+				return array();
 			}
 			if (!Configure::configured('_cake_core_')) {
 				App::uses('PhpReader', 'Configure');
 				Configure::config('_cake_core_', new PhpReader(CAKE . 'Config' . DS));
 			}
 			Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_');
-			self::$_caseFold[$range] = Configure::read($range);
+			static::$_caseFold[$range] = Configure::read($range);
 			Configure::delete($range);
 		}
 
-		if (!self::$_codeRange[$char]) {
-			return null;
+		if (!static::$_codeRange[$char]) {
+			return array();
 		}
-		self::$_table = self::$_codeRange[$char];
-		$count = count(self::$_caseFold[self::$_table]);
+		static::$_table = static::$_codeRange[$char];
+		$count = count(static::$_caseFold[static::$_table]);
 
 		for ($i = 0; $i < $count; $i++) {
-			if ($type === 'lower' && self::$_caseFold[self::$_table][$i][$type][0] === $char) {
-				$found[] = self::$_caseFold[self::$_table][$i];
-			} elseif ($type === 'upper' && self::$_caseFold[self::$_table][$i][$type] === $char) {
-				$found[] = self::$_caseFold[self::$_table][$i];
+			if ($type === 'lower' && static::$_caseFold[static::$_table][$i][$type][0] === $char) {
+				$found[] = static::$_caseFold[static::$_table][$i];
+			} elseif ($type === 'upper' && static::$_caseFold[static::$_table][$i][$type] === $char) {
+				$found[] = static::$_caseFold[static::$_table][$i];
 			}
 		}
 		return $found;
@@ -860,8 +860,9 @@ class Multibyte {
 
 /**
  * Check the $string for multibyte characters
- * @param string $string value to test
- * @return boolean
+ *
+ * @param string $string Value to test.
+ * @return bool
  */
 	public static function checkMultibyte($string) {
 		$length = strlen($string);
diff --git a/web/api/lib/Cake/LICENSE.txt b/web/api/lib/Cake/LICENSE.txt
index 414ab1e72..610573476 100644
--- a/web/api/lib/Cake/LICENSE.txt
+++ b/web/api/lib/Cake/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License
 
 CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
-Copyright (c) 2005-2013, Cake Software Foundation, Inc.
+Copyright (c) 2005-2015, Cake Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/web/api/lib/Cake/Log/CakeLog.php b/web/api/lib/Cake/Log/CakeLog.php
index cffbccf15..0e8ae2760 100644
--- a/web/api/lib/Cake/Log/CakeLog.php
+++ b/web/api/lib/Cake/Log/CakeLog.php
@@ -31,9 +31,9 @@ App::uses('LogEngineCollection', 'Log');
  * You can configure log adapters in your applications `bootstrap.php` file.
  * A sample configuration would look like:
  *
- * {{{
+ * ```
  * CakeLog::config('my_log', array('engine' => 'File'));
- * }}}
+ * ```
  *
  * See the documentation on CakeLog::config() for more detail.
  *
@@ -48,10 +48,10 @@ App::uses('LogEngineCollection', 'Log');
  * RFC 5424. When logging messages you can either use the named methods,
  * or the correct constants with `write()`:
  *
- * {{{
+ * ```
  * CakeLog::error('Something horrible happened');
  * CakeLog::write(LOG_ERR, 'Something horrible happened');
- * }}}
+ * ```
  *
  * If you require custom logging levels, you can use CakeLog::levels() to
  * append additional logging levels.
@@ -66,11 +66,11 @@ App::uses('LogEngineCollection', 'Log');
  * application. By using scopes you can control logging for each part
  * of your application and still keep standard log levels.
  *
- *
  * See CakeLog::config() and CakeLog::write() for more information
  * on scopes
  *
  * @package       Cake.Log
+ * @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#logging
  */
 class CakeLog {
 
@@ -118,8 +118,8 @@ class CakeLog {
  * @return void
  */
 	protected static function _init() {
-		self::$_levels = self::defaultLevels();
-		self::$_Collection = new LogEngineCollection();
+		static::$_levels = static::defaultLevels();
+		static::$_Collection = new LogEngineCollection();
 	}
 
 /**
@@ -129,12 +129,12 @@ class CakeLog {
  *
  * ### Usage:
  *
- * {{{
+ * ```
  * CakeLog::config('second_file', array(
  *     'engine' => 'File',
  *     'path' => '/var/logs/my_app/'
  * ));
- * }}}
+ * ```
  *
  * Will configure a FileLog instance to use the specified path.
  * All options that are not `engine` are passed onto the logging adapter,
@@ -146,13 +146,13 @@ class CakeLog {
  * When configuring loggers, you can set which levels a logger will handle.
  * This allows you to disable debug messages in production for example:
  *
- * {{{
+ * ```
  * CakeLog::config('default', array(
  *     'engine' => 'File',
  *     'path' => LOGS,
  *     'levels' => array('error', 'critical', 'alert', 'emergency')
  * ));
- * }}}
+ * ```
  *
  * The above logger would only log error messages or higher. Any
  * other log messages would be discarded.
@@ -164,13 +164,13 @@ class CakeLog {
  * logger. If you don't define any scopes an adapter will catch
  * all scopes that match the handled levels.
  *
- * {{{
+ * ```
  * CakeLog::config('payments', array(
  *     'engine' => 'File',
  *     'types' => array('info', 'error', 'warning'),
  *     'scopes' => array('payment', 'order')
  * ));
- * }}}
+ * ```
  *
  * The above logger will only capture log entries made in the
  * `payment` and `order` scopes. All other scopes including the
@@ -182,8 +182,9 @@ class CakeLog {
  * @param string $key The keyname for this logger, used to remove the
  *    logger later.
  * @param array $config Array of configuration information for the logger
- * @return boolean success of configuration.
+ * @return bool success of configuration.
  * @throws CakeLogException
+ * @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#creating-and-configuring-log-streams
  */
 	public static function config($key, $config) {
 		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
@@ -192,10 +193,10 @@ class CakeLog {
 		if (empty($config['engine'])) {
 			throw new CakeLogException(__d('cake_dev', 'Missing logger class name'));
 		}
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		self::$_Collection->load($key, $config);
+		static::$_Collection->load($key, $config);
 		return true;
 	}
 
@@ -205,10 +206,10 @@ class CakeLog {
  * @return array Array of configured log streams.
  */
 	public static function configured() {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		return self::$_Collection->loaded();
+		return static::$_Collection->loaded();
 	}
 
 /**
@@ -219,15 +220,15 @@ class CakeLog {
  *
  * To append additional level 'user0' and 'user1' to to default log levels:
  *
- * {{{
+ * ```
  * CakeLog::levels(array('user0, 'user1'));
  * // or
  * CakeLog::levels(array('user0, 'user1'), true);
- * }}}
+ * ```
  *
  * will result in:
  *
- * {{{
+ * ```
  * array(
  *     0 => 'emergency',
  *     1 => 'alert',
@@ -235,43 +236,43 @@ class CakeLog {
  *     8 => 'user0',
  *     9 => 'user1',
  * );
- * }}}
+ * ```
  *
  * To set/replace existing configuration, pass an array with the second argument
  * set to false.
  *
- * {{{
+ * ```
  * CakeLog::levels(array('user0, 'user1'), false);
- * }}}
+ * ```
  *
  * will result in:
  *
- * {{{
+ * ```
  * array(
  *      0 => 'user0',
  *      1 => 'user1',
  * );
- * }}}
+ * ```
  *
  * @param array $levels array
- * @param boolean $append true to append, false to replace
+ * @param bool $append true to append, false to replace
  * @return array Active log levels
  */
 	public static function levels($levels = array(), $append = true) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
 		if (empty($levels)) {
-			return self::$_levels;
+			return static::$_levels;
 		}
 		$levels = array_values($levels);
 		if ($append) {
-			self::$_levels = array_merge(self::$_levels, $levels);
+			static::$_levels = array_merge(static::$_levels, $levels);
 		} else {
-			self::$_levels = $levels;
+			static::$_levels = $levels;
 		}
-		self::$_levelMap = array_flip(self::$_levels);
-		return self::$_levels;
+		static::$_levelMap = array_flip(static::$_levels);
+		return static::$_levels;
 	}
 
 /**
@@ -280,9 +281,9 @@ class CakeLog {
  * @return array Default log levels
  */
 	public static function defaultLevels() {
-		self::$_levelMap = self::$_defaultLevels;
-		self::$_levels = array_flip(self::$_levelMap);
-		return self::$_levels;
+		static::$_levelMap = static::$_defaultLevels;
+		static::$_levels = array_flip(static::$_levelMap);
+		return static::$_levels;
 	}
 
 /**
@@ -293,27 +294,27 @@ class CakeLog {
  * @return void
  */
 	public static function drop($streamName) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		self::$_Collection->unload($streamName);
+		static::$_Collection->unload($streamName);
 	}
 
 /**
  * Checks whether $streamName is enabled
  *
  * @param string $streamName to check
- * @return boolean
+ * @return bool
  * @throws CakeLogException
  */
 	public static function enabled($streamName) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if (!isset(static::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
-		return self::$_Collection->enabled($streamName);
+		return static::$_Collection->enabled($streamName);
 	}
 
 /**
@@ -325,13 +326,13 @@ class CakeLog {
  * @throws CakeLogException
  */
 	public static function enable($streamName) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if (!isset(static::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
-		self::$_Collection->enable($streamName);
+		static::$_Collection->enable($streamName);
 	}
 
 /**
@@ -344,28 +345,28 @@ class CakeLog {
  * @throws CakeLogException
  */
 	public static function disable($streamName) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if (!isset(static::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
-		self::$_Collection->disable($streamName);
+		static::$_Collection->disable($streamName);
 	}
 
 /**
  * Gets the logging engine from the active streams.
  *
- * @see BaseLog
  * @param string $streamName Key name of a configured stream to get.
  * @return mixed instance of BaseLog or false if not found
+ * @see BaseLog
  */
 	public static function stream($streamName) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
-		if (!empty(self::$_Collection->{$streamName})) {
-			return self::$_Collection->{$streamName};
+		if (!empty(static::$_Collection->{$streamName})) {
+			return static::$_Collection->{$streamName};
 		}
 		return false;
 	}
@@ -392,28 +393,29 @@ class CakeLog {
  *
  * `CakeLog::write('warning', 'Stuff is broken here');`
  *
- * @param integer|string $type Type of message being written. When value is an integer
+ * @param int|string $type Type of message being written. When value is an integer
  *    or a string matching the recognized levels, then it will
  *    be treated log levels. Otherwise it's treated as scope.
  * @param string $message Message content to log
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
+ * @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#writing-to-logs
  */
 	public static function write($type, $message, $scope = array()) {
-		if (empty(self::$_Collection)) {
-			self::_init();
+		if (empty(static::$_Collection)) {
+			static::_init();
 		}
 
-		if (is_int($type) && isset(self::$_levels[$type])) {
-			$type = self::$_levels[$type];
+		if (is_int($type) && isset(static::$_levels[$type])) {
+			$type = static::$_levels[$type];
 		}
-		if (is_string($type) && empty($scope) && !in_array($type, self::$_levels)) {
+		if (is_string($type) && empty($scope) && !in_array($type, static::$_levels)) {
 			$scope = $type;
 		}
 		$logged = false;
-		foreach (self::$_Collection->enabled() as $streamName) {
-			$logger = self::$_Collection->{$streamName};
+		foreach (static::$_Collection->enabled() as $streamName) {
+			$logger = static::$_Collection->{$streamName};
 			$types = $scopes = $config = array();
 			if (method_exists($logger, 'config')) {
 				$config = $logger->config();
@@ -450,10 +452,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function emergency($message, $scope = array()) {
-		return self::write(self::$_levelMap['emergency'], $message, $scope);
+		return static::write(static::$_levelMap['emergency'], $message, $scope);
 	}
 
 /**
@@ -462,10 +464,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function alert($message, $scope = array()) {
-		return self::write(self::$_levelMap['alert'], $message, $scope);
+		return static::write(static::$_levelMap['alert'], $message, $scope);
 	}
 
 /**
@@ -474,10 +476,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function critical($message, $scope = array()) {
-		return self::write(self::$_levelMap['critical'], $message, $scope);
+		return static::write(static::$_levelMap['critical'], $message, $scope);
 	}
 
 /**
@@ -486,10 +488,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function error($message, $scope = array()) {
-		return self::write(self::$_levelMap['error'], $message, $scope);
+		return static::write(static::$_levelMap['error'], $message, $scope);
 	}
 
 /**
@@ -498,10 +500,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function warning($message, $scope = array()) {
-		return self::write(self::$_levelMap['warning'], $message, $scope);
+		return static::write(static::$_levelMap['warning'], $message, $scope);
 	}
 
 /**
@@ -510,10 +512,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function notice($message, $scope = array()) {
-		return self::write(self::$_levelMap['notice'], $message, $scope);
+		return static::write(static::$_levelMap['notice'], $message, $scope);
 	}
 
 /**
@@ -522,10 +524,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function debug($message, $scope = array()) {
-		return self::write(self::$_levelMap['debug'], $message, $scope);
+		return static::write(static::$_levelMap['debug'], $message, $scope);
 	}
 
 /**
@@ -534,10 +536,10 @@ class CakeLog {
  * @param string $message log message
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function info($message, $scope = array()) {
-		return self::write(self::$_levelMap['info'], $message, $scope);
+		return static::write(static::$_levelMap['info'], $message, $scope);
 	}
 
 }
diff --git a/web/api/lib/Cake/Log/CakeLogInterface.php b/web/api/lib/Cake/Log/CakeLogInterface.php
index ca7cfa2d0..6fdb3a903 100644
--- a/web/api/lib/Cake/Log/CakeLogInterface.php
+++ b/web/api/lib/Cake/Log/CakeLogInterface.php
@@ -27,8 +27,8 @@ interface CakeLogInterface {
 /**
  * Write method to handle writes being made to the Logger
  *
- * @param string $type
- * @param string $message
+ * @param string $type Message type.
+ * @param string $message Message to write.
  * @return void
  */
 	public function write($type, $message);
diff --git a/web/api/lib/Cake/Log/Engine/ConsoleLog.php b/web/api/lib/Cake/Log/Engine/ConsoleLog.php
index 73389fe7a..3c716946e 100644
--- a/web/api/lib/Cake/Log/Engine/ConsoleLog.php
+++ b/web/api/lib/Cake/Log/Engine/ConsoleLog.php
@@ -48,7 +48,9 @@ class ConsoleLog extends BaseLog {
  */
 	public function __construct($config = array()) {
 		parent::__construct($config);
-		if (DS === '\\' && !(bool)env('ANSICON')) {
+		if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
+			(function_exists('posix_isatty') && !posix_isatty($this->_output))
+		) {
 			$outputAs = ConsoleOutput::PLAIN;
 		} else {
 			$outputAs = ConsoleOutput::COLOR;
@@ -75,7 +77,7 @@ class ConsoleLog extends BaseLog {
  *
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
- * @return boolean success of write.
+ * @return bool success of write.
  */
 	public function write($type, $message) {
 		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
diff --git a/web/api/lib/Cake/Log/Engine/FileLog.php b/web/api/lib/Cake/Log/Engine/FileLog.php
index 4dca59d69..988ed341f 100644
--- a/web/api/lib/Cake/Log/Engine/FileLog.php
+++ b/web/api/lib/Cake/Log/Engine/FileLog.php
@@ -61,7 +61,7 @@ class FileLog extends BaseLog {
 /**
  * Max file size, used for log file rotation.
  *
- * @var integer
+ * @var int
  */
 	protected $_size = null;
 
@@ -83,7 +83,7 @@ class FileLog extends BaseLog {
  * - `mask` A mask is applied when log files are created. Left empty no chmod
  *   is made.
  *
- * @param array $options Options for the FileLog, see above.
+ * @param array $config Options for the FileLog, see above.
  */
 	public function __construct($config = array()) {
 		$config = Hash::merge($this->_defaults, $config);
@@ -128,7 +128,7 @@ class FileLog extends BaseLog {
  *
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
- * @return boolean success of write.
+ * @return bool success of write.
  */
 	public function write($type, $message) {
 		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
@@ -157,6 +157,7 @@ class FileLog extends BaseLog {
 
 /**
  * Get filename
+ *
  * @param string $type The type of log.
  * @return string File name
  */
@@ -165,7 +166,7 @@ class FileLog extends BaseLog {
 
 		if (!empty($this->_file)) {
 			$filename = $this->_file;
-		} elseif ($type == 'error' || $type == 'warning') {
+		} elseif ($type === 'error' || $type === 'warning') {
 			$filename = 'error.log';
 		} elseif (in_array($type, $debugTypes)) {
 			$filename = 'debug.log';
@@ -181,7 +182,7 @@ class FileLog extends BaseLog {
  * Also if `rotate` count is reached oldest file is removed.
  *
  * @param string $filename Log file name
- * @return mixed True if rotated successfully or false in case of error.
+ * @return mixed True if rotated successfully or false in case of error, otherwise null.
  *   Void if file doesn't need to be rotated.
  */
 	protected function _rotateFile($filename) {
@@ -195,7 +196,7 @@ class FileLog extends BaseLog {
 		if (!file_exists($filepath) ||
 			filesize($filepath) < $this->_size
 		) {
-			return;
+			return null;
 		}
 
 		if ($this->_config['rotate'] === 0) {
diff --git a/web/api/lib/Cake/Log/Engine/SyslogLog.php b/web/api/lib/Cake/Log/Engine/SyslogLog.php
index 51cf1ac9f..21b45c6e0 100644
--- a/web/api/lib/Cake/Log/Engine/SyslogLog.php
+++ b/web/api/lib/Cake/Log/Engine/SyslogLog.php
@@ -26,7 +26,6 @@ App::uses('BaseLog', 'Log/Engine');
 class SyslogLog extends BaseLog {
 
 /**
- *
  * By default messages are formatted as:
  * 	type: message
  *
@@ -41,14 +40,14 @@ class SyslogLog extends BaseLog {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *	CakeLog::config('error', array(
  *		'engine' => 'Syslog',
  *		'types' => array('emergency', 'alert', 'critical', 'error'),
  *		'format' => "%s: My-App - %s",
  *		'prefix' => 'Web Server 01'
  *	));
- * }}}
+ * ```
  *
  * @var array
  */
@@ -60,7 +59,6 @@ class SyslogLog extends BaseLog {
 	);
 
 /**
- *
  * Used to map the string names back to their LOG_* constants
  *
  * @var array
@@ -79,7 +77,7 @@ class SyslogLog extends BaseLog {
 /**
  * Whether the logger connection is open or not
  *
- * @var boolean
+ * @var bool
  */
 	protected $_open = false;
 
@@ -87,7 +85,7 @@ class SyslogLog extends BaseLog {
  * Make sure the configuration contains the format parameter, by default it uses
  * the error number and the type as a prefix to the message
  *
- * @param array $config
+ * @param array $config Options list.
  */
 	public function __construct($config = array()) {
 		$config += $this->_defaults;
@@ -102,7 +100,7 @@ class SyslogLog extends BaseLog {
  *
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
- * @return boolean success of write.
+ * @return bool success of write.
  */
 	public function write($type, $message) {
 		if (!$this->_open) {
@@ -130,8 +128,8 @@ class SyslogLog extends BaseLog {
  * will initialize the connection to the system logger
  *
  * @param string $ident the prefix to add to all messages logged
- * @param integer $options the options flags to be used for logged messages
- * @param integer $facility the stream or facility to log to
+ * @param int $options the options flags to be used for logged messages
+ * @param int $facility the stream or facility to log to
  * @return void
  */
 	protected function _open($ident, $options, $facility) {
@@ -142,9 +140,9 @@ class SyslogLog extends BaseLog {
  * Extracts the call to syslog() in order to run unit tests on it. This function
  * will perform the actual write in the system logger
  *
- * @param integer $priority
- * @param string $message
- * @return boolean
+ * @param int $priority Message priority.
+ * @param string $message Message to log.
+ * @return bool
  */
 	protected function _write($priority, $message) {
 		return syslog($priority, $message);
diff --git a/web/api/lib/Cake/Model/AclNode.php b/web/api/lib/Cake/Model/AclNode.php
index a565eb7a1..1080b9a22 100644
--- a/web/api/lib/Cake/Model/AclNode.php
+++ b/web/api/lib/Cake/Model/AclNode.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -28,7 +26,7 @@ class AclNode extends Model {
 /**
  * Explicitly disable in-memory query caching for ACL models
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -41,7 +39,6 @@ class AclNode extends Model {
 
 /**
  * Constructor
- *
  */
 	public function __construct() {
 		$config = Configure::read('Acl.database');
@@ -90,6 +87,8 @@ class AclNode extends Model {
 				'order' => $db->name("{$type}.lft") . ' DESC'
 			);
 
+			$conditionsAfterJoin = array();
+
 			foreach ($path as $i => $alias) {
 				$j = $i - 1;
 
@@ -98,23 +97,25 @@ class AclNode extends Model {
 					'alias' => "{$type}{$i}",
 					'type' => 'INNER',
 					'conditions' => array(
-						$db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft"),
-						$db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght"),
-						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string'),
-						$db->name("{$type}{$j}.id") . ' = ' . $db->name("{$type}{$i}.parent_id")
+						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string')
 					)
 				);
 
+				// it will be better if this conditions will performs after join operation
+				$conditionsAfterJoin[] = $db->name("{$type}{$j}.id") . ' = ' . $db->name("{$type}{$i}.parent_id");
+				$conditionsAfterJoin[] = $db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght");
+				$conditionsAfterJoin[] = $db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft");
+
 				$queryData['conditions'] = array('or' => array(
 					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght"),
 					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}{$i}.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}{$i}.rght"))
 				);
 			}
+			$queryData['conditions'] = array_merge($queryData['conditions'], $conditionsAfterJoin);
 			$result = $db->read($this, $queryData, -1);
 			$path = array_values($path);
 
-			if (
-				!isset($result[0][$type]) ||
+			if (!isset($result[0][$type]) ||
 				(!empty($path) && $result[0][$type]['alias'] != $path[count($path) - 1]) ||
 				(empty($path) && $result[0][$type]['alias'] != $start)
 			) {
diff --git a/web/api/lib/Cake/Model/Aco.php b/web/api/lib/Cake/Model/Aco.php
index ae7278220..112b82c38 100644
--- a/web/api/lib/Cake/Model/Aco.php
+++ b/web/api/lib/Cake/Model/Aco.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Model/AcoAction.php b/web/api/lib/Cake/Model/AcoAction.php
index 8bf585fb6..416659279 100644
--- a/web/api/lib/Cake/Model/AcoAction.php
+++ b/web/api/lib/Cake/Model/AcoAction.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Model/Aro.php b/web/api/lib/Cake/Model/Aro.php
index d5b4b8d34..60a95bf94 100644
--- a/web/api/lib/Cake/Model/Aro.php
+++ b/web/api/lib/Cake/Model/Aro.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Model/Behavior/AclBehavior.php b/web/api/lib/Cake/Model/Behavior/AclBehavior.php
index 3fe802094..2971979c1 100644
--- a/web/api/lib/Cake/Model/Behavior/AclBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/AclBehavior.php
@@ -42,8 +42,8 @@ class AclBehavior extends ModelBehavior {
 /**
  * Sets up the configuration for the model, and loads ACL models if they haven't been already
  *
- * @param Model $model
- * @param array $config
+ * @param Model $model Model using this behavior.
+ * @param array $config Configuration options.
  * @return void
  */
 	public function setup(Model $model, $config = array()) {
@@ -70,7 +70,7 @@ class AclBehavior extends ModelBehavior {
 /**
  * Retrieves the Aro/Aco node for this model
  *
- * @param Model $model
+ * @param Model $model Model using this behavior.
  * @param string|array|Model $ref Array with 'model' and 'foreign_key', model object, or string value
  * @param string $type Only needed when Acl is set up as 'both', specify 'Aro' or 'Aco' to get the correct node
  * @return array
@@ -81,7 +81,7 @@ class AclBehavior extends ModelBehavior {
 			$type = $this->_typeMaps[$this->settings[$model->name]['type']];
 			if (is_array($type)) {
 				trigger_error(__d('cake_dev', 'AclBehavior is setup with more then one type, please specify type parameter for node()'), E_USER_WARNING);
-				return null;
+				return array();
 			}
 		}
 		if (empty($ref)) {
@@ -93,8 +93,8 @@ class AclBehavior extends ModelBehavior {
 /**
  * Creates a new ARO/ACO node bound to this record
  *
- * @param Model $model
- * @param boolean $created True if this is a new record
+ * @param Model $model Model using this behavior.
+ * @param bool $created True if this is a new record
  * @param array $options Options passed from Model::save().
  * @return void
  */
@@ -104,7 +104,7 @@ class AclBehavior extends ModelBehavior {
 			$types = array($types);
 		}
 		foreach ($types as $type) {
-			$parent = $model->parentNode();
+			$parent = $model->parentNode($type);
 			if (!empty($parent)) {
 				$parent = $this->node($model, $parent, $type);
 			}
@@ -125,7 +125,7 @@ class AclBehavior extends ModelBehavior {
 /**
  * Destroys the ARO/ACO node bound to the deleted record
  *
- * @param Model $model
+ * @param Model $model Model using this behavior.
  * @return void
  */
 	public function afterDelete(Model $model) {
diff --git a/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php b/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
index 5f5ccef95..985c4fc6c 100644
--- a/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -75,7 +75,7 @@ class ContainableBehavior extends ModelBehavior {
  *
  * `Model->find('all', array('contain' => array('Model1', 'Model2')));`
  *
- * {{{
+ * ```
  * Model->find('all', array('contain' => array(
  * 	'Model1' => array('Model11', 'Model12'),
  * 	'Model2',
@@ -84,7 +84,7 @@ class ContainableBehavior extends ModelBehavior {
  * 		'Model32',
  * 		'Model33' => array('Model331', 'Model332')
  * )));
- * }}}
+ * ```
  *
  * @param Model $Model Model using the behavior
  * @param array $query Query parameters as set by cake
@@ -188,7 +188,7 @@ class ContainableBehavior extends ModelBehavior {
 		foreach (array('hasOne', 'belongsTo') as $type) {
 			if (!empty($Model->{$type})) {
 				foreach ($Model->{$type} as $assoc => $data) {
-					if ($Model->useDbConfig == $Model->{$assoc}->useDbConfig && !empty($data['fields'])) {
+					if ($Model->useDbConfig === $Model->{$assoc}->useDbConfig && !empty($data['fields'])) {
 						foreach ((array)$data['fields'] as $field) {
 							$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
 						}
@@ -203,7 +203,7 @@ class ContainableBehavior extends ModelBehavior {
 					$field = $Model->primaryKey;
 				} elseif (preg_match('/^.+\.\-\-[^-]+\-\-$/', $field)) {
 					list($modelName, $field) = explode('.', $field);
-					if ($Model->useDbConfig == $Model->{$modelName}->useDbConfig) {
+					if ($Model->useDbConfig === $Model->{$modelName}->useDbConfig) {
 						$field = $modelName . '.' . (
 							($field === '--primaryKey--') ? $Model->$modelName->primaryKey : $field
 						);
@@ -263,7 +263,7 @@ class ContainableBehavior extends ModelBehavior {
  * @param Model $Model Model on which binding restriction is being applied
  * @param array $contain Parameters to use for restricting this model
  * @param array $containments Current set of containments
- * @param boolean $throwErrors Whether non-existent bindings show throw errors
+ * @param bool $throwErrors Whether non-existent bindings show throw errors
  * @return array Containments
  */
 	public function containments(Model $Model, $contain, $containments = array(), $throwErrors = null) {
@@ -365,7 +365,7 @@ class ContainableBehavior extends ModelBehavior {
  *
  * @param Model $Model Model
  * @param array $map Map of relations for given model
- * @param array|boolean $fields If array, fields to initially load, if false use $Model as primary model
+ * @param array|bool $fields If array, fields to initially load, if false use $Model as primary model
  * @return array Fields
  */
 	public function fieldDependencies(Model $Model, $map, $fields = array()) {
diff --git a/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php b/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
index 4ebdfdb55..3ba00ff75 100644
--- a/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
@@ -121,7 +121,7 @@ class TranslateBehavior extends ModelBehavior {
 		$this->_joinTable = $joinTable;
 		$this->_runtimeModel = $RuntimeModel;
 
-		if (is_string($query['fields']) && "COUNT(*) AS {$db->name('count')}" == $query['fields']) {
+		if (is_string($query['fields']) && $query['fields'] === "COUNT(*) AS {$db->name('count')}") {
 			$query['fields'] = "COUNT(DISTINCT({$db->name($Model->escapeField())})) {$db->alias}count";
 			$query['joins'][] = array(
 				'type' => 'INNER',
@@ -140,7 +140,7 @@ class TranslateBehavior extends ModelBehavior {
 			unset($this->_joinTable, $this->_runtimeModel);
 			return $query;
 		} elseif (is_string($query['fields'])) {
-			$query['fields'] = String::tokenize($query['fields']);
+			$query['fields'] = CakeText::tokenize($query['fields']);
 		}
 
 		$fields = array_merge(
@@ -157,8 +157,7 @@ class TranslateBehavior extends ModelBehavior {
 			);
 			foreach ($fields as $key => $value) {
 				$field = (is_numeric($key)) ? $value : $key;
-				if (
-					$isAllFields ||
+				if ($isAllFields ||
 					in_array($Model->alias . '.' . $field, $query['fields']) ||
 					in_array($field, $query['fields'])
 				) {
@@ -274,7 +273,7 @@ class TranslateBehavior extends ModelBehavior {
  *
  * @param Model $Model Model find was run on
  * @param array $results Array of model results.
- * @param boolean $primary Did the find originate on $model.
+ * @param bool $primary Did the find originate on $model.
  * @return array Modified results
  */
 	public function afterFind(Model $Model, $results, $primary = false) {
@@ -329,7 +328,7 @@ class TranslateBehavior extends ModelBehavior {
  *
  * @param Model $Model Model invalidFields was called on.
  * @param array $options Options passed from Model::save().
- * @return boolean
+ * @return bool
  * @see Model::save()
  */
 	public function beforeValidate(Model $Model, $options = array()) {
@@ -346,7 +345,7 @@ class TranslateBehavior extends ModelBehavior {
  *
  * @param Model $Model Model save was called on.
  * @param array $options Options passed from Model::save().
- * @return boolean true.
+ * @return bool true.
  * @see Model::save()
  */
 	public function beforeSave(Model $Model, $options = array()) {
@@ -367,7 +366,7 @@ class TranslateBehavior extends ModelBehavior {
  * and to allow translations to be persisted even when validation
  * is disabled.
  *
- * @param Model $Model
+ * @param Model $Model Model using this behavior.
  * @return void
  */
 	protected function _setRuntimeData(Model $Model) {
@@ -400,7 +399,7 @@ class TranslateBehavior extends ModelBehavior {
  * Restores model data to the original data.
  * This solves issues with saveAssociated and validate = first.
  *
- * @param Model $model
+ * @param Model $Model Model using this behavior.
  * @return void
  */
 	public function afterValidate(Model $Model) {
@@ -415,7 +414,7 @@ class TranslateBehavior extends ModelBehavior {
  * afterSave Callback
  *
  * @param Model $Model Model the callback is called on
- * @param boolean $created Whether or not the save created a record.
+ * @param bool $created Whether or not the save created a record.
  * @param array $options Options passed from Model::save().
  * @return void
  */
@@ -437,6 +436,10 @@ class TranslateBehavior extends ModelBehavior {
 			$tempData = $this->_prepareTranslations($Model, $tempData);
 		}
 		$locale = $this->_getLocale($Model);
+		$atomic = array();
+		if (isset($options['atomic'])) {
+			$atomic = array('atomic' => $options['atomic']);
+		}
 
 		foreach ($tempData as $field => $value) {
 			unset($conditions['content']);
@@ -466,10 +469,11 @@ class TranslateBehavior extends ModelBehavior {
 					$RuntimeModel->save(array(
 						$RuntimeModel->alias => array_merge(
 							$conditions, array('id' => $translations[$_locale])
-						)
+						),
+						$atomic
 					));
 				} else {
-					$RuntimeModel->save(array($RuntimeModel->alias => $conditions));
+					$RuntimeModel->save(array($RuntimeModel->alias => $conditions), $atomic);
 				}
 			}
 		}
@@ -479,7 +483,7 @@ class TranslateBehavior extends ModelBehavior {
  * Prepares the data to be saved for translated records.
  * Add blank fields, and populates data for multi-locale saves.
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param array $data The sparse data that was provided.
  * @return array The fully populated data to save.
  */
@@ -569,11 +573,11 @@ class TranslateBehavior extends ModelBehavior {
  * *Note* You should avoid binding translations that overlap existing model properties.
  * This can cause un-expected and un-desirable behavior.
  *
- * @param Model $Model instance of model
+ * @param Model $Model using this behavior of model
  * @param string|array $fields string with field or array(field1, field2=>AssocName, field3)
- * @param boolean $reset Leave true to have the fields only modified for the next operation.
+ * @param bool $reset Leave true to have the fields only modified for the next operation.
  *   if false the field will be added for all future queries.
- * @return boolean
+ * @return bool
  * @throws CakeException when attempting to bind a translating called name. This is not allowed
  *   as it shadows Model::$name.
  */
@@ -585,7 +589,8 @@ class TranslateBehavior extends ModelBehavior {
 		$RuntimeModel = $this->translateModel($Model);
 		$default = array(
 			'className' => $RuntimeModel->alias,
-			'foreignKey' => 'foreign_key'
+			'foreignKey' => 'foreign_key',
+			'order' => 'id'
 		);
 
 		foreach ($fields as $key => $value) {
@@ -642,7 +647,7 @@ class TranslateBehavior extends ModelBehavior {
 /**
  * Update runtime setting for a given field.
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param string $field The field to update.
  * @return void
  */
@@ -664,10 +669,10 @@ class TranslateBehavior extends ModelBehavior {
  * Unbind translation for fields, optionally unbinds hasMany association for
  * fake field
  *
- * @param Model $Model instance of model
+ * @param Model $Model using this behavior of model
  * @param string|array $fields string with field, or array(field1, field2=>AssocName, field3), or null for
  *    unbind all original translations
- * @return boolean
+ * @return bool
  */
 	public function unbindTranslation(Model $Model, $fields = null) {
 		if (empty($fields) && empty($this->settings[$Model->alias])) {
diff --git a/web/api/lib/Cake/Model/Behavior/TreeBehavior.php b/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
index 6068f4283..a19d4a8fe 100644
--- a/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -44,7 +44,7 @@ class TreeBehavior extends ModelBehavior {
  * @var array
  */
 	protected $_defaults = array(
-		'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght',
+		'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght', 'level' => null,
 		'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, 'recursive' => -1
 	);
 
@@ -58,7 +58,7 @@ class TreeBehavior extends ModelBehavior {
 /**
  * Initiate Tree behavior
  *
- * @param Model $Model instance of model
+ * @param Model $Model using this behavior of model
  * @param array $config array of configuration settings.
  * @return void
  */
@@ -84,10 +84,10 @@ class TreeBehavior extends ModelBehavior {
  * Overridden to transparently manage setting the lft and rght fields if and only if the parent field is included in the
  * parameters to be saved.
  *
- * @param Model $Model Model instance.
- * @param boolean $created indicates whether the node just saved was created or updated
+ * @param Model $Model Model using this behavior.
+ * @param bool $created indicates whether the node just saved was created or updated
  * @param array $options Options passed from Model::save().
- * @return boolean true on success, false on failure
+ * @return bool true on success, false on failure
  */
 	public function afterSave(Model $Model, $created, $options = array()) {
 		extract($this->settings[$Model->alias]);
@@ -97,10 +97,47 @@ class TreeBehavior extends ModelBehavior {
 			}
 		} elseif ($this->settings[$Model->alias]['__parentChange']) {
 			$this->settings[$Model->alias]['__parentChange'] = false;
+			if ($level) {
+				$this->_setChildrenLevel($Model, $Model->id);
+			}
 			return $this->_setParent($Model, $Model->data[$Model->alias][$parent]);
 		}
 	}
 
+/**
+ * Set level for descendents.
+ *
+ * @param Model $Model Model using this behavior.
+ * @param int|string $id Record ID
+ * @return void
+ */
+	protected function _setChildrenLevel(Model $Model, $id) {
+		$settings = $Model->Behaviors->Tree->settings[$Model->alias];
+		$primaryKey = $Model->primaryKey;
+		$depths = array($id => (int)$Model->data[$Model->alias][$settings['level']]);
+
+		$children = $Model->children(
+			$id,
+			false,
+			array($primaryKey, $settings['parent'], $settings['level']),
+			$settings['left'],
+			null,
+			1,
+			-1
+		);
+
+		foreach ($children as $node) {
+			$parentIdValue = $node[$Model->alias][$settings['parent']];
+			$depth = (int)$depths[$parentIdValue] + 1;
+			$depths[$node[$Model->alias][$primaryKey]] = $depth;
+
+			$Model->updateAll(
+				array($Model->escapeField($settings['level']) => $depth),
+				array($Model->escapeField($primaryKey) => $node[$Model->alias][$primaryKey])
+			);
+		}
+	}
+
 /**
  * Runs before a find() operation
  *
@@ -120,15 +157,16 @@ class TreeBehavior extends ModelBehavior {
  *
  * This is used to delete child nodes in the afterDelete.
  *
- * @param Model $Model Model instance
- * @param boolean $cascade
- * @return boolean
+ * @param Model $Model Model using this behavior.
+ * @param bool $cascade If true records that depend on this record will also be deleted
+ * @return bool
  */
 	public function beforeDelete(Model $Model, $cascade = true) {
 		extract($this->settings[$Model->alias]);
 		$data = $Model->find('first', array(
 			'conditions' => array($Model->escapeField($Model->primaryKey) => $Model->id),
 			'fields' => array($Model->escapeField($left), $Model->escapeField($right)),
+			'order' => false,
 			'recursive' => -1));
 		if ($data) {
 			$this->_deletedRow[$Model->alias] = current($data);
@@ -141,8 +179,8 @@ class TreeBehavior extends ModelBehavior {
  *
  * Will delete the current node and all children using the deleteAll method and sync the table
  *
- * @param Model $Model Model instance
- * @return boolean true to continue, false to abort the delete
+ * @param Model $Model Model using this behavior
+ * @return bool true to continue, false to abort the delete
  */
 	public function afterDelete(Model $Model) {
 		extract($this->settings[$Model->alias]);
@@ -172,80 +210,115 @@ class TreeBehavior extends ModelBehavior {
  * parameters to be saved. For newly created nodes with NO parent the left and right field values are set directly by
  * this method bypassing the setParent logic.
  *
- * @since         1.2
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param array $options Options passed from Model::save().
- * @return boolean true to continue, false to abort the save
+ * @return bool true to continue, false to abort the save
  * @see Model::save()
  */
 	public function beforeSave(Model $Model, $options = array()) {
 		extract($this->settings[$Model->alias]);
 
 		$this->_addToWhitelist($Model, array($left, $right));
+		if ($level) {
+			$this->_addToWhitelist($Model, $level);
+		}
+		$parentIsSet = array_key_exists($parent, $Model->data[$Model->alias]);
+
 		if (!$Model->id || !$Model->exists()) {
-			if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) {
-				$parentNode = $Model->find('first', array(
-					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
-					'fields' => array($Model->primaryKey, $right), 'recursive' => $recursive
-				));
+			if ($parentIsSet && $Model->data[$Model->alias][$parent]) {
+				$parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]);
 				if (!$parentNode) {
 					return false;
 				}
-				list($parentNode) = array_values($parentNode);
+
 				$Model->data[$Model->alias][$left] = 0;
 				$Model->data[$Model->alias][$right] = 0;
-			} else {
-				$edge = $this->_getMax($Model, $scope, $right, $recursive);
-				$Model->data[$Model->alias][$left] = $edge + 1;
-				$Model->data[$Model->alias][$right] = $edge + 2;
+				if ($level) {
+					$Model->data[$Model->alias][$level] = (int)$parentNode[$Model->alias][$level] + 1;
+				}
+				return true;
 			}
-		} elseif (array_key_exists($parent, $Model->data[$Model->alias])) {
+
+			$edge = $this->_getMax($Model, $scope, $right, $recursive);
+			$Model->data[$Model->alias][$left] = $edge + 1;
+			$Model->data[$Model->alias][$right] = $edge + 2;
+			if ($level) {
+				$Model->data[$Model->alias][$level] = 0;
+			}
+			return true;
+		}
+
+		if ($parentIsSet) {
 			if ($Model->data[$Model->alias][$parent] != $Model->field($parent)) {
 				$this->settings[$Model->alias]['__parentChange'] = true;
 			}
 			if (!$Model->data[$Model->alias][$parent]) {
 				$Model->data[$Model->alias][$parent] = null;
 				$this->_addToWhitelist($Model, $parent);
-			} else {
-				$values = $Model->find('first', array(
-					'conditions' => array($scope, $Model->escapeField() => $Model->id),
-					'fields' => array($Model->primaryKey, $parent, $left, $right), 'recursive' => $recursive)
-				);
-
-				if (empty($values)) {
-					return false;
+				if ($level) {
+					$Model->data[$Model->alias][$level] = 0;
 				}
-				list($node) = array_values($values);
+				return true;
+			}
 
-				$parentNode = $Model->find('first', array(
-					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
-					'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
-				));
-				if (!$parentNode) {
-					return false;
-				}
-				list($parentNode) = array_values($parentNode);
+			$values = $this->_getNode($Model, $Model->id);
+			if (empty($values)) {
+				return false;
+			}
+			list($node) = array_values($values);
 
-				if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
-					return false;
-				} elseif ($node[$Model->primaryKey] == $parentNode[$Model->primaryKey]) {
-					return false;
-				}
+			$parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]);
+			if (!$parentNode) {
+				return false;
+			}
+			list($parentNode) = array_values($parentNode);
+
+			if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
+				return false;
+			}
+			if ($node[$Model->primaryKey] === $parentNode[$Model->primaryKey]) {
+				return false;
+			}
+			if ($level) {
+				$Model->data[$Model->alias][$level] = (int)$parentNode[$level] + 1;
 			}
 		}
+
 		return true;
 	}
 
+/**
+ * Returns a single node from the tree from its primary key
+ *
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to read
+ * @return array|bool The record read or false
+ */
+	protected function _getNode(Model $Model, $id) {
+		$settings = $this->settings[$Model->alias];
+		$fields = array($Model->primaryKey, $settings['parent'], $settings['left'], $settings['right']);
+		if ($settings['level']) {
+			$fields[] = $settings['level'];
+		}
+
+		return $Model->find('first', array(
+			'conditions' => array($Model->escapeField() => $id),
+			'fields' => $fields,
+			'recursive' => $settings['recursive'],
+			'order' => false,
+		));
+	}
+
 /**
  * Get the number of child nodes
  *
  * If the direct parameter is set to true, only the direct children are counted (based upon the parent_id field)
  * If false is passed for the id parameter, all top level nodes are counted, or all nodes are counted.
  *
- * @param Model $Model Model instance
- * @param integer|string|boolean $id The ID of the record to read or false to read all top level nodes
- * @param boolean $direct whether to count direct, or all, children
- * @return integer number of child nodes
+ * @param Model $Model Model using this behavior
+ * @param int|string|bool $id The ID of the record to read or false to read all top level nodes
+ * @param bool $direct whether to count direct, or all, children
+ * @return int number of child nodes
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::childCount
  */
 	public function childCount(Model $Model, $id = null, $direct = false) {
@@ -268,7 +341,7 @@ class TreeBehavior extends ModelBehavior {
 		} elseif ($Model->id === $id && isset($Model->data[$Model->alias][$left]) && isset($Model->data[$Model->alias][$right])) {
 			$data = $Model->data[$Model->alias];
 		} else {
-			$data = $Model->find('first', array('conditions' => array($scope, $Model->escapeField() => $id), 'recursive' => $recursive));
+			$data = $this->_getNode($Model, $id);
 			if (!$data) {
 				return 0;
 			}
@@ -283,19 +356,21 @@ class TreeBehavior extends ModelBehavior {
  * If the direct parameter is set to true, only the direct children are returned (based upon the parent_id field)
  * If false is passed for the id parameter, top level, or all (depending on direct parameter appropriate) are counted.
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to read
- * @param boolean $direct whether to return only the direct, or all, children
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to read
+ * @param bool $direct whether to return only the direct, or all, children
  * @param string|array $fields Either a single string of a field name, or an array of field names
  * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC") defaults to the tree order
- * @param integer $limit SQL LIMIT clause, for calculating items per page.
- * @param integer $page Page number, for accessing paged data
- * @param integer $recursive The number of levels deep to fetch associated records
+ * @param int $limit SQL LIMIT clause, for calculating items per page.
+ * @param int $page Page number, for accessing paged data
+ * @param int $recursive The number of levels deep to fetch associated records
  * @return array Array of child nodes
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::children
  */
 	public function children(Model $Model, $id = null, $direct = false, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
+		$options = array();
 		if (is_array($id)) {
+			$options = $this->_getOptions($id);
 			extract(array_merge(array('id' => null), $id));
 		}
 		$overrideRecursive = $recursive;
@@ -325,7 +400,8 @@ class TreeBehavior extends ModelBehavior {
 			$result = array_values((array)$Model->find('first', array(
 				'conditions' => array($scope, $Model->escapeField() => $id),
 				'fields' => array($left, $right),
-				'recursive' => $recursive
+				'recursive' => $recursive,
+				'order' => false,
 			)));
 
 			if (empty($result) || !isset($result[0])) {
@@ -336,18 +412,21 @@ class TreeBehavior extends ModelBehavior {
 				$Model->escapeField($left) . ' >' => $result[0][$left]
 			);
 		}
-		return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+		$options = array_merge(compact(
+			'conditions', 'fields', 'order', 'limit', 'page', 'recursive'
+		), $options);
+		return $Model->find('all', $options);
 	}
 
 /**
  * A convenience method for returning a hierarchical array used for HTML select boxes
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param string|array $conditions SQL conditions as a string or as an array('field' =>'value',...)
  * @param string $keyPath A string path to the key, i.e. "{n}.Post.id"
  * @param string $valuePath A string path to the value, i.e. "{n}.Post.title"
  * @param string $spacer The character or characters which will be repeated
- * @param integer $recursive The number of levels deep to fetch associated records
+ * @param int $recursive The number of levels deep to fetch associated records
  * @return array An associative array of records, where the id is the key, and the display field is the value
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::generateTreeList
  */
@@ -363,27 +442,61 @@ class TreeBehavior extends ModelBehavior {
 			$fields = array($Model->primaryKey, $Model->displayField, $left, $right);
 		}
 
-		if (!$keyPath) {
-			$keyPath = '{n}.' . $Model->alias . '.' . $Model->primaryKey;
-		}
-
-		if (!$valuePath) {
-			$valuePath = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
-
-		} elseif (is_string($valuePath)) {
-			$valuePath = array('%s%s', '{n}.tree_prefix', $valuePath);
-
-		} else {
-			array_unshift($valuePath, '%s' . $valuePath[0], '{n}.tree_prefix');
-		}
-
 		$conditions = (array)$conditions;
 		if ($scope) {
 			$conditions[] = $scope;
 		}
 
-		$order = $Model->escapeField($left) . " asc";
+		$order = $Model->escapeField($left) . ' asc';
 		$results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
+
+		return $this->formatTreeList($Model, $results, compact('keyPath', 'valuePath', 'spacer'));
+	}
+
+/**
+ * Formats result of a find() call to a hierarchical array used for HTML select boxes.
+ *
+ * Note that when using your own find() call this expects the order to be "left" field asc in order
+ * to generate the same result as using generateTreeList() directly.
+ *
+ * Options:
+ *
+ * - 'keyPath': A string path to the key, i.e. "{n}.Post.id"
+ * - 'valuePath': A string path to the value, i.e. "{n}.Post.title"
+ * - 'spacer': The character or characters which will be repeated
+ *
+ * @param Model $Model Model using this behavior
+ * @param array $results Result array of a find() call
+ * @param array $options Options
+ * @return array An associative array of records, where the id is the key, and the display field is the value
+ */
+	public function formatTreeList(Model $Model, array $results, array $options = array()) {
+		if (empty($results)) {
+			return array();
+		}
+		$defaults = array(
+			'keyPath' => null,
+			'valuePath' => null,
+			'spacer' => '_'
+		);
+		$options += $defaults;
+
+		extract($this->settings[$Model->alias]);
+
+		if (!$options['keyPath']) {
+			$options['keyPath'] = '{n}.' . $Model->alias . '.' . $Model->primaryKey;
+		}
+
+		if (!$options['valuePath']) {
+			$options['valuePath'] = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
+
+		} elseif (is_string($options['valuePath'])) {
+			$options['valuePath'] = array('%s%s', '{n}.tree_prefix', $options['valuePath']);
+
+		} else {
+			array_unshift($options['valuePath'], '%s' . $options['valuePath'][0], '{n}.tree_prefix');
+		}
+
 		$stack = array();
 
 		foreach ($results as $i => $result) {
@@ -392,13 +505,11 @@ class TreeBehavior extends ModelBehavior {
 				array_pop($stack);
 				$count--;
 			}
-			$results[$i]['tree_prefix'] = str_repeat($spacer, $count);
+			$results[$i]['tree_prefix'] = str_repeat($options['spacer'], $count);
 			$stack[] = $result[$Model->alias][$right];
 		}
-		if (empty($results)) {
-			return array();
-		}
-		return Hash::combine($results, $keyPath, $valuePath);
+
+		return Hash::combine($results, $options['keyPath'], $options['valuePath']);
 	}
 
 /**
@@ -406,15 +517,17 @@ class TreeBehavior extends ModelBehavior {
  *
  * reads the parent id and returns this node
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to read
- * @param string|array $fields
- * @param integer $recursive The number of levels deep to fetch associated records
- * @return array|boolean Array of data for the parent node
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to read
+ * @param string|array $fields Fields to get
+ * @param int $recursive The number of levels deep to fetch associated records
+ * @return array|bool Array of data for the parent node
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::getParentNode
  */
 	public function getParentNode(Model $Model, $id = null, $fields = null, $recursive = null) {
+		$options = array();
 		if (is_array($id)) {
+			$options = $this->_getOptions($id);
 			extract(array_merge(array('id' => null), $id));
 		}
 		$overrideRecursive = $recursive;
@@ -425,31 +538,67 @@ class TreeBehavior extends ModelBehavior {
 		if ($overrideRecursive !== null) {
 			$recursive = $overrideRecursive;
 		}
-		$parentId = $Model->find('first', array('conditions' => array($Model->primaryKey => $id), 'fields' => array($parent), 'recursive' => -1));
+		$parentId = $Model->find('first', array(
+			'conditions' => array($Model->primaryKey => $id),
+			'fields' => array($parent),
+			'order' => false,
+			'recursive' => -1
+		));
 
 		if ($parentId) {
 			$parentId = $parentId[$Model->alias][$parent];
-			$parent = $Model->find('first', array('conditions' => array($Model->escapeField() => $parentId), 'fields' => $fields, 'recursive' => $recursive));
+			$options = array_merge(array(
+				'conditions' => array($Model->escapeField() => $parentId),
+				'fields' => $fields,
+				'order' => false,
+				'recursive' => $recursive
+			), $options);
+			$parent = $Model->find('first', $options);
 
 			return $parent;
 		}
 		return false;
 	}
 
+/**
+ * Convenience method to create default find() options from $arg when it is an
+ * associative array.
+ *
+ * @param array $arg Array
+ * @return array Options array
+ */
+	protected function _getOptions($arg) {
+		return count(array_filter(array_keys($arg), 'is_string') > 0) ?
+			$arg :
+			array();
+	}
+
 /**
  * Get the path to the given node
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to read
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to read
  * @param string|array $fields Either a single string of a field name, or an array of field names
- * @param integer $recursive The number of levels deep to fetch associated records
+ * @param int $recursive The number of levels deep to fetch associated records
  * @return array Array of nodes from top most parent to current node
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::getPath
  */
 	public function getPath(Model $Model, $id = null, $fields = null, $recursive = null) {
+		$options = array();
 		if (is_array($id)) {
+			$options = $this->_getOptions($id);
 			extract(array_merge(array('id' => null), $id));
 		}
+
+		if (!empty($options)) {
+			$fields = null;
+			if (!empty($options['fields'])) {
+				$fields = $options['fields'];
+			}
+			if (!empty($options['recursive'])) {
+				$recursive = $options['recursive'];
+			}
+		}
 		$overrideRecursive = $recursive;
 		if (empty($id)) {
 			$id = $Model->id;
@@ -458,17 +607,29 @@ class TreeBehavior extends ModelBehavior {
 		if ($overrideRecursive !== null) {
 			$recursive = $overrideRecursive;
 		}
-		$result = $Model->find('first', array('conditions' => array($Model->escapeField() => $id), 'fields' => array($left, $right), 'recursive' => $recursive));
+		$result = $Model->find('first', array(
+			'conditions' => array($Model->escapeField() => $id),
+			'fields' => array($left, $right),
+			'order' => false,
+			'recursive' => $recursive
+		));
 		if ($result) {
 			$result = array_values($result);
 		} else {
-			return null;
+			return array();
 		}
 		$item = $result[0];
-		$results = $Model->find('all', array(
-			'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
-			'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'), 'recursive' => $recursive
-		));
+		$options = array_merge(array(
+			'conditions' => array(
+				$scope,
+				$Model->escapeField($left) . ' <=' => $item[$left],
+				$Model->escapeField($right) . ' >=' => $item[$right],
+			),
+			'fields' => $fields,
+			'order' => array($Model->escapeField($left) => 'asc'),
+			'recursive' => $recursive
+		), $options);
+		$results = $Model->find('all', $options);
 		return $results;
 	}
 
@@ -477,10 +638,10 @@ class TreeBehavior extends ModelBehavior {
  *
  * If the node is the last child, or is a top level node with no subsequent node this method will return false
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to move
- * @param integer|boolean $number how many places to move the node or true to move to last position
- * @return boolean true on success, false on failure
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to move
+ * @param int|bool $number how many places to move the node or true to move to last position
+ * @return bool true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::moveDown
  */
 	public function moveDown(Model $Model, $id = null, $number = 1) {
@@ -494,22 +655,18 @@ class TreeBehavior extends ModelBehavior {
 			$id = $Model->id;
 		}
 		extract($this->settings[$Model->alias]);
-		list($node) = array_values($Model->find('first', array(
-			'conditions' => array($scope, $Model->escapeField() => $id),
-			'fields' => array($Model->primaryKey, $left, $right, $parent), 'recursive' => $recursive
-		)));
+		list($node) = array_values($this->_getNode($Model, $id));
 		if ($node[$parent]) {
-			list($parentNode) = array_values($Model->find('first', array(
-				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
-				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
-			)));
+			list($parentNode) = array_values($this->_getNode($Model, $node[$parent]));
 			if (($node[$right] + 1) == $parentNode[$right]) {
 				return false;
 			}
 		}
 		$nextNode = $Model->find('first', array(
 			'conditions' => array($scope, $Model->escapeField($left) => ($node[$right] + 1)),
-			'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive)
+			'fields' => array($Model->primaryKey, $left, $right),
+			'order' => false,
+			'recursive' => $recursive)
 		);
 		if ($nextNode) {
 			list($nextNode) = array_values($nextNode);
@@ -535,10 +692,10 @@ class TreeBehavior extends ModelBehavior {
  *
  * If the node is the first child, or is a top level node with no previous node this method will return false
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to move
- * @param integer|boolean $number how many places to move the node, or true to move to first position
- * @return boolean true on success, false on failure
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to move
+ * @param int|bool $number how many places to move the node, or true to move to first position
+ * @return bool true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::moveUp
  */
 	public function moveUp(Model $Model, $id = null, $number = 1) {
@@ -552,15 +709,9 @@ class TreeBehavior extends ModelBehavior {
 			$id = $Model->id;
 		}
 		extract($this->settings[$Model->alias]);
-		list($node) = array_values($Model->find('first', array(
-			'conditions' => array($scope, $Model->escapeField() => $id),
-			'fields' => array($Model->primaryKey, $left, $right, $parent), 'recursive' => $recursive
-		)));
+		list($node) = array_values($this->_getNode($Model, $id));
 		if ($node[$parent]) {
-			list($parentNode) = array_values($Model->find('first', array(
-				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
-				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
-			)));
+			list($parentNode) = array_values($this->_getNode($Model, $node[$parent]));
 			if (($node[$left] - 1) == $parentNode[$left]) {
 				return false;
 			}
@@ -568,6 +719,7 @@ class TreeBehavior extends ModelBehavior {
 		$previousNode = $Model->find('first', array(
 			'conditions' => array($scope, $Model->escapeField($right) => ($node[$left] - 1)),
 			'fields' => array($Model->primaryKey, $left, $right),
+			'order' => false,
 			'recursive' => $recursive
 		));
 
@@ -597,11 +749,11 @@ class TreeBehavior extends ModelBehavior {
  * 'parent' the values of the parent_id field will be used to populate the left and right fields. The missingParentAction
  * parameter only applies to "parent" mode and determines what to do if the parent field contains an id that is not present.
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param string $mode parent or tree
- * @param string|integer $missingParentAction 'return' to do nothing and return, 'delete' to
+ * @param string|int $missingParentAction 'return' to do nothing and return, 'delete' to
  * delete, or the id of the parent to set as the parent_id
- * @return boolean true on success, false on failure
+ * @return bool true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::recover
  */
 	public function recover(Model $Model, $mode = 'parent', $missingParentAction = null) {
@@ -620,7 +772,8 @@ class TreeBehavior extends ModelBehavior {
 				'recursive' => 0,
 				'conditions' => array($scope, array(
 					'NOT' => array($Model->escapeField($parent) => null), $Model->VerifyParent->escapeField() => null
-				))
+				)),
+				'order' => false,
 			));
 			$Model->unbindModel(array('belongsTo' => array('VerifyParent')));
 			if ($missingParents) {
@@ -656,10 +809,10 @@ class TreeBehavior extends ModelBehavior {
  *
  * Recursive helper function used by recover
  *
- * @param Model $Model
- * @param integer $counter
- * @param mixed $parentId
- * @return integer $counter
+ * @param Model $Model Model instance.
+ * @param int $counter Counter
+ * @param mixed $parentId Parent record Id
+ * @return int counter
  */
 	protected function _recoverByParentId(Model $Model, $counter = 1, $parentId = null) {
 		$params = array(
@@ -737,9 +890,9 @@ class TreeBehavior extends ModelBehavior {
  * - 'order' Direction to order either DESC or ASC (defaults to ASC)
  * - 'verify' Whether or not to verify the tree before reorder. defaults to true.
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @param array $options array of options to use in reordering.
- * @return boolean true on success, false on failure
+ * @return bool true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::reorder
  */
 	public function reorder(Model $Model, $options = array()) {
@@ -775,10 +928,10 @@ class TreeBehavior extends ModelBehavior {
  * If the parameter delete is false, the node will become a new top level node. Otherwise the node will be deleted
  * after the children are reparented.
  *
- * @param Model $Model Model instance
- * @param integer|string $id The ID of the record to remove
- * @param boolean $delete whether to delete the node after reparenting children (if any)
- * @return boolean true on success, false on failure
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The ID of the record to remove
+ * @param bool $delete whether to delete the node after reparenting children (if any)
+ * @return bool true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::removeFromTree
  */
 	public function removeFromTree(Model $Model, $id = null, $delete = false) {
@@ -787,11 +940,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		extract($this->settings[$Model->alias]);
 
-		list($node) = array_values($Model->find('first', array(
-			'conditions' => array($scope, $Model->escapeField() => $id),
-			'fields' => array($Model->primaryKey, $left, $right, $parent),
-			'recursive' => $recursive
-		)));
+		list($node) = array_values($this->_getNode($Model, $id));
 
 		if ($node[$right] == $node[$left] + 1) {
 			if ($delete) {
@@ -800,11 +949,7 @@ class TreeBehavior extends ModelBehavior {
 			$Model->id = $id;
 			return $Model->saveField($parent, null);
 		} elseif ($node[$parent]) {
-			list($parentNode) = array_values($Model->find('first', array(
-				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
-				'fields' => array($Model->primaryKey, $left, $right),
-				'recursive' => $recursive
-			)));
+			list($parentNode) = array_values($this->_getNode($Model, $node[$parent]));
 		} else {
 			$parentNode[$right] = $node[$right] + 1;
 		}
@@ -845,7 +990,7 @@ class TreeBehavior extends ModelBehavior {
  *
  * Returns true if the tree is valid otherwise an array of (type, incorrect left/right index, message)
  *
- * @param Model $Model Model instance
+ * @param Model $Model Model using this behavior
  * @return mixed true if the tree is valid or empty, otherwise an array of (error type [index, node],
  *  [incorrect left/right index,node id], message)
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::verify
@@ -871,7 +1016,11 @@ class TreeBehavior extends ModelBehavior {
 				}
 			}
 		}
-		$node = $Model->find('first', array('conditions' => array($scope, $Model->escapeField($right) . '< ' . $Model->escapeField($left)), 'recursive' => 0));
+		$node = $Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField($right) . '< ' . $Model->escapeField($left)),
+			'order' => false,
+			'recursive' => 0
+		));
 		if ($node) {
 			$errors[] = array('node', $node[$Model->alias][$Model->primaryKey], 'left greater than right.');
 		}
@@ -882,7 +1031,8 @@ class TreeBehavior extends ModelBehavior {
 			'fields' => array($Model->primaryKey, $left, $right, $parent)
 		))));
 
-		foreach ($Model->find('all', array('conditions' => $scope, 'recursive' => 0)) as $instance) {
+		$rows = $Model->find('all', array('conditions' => $scope, 'recursive' => 0));
+		foreach ($rows as $instance) {
 			if ($instance[$Model->alias][$left] === null || $instance[$Model->alias][$right] === null) {
 				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
 					'has invalid left or right values');
@@ -910,6 +1060,41 @@ class TreeBehavior extends ModelBehavior {
 		return true;
 	}
 
+/**
+ * Returns the depth level of a node in the tree.
+ *
+ * @param Model $Model Model using this behavior
+ * @param int|string $id The primary key for record to get the level of.
+ * @return int|bool Integer of the level or false if the node does not exist.
+ */
+	public function getLevel(Model $Model, $id = null) {
+		if ($id === null) {
+			$id = $Model->id;
+		}
+
+		$node = $Model->find('first', array(
+			'conditions' => array($Model->escapeField() => $id),
+			'order' => false,
+			'recursive' => -1
+		));
+
+		if (empty($node)) {
+			return false;
+		}
+
+		extract($this->settings[$Model->alias]);
+
+		return $Model->find('count', array(
+			'conditions' => array(
+				$scope,
+				$left . ' <' => $node[$Model->alias][$left],
+				$right . ' >' => $node[$Model->alias][$right]
+			),
+			'order' => false,
+			'recursive' => -1
+		));
+	}
+
 /**
  * Sets the parent of the given node
  *
@@ -917,29 +1102,21 @@ class TreeBehavior extends ModelBehavior {
  * of recovering a corrupted table, or creating new nodes. Otherwise it should always be false. In reality this
  * method could be private, since calling save with parent_id set also calls setParent
  *
- * @param Model $Model Model instance
- * @param integer|string $parentId
- * @param boolean $created
- * @return boolean true on success, false on failure
+ * @param Model $Model Model using this behavior
+ * @param int|string $parentId Parent record Id
+ * @param bool $created True if newly created record else false.
+ * @return bool true on success, false on failure
  */
 	protected function _setParent(Model $Model, $parentId = null, $created = false) {
 		extract($this->settings[$Model->alias]);
-		list($node) = array_values($Model->find('first', array(
-			'conditions' => array($scope, $Model->escapeField() => $Model->id),
-			'fields' => array($Model->primaryKey, $parent, $left, $right),
-			'recursive' => $recursive
-		)));
+		list($node) = array_values($this->_getNode($Model, $Model->id));
 		$edge = $this->_getMax($Model, $scope, $right, $recursive, $created);
 
 		if (empty($parentId)) {
 			$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
 			$this->_sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
 		} else {
-			$values = $Model->find('first', array(
-				'conditions' => array($scope, $Model->escapeField() => $parentId),
-				'fields' => array($Model->primaryKey, $left, $right),
-				'recursive' => $recursive
-			));
+			$values = $this->_getNode($Model, $parentId);
 
 			if ($values === false) {
 				return false;
@@ -951,7 +1128,7 @@ class TreeBehavior extends ModelBehavior {
 			}
 			$parentNode = $parentNode[0];
 
-			if (($Model->id == $parentId)) {
+			if (($Model->id === $parentId)) {
 				return false;
 			} elseif (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
 				return false;
@@ -987,12 +1164,12 @@ class TreeBehavior extends ModelBehavior {
 /**
  * get the maximum index value in the table.
  *
- * @param Model $Model
- * @param string $scope
- * @param string $right
- * @param integer $recursive
- * @param boolean $created
- * @return integer
+ * @param Model $Model Model Instance.
+ * @param string $scope Scoping conditions.
+ * @param string $right Right value
+ * @param int $recursive Recursive find value.
+ * @param bool $created Whether it's a new record.
+ * @return int
  */
 	protected function _getMax(Model $Model, $scope, $right, $recursive = -1, $created = false) {
 		$db = ConnectionManager::getDataSource($Model->useDbConfig);
@@ -1009,6 +1186,7 @@ class TreeBehavior extends ModelBehavior {
 			'conditions' => $scope,
 			'fields' => $db->calculate($Model, 'max', array($name, $right)),
 			'recursive' => $recursive,
+			'order' => false,
 			'callbacks' => false
 		)));
 		return (empty($edge[$right])) ? 0 : $edge[$right];
@@ -1017,11 +1195,11 @@ class TreeBehavior extends ModelBehavior {
 /**
  * get the minimum index value in the table.
  *
- * @param Model $Model
- * @param string $scope
- * @param string $left
- * @param integer $recursive
- * @return integer
+ * @param Model $Model Model instance.
+ * @param string $scope Scoping conditions.
+ * @param string $left Left value.
+ * @param int $recursive Recurursive find value.
+ * @return int
  */
 	protected function _getMin(Model $Model, $scope, $left, $recursive = -1) {
 		$db = ConnectionManager::getDataSource($Model->useDbConfig);
@@ -1030,6 +1208,7 @@ class TreeBehavior extends ModelBehavior {
 			'conditions' => $scope,
 			'fields' => $db->calculate($Model, 'min', array($name, $left)),
 			'recursive' => $recursive,
+			'order' => false,
 			'callbacks' => false
 		)));
 		return (empty($edge[$left])) ? 0 : $edge[$left];
@@ -1040,12 +1219,12 @@ class TreeBehavior extends ModelBehavior {
  *
  * Handles table sync operations, Taking account of the behavior scope.
  *
- * @param Model $Model
- * @param integer $shift
- * @param string $dir
- * @param array $conditions
- * @param boolean $created
- * @param string $field
+ * @param Model $Model Model instance.
+ * @param int $shift Shift by.
+ * @param string $dir Direction.
+ * @param array $conditions Conditions.
+ * @param bool $created Whether it's a new record.
+ * @param string $field Field type.
  * @return void
  */
 	protected function _sync(Model $Model, $shift, $dir = '+', $conditions = array(), $created = false, $field = 'both') {
diff --git a/web/api/lib/Cake/Model/BehaviorCollection.php b/web/api/lib/Cake/Model/BehaviorCollection.php
index 564bb95f3..f90e6fabd 100644
--- a/web/api/lib/Cake/Model/BehaviorCollection.php
+++ b/web/api/lib/Cake/Model/BehaviorCollection.php
@@ -54,8 +54,8 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 /**
  * Attaches a model object and loads a list of behaviors
  *
- * @param string $modelName
- * @param array $behaviors
+ * @param string $modelName Model name.
+ * @param array $behaviors Behaviors list.
  * @return void
  */
 	public function init($modelName, $behaviors = array()) {
@@ -71,10 +71,10 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 /**
  * Backwards compatible alias for load()
  *
- * @param string $behavior
- * @param array $config
+ * @param string $behavior Behavior name.
+ * @param array $config Configuration options.
  * @return void
- * @deprecated Will be removed in 3.0. Replaced with load().
+ * @deprecated 3.0.0 Will be removed in 3.0. Replaced with load().
  */
 	public function attach($behavior, $config = array()) {
 		return $this->load($behavior, $config);
@@ -86,18 +86,18 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
  * can still be used as normal.
  *
  * You can alias your behavior as an existing behavior by setting the 'className' key, i.e.,
- * {{{
+ * ```
  * public $actsAs = array(
  *   'Tree' => array(
  *     'className' => 'AliasedTree'
  *   );
  * );
- * }}}
+ * ```
  * All calls to the `Tree` behavior would use `AliasedTree` instead.
  *
  * @param string $behavior CamelCased name of the behavior to load
  * @param array $config Behavior configuration parameters
- * @return boolean True on success, false on failure
+ * @return bool True on success, false on failure
  * @throws MissingBehaviorException when a behavior could not be found.
  */
 	public function load($behavior, $config = array()) {
@@ -190,7 +190,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
 			parent::unload($name);
 		}
 		foreach ($this->_methods as $m => $callback) {
-			if (is_array($callback) && $callback[0] == $name) {
+			if (is_array($callback) && $callback[0] === $name) {
 				unset($this->_methods[$m]);
 			}
 		}
@@ -201,7 +201,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
  *
  * @param string $name Name of behavior
  * @return void
- * @deprecated Will be removed in 3.0. Use unload instead.
+ * @deprecated 3.0.0 Will be removed in 3.0. Use unload instead.
  */
 	public function detach($name) {
 		return $this->unload($name);
@@ -216,7 +216,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
  * @param Model $model The model the method was originally called on.
  * @param string $method The method called.
  * @param array $params Parameters for the called method.
- * @param boolean $strict If methods are not found, trigger an error.
+ * @param bool $strict If methods are not found, trigger an error.
  * @return array All methods for all behaviors attached to this object
  */
 	public function dispatchMethod($model, $method, $params = array(), $strict = false) {
@@ -254,7 +254,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
  * also check mappedMethods.
  *
  * @param string $method The method to find.
- * @param boolean $callback Return the callback for the method.
+ * @param bool $callback Return the callback for the method.
  * @return mixed If $callback is false, a boolean will be returned, if its true, an array
  *   containing callback information will be returned. For mapped methods the array will have 3 elements.
  */
diff --git a/web/api/lib/Cake/Model/CakeSchema.php b/web/api/lib/Cake/Model/CakeSchema.php
index 2d08f5ece..38f663cc5 100644
--- a/web/api/lib/Cake/Model/CakeSchema.php
+++ b/web/api/lib/Cake/Model/CakeSchema.php
@@ -22,49 +22,49 @@ App::uses('ConnectionManager', 'Model');
 App::uses('File', 'Utility');
 
 /**
- * Base Class for Schema management
+ * Base Class for Schema management.
  *
  * @package       Cake.Model
  */
 class CakeSchema extends Object {
 
 /**
- * Name of the schema
+ * Name of the schema.
  *
  * @var string
  */
 	public $name = null;
 
 /**
- * Path to write location
+ * Path to write location.
  *
  * @var string
  */
 	public $path = null;
 
 /**
- * File to write
+ * File to write.
  *
  * @var string
  */
 	public $file = 'schema.php';
 
 /**
- * Connection used for read
+ * Connection used for read.
  *
  * @var string
  */
 	public $connection = 'default';
 
 /**
- * plugin name.
+ * Plugin name.
  *
  * @var string
  */
 	public $plugin = null;
 
 /**
- * Set of tables
+ * Set of tables.
  *
  * @var array
  */
@@ -73,7 +73,7 @@ class CakeSchema extends Object {
 /**
  * Constructor
  *
- * @param array $options optional load object properties
+ * @param array $options Optional load object properties.
  */
 	public function __construct($options = array()) {
 		parent::__construct();
@@ -86,7 +86,7 @@ class CakeSchema extends Object {
 		}
 
 		if (strtolower($this->name) === 'cake') {
-			$this->name = Inflector::camelize(Inflector::slug(Configure::read('App.dir')));
+			$this->name = 'App';
 		}
 
 		if (empty($options['path'])) {
@@ -98,9 +98,9 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Builds schema object properties
+ * Builds schema object properties.
  *
- * @param array $data loaded object properties
+ * @param array $data Loaded object properties.
  * @return void
  */
 	public function build($data) {
@@ -129,29 +129,29 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Before callback to be implemented in subclasses
+ * Before callback to be implemented in subclasses.
  *
- * @param array $event schema object properties
- * @return boolean Should process continue
+ * @param array $event Schema object properties.
+ * @return bool Should process continue.
  */
 	public function before($event = array()) {
 		return true;
 	}
 
 /**
- * After callback to be implemented in subclasses
+ * After callback to be implemented in subclasses.
  *
- * @param array $event schema object properties
+ * @param array $event Schema object properties.
  * @return void
  */
 	public function after($event = array()) {
 	}
 
 /**
- * Reads database and creates schema tables
+ * Reads database and creates schema tables.
  *
- * @param array $options schema object properties
- * @return array Set of name and tables
+ * @param array $options Schema object properties.
+ * @return array Set of name and tables.
  */
 	public function load($options = array()) {
 		if (is_string($options)) {
@@ -163,11 +163,10 @@ class CakeSchema extends Object {
 
 		$class = $name . 'Schema';
 
-		if (!class_exists($class)) {
-			if (file_exists($path . DS . $file) && is_file($path . DS . $file)) {
-				require_once $path . DS . $file;
-			} elseif (file_exists($path . DS . 'schema.php') && is_file($path . DS . 'schema.php')) {
-				require_once $path . DS . 'schema.php';
+		if (!class_exists($class) && !$this->_requireFile($path, $file)) {
+			$class = Inflector::camelize(Inflector::slug(Configure::read('App.dir'))) . 'Schema';
+			if (!class_exists($class)) {
+				$this->_requireFile($path, $file);
 			}
 		}
 
@@ -179,7 +178,7 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Reads database and creates schema tables
+ * Reads database and creates schema tables.
  *
  * Options
  *
@@ -187,8 +186,8 @@ class CakeSchema extends Object {
  * - 'name' - name of the schema
  * - 'models' - a list of models to use, or false to ignore models
  *
- * @param array $options schema object properties
- * @return array Array indexed by name and tables
+ * @param array $options Schema object properties.
+ * @return array Array indexed by name and tables.
  */
 	public function read($options = array()) {
 		extract(array_merge(
@@ -230,7 +229,7 @@ class CakeSchema extends Object {
 				}
 
 				if (isset($this->plugin)) {
-					if ($model == $this->plugin . 'AppModel') {
+					if ($model === $this->plugin . 'AppModel') {
 						continue;
 					}
 					$importModel = $model;
@@ -341,11 +340,11 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Writes schema file from object or options
+ * Writes schema file from object or options.
  *
- * @param array|object $object schema object or options array
- * @param array $options schema object properties to override object
- * @return mixed false or string written to file
+ * @param array|object $object Schema object or options array.
+ * @param array $options Schema object properties to override object.
+ * @return mixed False or string written to file.
  */
 	public function write($object, $options = array()) {
 		if (is_object($object)) {
@@ -398,12 +397,14 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Generate the code for a table. Takes a table name and $fields array
- * Returns a completed variable declaration to be used in schema classes
+ * Generate the schema code for a table.
+ *
+ * Takes a table name and $fields array and returns a completed,
+ * escaped variable declaration to be used in schema classes.
  *
  * @param string $table Table name you want returned.
  * @param array $fields Array of field information to generate the table with.
- * @return string Variable declaration for a schema class
+ * @return string Variable declaration for a schema class.
  */
 	public function generateTable($table, $fields) {
 		$out = "\tpublic \${$table} = array(\n";
@@ -427,10 +428,7 @@ class CakeSchema extends Object {
 					$col .= implode(",\n\t\t\t", $props) . "\n\t\t";
 				} elseif ($field === 'tableParameters') {
 					$col = "\t\t'tableParameters' => array(";
-					$props = array();
-					foreach ((array)$value as $key => $param) {
-						$props[] = "'{$key}' => '$param'";
-					}
+					$props = $this->_values($value);
 					$col .= implode(', ', $props);
 				}
 				$col .= ")";
@@ -443,11 +441,11 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Compares two sets of schemas
+ * Compares two sets of schemas.
  *
- * @param array|object $old Schema object or array
- * @param array|object $new Schema object or array
- * @return array Tables (that are added, dropped, or changed)
+ * @param array|object $old Schema object or array.
+ * @param array|object $new Schema object or array.
+ * @return array Tables (that are added, dropped, or changed.)
  */
 	public function compare($old, $new = null) {
 		if (empty($new)) {
@@ -529,15 +527,15 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Extended array_diff_assoc noticing change from/to NULL values
+ * Extended array_diff_assoc noticing change from/to NULL values.
  *
  * It behaves almost the same way as array_diff_assoc except for NULL values: if
  * one of the values is not NULL - change is detected. It is useful in situation
  * where one value is strval('') ant other is strval(null) - in string comparing
  * methods this results as EQUAL, while it is not.
  *
- * @param array $array1 Base array
- * @param array $array2 Corresponding array checked for equality
+ * @param array $array1 Base array.
+ * @param array $array2 Corresponding array checked for equality.
  * @return array Difference as array with array(keys => values) from input array
  *     where match was not found.
  */
@@ -569,10 +567,10 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Formats Schema columns from Model Object
+ * Formats Schema columns from Model Object.
  *
- * @param array $values options keys(type, null, default, key, length, extra)
- * @return array Formatted values
+ * @param array $values Options keys(type, null, default, key, length, extra).
+ * @return array Formatted values.
  */
 	protected function _values($values) {
 		$vals = array();
@@ -597,10 +595,10 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Formats Schema columns from Model Object
+ * Formats Schema columns from Model Object.
  *
- * @param array $Obj model object
- * @return array Formatted columns
+ * @param array &$Obj model object.
+ * @return array Formatted columns.
  */
 	protected function _columns(&$Obj) {
 		$db = $Obj->getDataSource();
@@ -608,7 +606,7 @@ class CakeSchema extends Object {
 
 		$columns = array();
 		foreach ($fields as $name => $value) {
-			if ($Obj->primaryKey == $name) {
+			if ($Obj->primaryKey === $name) {
 				$value['key'] = 'primary';
 			}
 			if (!isset($db->columns[$value['type']])) {
@@ -640,10 +638,10 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Compare two schema files table Parameters
+ * Compare two schema files table Parameters.
  *
- * @param array $new New indexes
- * @param array $old Old indexes
+ * @param array $new New indexes.
+ * @param array $old Old indexes.
  * @return mixed False on failure, or an array of parameters to add & drop.
  */
 	protected function _compareTableParameters($new, $old) {
@@ -655,11 +653,11 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Compare two schema indexes
+ * Compare two schema indexes.
  *
- * @param array $new New indexes
- * @param array $old Old indexes
- * @return mixed false on failure or array of indexes to add and drop
+ * @param array $new New indexes.
+ * @param array $old Old indexes.
+ * @return mixed False on failure or array of indexes to add and drop.
  */
 	protected function _compareIndexes($new, $old) {
 		if (!is_array($new) || !is_array($old)) {
@@ -706,14 +704,33 @@ class CakeSchema extends Object {
 	}
 
 /**
- * Trim the table prefix from the full table name, and return the prefix-less table
+ * Trim the table prefix from the full table name, and return the prefix-less
+ * table.
  *
- * @param string $prefix Table prefix
- * @param string $table Full table name
- * @return string Prefix-less table name
+ * @param string $prefix Table prefix.
+ * @param string $table Full table name.
+ * @return string Prefix-less table name.
  */
 	protected function _noPrefixTable($prefix, $table) {
 		return preg_replace('/^' . preg_quote($prefix) . '/', '', $table);
 	}
 
+/**
+ * Attempts to require the schema file specified.
+ *
+ * @param string $path Filesystem path to the file.
+ * @param string $file Filesystem basename of the file.
+ * @return bool True when a file was successfully included, false on failure.
+ */
+	protected function _requireFile($path, $file) {
+		if (file_exists($path . DS . $file) && is_file($path . DS . $file)) {
+			require_once $path . DS . $file;
+			return true;
+		} elseif (file_exists($path . DS . 'schema.php') && is_file($path . DS . 'schema.php')) {
+			require_once $path . DS . 'schema.php';
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/web/api/lib/Cake/Model/ConnectionManager.php b/web/api/lib/Cake/Model/ConnectionManager.php
index 57bc05d32..926b5f22e 100644
--- a/web/api/lib/Cake/Model/ConnectionManager.php
+++ b/web/api/lib/Cake/Model/ConnectionManager.php
@@ -54,7 +54,7 @@ class ConnectionManager {
 /**
  * Indicates if the init code for this class has already been executed
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_init = false;
 
@@ -66,9 +66,9 @@ class ConnectionManager {
 	protected static function _init() {
 		include_once APP . 'Config' . DS . 'database.php';
 		if (class_exists('DATABASE_CONFIG')) {
-			self::$config = new DATABASE_CONFIG();
+			static::$config = new DATABASE_CONFIG();
 		}
-		self::$_init = true;
+		static::$_init = true;
 	}
 
 /**
@@ -79,20 +79,20 @@ class ConnectionManager {
  * @throws MissingDatasourceException
  */
 	public static function getDataSource($name) {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
 
-		if (!empty(self::$_dataSources[$name])) {
-			return self::$_dataSources[$name];
+		if (!empty(static::$_dataSources[$name])) {
+			return static::$_dataSources[$name];
 		}
 
-		if (empty(self::$_connectionsEnum[$name])) {
-			self::_getConnectionObject($name);
+		if (empty(static::$_connectionsEnum[$name])) {
+			static::_getConnectionObject($name);
 		}
 
-		self::loadDataSource($name);
-		$conn = self::$_connectionsEnum[$name];
+		static::loadDataSource($name);
+		$conn = static::$_connectionsEnum[$name];
 		$class = $conn['classname'];
 
 		if (strpos(App::location($class), 'Datasource') === false) {
@@ -102,10 +102,10 @@ class ConnectionManager {
 				'message' => 'Datasource is not found in Model/Datasource package.'
 			));
 		}
-		self::$_dataSources[$name] = new $class(self::$config->{$name});
-		self::$_dataSources[$name]->configKeyName = $name;
+		static::$_dataSources[$name] = new $class(static::$config->{$name});
+		static::$_dataSources[$name]->configKeyName = $name;
 
-		return self::$_dataSources[$name];
+		return static::$_dataSources[$name];
 	}
 
 /**
@@ -116,24 +116,24 @@ class ConnectionManager {
  * @return array List of available connections
  */
 	public static function sourceList() {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
-		return array_keys(self::$_dataSources);
+		return array_keys(static::$_dataSources);
 	}
 
 /**
  * Gets a DataSource name from an object reference.
  *
  * @param DataSource $source DataSource object
- * @return string Datasource name, or null if source is not present
+ * @return string|null Datasource name, or null if source is not present
  *    in the ConnectionManager.
  */
 	public static function getSourceName($source) {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
-		foreach (self::$_dataSources as $name => $ds) {
+		foreach (static::$_dataSources as $name => $ds) {
 			if ($ds === $source) {
 				return $name;
 			}
@@ -145,20 +145,20 @@ class ConnectionManager {
  * Loads the DataSource class for the given connection name
  *
  * @param string|array $connName A string name of the connection, as defined in app/Config/database.php,
- *                        or an array containing the filename (without extension) and class name of the object,
- *                        to be found in app/Model/Datasource/ or lib/Cake/Model/Datasource/.
- * @return boolean True on success, null on failure or false if the class is already loaded
+ *    or an array containing the filename (without extension) and class name of the object,
+ *    to be found in app/Model/Datasource/ or lib/Cake/Model/Datasource/.
+ * @return bool True on success, null on failure or false if the class is already loaded
  * @throws MissingDatasourceException
  */
 	public static function loadDataSource($connName) {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
 
 		if (is_array($connName)) {
 			$conn = $connName;
 		} else {
-			$conn = self::$_connectionsEnum[$connName];
+			$conn = static::$_connectionsEnum[$connName];
 		}
 
 		if (class_exists($conn['classname'], false)) {
@@ -184,16 +184,16 @@ class ConnectionManager {
 	}
 
 /**
- * Return a list of connections
+ * Returns a list of connections
  *
  * @return array An associative array of elements where the key is the connection name
- *               (as defined in Connections), and the value is an array with keys 'filename' and 'classname'.
+ *    (as defined in Connections), and the value is an array with keys 'filename' and 'classname'.
  */
 	public static function enumConnectionObjects() {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
-		return (array)self::$config;
+		return (array)static::$config;
 	}
 
 /**
@@ -201,19 +201,19 @@ class ConnectionManager {
  *
  * @param string $name The DataSource name
  * @param array $config The DataSource configuration settings
- * @return DataSource A reference to the DataSource object, or null if creation failed
+ * @return DataSource|null A reference to the DataSource object, or null if creation failed
  */
 	public static function create($name = '', $config = array()) {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
 
-		if (empty($name) || empty($config) || array_key_exists($name, self::$_connectionsEnum)) {
+		if (empty($name) || empty($config) || array_key_exists($name, static::$_connectionsEnum)) {
 			return null;
 		}
-		self::$config->{$name} = $config;
-		self::$_connectionsEnum[$name] = self::_connectionData($config);
-		$return = self::getDataSource($name);
+		static::$config->{$name} = $config;
+		static::$_connectionsEnum[$name] = static::_connectionData($config);
+		$return = static::getDataSource($name);
 		return $return;
 	}
 
@@ -221,17 +221,17 @@ class ConnectionManager {
  * Removes a connection configuration at runtime given its name
  *
  * @param string $name the connection name as it was created
- * @return boolean success if connection was removed, false if it does not exist
+ * @return bool success if connection was removed, false if it does not exist
  */
 	public static function drop($name) {
-		if (empty(self::$_init)) {
-			self::_init();
+		if (empty(static::$_init)) {
+			static::_init();
 		}
 
-		if (!isset(self::$config->{$name})) {
+		if (!isset(static::$config->{$name})) {
 			return false;
 		}
-		unset(self::$_connectionsEnum[$name], self::$_dataSources[$name], self::$config->{$name});
+		unset(static::$_connectionsEnum[$name], static::$_dataSources[$name], static::$config->{$name});
 		return true;
 	}
 
@@ -243,8 +243,8 @@ class ConnectionManager {
  * @throws MissingDatasourceConfigException
  */
 	protected static function _getConnectionObject($name) {
-		if (!empty(self::$config->{$name})) {
-			self::$_connectionsEnum[$name] = self::_connectionData(self::$config->{$name});
+		if (!empty(static::$config->{$name})) {
+			static::$_connectionsEnum[$name] = static::_connectionData(static::$config->{$name});
 		} else {
 			throw new MissingDatasourceConfigException(array('config' => $name));
 		}
diff --git a/web/api/lib/Cake/Model/Datasource/CakeSession.php b/web/api/lib/Cake/Model/Datasource/CakeSession.php
index 1721824f1..4a25f67c8 100644
--- a/web/api/lib/Cake/Model/Datasource/CakeSession.php
+++ b/web/api/lib/Cake/Model/Datasource/CakeSession.php
@@ -37,7 +37,7 @@ class CakeSession {
 /**
  * True if the Session is still valid
  *
- * @var boolean
+ * @var bool
  */
 	public static $valid = false;
 
@@ -65,28 +65,28 @@ class CakeSession {
 /**
  * Error number of last occurred error
  *
- * @var integer
+ * @var int
  */
 	public static $lastError = null;
 
 /**
  * Start time for this session.
  *
- * @var integer
+ * @var int
  */
 	public static $time = false;
 
 /**
  * Cookie lifetime
  *
- * @var integer
+ * @var int
  */
 	public static $cookieLifeTime;
 
 /**
  * Time when this session becomes invalid.
  *
- * @var integer
+ * @var int
  */
 	public static $sessionTime = false;
 
@@ -107,7 +107,7 @@ class CakeSession {
 /**
  * Session timeout multiplier factor
  *
- * @var integer
+ * @var int
  */
 	public static $timeout = null;
 
@@ -115,7 +115,7 @@ class CakeSession {
  * Number of requests that can occur during a session time without the session being renewed.
  * This feature is only used when config value `Session.autoRegenerate` is set to true.
  *
- * @var integer
+ * @var int
  * @see CakeSession::_checkValid()
  */
 	public static $requestCountdown = 10;
@@ -123,7 +123,7 @@ class CakeSession {
 /**
  * Whether or not the init function in this class was already called
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_initialized = false;
 
@@ -137,35 +137,35 @@ class CakeSession {
 /**
  * Pseudo constructor.
  *
- * @param string $base The base path for the Session
+ * @param string|null $base The base path for the Session
  * @return void
  */
 	public static function init($base = null) {
-		self::$time = time();
+		static::$time = time();
 
-		if (env('HTTP_USER_AGENT')) {
-			self::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt'));
+		if (env('HTTP_USER_AGENT') && !static::$_userAgent) {
+			static::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt'));
 		}
 
-		self::_setPath($base);
-		self::_setHost(env('HTTP_HOST'));
+		static::_setPath($base);
+		static::_setHost(env('HTTP_HOST'));
 
-		if (!self::$_initialized) {
+		if (!static::$_initialized) {
 			register_shutdown_function('session_write_close');
 		}
 
-		self::$_initialized = true;
+		static::$_initialized = true;
 	}
 
 /**
  * Setup the Path variable
  *
- * @param string $base base path
+ * @param string|null $base base path
  * @return void
  */
 	protected static function _setPath($base = null) {
 		if (empty($base)) {
-			self::$path = '/';
+			static::$path = '/';
 			return;
 		}
 		if (strpos($base, 'index.php') !== false) {
@@ -174,7 +174,7 @@ class CakeSession {
 		if (strpos($base, '?') !== false) {
 			$base = str_replace('?', '', $base);
 		}
-		self::$path = $base;
+		static::$path = $base;
 	}
 
 /**
@@ -184,40 +184,42 @@ class CakeSession {
  * @return void
  */
 	protected static function _setHost($host) {
-		self::$host = $host;
-		if (strpos(self::$host, ':') !== false) {
-			self::$host = substr(self::$host, 0, strpos(self::$host, ':'));
+		static::$host = $host;
+		if (strpos(static::$host, ':') !== false) {
+			static::$host = substr(static::$host, 0, strpos(static::$host, ':'));
 		}
 	}
 
 /**
  * Starts the Session.
  *
- * @return boolean True if session was started
+ * @return bool True if session was started
  */
 	public static function start() {
-		if (self::started()) {
+		if (static::started()) {
 			return true;
 		}
 
-		$id = self::id();
-		self::_startSession();
-
-		if (!$id && self::started()) {
-			self::_checkValid();
+		$id = static::id();
+		static::_startSession();
+		if (!$id && static::started()) {
+			static::_checkValid();
 		}
 
-		self::$error = false;
-		self::$valid = true;
-		return self::started();
+		static::$error = false;
+		static::$valid = true;
+		return static::started();
 	}
 
 /**
  * Determine if Session has been started.
  *
- * @return boolean True if session has been started.
+ * @return bool True if session has been started.
  */
 	public static function started() {
+		if (function_exists('session_status')) {
+			return isset($_SESSION) && (session_status() === PHP_SESSION_ACTIVE);
+		}
 		return isset($_SESSION) && session_id();
 	}
 
@@ -225,10 +227,10 @@ class CakeSession {
  * Returns true if given variable is set in session.
  *
  * @param string $name Variable name to check for
- * @return boolean True if variable is there
+ * @return bool True if variable is there
  */
-	public static function check($name = null) {
-		if (empty($name) || !self::_hasSession() || !self::start()) {
+	public static function check($name) {
+		if (empty($name) || !static::_hasSession() || !static::start()) {
 			return false;
 		}
 
@@ -246,30 +248,30 @@ class CakeSession {
  * within the session id. For example, the file session handler only allows
  * characters in the range a-z A-Z 0-9 , (comma) and - (minus).
  *
- * @param string $id Id to replace the current session id
+ * @param string|null $id Id to replace the current session id
  * @return string Session id
  */
 	public static function id($id = null) {
 		if ($id) {
-			self::$id = $id;
-			session_id(self::$id);
+			static::$id = $id;
+			session_id(static::$id);
 		}
-		if (self::started()) {
+		if (static::started()) {
 			return session_id();
 		}
-		return self::$id;
+		return static::$id;
 	}
 
 /**
  * Removes a variable from session.
  *
  * @param string $name Session variable to remove
- * @return boolean Success
+ * @return bool Success
  */
 	public static function delete($name) {
-		if (self::check($name)) {
-			self::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
-			return !self::check($name);
+		if (static::check($name)) {
+			static::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
+			return !static::check($name);
 		}
 		return false;
 	}
@@ -277,7 +279,7 @@ class CakeSession {
 /**
  * Used to write new data to _SESSION, since PHP doesn't like us setting the _SESSION var itself.
  *
- * @param array $old Set of old variables => values
+ * @param array &$old Set of old variables => values
  * @param array $new New set of variable => value
  * @return void
  */
@@ -297,14 +299,14 @@ class CakeSession {
 /**
  * Return error description for given error number.
  *
- * @param integer $errorNumber Error to set
+ * @param int $errorNumber Error to set
  * @return string Error as string
  */
 	protected static function _error($errorNumber) {
-		if (!is_array(self::$error) || !array_key_exists($errorNumber, self::$error)) {
+		if (!is_array(static::$error) || !array_key_exists($errorNumber, static::$error)) {
 			return false;
 		}
-		return self::$error[$errorNumber];
+		return static::$error[$errorNumber];
 	}
 
 /**
@@ -313,8 +315,8 @@ class CakeSession {
  * @return mixed Error description as a string, or false.
  */
 	public static function error() {
-		if (self::$lastError) {
-			return self::_error(self::$lastError);
+		if (static::$lastError) {
+			return static::_error(static::$lastError);
 		}
 		return false;
 	}
@@ -322,69 +324,70 @@ class CakeSession {
 /**
  * Returns true if session is valid.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public static function valid() {
-		if (self::start() && self::read('Config')) {
-			if (self::_validAgentAndTime() && self::$error === false) {
-				self::$valid = true;
+		if (static::start() && static::read('Config')) {
+			if (static::_validAgentAndTime() && static::$error === false) {
+				static::$valid = true;
 			} else {
-				self::$valid = false;
-				self::_setError(1, 'Session Highjacking Attempted !!!');
+				static::$valid = false;
+				static::_setError(1, 'Session Highjacking Attempted !!!');
 			}
 		}
-		return self::$valid;
+		return static::$valid;
 	}
 
 /**
  * Tests that the user agent is valid and that the session hasn't 'timed out'.
- * Since timeouts are implemented in CakeSession it checks the current self::$time
+ * Since timeouts are implemented in CakeSession it checks the current static::$time
  * against the time the session is set to expire. The User agent is only checked
  * if Session.checkAgent == true.
  *
- * @return boolean
+ * @return bool
  */
 	protected static function _validAgentAndTime() {
-		$config = self::read('Config');
+		$userAgent = static::read('Config.userAgent');
+		$time = static::read('Config.time');
 		$validAgent = (
 			Configure::read('Session.checkAgent') === false ||
-			self::$_userAgent == $config['userAgent']
+			isset($userAgent) && static::$_userAgent === $userAgent
 		);
-		return ($validAgent && self::$time <= $config['time']);
+		return ($validAgent && static::$time <= $time);
 	}
 
 /**
  * Get / Set the user agent
  *
- * @param string $userAgent Set the user agent
- * @return string Current user agent
+ * @param string|null $userAgent Set the user agent
+ * @return string Current user agent.
  */
 	public static function userAgent($userAgent = null) {
 		if ($userAgent) {
-			self::$_userAgent = $userAgent;
+			static::$_userAgent = $userAgent;
 		}
-		if (empty(self::$_userAgent)) {
-			CakeSession::init(self::$path);
+		if (empty(static::$_userAgent)) {
+			CakeSession::init(static::$path);
 		}
-		return self::$_userAgent;
+		return static::$_userAgent;
 	}
 
 /**
  * Returns given session variable, or all of them, if no parameters given.
  *
- * @param string|array $name The name of the session variable (or a path as sent to Set.extract)
+ * @param string|null $name The name of the session variable (or a path as sent to Set.extract)
  * @return mixed The value of the session variable, null if session not available,
- *   session not started, or provided name not found in the session.
+ *   session not started, or provided name not found in the session, false on failure.
  */
 	public static function read($name = null) {
 		if (empty($name) && $name !== null) {
-			return false;
+			return null;
 		}
-		if (!self::_hasSession() || !self::start()) {
+		if (!static::_hasSession() || !static::start()) {
 			return null;
 		}
 		if ($name === null) {
-			return self::_returnSessionVars();
+			return static::_returnSessionVars();
 		}
 		$result = Hash::get($_SESSION, $name);
 
@@ -403,7 +406,7 @@ class CakeSession {
 		if (!empty($_SESSION)) {
 			return $_SESSION;
 		}
-		self::_setError(2, 'No Session vars set');
+		static::_setError(2, 'No Session vars set');
 		return false;
 	}
 
@@ -412,10 +415,10 @@ class CakeSession {
  *
  * @param string|array $name Name of variable
  * @param string $value Value to write
- * @return boolean True if the write was successful, false if the write failed
+ * @return bool True if the write was successful, false if the write failed
  */
 	public static function write($name, $value = null) {
-		if (empty($name) || !self::start()) {
+		if (empty($name) || !static::start()) {
 			return false;
 		}
 
@@ -424,7 +427,7 @@ class CakeSession {
 			$write = array($name => $value);
 		}
 		foreach ($write as $key => $val) {
-			self::_overwrite($_SESSION, Hash::insert($_SESSION, $key, $val));
+			static::_overwrite($_SESSION, Hash::insert($_SESSION, $key, $val));
 			if (Hash::get($_SESSION, $key) !== $val) {
 				return false;
 			}
@@ -432,32 +435,65 @@ class CakeSession {
 		return true;
 	}
 
+/**
+ * Reads and deletes a variable from session.
+ *
+ * @param string $name The key to read and remove (or a path as sent to Hash.extract).
+ * @return mixed The value of the session variable, null if session not available,
+ *   session not started, or provided name not found in the session.
+ */
+	public static function consume($name) {
+		if (empty($name)) {
+			return null;
+		}
+		$value = static::read($name);
+		if ($value !== null) {
+			static::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
+		}
+		return $value;
+	}
+
 /**
  * Helper method to destroy invalid sessions.
  *
  * @return void
  */
 	public static function destroy() {
-		if (!self::started()) {
-			self::_startSession();
+		if (!static::started()) {
+			static::_startSession();
 		}
 
-		session_destroy();
+		if (static::started()) {
+			if (session_id() && static::_hasSession()) {
+				session_write_close();
+				session_start();
+			}
+			session_destroy();
+			unset($_COOKIE[static::_cookieName()]);
+		}
 
 		$_SESSION = null;
-		self::$id = null;
-		self::$_cookieName = null;
+		static::$id = null;
+		static::$_cookieName = null;
 	}
 
 /**
- * Clears the session, the session id, and renews the session.
+ * Clears the session.
  *
+ * Optionally also clears the session id and renews the session.
+ *
+ * @param bool $renew If the session should also be renewed. Defaults to true.
  * @return void
  */
-	public static function clear() {
+	public static function clear($renew = true) {
+		if (!$renew) {
+			$_SESSION = array();
+			return;
+		}
+
 		$_SESSION = null;
-		self::$id = null;
-		self::renew();
+		static::$id = null;
+		static::renew();
 	}
 
 /**
@@ -472,7 +508,7 @@ class CakeSession {
 		$sessionConfig = Configure::read('Session');
 
 		if (isset($sessionConfig['defaults'])) {
-			$defaults = self::_defaultConfig($sessionConfig['defaults']);
+			$defaults = static::_defaultConfig($sessionConfig['defaults']);
 			if ($defaults) {
 				$sessionConfig = Hash::merge($defaults, $sessionConfig);
 			}
@@ -490,17 +526,26 @@ class CakeSession {
 		if (!isset($sessionConfig['ini']['session.name'])) {
 			$sessionConfig['ini']['session.name'] = $sessionConfig['cookie'];
 		}
-		self::$_cookieName = $sessionConfig['ini']['session.name'];
+		static::$_cookieName = $sessionConfig['ini']['session.name'];
 
 		if (!empty($sessionConfig['handler'])) {
 			$sessionConfig['ini']['session.save_handler'] = 'user';
+		} elseif (!empty($sessionConfig['session.save_path']) && Configure::read('debug')) {
+			if (!is_dir($sessionConfig['session.save_path'])) {
+				mkdir($sessionConfig['session.save_path'], 0775, true);
+			}
 		}
+
 		if (!isset($sessionConfig['ini']['session.gc_maxlifetime'])) {
 			$sessionConfig['ini']['session.gc_maxlifetime'] = $sessionConfig['timeout'] * 60;
 		}
 		if (!isset($sessionConfig['ini']['session.cookie_httponly'])) {
 			$sessionConfig['ini']['session.cookie_httponly'] = 1;
 		}
+		// For IE<=8
+		if (!isset($sessionConfig['cacheLimiter'])) {
+			$sessionConfig['cacheLimiter'] = 'must-revalidate';
+		}
 
 		if (empty($_SESSION)) {
 			if (!empty($sessionConfig['ini']) && is_array($sessionConfig['ini'])) {
@@ -515,7 +560,7 @@ class CakeSession {
 			call_user_func_array('session_set_save_handler', $sessionConfig['handler']);
 		}
 		if (!empty($sessionConfig['handler']['engine'])) {
-			$handler = self::_getHandler($sessionConfig['handler']['engine']);
+			$handler = static::_getHandler($sessionConfig['handler']['engine']);
 			session_set_save_handler(
 				array($handler, 'open'),
 				array($handler, 'close'),
@@ -526,7 +571,7 @@ class CakeSession {
 			);
 		}
 		Configure::write('Session', $sessionConfig);
-		self::$sessionTime = self::$time + ($sessionConfig['timeout'] * 60);
+		static::$sessionTime = static::$time + ($sessionConfig['timeout'] * 60);
 	}
 
 /**
@@ -535,28 +580,29 @@ class CakeSession {
  * @return string
  */
 	protected static function _cookieName() {
-		if (self::$_cookieName !== null) {
-			return self::$_cookieName;
+		if (static::$_cookieName !== null) {
+			return static::$_cookieName;
 		}
 
-		self::init();
-		self::_configureSession();
+		static::init();
+		static::_configureSession();
 
-		return self::$_cookieName = session_name();
+		return static::$_cookieName = session_name();
 	}
 
 /**
  * Returns whether a session exists
- * @return boolean
+ *
+ * @return bool
  */
 	protected static function _hasSession() {
-		return self::started() || isset($_COOKIE[self::_cookieName()]);
+		return static::started() || isset($_COOKIE[static::_cookieName()]) || (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg');
 	}
 
 /**
  * Find the handler class and make sure it implements the correct interface.
  *
- * @param string $handler
+ * @param string $handler Handler name.
  * @return void
  * @throws CakeSessionException
  */
@@ -576,8 +622,8 @@ class CakeSession {
 /**
  * Get one of the prebaked default session configurations.
  *
- * @param string $name
- * @return boolean|array
+ * @param string $name Config name.
+ * @return bool|array
  */
 	protected static function _defaultConfig($name) {
 		$defaults = array(
@@ -586,7 +632,7 @@ class CakeSession {
 				'timeout' => 240,
 				'ini' => array(
 					'session.use_trans_sid' => 0,
-					'session.cookie_path' => self::$path
+					'session.cookie_path' => static::$path
 				)
 			),
 			'cake' => array(
@@ -597,7 +643,7 @@ class CakeSession {
 					'url_rewriter.tags' => '',
 					'session.serialize_handler' => 'php',
 					'session.use_cookies' => 1,
-					'session.cookie_path' => self::$path,
+					'session.cookie_path' => static::$path,
 					'session.save_path' => TMP . 'sessions',
 					'session.save_handler' => 'files'
 				)
@@ -609,7 +655,7 @@ class CakeSession {
 					'session.use_trans_sid' => 0,
 					'url_rewriter.tags' => '',
 					'session.use_cookies' => 1,
-					'session.cookie_path' => self::$path,
+					'session.cookie_path' => static::$path,
 					'session.save_handler' => 'user',
 				),
 				'handler' => array(
@@ -624,7 +670,7 @@ class CakeSession {
 					'session.use_trans_sid' => 0,
 					'url_rewriter.tags' => '',
 					'session.use_cookies' => 1,
-					'session.cookie_path' => self::$path,
+					'session.cookie_path' => static::$path,
 					'session.save_handler' => 'user',
 					'session.serialize_handler' => 'php',
 				),
@@ -643,20 +689,22 @@ class CakeSession {
 /**
  * Helper method to start a session
  *
- * @return boolean Success
+ * @return bool Success
  */
 	protected static function _startSession() {
-		self::init();
+		static::init();
 		session_write_close();
-		self::_configureSession();
+		static::_configureSession();
 
 		if (headers_sent()) {
 			if (empty($_SESSION)) {
 				$_SESSION = array();
 			}
 		} else {
-			// For IE<=8
-			session_cache_limiter("must-revalidate");
+			$limit = Configure::read('Session.cacheLimiter');
+			if (!empty($limit)) {
+				session_cache_limiter($limit);
+			}
 			session_start();
 		}
 		return true;
@@ -668,31 +716,31 @@ class CakeSession {
  * @return void
  */
 	protected static function _checkValid() {
-		$config = self::read('Config');
+		$config = static::read('Config');
 		if ($config) {
 			$sessionConfig = Configure::read('Session');
 
-			if (self::valid()) {
-				self::write('Config.time', self::$sessionTime);
+			if (static::valid()) {
+				static::write('Config.time', static::$sessionTime);
 				if (isset($sessionConfig['autoRegenerate']) && $sessionConfig['autoRegenerate'] === true) {
 					$check = $config['countdown'];
 					$check -= 1;
-					self::write('Config.countdown', $check);
+					static::write('Config.countdown', $check);
 
 					if ($check < 1) {
-						self::renew();
-						self::write('Config.countdown', self::$requestCountdown);
+						static::renew();
+						static::write('Config.countdown', static::$requestCountdown);
 					}
 				}
 			} else {
 				$_SESSION = array();
-				self::destroy();
-				self::_setError(1, 'Session Highjacking Attempted !!!');
-				self::_startSession();
-				self::_writeConfig();
+				static::destroy();
+				static::_setError(1, 'Session Highjacking Attempted !!!');
+				static::_startSession();
+				static::_writeConfig();
 			}
 		} else {
-			self::_writeConfig();
+			static::_writeConfig();
 		}
 	}
 
@@ -702,9 +750,9 @@ class CakeSession {
  * @return void
  */
 	protected static function _writeConfig() {
-		self::write('Config.userAgent', self::$_userAgent);
-		self::write('Config.time', self::$sessionTime);
-		self::write('Config.countdown', self::$requestCountdown);
+		static::write('Config.userAgent', static::$_userAgent);
+		static::write('Config.time', static::$sessionTime);
+		static::write('Config.countdown', static::$requestCountdown);
 	}
 
 /**
@@ -713,10 +761,15 @@ class CakeSession {
  * @return void
  */
 	public static function renew() {
-		if (session_id()) {
-			if (session_id() || isset($_COOKIE[session_name()])) {
-				setcookie(Configure::read('Session.cookie'), '', time() - 42000, self::$path);
-			}
+		if (session_id() === '') {
+			return;
+		}
+		if (isset($_COOKIE[static::_cookieName()])) {
+			setcookie(Configure::read('Session.cookie'), '', time() - 42000, static::$path);
+		}
+		if (!headers_sent()) {
+			session_write_close();
+			session_start();
 			session_regenerate_id(true);
 		}
 	}
@@ -724,16 +777,16 @@ class CakeSession {
 /**
  * Helper method to set an internal error message.
  *
- * @param integer $errorNumber Number of the error
+ * @param int $errorNumber Number of the error
  * @param string $errorMessage Description of the error
  * @return void
  */
 	protected static function _setError($errorNumber, $errorMessage) {
-		if (self::$error === false) {
-			self::$error = array();
+		if (static::$error === false) {
+			static::$error = array();
 		}
-		self::$error[$errorNumber] = $errorMessage;
-		self::$lastError = $errorNumber;
+		static::$error[$errorNumber] = $errorMessage;
+		static::$lastError = $errorNumber;
 	}
 
 }
diff --git a/web/api/lib/Cake/Model/Datasource/DataSource.php b/web/api/lib/Cake/Model/Datasource/DataSource.php
index e06ef86d6..e77df4f8e 100644
--- a/web/api/lib/Cake/Model/Datasource/DataSource.php
+++ b/web/api/lib/Cake/Model/Datasource/DataSource.php
@@ -29,7 +29,7 @@ class DataSource extends Object {
 /**
  * Are we connected to the DataSource?
  *
- * @var boolean
+ * @var bool
  */
 	public $connected = false;
 
@@ -64,7 +64,7 @@ class DataSource extends Object {
 /**
  * Whether or not this DataSource is in the middle of a transaction
  *
- * @var boolean
+ * @var bool
  */
 	protected $_transactionStarted = false;
 
@@ -72,7 +72,7 @@ class DataSource extends Object {
  * Whether or not source data like available tables and schema descriptions
  * should be cached
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheSources = true;
 
@@ -89,8 +89,8 @@ class DataSource extends Object {
 /**
  * Caches/returns cached results for child instances
  *
- * @param mixed $data
- * @return array Array of sources available in this datasource.
+ * @param mixed $data Unused in this class.
+ * @return array|null Array of sources available in this datasource.
  */
 	public function listSources($data = null) {
 		if ($this->cacheSources === false) {
@@ -116,8 +116,8 @@ class DataSource extends Object {
 /**
  * Returns a Model description (metadata) or null if none found.
  *
- * @param Model|string $model
- * @return array Array of Metadata for the $model
+ * @param Model|string $model The model to describe.
+ * @return array|null Array of Metadata for the $model
  */
 	public function describe($model) {
 		if ($this->cacheSources === false) {
@@ -144,7 +144,7 @@ class DataSource extends Object {
 /**
  * Begin a transaction
  *
- * @return boolean Returns true if a transaction is not in progress
+ * @return bool Returns true if a transaction is not in progress
  */
 	public function begin() {
 		return !$this->_transactionStarted;
@@ -153,7 +153,7 @@ class DataSource extends Object {
 /**
  * Commit a transaction
  *
- * @return boolean Returns true if a transaction is in progress
+ * @return bool Returns true if a transaction is in progress
  */
 	public function commit() {
 		return $this->_transactionStarted;
@@ -162,7 +162,7 @@ class DataSource extends Object {
 /**
  * Rollback a transaction
  *
- * @return boolean Returns true if a transaction is in progress
+ * @return bool Returns true if a transaction is in progress
  */
 	public function rollback() {
 		return $this->_transactionStarted;
@@ -186,7 +186,7 @@ class DataSource extends Object {
  * @param Model $Model The Model to be created.
  * @param array $fields An Array of fields to be saved.
  * @param array $values An Array of values to save.
- * @return boolean success
+ * @return bool success
  */
 	public function create(Model $Model, $fields = null, $values = null) {
 		return false;
@@ -199,7 +199,7 @@ class DataSource extends Object {
  *
  * @param Model $Model The model being read.
  * @param array $queryData An array of query data used to find the data you want
- * @param integer $recursive Number of levels of association
+ * @param int $recursive Number of levels of association
  * @return mixed
  */
 	public function read(Model $Model, $queryData = array(), $recursive = null) {
@@ -214,8 +214,8 @@ class DataSource extends Object {
  * @param Model $Model Instance of the model class being updated
  * @param array $fields Array of fields to be updated
  * @param array $values Array of values to be update $fields to.
- * @param mixed $conditions
- * @return boolean Success
+ * @param mixed $conditions The array of conditions to use.
+ * @return bool Success
  */
 	public function update(Model $Model, $fields = null, $values = null, $conditions = null) {
 		return false;
@@ -228,7 +228,7 @@ class DataSource extends Object {
  *
  * @param Model $Model The model class having record(s) deleted
  * @param mixed $conditions The conditions to use for deleting.
- * @return boolean Success
+ * @return bool Success
  */
 	public function delete(Model $Model, $conditions = null) {
 		return false;
@@ -237,7 +237,7 @@ class DataSource extends Object {
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
- * @param mixed $source
+ * @param mixed $source The source name.
  * @return mixed Last ID key generated in previous INSERT
  */
 	public function lastInsertId($source = null) {
@@ -247,8 +247,8 @@ class DataSource extends Object {
 /**
  * Returns the number of rows returned by last operation.
  *
- * @param mixed $source
- * @return integer Number of rows returned by last operation
+ * @param mixed $source The source name.
+ * @return int Number of rows returned by last operation
  */
 	public function lastNumRows($source = null) {
 		return false;
@@ -257,8 +257,8 @@ class DataSource extends Object {
 /**
  * Returns the number of rows affected by last query.
  *
- * @param mixed $source
- * @return integer Number of rows affected by last query.
+ * @param mixed $source The source name.
+ * @return int Number of rows affected by last query.
  */
 	public function lastAffected($source = null) {
 		return false;
@@ -269,7 +269,7 @@ class DataSource extends Object {
  * are satisfied. Often used from connect() to check for support
  * before establishing a connection.
  *
- * @return boolean Whether or not the Datasources conditions for use are met.
+ * @return bool Whether or not the Datasources conditions for use are met.
  */
 	public function enabled() {
 		return true;
@@ -320,7 +320,7 @@ class DataSource extends Object {
  * @param array $data Array of data with values that will be inserted in placeholders.
  * @param string $association Name of association model being replaced.
  * @param Model $Model Model instance.
- * @param array $stack
+ * @param array $stack The context stack.
  * @return mixed String of query data with placeholders replaced, or false on failure.
  */
 	public function insertQueryData($query, $data, $association, Model $Model, $stack) {
@@ -407,16 +407,16 @@ class DataSource extends Object {
 /**
  * Returns the schema name. Override this in subclasses.
  *
- * @return string schema name
+ * @return string|null The schema name
  */
 	public function getSchemaName() {
 		return null;
 	}
 
 /**
- * Closes a connection. Override in subclasses
+ * Closes a connection. Override in subclasses.
  *
- * @return boolean
+ * @return bool
  */
 	public function close() {
 		return $this->connected = false;
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Mysql.php b/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
index aae05d8b0..24358c107 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -52,7 +52,7 @@ class Mysql extends DboSource {
 /**
  * Reference to the PDO object connection
  *
- * @var PDO $_connection
+ * @var PDO
  */
 	protected $_connection = null;
 
@@ -73,7 +73,7 @@ class Mysql extends DboSource {
 /**
  * use alias for update and delete. Set to true if version >= 4.1
  *
- * @var boolean
+ * @var bool
  */
 	protected $_useAlias = true;
 
@@ -102,7 +102,8 @@ class Mysql extends DboSource {
 	public $tableParameters = array(
 		'charset' => array('value' => 'DEFAULT CHARSET', 'quote' => false, 'join' => '=', 'column' => 'charset'),
 		'collate' => array('value' => 'COLLATE', 'quote' => false, 'join' => '=', 'column' => 'Collation'),
-		'engine' => array('value' => 'ENGINE', 'quote' => false, 'join' => '=', 'column' => 'Engine')
+		'engine' => array('value' => 'ENGINE', 'quote' => false, 'join' => '=', 'column' => 'Engine'),
+		'comment' => array('value' => 'COMMENT', 'quote' => true, 'join' => '=', 'column' => 'Comment'),
 	);
 
 /**
@@ -145,7 +146,7 @@ class Mysql extends DboSource {
  *   combined with `ssl_key`.
  * - `ssl_ca` The certificate authority for SSL connections.
  *
- * @return boolean True if the database could be connected, else false
+ * @return bool True if the database could be connected, else false
  * @throws MissingConnectionException
  */
 	public function connect() {
@@ -203,7 +204,7 @@ class Mysql extends DboSource {
 /**
  * Check whether the MySQL extension is installed/loaded
  *
- * @return boolean
+ * @return bool
  */
 	public function enabled() {
 		return in_array('mysql', PDO::getAvailableDrivers());
@@ -212,7 +213,7 @@ class Mysql extends DboSource {
 /**
  * Returns an array of sources (tables) in the database.
  *
- * @param mixed $data
+ * @param mixed $data List of tables.
  * @return array Array of table names in the database
  */
 	public function listSources($data = null) {
@@ -240,7 +241,7 @@ class Mysql extends DboSource {
 /**
  * Builds a map of the columns contained in a result
  *
- * @param PDOStatement $results
+ * @param PDOStatement $results The results to format.
  * @return void
  */
 	public function resultSet($results) {
@@ -351,6 +352,9 @@ class Mysql extends DboSource {
 			if (in_array($fields[$column->Field]['type'], $this->fieldParameters['unsigned']['types'], true)) {
 				$fields[$column->Field]['unsigned'] = $this->_unsigned($column->Type);
 			}
+			if (in_array($fields[$column->Field]['type'], array('timestamp', 'datetime')) && strtoupper($column->Default) === 'CURRENT_TIMESTAMP') {
+				$fields[$column->Field]['default'] = null;
+			}
 			if (!empty($column->Key) && isset($this->index[$column->Key])) {
 				$fields[$column->Field]['key'] = $this->index[$column->Key];
 			}
@@ -374,10 +378,10 @@ class Mysql extends DboSource {
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  *
- * @param Model $model
- * @param array $fields
- * @param array $values
- * @param mixed $conditions
+ * @param Model $model The model to update.
+ * @param array $fields The fields to update.
+ * @param array $values The values to set.
+ * @param mixed $conditions The conditions to use.
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
@@ -398,7 +402,7 @@ class Mysql extends DboSource {
 
 		if (!empty($conditions)) {
 			$alias = $this->name($model->alias);
-			if ($model->name == $model->alias) {
+			if ($model->name === $model->alias) {
 				$joins = implode(' ', $this->_getJoins($model));
 			}
 		}
@@ -418,9 +422,9 @@ class Mysql extends DboSource {
 /**
  * Generates and executes an SQL DELETE statement for given id/conditions on given model.
  *
- * @param Model $model
- * @param mixed $conditions
- * @return boolean Success
+ * @param Model $model The model to delete from.
+ * @param mixed $conditions The conditions to use.
+ * @return bool Success
  */
 	public function delete(Model $model, $conditions = null) {
 		if (!$this->_useAlias) {
@@ -459,7 +463,7 @@ class Mysql extends DboSource {
  * Sets the database encoding
  *
  * @param string $enc Database encoding
- * @return boolean
+ * @return bool
  */
 	public function setEncoding($enc) {
 		return $this->_execute('SET NAMES ' . $enc) !== false;
@@ -490,7 +494,7 @@ class Mysql extends DboSource {
 					if ($idx->Index_type === 'FULLTEXT') {
 						$index[$idx->Key_name]['type'] = strtolower($idx->Index_type);
 					} else {
-						$index[$idx->Key_name]['unique'] = intval($idx->Non_unique == 0);
+						$index[$idx->Key_name]['unique'] = (int)($idx->Non_unique == 0);
 					}
 				} else {
 					if (!empty($index[$idx->Key_name]['column']) && !is_array($index[$idx->Key_name]['column'])) {
@@ -516,7 +520,7 @@ class Mysql extends DboSource {
  * Generate a MySQL Alter Table syntax for the given Schema comparison
  *
  * @param array $compare Result of a CakeSchema::compare()
- * @param string $table
+ * @param string $table The table name.
  * @return array Array of alter statements to make.
  */
 	public function alterSchema($compare, $table = null) {
@@ -527,7 +531,7 @@ class Mysql extends DboSource {
 		$colList = array();
 		foreach ($compare as $curTable => $types) {
 			$indexes = $tableParameters = $colList = array();
-			if (!$table || $table == $curTable) {
+			if (!$table || $table === $curTable) {
 				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
 				foreach ($types as $type => $column) {
 					if (isset($column['indexes'])) {
@@ -560,7 +564,11 @@ class Mysql extends DboSource {
 								if (!isset($col['name'])) {
 									$col['name'] = $field;
 								}
-								$colList[] = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
+								$alter = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
+								if (isset($col['after'])) {
+									$alter .= ' AFTER ' . $this->name($col['after']);
+								}
+								$colList[] = $alter;
 							}
 							break;
 					}
@@ -696,7 +704,7 @@ class Mysql extends DboSource {
 	}
 
 /**
- * Returns an detailed array of sources (tables) in the database.
+ * Returns a detailed array of sources (tables) in the database.
  *
  * @param string $name Table name to get parameters
  * @return array Array of table names in the database
@@ -781,9 +789,23 @@ class Mysql extends DboSource {
 		if (strpos($col, 'enum') !== false) {
 			return "enum($vals)";
 		}
+		if (strpos($col, 'set') !== false) {
+			return "set($vals)";
+		}
 		return 'text';
 	}
 
+/**
+ * {@inheritDoc}
+ */
+	public function value($data, $column = null, $null = true) {
+		$value = parent::value($data, $column, $null);
+		if (is_numeric($value) && substr($column, 0, 3) === 'set') {
+			return $this->_connection->quote($value);
+		}
+		return $value;
+	}
+
 /**
  * Gets the schema name
  *
@@ -796,7 +818,7 @@ class Mysql extends DboSource {
 /**
  * Check if the server support nested transactions
  *
- * @return boolean
+ * @return bool
  */
 	public function nestedTransactionSupported() {
 		return $this->useNestedTransactions && version_compare($this->getVersion(), '4.1', '>=');
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Postgres.php b/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
index 365b575ac..033527ae0 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * PostgreSQL layer for DBO.
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -46,6 +44,7 @@ class Postgres extends DboSource {
 		'schema' => 'public',
 		'port' => 5432,
 		'encoding' => '',
+		'sslmode' => 'allow',
 		'flags' => array()
 	);
 
@@ -99,12 +98,12 @@ class Postgres extends DboSource {
  *
  * @var array
  */
-	protected $_sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', '~', '~*', '!~', '!~*', 'similar to');
+	protected $_sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', '~', '~\*', '\!~', '\!~\*', 'similar to');
 
 /**
  * Connects to the database using options in the given configuration array.
  *
- * @return boolean True if successfully connected.
+ * @return bool True if successfully connected.
  * @throws MissingConnectionException
  */
 	public function connect() {
@@ -118,7 +117,7 @@ class Postgres extends DboSource {
 
 		try {
 			$this->_connection = new PDO(
-				"pgsql:host={$config['host']};port={$config['port']};dbname={$config['database']}",
+				"pgsql:host={$config['host']};port={$config['port']};dbname={$config['database']};sslmode={$config['sslmode']}",
 				$config['login'],
 				$config['password'],
 				$flags
@@ -149,7 +148,7 @@ class Postgres extends DboSource {
 /**
  * Check if PostgreSQL is enabled/loaded
  *
- * @return boolean
+ * @return bool
  */
 	public function enabled() {
 		return in_array('pgsql', PDO::getAvailableDrivers());
@@ -158,7 +157,7 @@ class Postgres extends DboSource {
 /**
  * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
  *
- * @param mixed $data
+ * @param mixed $data The sources to list.
  * @return array Array of table names in the database
  */
 	public function listSources($data = null) {
@@ -219,10 +218,10 @@ class Postgres extends DboSource {
 					} elseif ($c->type === 'uuid') {
 						$length = 36;
 					} else {
-						$length = intval($c->oct_length);
+						$length = (int)$c->oct_length;
 					}
 				} elseif (!empty($c->char_length)) {
-					$length = intval($c->char_length);
+					$length = (int)$c->char_length;
 				} else {
 					$length = $this->length($c->type);
 				}
@@ -240,7 +239,7 @@ class Postgres extends DboSource {
 					'length' => $length
 				);
 				if ($model instanceof Model) {
-					if ($c->name == $model->primaryKey) {
+					if ($c->name === $model->primaryKey) {
 						$fields[$c->name]['key'] = 'primary';
 						if ($fields[$c->name]['type'] !== 'string') {
 							$fields[$c->name]['length'] = 11;
@@ -249,6 +248,7 @@ class Postgres extends DboSource {
 				}
 				if (
 					$fields[$c->name]['default'] === 'NULL' ||
+					$c->default === null ||
 					preg_match('/nextval\([\'"]?([\w.]+)/', $c->default, $seq)
 				) {
 					$fields[$c->name]['default'] = null;
@@ -261,6 +261,9 @@ class Postgres extends DboSource {
 						$this->_sequenceMap[$table][$c->name] = $sequenceName;
 					}
 				}
+				if ($fields[$c->name]['type'] === 'timestamp' && $fields[$c->name]['default'] === '') {
+					$fields[$c->name]['default'] = null;
+				}
 				if ($fields[$c->name]['type'] === 'boolean' && !empty($fields[$c->name]['default'])) {
 					$fields[$c->name]['default'] = constant($fields[$c->name]['default']);
 				}
@@ -284,7 +287,7 @@ class Postgres extends DboSource {
  *
  * @param string $source Name of the database table
  * @param string $field Name of the ID database field. Defaults to "id"
- * @return integer
+ * @return int
  */
 	public function lastInsertId($source = null, $field = 'id') {
 		$seq = $this->getSequence($source, $field);
@@ -318,7 +321,7 @@ class Postgres extends DboSource {
  * @param string $table The name of the table to update.
  * @param string $column The column to use when resetting the sequence value,
  *   the sequence name will be fetched using Postgres::getSequence();
- * @return boolean success.
+ * @return bool success.
  */
 	public function resetSequence($table, $column) {
 		$tableName = $this->fullTableName($table, false, false);
@@ -334,9 +337,9 @@ class Postgres extends DboSource {
  * Deletes all the records in a table and drops all associated auto-increment sequences
  *
  * @param string|Model $table A string or model class representing the table to be truncated
- * @param boolean $reset true for resetting the sequence, false to leave it as is.
+ * @param bool $reset true for resetting the sequence, false to leave it as is.
  *    and if 1, sequences are not modified
- * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
+ * @return bool SQL TRUNCATE TABLE statement, false if not applicable.
  */
 	public function truncate($table, $reset = false) {
 		$table = $this->fullTableName($table, false, false);
@@ -349,8 +352,8 @@ class Postgres extends DboSource {
 		if ($this->execute('DELETE FROM ' . $this->fullTableName($table))) {
 			if (isset($this->_sequenceMap[$table]) && $reset != true) {
 				foreach ($this->_sequenceMap[$table] as $sequence) {
-					list($schema, $sequence) = explode('.', $sequence);
-					$this->_execute("ALTER SEQUENCE \"{$schema}\".\"{$sequence}\" RESTART WITH 1");
+					$quoted = $this->name($sequence);
+					$this->_execute("ALTER SEQUENCE {$quoted} RESTART WITH 1");
 				}
 			}
 			return true;
@@ -361,7 +364,7 @@ class Postgres extends DboSource {
 /**
  * Prepares field names to be quoted by parent
  *
- * @param string $data
+ * @param string $data The name to format.
  * @return string SQL field
  */
 	public function name($data) {
@@ -374,10 +377,10 @@ class Postgres extends DboSource {
 /**
  * Generates the fields list of an SQL query.
  *
- * @param Model $model
- * @param string $alias Alias table name
- * @param mixed $fields
- * @param boolean $quote
+ * @param Model $model The model to get fields for.
+ * @param string $alias Alias table name.
+ * @param mixed $fields The list of fields to get.
+ * @param bool $quote Whether or not to quote identifiers.
  * @return array
  */
 	public function fields(Model $model, $alias = null, $fields = array(), $quote = true) {
@@ -509,7 +512,7 @@ class Postgres extends DboSource {
 		$colList = array();
 		foreach ($compare as $curTable => $types) {
 			$indexes = $colList = array();
-			if (!$table || $table == $curTable) {
+			if (!$table || $table === $curTable) {
 				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
 				foreach ($types as $type => $column) {
 					if (isset($column['indexes'])) {
@@ -540,7 +543,7 @@ class Postgres extends DboSource {
 
 								$default = isset($col['default']) ? $col['default'] : null;
 								$nullable = isset($col['null']) ? $col['null'] : null;
-								$boolToInt = $original['type'] == 'boolean' && $col['type'] == 'integer';
+								$boolToInt = $original['type'] === 'boolean' && $col['type'] === 'integer';
 								unset($col['default'], $col['null']);
 								if ($field !== $col['name']) {
 									$newName = $this->name($col['name']);
@@ -553,7 +556,11 @@ class Postgres extends DboSource {
 									$colList[] = 'ALTER COLUMN ' . $fieldName . '  SET DEFAULT NULL';
 									$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)) . ' USING CASE WHEN TRUE THEN 1 ELSE 0 END';
 								} else {
-									$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
+									if ($original['type'] === 'text' && $col['type'] === 'integer') {
+										$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)) . " USING cast({$fieldName} as INTEGER)";
+									} else {
+										$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
+									}
 								}
 
 								if (isset($nullable)) {
@@ -640,8 +647,8 @@ class Postgres extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param integer $limit Limit of results returned
- * @param integer $offset Offset from which to start results
+ * @param int $limit Limit of results returned
+ * @param int $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	public function limit($limit, $offset = null) {
@@ -710,7 +717,7 @@ class Postgres extends DboSource {
  * Gets the length of a database-native column description, or null if no length
  *
  * @param string $real Real database-layer column type (i.e. "varchar(255)")
- * @return integer An integer representing the length of the column
+ * @return int An integer representing the length of the column
  */
 	public function length($real) {
 		$col = str_replace(array(')', 'unsigned'), '', $real);
@@ -723,7 +730,7 @@ class Postgres extends DboSource {
 			return 36;
 		}
 		if ($limit) {
-			return intval($limit);
+			return (int)$limit;
 		}
 		return null;
 	}
@@ -731,7 +738,7 @@ class Postgres extends DboSource {
 /**
  * resultSet method
  *
- * @param array $results
+ * @param array &$results The results
  * @return void
  */
 	public function resultSet(&$results) {
@@ -786,8 +793,8 @@ class Postgres extends DboSource {
  * Translates between PHP boolean values and PostgreSQL boolean values
  *
  * @param mixed $data Value to be translated
- * @param boolean $quote true to quote a boolean to be used in a query, false to return the boolean value
- * @return boolean Converted boolean value
+ * @param bool $quote true to quote a boolean to be used in a query, false to return the boolean value
+ * @return bool Converted boolean value
  */
 	public function boolean($data, $quote = false) {
 		switch (true) {
@@ -817,7 +824,7 @@ class Postgres extends DboSource {
  * Sets the database encoding
  *
  * @param mixed $enc Database encoding
- * @return boolean True on success, false on failure
+ * @return bool True on success, false on failure
  */
 	public function setEncoding($enc) {
 		return $this->_execute('SET NAMES ' . $this->value($enc)) !== false;
@@ -886,8 +893,8 @@ class Postgres extends DboSource {
 /**
  * Format indexes for create table
  *
- * @param array $indexes
- * @param string $table
+ * @param array $indexes The index to build
+ * @param string $table The table name.
  * @return string
  */
 	public function buildIndex($indexes, $table = null) {
@@ -918,8 +925,8 @@ class Postgres extends DboSource {
 /**
  * Overrides DboSource::renderStatement to handle schema generation with Postgres-style indexes
  *
- * @param string $type
- * @param array $data
+ * @param string $type The query type.
+ * @param array $data The array of data to render.
  * @return string
  */
 	public function renderStatement($type, $data) {
@@ -959,7 +966,7 @@ class Postgres extends DboSource {
 /**
  * Check if the server support nested transactions
  *
- * @return boolean
+ * @return bool
  */
 	public function nestedTransactionSupported() {
 		return $this->useNestedTransactions && version_compare($this->getVersion(), '8.0', '>=');
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php b/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
index 5f58fed5d..9bdc81c4c 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -17,7 +17,7 @@
  */
 
 App::uses('DboSource', 'Model/Datasource');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 /**
  * DBO implementation for the SQLite3 DBMS.
@@ -102,7 +102,7 @@ class Sqlite extends DboSource {
 /**
  * Connects to the database using config['database'] as a filename.
  *
- * @return boolean
+ * @return bool
  * @throws MissingConnectionException
  */
 	public function connect() {
@@ -126,7 +126,7 @@ class Sqlite extends DboSource {
 /**
  * Check whether the SQLite extension is installed/loaded
  *
- * @return boolean
+ * @return bool
  */
 	public function enabled() {
 		return in_array('sqlite', PDO::getAvailableDrivers());
@@ -135,7 +135,7 @@ class Sqlite extends DboSource {
 /**
  * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
  *
- * @param mixed $data
+ * @param mixed $data Unused.
  * @return array Array of table names in the database
  */
 	public function listSources($data = null) {
@@ -202,10 +202,10 @@ class Sqlite extends DboSource {
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  *
- * @param Model $model
- * @param array $fields
- * @param array $values
- * @param mixed $conditions
+ * @param Model $model The model instance to update.
+ * @param array $fields The fields to update.
+ * @param array $values The values to set columns to.
+ * @param mixed $conditions array of conditions to use.
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
@@ -227,7 +227,7 @@ class Sqlite extends DboSource {
  * primary key, where applicable.
  *
  * @param string|Model $table A string or model class representing the table to be truncated
- * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
+ * @return bool SQL TRUNCATE TABLE statement, false if not applicable.
  */
 	public function truncate($table) {
 		if (in_array('sqlite_sequence', $this->listSources())) {
@@ -287,7 +287,7 @@ class Sqlite extends DboSource {
 /**
  * Generate ResultSet
  *
- * @param mixed $results
+ * @param mixed $results The results to modify.
  * @return void
  */
 	public function resultSet($results) {
@@ -297,14 +297,19 @@ class Sqlite extends DboSource {
 		$index = 0;
 		$j = 0;
 
-		//PDO::getColumnMeta is experimental and does not work with sqlite3,
-		//	so try to figure it out based on the querystring
+		// PDO::getColumnMeta is experimental and does not work with sqlite3,
+		// so try to figure it out based on the querystring
 		$querystring = $results->queryString;
-		if (stripos($querystring, 'SELECT') === 0) {
-			$last = strripos($querystring, 'FROM');
-			if ($last !== false) {
-				$selectpart = substr($querystring, 7, $last - 8);
-				$selects = String::tokenize($selectpart, ',', '(', ')');
+		if (stripos($querystring, 'SELECT') === 0 && stripos($querystring, 'FROM') > 0) {
+			$selectpart = substr($querystring, 7);
+			$selects = array();
+			foreach (CakeText::tokenize($selectpart, ',', '(', ')') as $part) {
+				$fromPos = stripos($part, ' FROM ');
+				if ($fromPos !== false) {
+					$selects[] = trim(substr($part, 0, $fromPos));
+					break;
+				}
+				$selects[] = $part;
 			}
 		} elseif (strpos($querystring, 'PRAGMA table_info') === 0) {
 			$selects = array('cid', 'name', 'type', 'notnull', 'dflt_value', 'pk');
@@ -318,7 +323,7 @@ class Sqlite extends DboSource {
 				$j++;
 				continue;
 			}
-			if (preg_match('/\bAS\s+(.*)/i', $selects[$j], $matches)) {
+			if (preg_match('/\bAS(?!.*\bAS\b)\s+(.*)/i', $selects[$j], $matches)) {
 				$columnName = trim($matches[1], '"');
 			} else {
 				$columnName = trim(str_replace('"', '', $selects[$j]));
@@ -371,8 +376,8 @@ class Sqlite extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param integer $limit Limit of results returned
- * @param integer $offset Offset from which to start results
+ * @param int $limit Limit of results returned
+ * @param int $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	public function limit($limit, $offset = null) {
@@ -427,7 +432,7 @@ class Sqlite extends DboSource {
  * Sets the database encoding
  *
  * @param string $enc Database encoding
- * @return boolean
+ * @return bool
  */
 	public function setEncoding($enc) {
 		if (!in_array($enc, array("UTF-8", "UTF-16", "UTF-16le", "UTF-16be"))) {
@@ -448,9 +453,9 @@ class Sqlite extends DboSource {
 /**
  * Removes redundant primary key indexes, as they are handled in the column def of the key.
  *
- * @param array $indexes
- * @param string $table
- * @return string
+ * @param array $indexes The indexes to build.
+ * @param string $table The table name.
+ * @return string The completed index.
  */
 	public function buildIndex($indexes, $table = null) {
 		$join = array();
@@ -509,7 +514,7 @@ class Sqlite extends DboSource {
 							$key['name'] = 'PRIMARY';
 						}
 						$index[$key['name']]['column'] = $keyCol[0]['name'];
-						$index[$key['name']]['unique'] = intval($key['unique'] == 1);
+						$index[$key['name']]['unique'] = (int)$key['unique'] === 1;
 					} else {
 						if (!is_array($index[$key['name']]['column'])) {
 							$col[] = $index[$key['name']]['column'];
@@ -526,8 +531,8 @@ class Sqlite extends DboSource {
 /**
  * Overrides DboSource::renderStatement to handle schema generation with SQLite-style indexes
  *
- * @param string $type
- * @param array $data
+ * @param string $type The type of statement being rendered.
+ * @param array $data The data to convert to SQL.
  * @return string
  */
 	public function renderStatement($type, $data) {
@@ -549,7 +554,7 @@ class Sqlite extends DboSource {
 /**
  * PDO deals in objects, not resources, so overload accordingly.
  *
- * @return boolean
+ * @return bool
  */
 	public function hasResult() {
 		return is_object($this->_result);
@@ -577,7 +582,7 @@ class Sqlite extends DboSource {
 /**
  * Check if the server support nested transactions
  *
- * @return boolean
+ * @return bool
  */
 	public function nestedTransactionSupported() {
 		return $this->useNestedTransactions && version_compare($this->getVersion(), '3.6.8', '>=');
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Sqlserver.php b/web/api/lib/Cake/Model/Datasource/Database/Sqlserver.php
index e7c202c4c..cb66267b5 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Sqlserver.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -115,7 +115,7 @@ class Sqlserver extends DboSource {
 /**
  * Connects to the database using options in the given configuration array.
  *
- * @return boolean True if the database could be connected, else false
+ * @return bool True if the database could be connected, else false
  * @throws MissingConnectionException
  */
 	public function connect() {
@@ -157,7 +157,7 @@ class Sqlserver extends DboSource {
 /**
  * Check that PDO SQL Server is installed/loaded
  *
- * @return boolean
+ * @return bool
  */
 	public function enabled() {
 		return in_array('sqlsrv', PDO::getAvailableDrivers());
@@ -166,7 +166,7 @@ class Sqlserver extends DboSource {
 /**
  * Returns an array of sources (tables) in the database.
  *
- * @param mixed $data
+ * @param mixed $data The names
  * @return array Array of table names in the database
  */
 	public function listSources($data = null) {
@@ -208,7 +208,7 @@ class Sqlserver extends DboSource {
 		}
 
 		$fields = array();
-		$schema = $model->schemaName;
+		$schema = is_object($model) ? $model->schemaName : false;
 
 		$cols = $this->_execute(
 			"SELECT
@@ -269,10 +269,10 @@ class Sqlserver extends DboSource {
 /**
  * Generates the fields list of an SQL query.
  *
- * @param Model $model
+ * @param Model $model The model to get fields for.
  * @param string $alias Alias table name
- * @param array $fields
- * @param boolean $quote
+ * @param array $fields The fields so far.
+ * @param bool $quote Whether or not to quote identfiers.
  * @return array
  */
 	public function fields(Model $model, $alias = null, $fields = array(), $quote = true) {
@@ -338,9 +338,9 @@ class Sqlserver extends DboSource {
  * Removes Identity (primary key) column from update data before returning to parent, if
  * value is empty.
  *
- * @param Model $model
- * @param array $fields
- * @param array $values
+ * @param Model $model The model to insert into.
+ * @param array $fields The fields to set.
+ * @param array $values The values to set.
  * @return array
  */
 	public function create(Model $model, $fields = null, $values = null) {
@@ -367,10 +367,10 @@ class Sqlserver extends DboSource {
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  * Removes Identity (primary key) column from update data before returning to parent.
  *
- * @param Model $model
- * @param array $fields
- * @param array $values
- * @param mixed $conditions
+ * @param Model $model The model to update.
+ * @param array $fields The fields to set.
+ * @param array $values The values to set.
+ * @param mixed $conditions The conditions to use.
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
@@ -389,8 +389,8 @@ class Sqlserver extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param integer $limit Limit of results returned
- * @param integer $offset Offset from which to start results
+ * @param int $limit Limit of results returned
+ * @param int $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	public function limit($limit, $offset = null) {
@@ -474,6 +474,9 @@ class Sqlserver extends DboSource {
 			if (in_array($length->Type, array('nchar', 'nvarchar'))) {
 				return floor($length->Length / 2);
 			}
+			if ($length->Type === 'text') {
+				return null;
+			}
 			return $length->Length;
 		}
 		return parent::length($length);
@@ -482,7 +485,7 @@ class Sqlserver extends DboSource {
 /**
  * Builds a map of the columns contained in a result
  *
- * @param PDOStatement $results
+ * @param PDOStatement $results The result to modify.
  * @return void
  */
 	public function resultSet($results) {
@@ -537,11 +540,11 @@ class Sqlserver extends DboSource {
 				if (version_compare($this->getVersion(), '11', '<') && preg_match('/FETCH\sFIRST\s+([0-9]+)/i', $limit, $offset)) {
 					preg_match('/OFFSET\s*(\d+)\s*.*?(\d+)\s*ROWS/', $limit, $limitOffset);
 
-					$limit = 'TOP ' . intval($limitOffset[2]);
-					$page = intval($limitOffset[1] / $limitOffset[2]);
-					$offset = intval($limitOffset[2] * $page);
+					$limit = 'TOP ' . (int)$limitOffset[2];
+					$page = (int)($limitOffset[1] / $limitOffset[2]);
+					$offset = (int)($limitOffset[2] * $page);
 
-					$rowCounter = self::ROW_COUNTER;
+					$rowCounter = static::ROW_COUNTER;
 					$sql = "SELECT {$limit} * FROM (
 							SELECT {$fields}, ROW_NUMBER() OVER ({$order}) AS {$rowCounter}
 							FROM {$table} {$alias} {$joins} {$conditions} {$group}
@@ -581,11 +584,12 @@ class Sqlserver extends DboSource {
  *
  * @param string $data String to be prepared for use in an SQL statement
  * @param string $column The column into which this data will be inserted
+ * @param bool $null Column allows NULL values
  * @return string Quoted and escaped data
  */
-	public function value($data, $column = null) {
+	public function value($data, $column = null, $null = true) {
 		if ($data === null || is_array($data) || is_object($data)) {
-			return parent::value($data, $column);
+			return parent::value($data, $column, $null);
 		}
 		if (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
 			return $data;
@@ -600,7 +604,7 @@ class Sqlserver extends DboSource {
 			case 'text':
 				return 'N' . $this->_connection->quote($data, PDO::PARAM_STR);
 			default:
-				return parent::value($data, $column);
+				return parent::value($data, $column, $null);
 		}
 	}
 
@@ -608,9 +612,9 @@ class Sqlserver extends DboSource {
  * Returns an array of all result rows for a given SQL query.
  * Returns false if no rows matched.
  *
- * @param Model $model
- * @param array $queryData
- * @param integer $recursive
+ * @param Model $model The model to read from
+ * @param array $queryData The query data
+ * @param int $recursive How many layers to go.
  * @return array|false Array of resultset rows, or false if no rows matched
  */
 	public function read(Model $model, $queryData = array(), $recursive = null) {
@@ -630,7 +634,7 @@ class Sqlserver extends DboSource {
 			$resultRow = array();
 			foreach ($this->map as $col => $meta) {
 				list($table, $column, $type) = $meta;
-				if ($table === 0 && $column === self::ROW_COUNTER) {
+				if ($table === 0 && $column === static::ROW_COUNTER) {
 					continue;
 				}
 				$resultRow[$table][$column] = $row[$col];
@@ -647,9 +651,9 @@ class Sqlserver extends DboSource {
 /**
  * Inserts multiple values into a table
  *
- * @param string $table
- * @param string $fields
- * @param array $values
+ * @param string $table The table to insert into.
+ * @param string $fields The fields to set.
+ * @param array $values The values to set.
  * @return void
  */
 	public function insertMulti($table, $fields, $values) {
@@ -688,7 +692,7 @@ class Sqlserver extends DboSource {
 			} else {
 				$result = str_replace('DEFAULT NULL', 'NULL', $result);
 			}
-		} elseif (array_keys($column) == array('type', 'name')) {
+		} elseif (array_keys($column) === array('type', 'name')) {
 			$result .= ' NULL';
 		} elseif (strpos($result, "DEFAULT N'")) {
 			$result = str_replace("DEFAULT N'", "DEFAULT '", $result);
@@ -699,8 +703,8 @@ class Sqlserver extends DboSource {
 /**
  * Format indexes for create table
  *
- * @param array $indexes
- * @param string $table
+ * @param array $indexes The indexes to build
+ * @param string $table The table to make indexes for.
  * @return string
  */
 	public function buildIndex($indexes, $table = null) {
@@ -744,8 +748,8 @@ class Sqlserver extends DboSource {
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
  *
- * @param mixed $source
- * @return integer Number of affected rows
+ * @param mixed $source Unused
+ * @return int Number of affected rows
  */
 	public function lastAffected($source = null) {
 		$affected = parent::lastAffected();
@@ -767,6 +771,7 @@ class Sqlserver extends DboSource {
  */
 	protected function _execute($sql, $params = array(), $prepareOptions = array()) {
 		$this->_lastAffected = false;
+		$sql = trim($sql);
 		if (strncasecmp($sql, 'SELECT', 6) === 0 || preg_match('/^EXEC(?:UTE)?\s/mi', $sql) > 0) {
 			$prepareOptions += array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL);
 			return parent::_execute($sql, $params, $prepareOptions);
diff --git a/web/api/lib/Cake/Model/Datasource/DboSource.php b/web/api/lib/Cake/Model/Datasource/DboSource.php
index d4217e97e..25d186bca 100644
--- a/web/api/lib/Cake/Model/Datasource/DboSource.php
+++ b/web/api/lib/Cake/Model/Datasource/DboSource.php
@@ -17,7 +17,7 @@
  */
 
 App::uses('DataSource', 'Model/Datasource');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('View', 'View');
 
 /**
@@ -63,7 +63,7 @@ class DboSource extends DataSource {
  * Whether or not to cache the results of DboSource::name() and DboSource::conditions()
  * into the memory cache. Set to false to disable the use of the memory cache.
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheMethods = true;
 
@@ -72,14 +72,14 @@ class DboSource extends DataSource {
  * the transaction methods (begin/commit/rollback), but just the global transaction will
  * be executed.
  *
- * @var boolean
+ * @var bool
  */
 	public $useNestedTransactions = false;
 
 /**
  * Print full query debug info?
  *
- * @var boolean
+ * @var bool
  */
 	public $fullDebug = false;
 
@@ -93,14 +93,14 @@ class DboSource extends DataSource {
 /**
  * Number of rows in current resultset
  *
- * @var integer
+ * @var int
  */
 	public $numRows = null;
 
 /**
  * Time the last query took
  *
- * @var integer
+ * @var int
  */
 	public $took = null;
 
@@ -114,14 +114,14 @@ class DboSource extends DataSource {
 /**
  * Queries count.
  *
- * @var integer
+ * @var int
  */
 	protected $_queriesCnt = 0;
 
 /**
  * Total duration of all queries.
  *
- * @var integer
+ * @var int
  */
 	protected $_queriesTime = null;
 
@@ -137,14 +137,14 @@ class DboSource extends DataSource {
  *
  * This is to prevent query log taking over too much memory.
  *
- * @var integer Maximum number of queries in the queries log.
+ * @var int
  */
 	protected $_queriesLogMax = 200;
 
 /**
  * Caches serialized results of executed queries
  *
- * @var array Cache of results from executed sql queries.
+ * @var array
  */
 	protected $_queryCache = array();
 
@@ -181,12 +181,12 @@ class DboSource extends DataSource {
  *
  * @var array
  */
-	protected $_sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
+	protected $_sqlOps = array('like', 'ilike', 'rlike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
 
 /**
  * Indicates the level of nested transactions
  *
- * @var integer
+ * @var int
  */
 	protected $_transactionNesting = 0;
 
@@ -232,7 +232,7 @@ class DboSource extends DataSource {
  * Indicates whether there was a change on the cached results on the methods of this class
  * This will be used for storing in a more persistent cache
  *
- * @var boolean
+ * @var bool
  */
 	protected $_methodCacheChange = false;
 
@@ -240,7 +240,7 @@ class DboSource extends DataSource {
  * Constructor
  *
  * @param array $config Array of configuration information for the Datasource.
- * @param boolean $autoConnect Whether or not the datasource should automatically connect.
+ * @param bool $autoConnect Whether or not the datasource should automatically connect.
  * @throws MissingConnectionException when a connection cannot be made.
  */
 	public function __construct($config = null, $autoConnect = true) {
@@ -265,7 +265,7 @@ class DboSource extends DataSource {
  * Reconnects to database server with optional new settings
  *
  * @param array $config An array defining the new configuration settings
- * @return boolean True on success, false on failure
+ * @return bool True on success, false on failure
  */
 	public function reconnect($config = array()) {
 		$this->disconnect();
@@ -278,13 +278,13 @@ class DboSource extends DataSource {
 /**
  * Disconnects from database.
  *
- * @return boolean Always true
+ * @return bool Always true
  */
 	public function disconnect() {
 		if ($this->_result instanceof PDOStatement) {
 			$this->_result->closeCursor();
 		}
-		unset($this->_connection);
+		$this->_connection = null;
 		$this->connected = false;
 		return true;
 	}
@@ -312,9 +312,10 @@ class DboSource extends DataSource {
  *
  * @param string $data String to be prepared for use in an SQL statement
  * @param string $column The column datatype into which this data will be inserted.
+ * @param bool $null Column allows NULL values
  * @return string Quoted and escaped data
  */
-	public function value($data, $column = null) {
+	public function value($data, $column = null, $null = true) {
 		if (is_array($data) && !empty($data)) {
 			return array_map(
 				array(&$this, 'value'),
@@ -348,14 +349,16 @@ class DboSource extends DataSource {
 				return $this->_connection->quote($data, PDO::PARAM_STR);
 			default:
 				if ($data === '') {
-					return 'NULL';
+					return $null ? 'NULL' : '""';
 				}
 				if (is_float($data)) {
 					return str_replace(',', '.', strval($data));
 				}
 				if ((is_int($data) || $data === '0') || (
-					is_numeric($data) && strpos($data, ',') === false &&
-					$data[0] != '0' && strpos($data, 'e') === false)
+					is_numeric($data) &&
+					strpos($data, ',') === false &&
+					$data[0] != '0' &&
+					strpos($data, 'e') === false)
 				) {
 					return $data;
 				}
@@ -396,11 +399,11 @@ class DboSource extends DataSource {
  *
  * @param string $sql SQL statement
  * @param array $params Additional options for the query.
- * @return boolean
+ * @return mixed Resource or object representing the result set, or false on failure
  */
 	public function rawQuery($sql, $params = array()) {
 		$this->took = $this->numRows = false;
-		return $this->execute($sql, $params);
+		return $this->execute($sql, array(), $params);
 	}
 
 /**
@@ -413,8 +416,8 @@ class DboSource extends DataSource {
  * - log - Whether or not the query should be logged to the memory log.
  *
  * @param string $sql SQL statement
- * @param array $options
- * @param array $params values to be bound to the query
+ * @param array $options The options for executing the query.
+ * @param array $params values to be bound to the query.
  * @return mixed Resource or object representing the result set, or false on failure
  */
 	public function execute($sql, $options = array(), $params = array()) {
@@ -499,8 +502,8 @@ class DboSource extends DataSource {
  * Returns number of affected rows in previous database operation. If no previous operation exists,
  * this returns false.
  *
- * @param mixed $source
- * @return integer Number of affected rows
+ * @param mixed $source The source to check.
+ * @return int Number of affected rows
  */
 	public function lastAffected($source = null) {
 		if ($this->hasResult()) {
@@ -514,7 +517,7 @@ class DboSource extends DataSource {
  * this returns false.
  *
  * @param mixed $source Not used
- * @return integer Number of rows in resultset
+ * @return int Number of rows in resultset
  */
 	public function lastNumRows($source = null) {
 		return $this->lastAffected();
@@ -535,16 +538,11 @@ class DboSource extends DataSource {
 
 		if (count($args) === 1) {
 			return $this->fetchAll($args[0]);
-		} elseif (count($args) > 1 && (strpos($args[0], 'findBy') === 0 || strpos($args[0], 'findAllBy') === 0)) {
+		} elseif (count($args) > 1 && preg_match('/^find(\w*)By(.+)/', $args[0], $matches)) {
 			$params = $args[1];
 
-			if (substr($args[0], 0, 6) === 'findBy') {
-				$all = false;
-				$field = Inflector::underscore(substr($args[0], 6));
-			} else {
-				$all = true;
-				$field = Inflector::underscore(substr($args[0], 9));
-			}
+			$findType = lcfirst($matches[1]);
+			$field = Inflector::underscore($matches[2]);
 
 			$or = (strpos($field, '_or_') !== false);
 			if ($or) {
@@ -577,7 +575,7 @@ class DboSource extends DataSource {
 				$conditions = array('OR' => $conditions);
 			}
 
-			if ($all) {
+			if ($findType !== 'first' && $findType !== '') {
 				if (isset($params[3 + $off])) {
 					$limit = $params[3 + $off];
 				}
@@ -589,7 +587,7 @@ class DboSource extends DataSource {
 				if (isset($params[5 + $off])) {
 					$recursive = $params[5 + $off];
 				}
-				return $args[2]->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+				return $args[2]->find($findType, compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
 			}
 			if (isset($params[3 + $off])) {
 				$recursive = $params[3 + $off];
@@ -645,10 +643,10 @@ class DboSource extends DataSource {
  *   by setting $options to `false`
  *
  * @param string $sql SQL statement
- * @param array|boolean $params Either parameters to be bound as values for the SQL statement,
+ * @param array|bool $params Either parameters to be bound as values for the SQL statement,
  *  or a boolean to control query caching.
  * @param array $options additional options for the query.
- * @return boolean|array Array of resultset rows, or false if no rows matched
+ * @return bool|array Array of resultset rows, or false if no rows matched
  */
 	public function fetchAll($sql, $params = array(), $options = array()) {
 		if (is_string($options)) {
@@ -695,7 +693,7 @@ class DboSource extends DataSource {
 /**
  * Fetches the next row from the current result set
  *
- * @return boolean
+ * @return bool
  */
 	public function fetchResult() {
 		return false;
@@ -704,7 +702,7 @@ class DboSource extends DataSource {
 /**
  * Modifies $result array to place virtual fields in model entry where they belongs to
  *
- * @param array $result Reference to the fetched row
+ * @param array &$result Reference to the fetched row
  * @return void
  */
 	public function fetchVirtualField(&$result) {
@@ -736,9 +734,9 @@ class DboSource extends DataSource {
 /**
  * Returns a single field of the first of query results for a given SQL query, or false if empty.
  *
- * @param string $name Name of the field
- * @param string $sql SQL query
- * @return mixed Value of field read.
+ * @param string $name The name of the field to get.
+ * @param string $sql The SQL query.
+ * @return mixed Value of field read, or false if not found.
  */
 	public function field($name, $sql) {
 		$data = $this->fetchRow($sql);
@@ -756,7 +754,7 @@ class DboSource extends DataSource {
  */
 	public function flushMethodCache() {
 		$this->_methodCacheChange = true;
-		self::$methodCache = array();
+		static::$methodCache = array();
 	}
 
 /**
@@ -775,14 +773,14 @@ class DboSource extends DataSource {
 		if ($this->cacheMethods === false) {
 			return $value;
 		}
-		if (!$this->_methodCacheChange && empty(self::$methodCache)) {
-			self::$methodCache = Cache::read('method_cache', '_cake_core_');
+		if (!$this->_methodCacheChange && empty(static::$methodCache)) {
+			static::$methodCache = (array)Cache::read('method_cache', '_cake_core_');
 		}
 		if ($value === null) {
-			return (isset(self::$methodCache[$method][$key])) ? self::$methodCache[$method][$key] : null;
+			return (isset(static::$methodCache[$method][$key])) ? static::$methodCache[$method][$key] : null;
 		}
 		$this->_methodCacheChange = true;
-		return self::$methodCache[$method][$key] = $value;
+		return static::$methodCache[$method][$key] = $value;
 	}
 
 /**
@@ -834,9 +832,7 @@ class DboSource extends DataSource {
 				$matches[1] . '(' . $this->name($matches[2]) . ')'
 			);
 		}
-		if (
-			preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
-		)) {
+		if (preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches)) {
 			return $this->cacheMethod(
 				__FUNCTION__, $cacheKey,
 				preg_replace(
@@ -853,16 +849,26 @@ class DboSource extends DataSource {
 /**
  * Checks if the source is connected to the database.
  *
- * @return boolean True if the database is connected, else false
+ * @return bool True if the database is connected, else false
  */
 	public function isConnected() {
+		if ($this->_connection === null) {
+			$connected = false;
+		} else {
+			try {
+				$connected = $this->_connection->query('SELECT 1');
+			} catch (Exception $e) {
+				$connected = false;
+			}
+		}
+		$this->connected = !empty($connected);
 		return $this->connected;
 	}
 
 /**
  * Checks if the result is valid
  *
- * @return boolean True if the result is valid else false
+ * @return bool True if the result is valid else false
  */
 	public function hasResult() {
 		return $this->_result instanceof PDOStatement;
@@ -871,8 +877,8 @@ class DboSource extends DataSource {
 /**
  * Get the query log as an array.
  *
- * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
- * @param boolean $clear If True the existing log will cleared.
+ * @param bool $sorted Get the queries sorted by time taken, defaults to false.
+ * @param bool $clear If True the existing log will cleared.
  * @return array Array of queries run as an array
  */
 	public function getLog($sorted = false, $clear = true) {
@@ -891,7 +897,7 @@ class DboSource extends DataSource {
  * Outputs the contents of the queries log. If in a non-CLI environment the sql_log element
  * will be rendered and output. If in a CLI environment, a plain text log is generated.
  *
- * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @param bool $sorted Get the queries sorted by time taken, defaults to false.
  * @return void
  */
 	public function showLog($sorted = false) {
@@ -937,8 +943,8 @@ class DboSource extends DataSource {
  * Gets full table name including prefix
  *
  * @param Model|string $model Either a Model object or a string table name.
- * @param boolean $quote Whether you want the table name quoted.
- * @param boolean $schema Whether you want the schema name included.
+ * @param bool $quote Whether you want the table name quoted.
+ * @param bool $schema Whether you want the schema name included.
  * @return string Full quoted table name
  */
 	public function fullTableName($model, $quote = true, $schema = true) {
@@ -983,7 +989,7 @@ class DboSource extends DataSource {
  *   used to generate field names.
  * @param array $values An array of values with keys matching the fields. If null, $Model->data will
  *   be used to generate values.
- * @return boolean Success
+ * @return bool Success
  */
 	public function create(Model $Model, $fields = null, $values = null) {
 		$id = null;
@@ -996,9 +1002,10 @@ class DboSource extends DataSource {
 		$count = count($fields);
 
 		for ($i = 0; $i < $count; $i++) {
-			$valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i]));
+			$schema = $Model->schema();
+			$valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i]), isset($schema[$fields[$i]]) ? $schema[$fields[$i]]['null'] : true);
 			$fieldInsert[] = $this->name($fields[$i]);
-			if ($fields[$i] == $Model->primaryKey) {
+			if ($fields[$i] === $Model->primaryKey) {
 				$id = $values[$i];
 			}
 		}
@@ -1029,7 +1036,7 @@ class DboSource extends DataSource {
  *
  * @param Model $Model A Model object that the query is for.
  * @param array $queryData An array of queryData information containing keys similar to Model::find().
- * @param integer $recursive Number of levels of association
+ * @param int $recursive Number of levels of association
  * @return mixed boolean false on error/failure. An array of results on success.
  */
 	public function read(Model $Model, $queryData = array(), $recursive = null) {
@@ -1113,11 +1120,6 @@ class DboSource extends DataSource {
 
 		$filtered = array();
 
-		// Filter hasOne and belongsTo associations
-		if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
-			$filtered = $this->_filterResults($resultSet, $Model);
-		}
-
 		// Deep associations
 		if ($Model->recursive > -1) {
 			$joined = array();
@@ -1140,6 +1142,7 @@ class DboSource extends DataSource {
 						$stack['_joined'] = $joined;
 
 						$db->queryAssociation($Model, $LinkModel, $type, $assoc, $assocData, $array, true, $resultSet, $Model->recursive - 1, $stack);
+						unset($db);
 
 						if ($type === 'hasMany' || $type === 'hasAndBelongsToMany') {
 							$filtered[] = $assoc;
@@ -1147,10 +1150,10 @@ class DboSource extends DataSource {
 					}
 				}
 			}
+		}
 
-			if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
-				$this->_filterResults($resultSet, $Model, $filtered);
-			}
+		if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
+			$this->_filterResults($resultSet, $Model, $filtered);
 		}
 
 		if ($recursive !== null) {
@@ -1165,7 +1168,7 @@ class DboSource extends DataSource {
  *
  * The primary model is always excluded, because the filtering is later done by Model::_filterResults().
  *
- * @param array $resultSet Reference of resultset to be filtered.
+ * @param array &$resultSet Reference of resultset to be filtered.
  * @param Model $Model Instance of model to operate against.
  * @param array $filtered List of classes already filtered, to be skipped.
  * @return array Array of results that have been filtered through $Model->afterFind.
@@ -1204,6 +1207,30 @@ class DboSource extends DataSource {
 		return $filtering;
 	}
 
+/**
+ * Passes association results through afterFind filters of the corresponding model.
+ *
+ * Similar to DboSource::_filterResults(), but this filters only specified models.
+ * The primary model can not be specified, because this call DboSource::_filterResults() internally.
+ *
+ * @param array &$resultSet Reference of resultset to be filtered.
+ * @param Model $Model Instance of model to operate against.
+ * @param array $toBeFiltered List of classes to be filtered.
+ * @return array Array of results that have been filtered through $Model->afterFind.
+ */
+	protected function _filterResultsInclusive(&$resultSet, Model $Model, $toBeFiltered = array()) {
+		$exclude = array();
+
+		if (is_array($resultSet)) {
+			$current = reset($resultSet);
+			if (is_array($current)) {
+				$exclude = array_diff(array_keys($current), $toBeFiltered);
+			}
+		}
+
+		return $this->_filterResults($resultSet, $Model, $exclude);
+	}
+
 /**
  * Queries associations.
  *
@@ -1220,11 +1247,11 @@ class DboSource extends DataSource {
  * @param string $type Association type, one of the model association types ie. hasMany.
  * @param string $association Association name.
  * @param array $assocData Association data.
- * @param array $queryData An array of queryData information containing keys similar to Model::find().
- * @param boolean $external Whether or not the association query is on an external datasource.
- * @param array $resultSet Existing results.
- * @param integer $recursive Number of levels of association.
- * @param array $stack
+ * @param array &$queryData An array of queryData information containing keys similar to Model::find().
+ * @param bool $external Whether or not the association query is on an external datasource.
+ * @param array &$resultSet Existing results.
+ * @param int $recursive Number of levels of association.
+ * @param array $stack A list with joined models.
  * @return mixed
  * @throws CakeException when results cannot be created.
  */
@@ -1236,7 +1263,7 @@ class DboSource extends DataSource {
 
 		$queryTemplate = $this->generateAssociationQuery($Model, $LinkModel, $type, $association, $assocData, $queryData, $external);
 		if (empty($queryTemplate)) {
-			return;
+			return null;
 		}
 
 		if (!is_array($resultSet)) {
@@ -1275,7 +1302,7 @@ class DboSource extends DataSource {
 
 			// Filter
 			if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
-				$this->_filterResults($assocResultSet, $Model);
+				$this->_filterResultsInclusive($assocResultSet, $Model, array($association));
 			}
 
 			// Merge
@@ -1304,7 +1331,7 @@ class DboSource extends DataSource {
 
 			// Filter
 			if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
-				$this->_filterResults($assocResultSet, $Model);
+				$this->_filterResultsInclusive($assocResultSet, $Model, array($association, $with));
 			}
 		}
 
@@ -1315,9 +1342,9 @@ class DboSource extends DataSource {
 		foreach ($resultSet as &$row) {
 			if ($type === 'hasOne' || $type === 'belongsTo' || $type === 'hasMany') {
 				$assocResultSet = array();
+				$prefetched = false;
 
-				if (
-					($type === 'hasOne' || $type === 'belongsTo') &&
+				if (($type === 'hasOne' || $type === 'belongsTo') &&
 					isset($row[$LinkModel->alias], $joined[$Model->alias]) &&
 					in_array($LinkModel->alias, $joined[$Model->alias])
 				) {
@@ -1325,6 +1352,7 @@ class DboSource extends DataSource {
 					if (!empty($joinedData)) {
 						$assocResultSet[0] = array($LinkModel->alias => $row[$LinkModel->alias]);
 					}
+					$prefetched = true;
 				} else {
 					$query = $this->insertQueryData($queryTemplate, $row, $association, $Model, $stack);
 					if ($query !== false) {
@@ -1339,8 +1367,7 @@ class DboSource extends DataSource {
 						foreach ($LinkModel->{$type1} as $assoc1 => $assocData1) {
 							$DeepModel = $LinkModel->{$assoc1};
 
-							if (
-								$type1 === 'belongsTo' ||
+							if ($type1 === 'belongsTo' ||
 								($type === 'belongsTo' && $DeepModel->alias === $modelAlias) ||
 								($DeepModel->alias !== $modelAlias)
 							) {
@@ -1372,10 +1399,15 @@ class DboSource extends DataSource {
 						$this->_mergeAssociation($row, $merge, $association, $type);
 					}
 				} else {
+					if (!$prefetched && $LinkModel->useConsistentAfterFind) {
+						if ($queryData['callbacks'] === true || $queryData['callbacks'] === 'after') {
+							$this->_filterResultsInclusive($assocResultSet, $Model, array($association));
+						}
+					}
 					$this->_mergeAssociation($row, $assocResultSet, $association, $type, $selfJoin);
 				}
 
-				if ($type !== 'hasAndBelongsToMany' && isset($row[$association])) {
+				if ($type !== 'hasAndBelongsToMany' && isset($row[$association]) && !$prefetched && !$LinkModel->useConsistentAfterFind) {
 					$row[$association] = $LinkModel->afterFind($row[$association], false);
 				}
 
@@ -1412,11 +1444,10 @@ class DboSource extends DataSource {
 	protected function _fetchHasMany(Model $Model, $query, $ids) {
 		$ids = array_unique($ids);
 
-		$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
 		if (count($ids) > 1) {
-			$query = str_replace('= (', 'IN (', $query);
+			$query = str_replace('= ({$__cakeID__$}', 'IN ({$__cakeID__$}', $query);
 		}
-
+		$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
 		return $this->fetchAll($query, $Model->cacheQueries);
 	}
 
@@ -1448,7 +1479,7 @@ class DboSource extends DataSource {
  *
  * Note: this function also deals with the formatting of the data.
  *
- * @param array $resultSet Data to merge into.
+ * @param array &$resultSet Data to merge into.
  * @param array $assocResultSet Data to merge.
  * @param string $association Name of Model being merged.
  * @param Model $Model Model being merged onto.
@@ -1494,11 +1525,11 @@ class DboSource extends DataSource {
 /**
  * Merge association of merge into data
  *
- * @param array $data
- * @param array $merge
- * @param string $association
- * @param string $type
- * @param boolean $selfJoin
+ * @param array &$data The data to merge.
+ * @param array &$merge The data to merge.
+ * @param string $association The association name to merge.
+ * @param string $type The type of association
+ * @param bool $selfJoin Whether or not this is a self join.
  * @return void
  */
 	protected function _mergeAssociation(&$data, &$merge, $association, $type, $selfJoin = false) {
@@ -1526,6 +1557,7 @@ class DboSource extends DataSource {
 					}
 				} else {
 					if (is_array($merge[0][$association])) {
+						$mergeAssocTmp = array();
 						foreach ($dataAssociation as $k => $v) {
 							if (!is_array($v)) {
 								$dataAssocTmp[$k] = $v;
@@ -1579,7 +1611,7 @@ class DboSource extends DataSource {
  *
  * When no fields are set, all the $Model fields are returned.
  *
- * @param Model $Model
+ * @param Model $Model The model to prepare.
  * @param array $queryData An array of queryData information containing keys similar to Model::find().
  * @return array Array containing SQL fields.
  */
@@ -1592,8 +1624,7 @@ class DboSource extends DataSource {
 			$assocFields = $this->fields($Model, null, "{$Model->alias}.{$Model->primaryKey}");
 			$passedFields = $queryData['fields'];
 
-			if (
-				count($passedFields) > 1 ||
+			if (count($passedFields) > 1 ||
 				(strpos($passedFields[0], $assocFields[0]) === false && !preg_match('/^[a-z]+\(/i', $passedFields[0]))
 			) {
 				$queryData['fields'] = array_merge($passedFields, $assocFields);
@@ -1608,7 +1639,7 @@ class DboSource extends DataSource {
  *
  * This is merely a convenient wrapper to DboSource::buildStatement().
  *
- * @param Model $Model
+ * @param Model $Model The model to build an association query for.
  * @param array $queryData An array of queryData information containing keys similar to Model::find().
  * @return string String containing an SQL statement.
  * @see DboSource::buildStatement()
@@ -1642,8 +1673,8 @@ class DboSource extends DataSource {
  * @param string $type Association type, one of the model association types ie. hasMany.
  * @param string $association Association name.
  * @param array $assocData Association data.
- * @param array $queryData An array of queryData information containing keys similar to Model::find().
- * @param boolean $external Whether or not the association query is on an external datasource.
+ * @param array &$queryData An array of queryData information containing keys similar to Model::find().
+ * @param bool $external Whether or not the association query is on an external datasource.
  * @return mixed
  *   String representing a query.
  *   True, when $external is false and association $type is 'hasOne' or 'belongsTo'.
@@ -1862,7 +1893,7 @@ class DboSource extends DataSource {
 			'type' => null,
 			'alias' => null,
 			'table' => 'join_table',
-			'conditions' => array()
+			'conditions' => '',
 		), $join);
 
 		if (!empty($data['alias'])) {
@@ -1912,11 +1943,11 @@ class DboSource extends DataSource {
 /**
  * Renders a final SQL JOIN statement
  *
- * @param array $data
+ * @param array $data The data to generate a join statement for.
  * @return string
  */
 	public function renderJoinStatement($data) {
-		if (strtoupper($data['type']) === 'CROSS') {
+		if (strtoupper($data['type']) === 'CROSS' || empty($data['conditions'])) {
 			return "{$data['type']} JOIN {$data['table']} {$data['alias']}";
 		}
 		return trim("{$data['type']} JOIN {$data['table']} {$data['alias']} ON ({$data['conditions']})");
@@ -1927,7 +1958,7 @@ class DboSource extends DataSource {
  *
  * @param string $type type of query being run. e.g select, create, update, delete, schema, alter.
  * @param array $data Array of data to insert into the query.
- * @return string Rendered SQL expression to be run.
+ * @return string|null Rendered SQL expression to be run, otherwise null.
  */
 	public function renderStatement($type, $data) {
 		extract($data);
@@ -1961,15 +1992,15 @@ class DboSource extends DataSource {
 				}
 				return "CREATE TABLE {$table} (\n{$columns}{$indexes}) {$tableParameters};";
 			case 'alter':
-				return;
+				return null;
 		}
 	}
 
 /**
  * Merges a mixed set of string/array conditions.
  *
- * @param mixed $query
- * @param mixed $assoc
+ * @param mixed $query The query to merge conditions for.
+ * @param mixed $assoc The association names.
  * @return array
  */
 	protected function _mergeConditions($query, $assoc) {
@@ -1998,11 +2029,11 @@ class DboSource extends DataSource {
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  * For databases that do not support aliases in UPDATE queries.
  *
- * @param Model $Model
- * @param array $fields
- * @param array $values
- * @param mixed $conditions
- * @return boolean Success
+ * @param Model $Model The model to update.
+ * @param array $fields The fields to update
+ * @param array $values The values fo the fields.
+ * @param mixed $conditions The conditions for the update. When non-empty $values will not be quoted.
+ * @return bool Success
  */
 	public function update(Model $Model, $fields = array(), $values = null, $conditions = null) {
 		if (!$values) {
@@ -2032,14 +2063,15 @@ class DboSource extends DataSource {
 /**
  * Quotes and prepares fields and values for an SQL UPDATE statement
  *
- * @param Model $Model
- * @param array $fields
- * @param boolean $quoteValues If values should be quoted, or treated as SQL snippets
- * @param boolean $alias Include the model alias in the field name
+ * @param Model $Model The model to prepare fields for.
+ * @param array $fields The fields to update.
+ * @param bool $quoteValues If values should be quoted, or treated as SQL snippets
+ * @param bool $alias Include the model alias in the field name
  * @return array Fields and values, quoted and prepared
  */
 	protected function _prepareUpdateFields(Model $Model, $fields, $quoteValues = true, $alias = false) {
 		$quotedAlias = $this->startQuote . $Model->alias . $this->endQuote;
+		$schema = $Model->schema();
 
 		$updates = array();
 		foreach ($fields as $field => $value) {
@@ -2060,7 +2092,7 @@ class DboSource extends DataSource {
 			$update = $quoted . ' = ';
 
 			if ($quoteValues) {
-				$update .= $this->value($value, $Model->getColumnType($field));
+				$update .= $this->value($value, $Model->getColumnType($field), isset($schema[$field]) ? $schema[$field]['null'] : true);
 			} elseif ($Model->getColumnType($field) === 'boolean' && (is_int($value) || is_bool($value))) {
 				$update .= $this->boolean($value, true);
 			} elseif (!$alias) {
@@ -2079,9 +2111,9 @@ class DboSource extends DataSource {
  * Generates and executes an SQL DELETE statement.
  * For databases that do not support aliases in UPDATE queries.
  *
- * @param Model $Model
- * @param mixed $conditions
- * @return boolean Success
+ * @param Model $Model The model to delete from
+ * @param mixed $conditions The conditions to use. If empty the model's primary key will be used.
+ * @return bool Success
  */
 	public function delete(Model $Model, $conditions = null) {
 		$alias = $joins = null;
@@ -2103,8 +2135,8 @@ class DboSource extends DataSource {
  * Gets a list of record IDs for the given conditions. Used for multi-record updates and deletes
  * in databases that do not support aliases in UPDATE/DELETE queries.
  *
- * @param Model $Model
- * @param mixed $conditions
+ * @param Model $Model The model to find matching records for.
+ * @param mixed $conditions The conditions to match against.
  * @return array List of record IDs
  */
 	protected function _matchRecords(Model $Model, $conditions = null) {
@@ -2153,7 +2185,7 @@ class DboSource extends DataSource {
 /**
  * Returns an array of SQL JOIN conditions from a model's associations.
  *
- * @param Model $Model
+ * @param Model $Model The model to get joins for.2
  * @return array
  */
 	protected function _getJoins(Model $Model) {
@@ -2192,7 +2224,7 @@ class DboSource extends DataSource {
 /**
  * Returns an SQL calculation, i.e. COUNT() or MAX()
  *
- * @param Model $Model
+ * @param Model $Model The model to get a calculated field for.
  * @param string $func Lowercase name of SQL function, i.e. 'count' or 'max'
  * @param array $params Function parameters (any values must be quoted manually)
  * @return string An SQL calculation function
@@ -2233,7 +2265,7 @@ class DboSource extends DataSource {
  * primary key, where applicable.
  *
  * @param Model|string $table A string or model class representing the table to be truncated
- * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
+ * @return bool SQL TRUNCATE TABLE statement, false if not applicable.
  */
 	public function truncate($table) {
 		return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
@@ -2242,7 +2274,7 @@ class DboSource extends DataSource {
 /**
  * Check if the server support nested transactions
  *
- * @return boolean
+ * @return bool
  */
 	public function nestedTransactionSupported() {
 		return false;
@@ -2251,7 +2283,7 @@ class DboSource extends DataSource {
 /**
  * Begin a transaction
  *
- * @return boolean True on success, false on fail
+ * @return bool True on success, false on fail
  * (i.e. if the database/model does not support transactions,
  * or a transaction has not started).
  */
@@ -2274,7 +2306,7 @@ class DboSource extends DataSource {
 /**
  * Begin a nested transaction
  *
- * @return boolean
+ * @return bool
  */
 	protected function _beginNested() {
 		$query = 'SAVEPOINT LEVEL' . ++$this->_transactionNesting;
@@ -2288,7 +2320,7 @@ class DboSource extends DataSource {
 /**
  * Commit a transaction
  *
- * @return boolean True on success, false on fail
+ * @return bool True on success, false on fail
  * (i.e. if the database/model does not support transactions,
  * or a transaction has not started).
  */
@@ -2316,7 +2348,7 @@ class DboSource extends DataSource {
 /**
  * Commit a nested transaction
  *
- * @return boolean
+ * @return bool
  */
 	protected function _commitNested() {
 		$query = 'RELEASE SAVEPOINT LEVEL' . $this->_transactionNesting--;
@@ -2330,7 +2362,7 @@ class DboSource extends DataSource {
 /**
  * Rollback a transaction
  *
- * @return boolean True on success, false on fail
+ * @return bool True on success, false on fail
  * (i.e. if the database/model does not support transactions,
  * or a transaction has not started).
  */
@@ -2358,7 +2390,7 @@ class DboSource extends DataSource {
 /**
  * Rollback a nested transaction
  *
- * @return boolean
+ * @return bool
  */
 	protected function _rollbackNested() {
 		$query = 'ROLLBACK TO SAVEPOINT LEVEL' . $this->_transactionNesting--;
@@ -2372,7 +2404,7 @@ class DboSource extends DataSource {
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
- * @param mixed $source
+ * @param mixed $source The source to get an id for.
  * @return mixed
  */
 	public function lastInsertId($source = null) {
@@ -2384,11 +2416,11 @@ class DboSource extends DataSource {
  * If conditions are supplied then they will be returned. If a model doesn't exist and no conditions
  * were provided either null or false will be returned based on what was input.
  *
- * @param Model $Model
- * @param string|array|boolean $conditions Array of conditions, conditions string, null or false. If an array of conditions,
+ * @param Model $Model The model to get conditions for.
+ * @param string|array|bool $conditions Array of conditions, conditions string, null or false. If an array of conditions,
  *   or string conditions those conditions will be returned. With other values the model's existence will be checked.
  *   If the model doesn't exist a null or false will be returned depending on the input value.
- * @param boolean $useAlias Use model aliases rather than table names when generating conditions
+ * @param bool $useAlias Use model aliases rather than table names when generating conditions
  * @return mixed Either null, false, $conditions or an array of default conditions to use.
  * @see DboSource::update()
  * @see DboSource::conditions()
@@ -2398,7 +2430,7 @@ class DboSource extends DataSource {
 			return $conditions;
 		}
 		$exists = $Model->exists();
-		if (!$exists && $conditions !== null) {
+		if (!$exists && ($conditions !== null || !empty($Model->__safeUpdateMode))) {
 			return false;
 		} elseif (!$exists) {
 			return null;
@@ -2414,9 +2446,9 @@ class DboSource extends DataSource {
 /**
  * Returns a key formatted like a string Model.fieldname(i.e. Post.title, or Country.name)
  *
- * @param Model $Model
- * @param string $key
- * @param string $assoc
+ * @param Model $Model The model to get a key for.
+ * @param string $key The key field.
+ * @param string $assoc The association name.
  * @return string
  */
 	public function resolveKey(Model $Model, $key, $assoc = null) {
@@ -2429,7 +2461,7 @@ class DboSource extends DataSource {
 /**
  * Private helper method to remove query metadata in given data array.
  *
- * @param array $data
+ * @param array $data The data to scrub.
  * @return array
  */
 	protected function _scrubQueryData($data) {
@@ -2444,7 +2476,7 @@ class DboSource extends DataSource {
 /**
  * Converts model virtual fields into sql expressions to be fetched later
  *
- * @param Model $Model
+ * @param Model $Model The model to get virtual fields for.
  * @param string $alias Alias table name
  * @param array $fields virtual fields to be used on query
  * @return array
@@ -2462,10 +2494,10 @@ class DboSource extends DataSource {
 /**
  * Generates the fields list of an SQL query.
  *
- * @param Model $Model
+ * @param Model $Model The model to get fields for.
  * @param string $alias Alias table name
- * @param mixed $fields
- * @param boolean $quote If false, returns fields array unquoted
+ * @param mixed $fields The provided list of fields.
+ * @param bool $quote If false, returns fields array unquoted
  * @return array
  */
 	public function fields(Model $Model, $alias = null, $fields = array(), $quote = true) {
@@ -2492,7 +2524,7 @@ class DboSource extends DataSource {
 		if ($allFields) {
 			$fields = array_keys($Model->schema());
 		} elseif (!is_array($fields)) {
-			$fields = String::tokenize($fields);
+			$fields = CakeText::tokenize($fields);
 		}
 		$fields = array_values(array_filter($fields));
 		$allFields = $allFields || in_array('*', $fields) || in_array($Model->alias . '.*', $fields);
@@ -2585,8 +2617,8 @@ class DboSource extends DataSource {
  * Setting DboSource::$cacheMethods to false will disable the memory cache.
  *
  * @param mixed $conditions Array or string of conditions, or any value.
- * @param boolean $quoteValues If true, values should be quoted
- * @param boolean $where If true, "WHERE " will be prepended to the return value
+ * @param bool $quoteValues If true, values should be quoted
+ * @param bool $where If true, "WHERE " will be prepended to the return value
  * @param Model $Model A reference to the Model instance making the query
  * @return string SQL fragment
  */
@@ -2629,7 +2661,7 @@ class DboSource extends DataSource {
  * Creates a WHERE clause by parsing given conditions array. Used by DboSource::conditions().
  *
  * @param array $conditions Array or string of conditions
- * @param boolean $quoteValues If true, values should be quoted
+ * @param bool $quoteValues If true, values should be quoted
  * @param Model $Model A reference to the Model instance making the query
  * @return string SQL fragment
  */
@@ -2695,8 +2727,7 @@ class DboSource extends DataSource {
 				} elseif (is_array($value) && !empty($value) && !$valueInsert) {
 					$keys = array_keys($value);
 					if ($keys === array_values($keys)) {
-						$count = count($value);
-						if ($count === 1 && !preg_match('/\s+(?:NOT|\!=)$/', $key)) {
+						if (count($value) === 1 && !preg_match('/\s+(?:NOT|IN|\!=)$/', $key)) {
 							$data = $this->_quoteFields($key) . ' = (';
 							if ($quoteValues) {
 								if ($Model !== null) {
@@ -2745,10 +2776,11 @@ class DboSource extends DataSource {
 		$operatorMatch .= ')\\x20?)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is';
 		$bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false));
 
+		$key = trim($key);
 		if (strpos($key, ' ') === false) {
 			$operator = '=';
 		} else {
-			list($key, $operator) = explode(' ', trim($key), 2);
+			list($key, $operator) = explode(' ', $key, 2);
 
 			if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
 				$key = $key . ' ' . $operator;
@@ -2791,7 +2823,7 @@ class DboSource extends DataSource {
 		}
 
 		if ($bound) {
-			return String::insert($key . ' ' . trim($operator), $value);
+			return CakeText::insert($key . ' ' . trim($operator), $value);
 		}
 
 		if (!preg_match($operatorMatch, trim($operator))) {
@@ -2832,7 +2864,7 @@ class DboSource extends DataSource {
 /**
  * Quotes Model.fields
  *
- * @param string $conditions
+ * @param string $conditions The conditions to quote.
  * @return string or false if no match
  */
 	protected function _quoteFields($conditions) {
@@ -2845,12 +2877,19 @@ class DboSource extends DataSource {
 		if (!empty($this->endQuote)) {
 			$end = preg_quote($this->endQuote);
 		}
+		// Remove quotes and requote all the Model.field names.
 		$conditions = str_replace(array($start, $end), '', $conditions);
 		$conditions = preg_replace_callback(
 			'/(?:[\'\"][^\'\"\\\]*(?:\\\.[^\'\"\\\]*)*[\'\"])|([a-z0-9_][a-z0-9\\-_]*\\.[a-z0-9_][a-z0-9_\\-]*)/i',
 			array(&$this, '_quoteMatchedField'),
 			$conditions
 		);
+		// Quote `table_name AS Alias`
+		$conditions = preg_replace(
+			'/(\s[a-z0-9\\-_.' . $start . $end . ']*' . $end . ')\s+AS\s+([a-z0-9\\-_]+)/i',
+			'\1 AS ' . $this->startQuote . '\2' . $this->endQuote,
+			$conditions
+		);
 		if ($conditions !== null) {
 			return $conditions;
 		}
@@ -2873,8 +2912,8 @@ class DboSource extends DataSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param integer $limit Limit of results returned
- * @param integer $offset Offset from which to start results
+ * @param int $limit Limit of results returned
+ * @param int $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	public function limit($limit, $offset = null) {
@@ -2979,7 +3018,7 @@ class DboSource extends DataSource {
  * Create a GROUP BY SQL clause.
  *
  * @param string|array $fields Group By fields
- * @param Model $Model
+ * @param Model $Model The model to get group by fields for.
  * @return string Group By clause or null.
  */
 	public function group($fields, Model $Model = null) {
@@ -3018,7 +3057,7 @@ class DboSource extends DataSource {
  *
  * @param Model $Model Model to search
  * @param string $sql SQL WHERE clause (condition only, not the "WHERE" part)
- * @return boolean True if the table has a matching record, else false
+ * @return bool True if the table has a matching record, else false
  */
 	public function hasAny(Model $Model, $sql) {
 		$sql = $this->conditions($sql);
@@ -3050,7 +3089,7 @@ class DboSource extends DataSource {
 				list($col, $limit) = explode('(', $col);
 			}
 			if ($limit !== null) {
-				return intval($limit);
+				return (int)$limit;
 			}
 			return null;
 		}
@@ -3091,15 +3130,15 @@ class DboSource extends DataSource {
 				}
 			}
 		}
-		return intval($length);
+		return (int)$length;
 	}
 
 /**
  * Translates between PHP boolean values and Database (faked) boolean values
  *
  * @param mixed $data Value to be translated
- * @param boolean $quote
- * @return string|boolean Converted boolean value
+ * @param bool $quote Whether or not the field should be cast to a string.
+ * @return string|bool Converted boolean value
  */
 	public function boolean($data, $quote = false) {
 		if ($quote) {
@@ -3116,7 +3155,7 @@ class DboSource extends DataSource {
  * @param array $values The array of values to insert. The values should
  *   be an array of rows. Each row should have values keyed by the column name.
  *   Each row must have the values in the same order as $fields.
- * @return boolean
+ * @return bool
  */
 	public function insertMulti($table, $fields, $values) {
 		$table = $this->fullTableName($table);
@@ -3165,7 +3204,7 @@ class DboSource extends DataSource {
  *
  * @param string $table The name of the table to update.
  * @param string $column The column to use when resetting the sequence value.
- * @return boolean|void success.
+ * @return bool Success.
  */
 	public function resetSequence($table, $column) {
 	}
@@ -3196,7 +3235,7 @@ class DboSource extends DataSource {
 		$out = '';
 
 		foreach ($schema->tables as $curTable => $columns) {
-			if (!$tableName || $tableName == $curTable) {
+			if (!$tableName || $tableName === $curTable) {
 				$cols = $indexes = $tableParameters = array();
 				$primary = null;
 				$table = $this->fullTableName($curTable);
@@ -3245,11 +3284,11 @@ class DboSource extends DataSource {
 	}
 
 /**
- * Generate a alter syntax from	CakeSchema::compare()
+ * Generate an alter syntax from CakeSchema::compare()
  *
- * @param mixed $compare
- * @param string $table
- * @return boolean
+ * @param mixed $compare The comparison data.
+ * @param string $table The table name.
+ * @return bool
  */
 	public function alterSchema($compare, $table = null) {
 		return false;
@@ -3381,8 +3420,8 @@ class DboSource extends DataSource {
 /**
  * Format indexes for create table.
  *
- * @param array $indexes
- * @param string $table
+ * @param array $indexes The indexes to build
+ * @param string $table The table name.
  * @return array
  */
 	public function buildIndex($indexes, $table = null) {
@@ -3411,7 +3450,7 @@ class DboSource extends DataSource {
 /**
  * Read additional table parameters
  *
- * @param string $name
+ * @param string $name The table name to read.
  * @return array
  */
 	public function readTableParameters($name) {
@@ -3430,8 +3469,8 @@ class DboSource extends DataSource {
 /**
  * Format parameters for create table
  *
- * @param array $parameters
- * @param string $table
+ * @param array $parameters The parameters to create SQL for.
+ * @param string $table The table name.
  * @return array
  */
 	public function buildTableParameters($parameters, $table = null) {
@@ -3450,18 +3489,18 @@ class DboSource extends DataSource {
 /**
  * Guesses the data type of an array
  *
- * @param string $value
- * @return void
+ * @param string $value The value to introspect for type data.
+ * @return string
  */
 	public function introspectType($value) {
 		if (!is_array($value)) {
 			if (is_bool($value)) {
 				return 'boolean';
 			}
-			if (is_float($value) && floatval($value) === $value) {
+			if (is_float($value) && (float)$value === $value) {
 				return 'float';
 			}
-			if (is_int($value) && intval($value) === $value) {
+			if (is_int($value) && (int)$value === $value) {
 				return 'integer';
 			}
 			if (is_string($value) && strlen($value) > 255) {
@@ -3537,8 +3576,9 @@ class DboSource extends DataSource {
  */
 	public function __destruct() {
 		if ($this->_methodCacheChange) {
-			Cache::write('method_cache', self::$methodCache, '_cake_core_');
+			Cache::write('method_cache', static::$methodCache, '_cake_core_');
 		}
+		parent::__destruct();
 	}
 
 }
diff --git a/web/api/lib/Cake/Model/Datasource/Session/CacheSession.php b/web/api/lib/Cake/Model/Datasource/Session/CacheSession.php
index 138c87596..35f40d56e 100644
--- a/web/api/lib/Cake/Model/Datasource/Session/CacheSession.php
+++ b/web/api/lib/Cake/Model/Datasource/Session/CacheSession.php
@@ -30,7 +30,7 @@ class CacheSession implements CakeSessionHandlerInterface {
 /**
  * Method called on open of a database session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function open() {
 		return true;
@@ -39,7 +39,7 @@ class CacheSession implements CakeSessionHandlerInterface {
 /**
  * Method called on close of a database session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function close() {
 		return true;
@@ -52,38 +52,43 @@ class CacheSession implements CakeSessionHandlerInterface {
  * @return mixed The value of the key or false if it does not exist
  */
 	public function read($id) {
-		return Cache::read($id, Configure::read('Session.handler.config'));
+		$data = Cache::read($id, Configure::read('Session.handler.config'));
+
+		if (!is_numeric($data) && empty($data)) {
+			return '';
+		}
+		return $data;
 	}
 
 /**
  * Helper function called on write for database sessions.
  *
- * @param integer $id ID that uniquely identifies session in database
+ * @param int $id ID that uniquely identifies session in database
  * @param mixed $data The value of the data to be saved.
- * @return boolean True for successful write, false otherwise.
+ * @return bool True for successful write, false otherwise.
  */
 	public function write($id, $data) {
-		return Cache::write($id, $data, Configure::read('Session.handler.config'));
+		return (bool)Cache::write($id, $data, Configure::read('Session.handler.config'));
 	}
 
 /**
  * Method called on the destruction of a database session.
  *
- * @param integer $id ID that uniquely identifies session in cache
- * @return boolean True for successful delete, false otherwise.
+ * @param int $id ID that uniquely identifies session in cache
+ * @return bool True for successful delete, false otherwise.
  */
 	public function destroy($id) {
-		return Cache::delete($id, Configure::read('Session.handler.config'));
+		return (bool)Cache::delete($id, Configure::read('Session.handler.config'));
 	}
 
 /**
  * Helper function called on gc for cache sessions.
  *
- * @param integer $expires Timestamp (defaults to current time)
- * @return boolean Success
+ * @param int $expires Timestamp (defaults to current time)
+ * @return bool Success
  */
 	public function gc($expires = null) {
-		return Cache::gc(Configure::read('Session.handler.config'), $expires);
+		return (bool)Cache::gc(Configure::read('Session.handler.config'), $expires);
 	}
 
 }
diff --git a/web/api/lib/Cake/Model/Datasource/Session/CakeSessionHandlerInterface.php b/web/api/lib/Cake/Model/Datasource/Session/CakeSessionHandlerInterface.php
index 011ad43ae..66ef32353 100644
--- a/web/api/lib/Cake/Model/Datasource/Session/CakeSessionHandlerInterface.php
+++ b/web/api/lib/Cake/Model/Datasource/Session/CakeSessionHandlerInterface.php
@@ -25,14 +25,14 @@ interface CakeSessionHandlerInterface {
 /**
  * Method called on open of a session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function open();
 
 /**
  * Method called on close of a session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function close();
 
@@ -47,17 +47,17 @@ interface CakeSessionHandlerInterface {
 /**
  * Helper function called on write for sessions.
  *
- * @param integer $id ID that uniquely identifies session in database
+ * @param int $id ID that uniquely identifies session in database
  * @param mixed $data The value of the data to be saved.
- * @return boolean True for successful write, false otherwise.
+ * @return bool True for successful write, false otherwise.
  */
 	public function write($id, $data);
 
 /**
  * Method called on the destruction of a session.
  *
- * @param integer $id ID that uniquely identifies session in database
- * @return boolean True for successful delete, false otherwise.
+ * @param int $id ID that uniquely identifies session in database
+ * @return bool True for successful delete, false otherwise.
  */
 	public function destroy($id);
 
@@ -65,8 +65,8 @@ interface CakeSessionHandlerInterface {
  * Run the Garbage collection on the session storage. This method should vacuum all
  * expired or dead sessions.
  *
- * @param integer $expires Timestamp (defaults to current time)
- * @return boolean Success
+ * @param int $expires Timestamp (defaults to current time)
+ * @return bool Success
  */
 	public function gc($expires = null);
 
diff --git a/web/api/lib/Cake/Model/Datasource/Session/DatabaseSession.php b/web/api/lib/Cake/Model/Datasource/Session/DatabaseSession.php
index 4a45b8503..cd4b904a8 100644
--- a/web/api/lib/Cake/Model/Datasource/Session/DatabaseSession.php
+++ b/web/api/lib/Cake/Model/Datasource/Session/DatabaseSession.php
@@ -36,14 +36,13 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 /**
  * Number of seconds to mark the session as expired
  *
- * @var integer
+ * @var int
  */
 	protected $_timeout;
 
 /**
  * Constructor. Looks at Session configuration information and
  * sets up the session model.
- *
  */
 	public function __construct() {
 		$modelName = Configure::read('Session.handler.model');
@@ -67,7 +66,7 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 /**
  * Method called on open of a database session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function open() {
 		return true;
@@ -76,7 +75,7 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 /**
  * Method called on close of a database session.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function close() {
 		return true;
@@ -85,27 +84,34 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 /**
  * Method used to read from a database session.
  *
- * @param integer|string $id The key of the value to read
+ * @param int|string $id The key of the value to read
  * @return mixed The value of the key or false if it does not exist
  */
 	public function read($id) {
 		$row = $this->_model->find('first', array(
-			'conditions' => array($this->_model->primaryKey => $id)
+			'conditions' => array($this->_model->alias . '.' . $this->_model->primaryKey => $id)
 		));
 
-		if (empty($row[$this->_model->alias]['data'])) {
-			return false;
+		if (empty($row[$this->_model->alias])) {
+			return '';
 		}
 
-		return $row[$this->_model->alias]['data'];
+		if (!is_numeric($row[$this->_model->alias]['data']) && empty($row[$this->_model->alias]['data'])) {
+			return '';
+		}
+
+		return (string)$row[$this->_model->alias]['data'];
 	}
 
 /**
  * Helper function called on write for database sessions.
  *
- * @param integer $id ID that uniquely identifies session in database
+ * Will retry, once, if the save triggers a PDOException which
+ * can happen if a race condition is encountered
+ *
+ * @param int $id ID that uniquely identifies session in database
  * @param mixed $data The value of the data to be saved.
- * @return boolean True for successful write, false otherwise.
+ * @return bool True for successful write, false otherwise.
  */
 	public function write($id, $data) {
 		if (!$id) {
@@ -114,24 +120,34 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 		$expires = time() + $this->_timeout;
 		$record = compact('id', 'data', 'expires');
 		$record[$this->_model->primaryKey] = $id;
-		return $this->_model->save($record);
+
+		$options = array(
+			'validate' => false,
+			'callbacks' => false,
+			'counterCache' => false
+		);
+		try {
+			return (bool)$this->_model->save($record, $options);
+		} catch (PDOException $e) {
+			return (bool)$this->_model->save($record, $options);
+		}
 	}
 
 /**
  * Method called on the destruction of a database session.
  *
- * @param integer $id ID that uniquely identifies session in database
- * @return boolean True for successful delete, false otherwise.
+ * @param int $id ID that uniquely identifies session in database
+ * @return bool True for successful delete, false otherwise.
  */
 	public function destroy($id) {
-		return $this->_model->delete($id);
+		return (bool)$this->_model->delete($id);
 	}
 
 /**
  * Helper function called on gc for database sessions.
  *
- * @param integer $expires Timestamp (defaults to current time)
- * @return boolean Success
+ * @param int $expires Timestamp (defaults to current time)
+ * @return bool Success
  */
 	public function gc($expires = null) {
 		if (!$expires) {
@@ -139,7 +155,8 @@ class DatabaseSession implements CakeSessionHandlerInterface {
 		} else {
 			$expires = time() - $expires;
 		}
-		return $this->_model->deleteAll(array($this->_model->alias . ".expires <" => $expires), false, false);
+		$this->_model->deleteAll(array($this->_model->alias . ".expires <" => $expires), false, false);
+		return true;
 	}
 
 }
diff --git a/web/api/lib/Cake/Model/Model.php b/web/api/lib/Cake/Model/Model.php
index 299060f57..4b4b83d47 100644
--- a/web/api/lib/Cake/Model/Model.php
+++ b/web/api/lib/Cake/Model/Model.php
@@ -20,7 +20,7 @@
 
 App::uses('ClassRegistry', 'Utility');
 App::uses('Validation', 'Utility');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('Hash', 'Utility');
 App::uses('BehaviorCollection', 'Model');
 App::uses('ModelBehavior', 'Model');
@@ -107,7 +107,7 @@ class Model extends Object implements CakeEventListener {
  * The name of the primary key field for this model.
  *
  * @var string
- * @link http://book.cakephp.org/2.0/en/models/model-attributes.html#primaryKey
+ * @link http://book.cakephp.org/2.0/en/models/model-attributes.html#primarykey
  */
 	public $primaryKey = null;
 
@@ -124,33 +124,33 @@ class Model extends Object implements CakeEventListener {
  *
  * ### Validating using regular expressions
  *
- * {{{
+ * ```
  * public $validate = array(
  *     'name' => '/^[a-z].+$/i'
  * );
- * }}}
+ * ```
  *
  * ### Validating using methods (no parameters)
  *
- * {{{
+ * ```
  * public $validate = array(
- *     'name' => 'notEmpty'
+ *     'name' => 'notBlank'
  * );
- * }}}
+ * ```
  *
  * ### Validating using methods (with parameters)
  *
- * {{{
+ * ```
  * public $validate = array(
- *     'age' => array(
- *         'rule' => array('between', 5, 25)
+ *     'length' => array(
+ *         'rule' => array('lengthBetween', 5, 25)
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Validating using custom method
  *
- * {{{
+ * ```
  * public $validate = array(
  *     'password' => array(
  *         'rule' => array('customValidation')
@@ -163,24 +163,24 @@ class Model extends Object implements CakeEventListener {
  *     }
  *     return true;
  * }
- * }}}
+ * ```
  *
  * ### Validations with messages
  *
  * The messages will be used in Model::$validationErrors and can be used in the FormHelper
  *
- * {{{
+ * ```
  * public $validate = array(
- *     'age' => array(
- *         'rule' => array('between', 5, 25),
- *         'message' => array('The age must be between %d and %d.')
+ *     'length' => array(
+ *         'rule' => array('lengthBetween', 5, 15),
+ *         'message' => array('Between %d to %d characters')
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Multiple validations to the same field
  *
- * {{{
+ * ```
  * public $validate = array(
  *     'login' => array(
  *         array(
@@ -194,7 +194,7 @@ class Model extends Object implements CakeEventListener {
  *         )
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Valid keys in validations
  *
@@ -266,7 +266,7 @@ class Model extends Object implements CakeEventListener {
  * Whether or not to cache queries for this model. This enables in-memory
  * caching only, the results are not stored beyond the current request.
  *
- * @var boolean
+ * @var bool
  * @link http://book.cakephp.org/2.0/en/models/model-attributes.html#cachequeries
  */
 	public $cacheQueries = false;
@@ -280,7 +280,7 @@ class Model extends Object implements CakeEventListener {
  *
  * ### Detailed configuration
  *
- * {{{
+ * ```
  * public $belongsTo = array(
  *     'Group',
  *     'Department' => array(
@@ -288,7 +288,7 @@ class Model extends Object implements CakeEventListener {
  *         'foreignKey' => 'department_id'
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Possible keys in association
  *
@@ -327,7 +327,7 @@ class Model extends Object implements CakeEventListener {
  *
  * ### Detailed configuration
  *
- * {{{
+ * ```
  * public $hasOne = array(
  *     'Profile',
  *     'Address' => array(
@@ -335,7 +335,7 @@ class Model extends Object implements CakeEventListener {
  *         'foreignKey' => 'user_id'
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Possible keys in association
  *
@@ -370,7 +370,7 @@ class Model extends Object implements CakeEventListener {
  *
  * ### Detailed configuration
  *
- * {{{
+ * ```
  * public $hasMany = array(
  *     'Comment',
  *     'Task' => array(
@@ -378,7 +378,7 @@ class Model extends Object implements CakeEventListener {
  *         'foreignKey' => 'user_id'
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Possible keys in association
  *
@@ -419,7 +419,7 @@ class Model extends Object implements CakeEventListener {
  *
  * ### Detailed configuration
  *
- * {{{
+ * ```
  * public $hasAndBelongsToMany = array(
  *     'Role',
  *     'Address' => array(
@@ -429,7 +429,7 @@ class Model extends Object implements CakeEventListener {
  *         'joinTable' => 'addresses_users'
  *     )
  * );
- * }}}
+ * ```
  *
  * ### Possible keys in association
  *
@@ -499,7 +499,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Whether or not to cache sources for this model.
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheSources = true;
 
@@ -514,7 +514,7 @@ class Model extends Object implements CakeEventListener {
  * Number of associations to recurse through during find calls. Fetches only
  * the first level by default.
  *
- * @var integer
+ * @var int
  * @link http://book.cakephp.org/2.0/en/models/model-attributes.html#recursive
  */
 	public $recursive = 1;
@@ -593,19 +593,46 @@ class Model extends Object implements CakeEventListener {
  */
 	public $__backContainableAssociation = array();
 
+/**
+ * Safe update mode
+ * If true, this prevents Model::save() from generating a query with WHERE 1 = 1 on race condition.
+ *
+ * @var bool
+ */
+	public $__safeUpdateMode = false;
+
 // @codingStandardsIgnoreEnd
 
+/**
+ * If true, afterFind will be passed consistent formatted $results in case of $primary is false.
+ * The format will be such as the following.
+ *
+ * ```
+ * $results = array(
+ * 	0 => array(
+ * 		'ModelName' => array(
+ * 			'field1' => 'value1',
+ * 			'field2' => 'value2'
+ * 		)
+ * 	)
+ * );
+ * ```
+ *
+ * @var bool
+ */
+	public $useConsistentAfterFind = true;
+
 /**
  * The ID of the model record that was last inserted.
  *
- * @var integer
+ * @var int
  */
 	protected $_insertID = null;
 
 /**
  * Has the datasource been configured.
  *
- * @var boolean
+ * @var bool
  * @see Model::getDataSource
  */
 	protected $_sourceConfigured = false;
@@ -656,14 +683,14 @@ class Model extends Object implements CakeEventListener {
  *
  * You can dynamically create model instances using the $id array syntax.
  *
- * {{{
+ * ```
  * $Post = new Model(array('table' => 'posts', 'name' => 'Post', 'ds' => 'connection2'));
- * }}}
+ * ```
  *
  * Would create a model attached to the posts table on connection2. Dynamic model creation is useful
  * when you want a model object that contains no associations or attached behaviors.
  *
- * @param boolean|integer|string|array $id Set this ID for this model on startup,
+ * @param bool|int|string|array $id Set this ID for this model on startup,
  * can also be an array of options, see above.
  * @param string $table Name of database table to use.
  * @param string $ds DataSource connection name.
@@ -749,7 +776,7 @@ class Model extends Object implements CakeEventListener {
 
 /**
  * Returns a list of all events that will fire in the model during it's lifecycle.
- * You can override this function to add you own listener callbacks
+ * You can override this function to add your own listener callbacks
  *
  * @return array
  */
@@ -804,7 +831,7 @@ class Model extends Object implements CakeEventListener {
  * Handles the lazy loading of model associations by looking in the association arrays for the requested variable
  *
  * @param string $name variable tested for existence in class
- * @return boolean true if the variable exists (if is a not loaded model association it will be created), false otherwise
+ * @return bool true if the variable exists (if is a not loaded model association it will be created), false otherwise
  */
 	public function __isset($name) {
 		$className = false;
@@ -909,8 +936,8 @@ class Model extends Object implements CakeEventListener {
  * model.
  *
  * @param array $params Set of bindings (indexed by binding type)
- * @param boolean $reset Set to false to make the binding permanent
- * @return boolean Success
+ * @param bool $reset Set to false to make the binding permanent
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/models/associations-linking-models-together.html#creating-and-destroying-associations-on-the-fly
  */
 	public function bindModel($params, $reset = true) {
@@ -959,8 +986,8 @@ class Model extends Object implements CakeEventListener {
  * Unbound models that are not made permanent will reset with the next call to Model::find()
  *
  * @param array $params Set of bindings to unbind (indexed by binding type)
- * @param boolean $reset Set to false to make the unbinding permanent
- * @return boolean Success
+ * @param bool $reset Set to false to make the unbinding permanent
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/models/associations-linking-models-together.html#creating-and-destroying-associations-on-the-fly
  */
 	public function unbindModel($params, $reset = true) {
@@ -1063,7 +1090,7 @@ class Model extends Object implements CakeEventListener {
  * Build an array-based association from string.
  *
  * @param string $type 'belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'
- * @param string $assocKey
+ * @param string $assocKey Association key.
  * @return void
  */
 	protected function _generateAssociation($type, $assocKey) {
@@ -1163,12 +1190,12 @@ class Model extends Object implements CakeEventListener {
  *
  * @param string|array|SimpleXmlElement|DomNode $one Array or string of data
  * @param string $two Value string for the alternative indata method
- * @return array Data with all of $one's keys and values
+ * @return array|null Data with all of $one's keys and values, otherwise null.
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html
  */
 	public function set($one, $two = null) {
 		if (!$one) {
-			return;
+			return null;
 		}
 
 		if (is_object($one)) {
@@ -1193,6 +1220,10 @@ class Model extends Object implements CakeEventListener {
 				continue;
 			}
 
+			if (!isset($this->data[$modelName])) {
+				$this->data[$modelName] = array();
+			}
+
 			foreach ($fieldSet as $fieldName => $fieldValue) {
 				unset($this->validationErrors[$fieldName]);
 
@@ -1214,7 +1245,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Move values to alias
  *
- * @param array $data
+ * @param array $data Data.
  * @return array
  */
 	protected function _setAliasData($data) {
@@ -1281,8 +1312,7 @@ class Model extends Object implements CakeEventListener {
 			return null;
 		}
 
-		if (
-			isset($data['hour']) &&
+		if (isset($data['hour']) &&
 			isset($data['meridian']) &&
 			!empty($data['hour']) &&
 			$data['hour'] != 12 &&
@@ -1349,8 +1379,8 @@ class Model extends Object implements CakeEventListener {
  * Returns an array of table metadata (column names and types) from the database.
  * $field => keys(type, null, default, key, length, extra)
  *
- * @param boolean|string $field Set to true to reload schema, or a string to return a specific field
- * @return array Array of table metadata
+ * @param bool|string $field Set to true to reload schema, or a string to return a specific field
+ * @return array|null Array of table metadata
  */
 	public function schema($field = false) {
 		if ($this->useTable !== false && (!is_array($this->_schema) || $field === true)) {
@@ -1398,8 +1428,12 @@ class Model extends Object implements CakeEventListener {
  * @return string Column type
  */
 	public function getColumnType($column) {
-		$db = $this->getDataSource();
 		$cols = $this->schema();
+		if (isset($cols[$column]) && isset($cols[$column]['type'])) {
+			return $cols[$column]['type'];
+		}
+
+		$db = $this->getDataSource();
 		$model = null;
 
 		$startQuote = isset($db->startQuote) ? $db->startQuote : null;
@@ -1425,7 +1459,7 @@ class Model extends Object implements CakeEventListener {
  * Returns true if the supplied field exists in the model's database table.
  *
  * @param string|array $name Name of field to look for, or an array of names
- * @param boolean $checkVirtual checks if the field is declared as virtual
+ * @param bool $checkVirtual checks if the field is declared as virtual
  * @return mixed If $name is a string, returns a boolean indicating whether the field exists.
  *               If $name is an array of field names, returns the first field that exists,
  *               or false if none exist.
@@ -1461,7 +1495,7 @@ class Model extends Object implements CakeEventListener {
  * inherited methods and methods that could be callable through behaviors.
  *
  * @param string $method The method to be called.
- * @return boolean True on method being callable.
+ * @return bool True on method being callable.
  */
 	public function hasMethod($method) {
 		if (method_exists($this, $method)) {
@@ -1475,7 +1509,7 @@ class Model extends Object implements CakeEventListener {
  * Returns true if the supplied field is a model Virtual Field
  *
  * @param string $field Name of field to look for
- * @return boolean indicating whether the field exists as a model virtual field.
+ * @return bool indicating whether the field exists as a model virtual field.
  */
 	public function isVirtualField($field) {
 		if (empty($this->virtualFields) || !is_string($field)) {
@@ -1488,7 +1522,7 @@ class Model extends Object implements CakeEventListener {
 
 		if (strpos($field, '.') !== false) {
 			list($model, $field) = explode('.', $field);
-			if ($model == $this->alias && isset($this->virtualFields[$field])) {
+			if ($model === $this->alias && isset($this->virtualFields[$field])) {
 				return true;
 			}
 		}
@@ -1525,9 +1559,9 @@ class Model extends Object implements CakeEventListener {
  * for those fields that are not defined in $data, and clearing previous validation errors.
  * Especially helpful for saving data in loops.
  *
- * @param boolean|array $data Optional data array to assign to the model after it is created. If null or false,
+ * @param bool|array $data Optional data array to assign to the model after it is created. If null or false,
  *   schema data defaults are not merged.
- * @param boolean $filterKey If true, overwrites any primary key input with an empty value
+ * @param bool $filterKey If true, overwrites any primary key input with an empty value
  * @return array The current Model::data; after merging $data and/or defaults from database
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-create-array-data-array
  */
@@ -1559,7 +1593,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * This function is a convenient wrapper class to create(false) and, as the name suggests, clears the id, data, and validation errors.
  *
- * @return boolean Always true upon success
+ * @return bool Always true upon success
  * @see Model::create()
  */
 	public function clear() {
@@ -1572,7 +1606,7 @@ class Model extends Object implements CakeEventListener {
  * data (Model::$data) with the record found.
  *
  * @param string|array $fields String of single field name, or an array of field names.
- * @param integer|string $id The ID of the record to read
+ * @param int|string $id The ID of the record to read
  * @return array Array of database fields, or false if not found
  * @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-read
  */
@@ -1602,13 +1636,13 @@ class Model extends Object implements CakeEventListener {
 	}
 
 /**
- * Returns the contents of a single field given the supplied conditions, in the
- * supplied order.
+ * Returns the content of a single field given the supplied conditions,
+ * of the first record in the supplied order.
  *
- * @param string $name Name of field to get
- * @param array $conditions SQL conditions (defaults to NULL)
- * @param string $order SQL ORDER BY fragment
- * @return string field contents, or false if not found
+ * @param string $name The name of the field to get.
+ * @param array $conditions SQL conditions (defaults to NULL).
+ * @param string $order SQL ORDER BY fragment.
+ * @return string|false Field content, or false if not found.
  * @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-field
  */
 	public function field($name, $conditions = null, $order = null) {
@@ -1649,11 +1683,11 @@ class Model extends Object implements CakeEventListener {
  *
  * @param string $name Name of the table field
  * @param mixed $value Value of the field
- * @param boolean|array $validate Either a boolean, or an array.
+ * @param bool|array $validate Either a boolean, or an array.
  *   If a boolean, indicates whether or not to validate before saving.
  *   If an array, allows control of 'validate', 'callbacks' and 'counterCache' options.
  *   See Model::save() for details of each options.
- * @return boolean See Model::save()
+ * @return bool|array See Model::save() False on failure or an array of model data on success.
  * @see Model::save()
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-savefield-string-fieldname-string-fieldvalue-validate-false
  */
@@ -1669,14 +1703,74 @@ class Model extends Object implements CakeEventListener {
 		return $this->save(array($this->alias => array($this->primaryKey => $id, $name => $value)), $options);
 	}
 
+/**
+ * Saves model data (based on white-list, if supplied) to the database. By
+ * default, validation occurs before save. Passthrough method to _doSave() with
+ * transaction handling.
+ *
+ * @param array $data Data to save.
+ * @param bool|array $validate Either a boolean, or an array.
+ *   If a boolean, indicates whether or not to validate before saving.
+ *   If an array, can have following keys:
+ *
+ *   - atomic: If true (default), will attempt to save the record in a single transaction.
+ *   - validate: Set to true/false to enable or disable validation.
+ *   - fieldList: An array of fields you want to allow for saving.
+ *   - callbacks: Set to false to disable callbacks. Using 'before' or 'after'
+ *     will enable only those callbacks.
+ *   - `counterCache`: Boolean to control updating of counter caches (if any)
+ *
+ * @param array $fieldList List of fields to allow to be saved
+ * @return mixed On success Model::$data if its not empty or true, false on failure
+ * @throws Exception
+ * @throws PDOException
+ * @triggers Model.beforeSave $this, array($options)
+ * @triggers Model.afterSave $this, array($created, $options)
+ * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html
+ */
+	public function save($data = null, $validate = true, $fieldList = array()) {
+		$defaults = array(
+			'validate' => true, 'fieldList' => array(),
+			'callbacks' => true, 'counterCache' => true,
+			'atomic' => true
+		);
+
+		if (!is_array($validate)) {
+			$options = compact('validate', 'fieldList') + $defaults;
+		} else {
+			$options = $validate + $defaults;
+		}
+
+		if (!$options['atomic']) {
+			return $this->_doSave($data, $options);
+		}
+
+		$db = $this->getDataSource();
+		$transactionBegun = $db->begin();
+		try {
+			$success = $this->_doSave($data, $options);
+			if ($transactionBegun) {
+				if ($success) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+			return $success;
+		} catch (Exception $e) {
+			if ($transactionBegun) {
+				$db->rollback();
+			}
+			throw $e;
+		}
+	}
+
 /**
  * Saves model data (based on white-list, if supplied) to the database. By
  * default, validation occurs before save.
  *
  * @param array $data Data to save.
- * @param boolean|array $validate Either a boolean, or an array.
- *   If a boolean, indicates whether or not to validate before saving.
- *   If an array, can have following keys:
+ * @param array $options can have following keys:
  *
  *   - validate: Set to true/false to enable or disable validation.
  *   - fieldList: An array of fields you want to allow for saving.
@@ -1684,24 +1778,14 @@ class Model extends Object implements CakeEventListener {
  *      will enable only those callbacks.
  *   - `counterCache`: Boolean to control updating of counter caches (if any)
  *
- * @param array $fieldList List of fields to allow to be saved
  * @return mixed On success Model::$data if its not empty or true, false on failure
+ * @throws PDOException
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html
  */
-	public function save($data = null, $validate = true, $fieldList = array()) {
-		$defaults = array(
-			'validate' => true, 'fieldList' => array(),
-			'callbacks' => true, 'counterCache' => true
-		);
+	protected function _doSave($data = null, $options = array()) {
 		$_whitelist = $this->whitelist;
 		$fields = array();
 
-		if (!is_array($validate)) {
-			$options = compact('validate', 'fieldList') + $defaults;
-		} else {
-			$options = $validate + $defaults;
-		}
-
 		if (!empty($options['fieldList'])) {
 			if (!empty($options['fieldList'][$this->alias]) && is_array($options['fieldList'][$this->alias])) {
 				$this->whitelist = $options['fieldList'][$this->alias];
@@ -1751,7 +1835,12 @@ class Model extends Object implements CakeEventListener {
 		$now = time();
 
 		foreach ($dateFields as $updateCol) {
-			if (in_array($updateCol, $fields) || !$this->hasField($updateCol)) {
+			$fieldHasValue = in_array($updateCol, $fields);
+			$fieldInWhitelist = (
+				count($this->whitelist) === 0 ||
+				in_array($updateCol, $this->whitelist)
+			);
+			if (($fieldHasValue && $fieldInWhitelist) || !$this->hasField($updateCol)) {
 				continue;
 			}
 
@@ -1779,12 +1868,10 @@ class Model extends Object implements CakeEventListener {
 			}
 		}
 
-		$db = $this->getDataSource();
-
 		if (empty($this->data[$this->alias][$this->primaryKey])) {
 			unset($this->data[$this->alias][$this->primaryKey]);
 		}
-		$fields = $values = array();
+		$joined = $fields = $values = array();
 
 		foreach ($this->data as $n => $v) {
 			if (isset($this->hasAndBelongsToMany[$n])) {
@@ -1807,6 +1894,11 @@ class Model extends Object implements CakeEventListener {
 			}
 		}
 
+		if (empty($fields) && empty($joined)) {
+			$this->whitelist = $_whitelist;
+			return false;
+		}
+
 		$count = count($fields);
 
 		if (!$exists && $count > 0) {
@@ -1820,14 +1912,21 @@ class Model extends Object implements CakeEventListener {
 			$cache = $this->_prepareUpdateFields(array_combine($fields, $values));
 
 			if (!empty($this->id)) {
-				$success = (bool)$db->update($this, $fields, $values);
+				$this->__safeUpdateMode = true;
+				try {
+					$success = (bool)$db->update($this, $fields, $values);
+				} catch (Exception $e) {
+					$this->__safeUpdateMode = false;
+					throw $e;
+				}
+				$this->__safeUpdateMode = false;
 			} else {
 				if (empty($this->data[$this->alias][$this->primaryKey]) && $this->_isUUIDField($this->primaryKey)) {
 					if (array_key_exists($this->primaryKey, $this->data[$this->alias])) {
 						$j = array_search($this->primaryKey, $fields);
-						$values[$j] = String::uuid();
+						$values[$j] = CakeText::uuid();
 					} else {
-						list($fields[], $values[]) = array($this->primaryKey, String::uuid());
+						list($fields[], $values[]) = array($this->primaryKey, CakeText::uuid());
 					}
 				}
 
@@ -1843,36 +1942,35 @@ class Model extends Object implements CakeEventListener {
 			}
 		}
 
-		if (!empty($joined) && $success === true) {
+		if ($success && !empty($joined)) {
 			$this->_saveMulti($joined, $this->id, $db);
 		}
 
-		if ($success && $count === 0) {
-			$success = false;
+		if (!$success) {
+			$this->whitelist = $_whitelist;
+			return $success;
 		}
 
-		if ($success && $count > 0) {
-			if (!empty($this->data)) {
-				if ($created) {
-					$this->data[$this->alias][$this->primaryKey] = $this->id;
-				}
+		if ($count > 0) {
+			if ($created) {
+				$this->data[$this->alias][$this->primaryKey] = $this->id;
 			}
 
 			if ($options['callbacks'] === true || $options['callbacks'] === 'after') {
 				$event = new CakeEvent('Model.afterSave', $this, array($created, $options));
 				$this->getEventManager()->dispatch($event);
 			}
-
-			if (!empty($this->data)) {
-				$success = $this->data;
-			}
-
-			$this->data = false;
-			$this->_clearCache();
-			$this->validationErrors = array();
 		}
 
+		if (!empty($this->data)) {
+			$success = $this->data;
+		}
+
+		$this->_clearCache();
+		$this->validationErrors = array();
 		$this->whitelist = $_whitelist;
+		$this->data = false;
+
 		return $success;
 	}
 
@@ -1880,7 +1978,7 @@ class Model extends Object implements CakeEventListener {
  * Check if the passed in field is a UUID field
  *
  * @param string $field the field to check
- * @return boolean
+ * @return bool
  */
 	protected function _isUUIDField($field) {
 		$field = $this->schema($field);
@@ -1891,8 +1989,8 @@ class Model extends Object implements CakeEventListener {
  * Saves model hasAndBelongsToMany data to the database.
  *
  * @param array $joined Data to save
- * @param integer|string $id ID of record in this model
- * @param DataSource $db
+ * @param int|string $id ID of record in this model
+ * @param DataSource $db Datasource instance.
  * @return void
  */
 	protected function _saveMulti($joined, $id, $db) {
@@ -1932,12 +2030,12 @@ class Model extends Object implements CakeEventListener {
 			}
 
 			foreach ((array)$data as $row) {
-				if ((is_string($row) && (strlen($row) == 36 || strlen($row) == 16)) || is_numeric($row)) {
+				if ((is_string($row) && (strlen($row) === 36 || strlen($row) === 16)) || is_numeric($row)) {
 					$newJoins[] = $row;
 					$values = array($id, $row);
 
 					if ($isUUID && $primaryAdded) {
-						$values[] = String::uuid();
+						$values[] = CakeText::uuid();
 					}
 
 					$newValues[$row] = $values;
@@ -1993,7 +2091,7 @@ class Model extends Object implements CakeEventListener {
 						$Model->create();
 					}
 
-					$Model->save($data);
+					$Model->save($data, array('atomic' => false));
 				}
 			}
 
@@ -2023,7 +2121,7 @@ class Model extends Object implements CakeEventListener {
  * Updates the counter cache of belongsTo associations after a save or delete operation
  *
  * @param array $keys Optional foreign key data, defaults to the information $this->data
- * @param boolean $created True if a new record was created, otherwise only associations with
+ * @param bool $created True if a new record was created, otherwise only associations with
  *   'counterScope' defined get updated
  * @return void
  */
@@ -2074,7 +2172,7 @@ class Model extends Object implements CakeEventListener {
 
 				if (isset($keys['old'][$foreignKey]) && $keys['old'][$foreignKey] != $keys[$foreignKey]) {
 					$conditions[$fkQuoted] = $keys['old'][$foreignKey];
-					$count = intval($this->find('count', compact('conditions', 'recursive')));
+					$count = (int)$this->find('count', compact('conditions', 'recursive'));
 
 					$Model->updateAll(
 						array($field => $count),
@@ -2088,7 +2186,7 @@ class Model extends Object implements CakeEventListener {
 					$conditions = array_merge($conditions, (array)$conditions);
 				}
 
-				$count = intval($this->find('count', compact('conditions', 'recursive')));
+				$count = (int)$this->find('count', compact('conditions', 'recursive'));
 
 				$Model->updateAll(
 					array($field => $count),
@@ -2108,7 +2206,7 @@ class Model extends Object implements CakeEventListener {
 	protected function _prepareUpdateFields($data) {
 		$foreignKeys = array();
 		foreach ($this->belongsTo as $assoc => $info) {
-			if ($info['counterCache']) {
+			if (isset($info['counterCache']) && $info['counterCache']) {
 				$foreignKeys[$assoc] = $info['foreignKey'];
 			}
 		}
@@ -2144,12 +2242,12 @@ class Model extends Object implements CakeEventListener {
  *   Should be set to false if database/table does not support transactions.
  * - `fieldList`: Equivalent to the $fieldList parameter in Model::save().
  *   It should be an associate array with model name as key and array of fields as value. Eg.
- *   {{{
+ *   ```
  *   array(
  *       'SomeModel' => array('field'),
  *       'AssociatedModel' => array('field', 'otherfield')
  *   )
- *   }}}
+ *   ```
  * - `deep`: See saveMany/saveAssociated
  * - `callbacks`: See Model::save()
  * - `counterCache`: See Model::save()
@@ -2199,6 +2297,7 @@ class Model extends Object implements CakeEventListener {
  * @return mixed If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record saved successfully.
+ * @throws PDOException
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-savemany-array-data-null-array-options-array
  */
 	public function saveMany($data = null, $options = array()) {
@@ -2226,50 +2325,60 @@ class Model extends Object implements CakeEventListener {
 			$options['validate'] = false;
 		}
 
+		$transactionBegun = false;
 		if ($options['atomic']) {
 			$db = $this->getDataSource();
 			$transactionBegun = $db->begin();
 		}
 
-		$return = array();
-		foreach ($data as $key => $record) {
-			$validates = $this->create(null) !== null;
-			$saved = false;
-			if ($validates) {
-				if ($options['deep']) {
-					$saved = $this->saveAssociated($record, array_merge($options, array('atomic' => false)));
-				} else {
-					$saved = $this->save($record, $options);
+		try {
+			$return = array();
+			foreach ($data as $key => $record) {
+				$validates = $this->create(null) !== null;
+				$saved = false;
+				if ($validates) {
+					if ($options['deep']) {
+						$saved = $this->saveAssociated($record, array('atomic' => false) + $options);
+					} else {
+						$saved = (bool)$this->save($record, array('atomic' => false) + $options);
+					}
+				}
+
+				$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true))));
+				if (!$validates) {
+					$validationErrors[$key] = $this->validationErrors;
+				}
+
+				if (!$options['atomic']) {
+					$return[$key] = $validates;
+				} elseif (!$validates) {
+					break;
 				}
 			}
 
-			$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true))));
-			if (!$validates) {
-				$validationErrors[$key] = $this->validationErrors;
-			}
+			$this->validationErrors = $validationErrors;
 
 			if (!$options['atomic']) {
-				$return[$key] = $validates;
-			} elseif (!$validates) {
-				break;
+				return $return;
 			}
-		}
 
-		$this->validationErrors = $validationErrors;
+			if ($validates) {
+				if ($transactionBegun) {
+					return $db->commit() !== false;
+				}
+				return true;
+			}
 
-		if (!$options['atomic']) {
-			return $return;
-		}
-
-		if ($validates) {
 			if ($transactionBegun) {
-				return $db->commit() !== false;
+				$db->rollback();
 			}
-			return true;
+			return false;
+		} catch (Exception $e) {
+			if ($transactionBegun) {
+				$db->rollback();
+			}
+			throw $e;
 		}
-
-		$db->rollback();
-		return false;
 	}
 
 /**
@@ -2285,9 +2394,9 @@ class Model extends Object implements CakeEventListener {
  * If you do not want this to happen, make a copy of `$data` before passing it
  * to this method
  *
- * @param array $data Record data to validate. This should be a numerically-indexed array
+ * @param array &$data Record data to validate. This should be a numerically-indexed array
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
- * @return boolean|array If atomic: True on success, or false on failure.
+ * @return bool|array If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record validated successfully.
  */
@@ -2306,12 +2415,12 @@ class Model extends Object implements CakeEventListener {
  *   Should be set to false if database/table does not support transactions.
  * - `fieldList`: Equivalent to the $fieldList parameter in Model::save().
  *   It should be an associate array with model name as key and array of fields as value. Eg.
- *   {{{
+ *   ```
  *   array(
  *       'SomeModel' => array('field'),
  *       'AssociatedModel' => array('field', 'otherfield')
  *   )
- *   }}}
+ *   ```
  * - `deep`: If set to true, not only directly associated data is saved, but deeper nested associated data as well.
  * - `callbacks`: See Model::save()
  * - `counterCache`: See Model::save()
@@ -2321,6 +2430,7 @@ class Model extends Object implements CakeEventListener {
  * @return mixed If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record saved successfully.
+ * @throws PDOException
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-saveassociated-array-data-null-array-options-array
  */
 	public function saveAssociated($data = null, $options = array()) {
@@ -2349,144 +2459,154 @@ class Model extends Object implements CakeEventListener {
 			$options['validate'] = false;
 		}
 
+		$transactionBegun = false;
 		if ($options['atomic']) {
 			$db = $this->getDataSource();
 			$transactionBegun = $db->begin();
 		}
 
-		$associations = $this->getAssociated();
-		$return = array();
-		$validates = true;
-		foreach ($data as $association => $values) {
-			$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
-			if ($isEmpty || !isset($associations[$association]) || $associations[$association] !== 'belongsTo') {
-				continue;
-			}
-
-			$Model = $this->{$association};
-
-			$validates = $Model->create(null) !== null;
-			$saved = false;
-			if ($validates) {
-				if ($options['deep']) {
-					$saved = $Model->saveAssociated($values, array('atomic' => false) + $options);
-				} else {
-					$saved = $Model->save($values, array('atomic' => false) + $options);
+		try {
+			$associations = $this->getAssociated();
+			$return = array();
+			$validates = true;
+			foreach ($data as $association => $values) {
+				$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
+				if ($isEmpty || !isset($associations[$association]) || $associations[$association] !== 'belongsTo') {
+					continue;
 				}
-				$validates = ($saved === true || (is_array($saved) && !in_array(false, $saved, true)));
-			}
 
-			if ($validates) {
-				$key = $this->belongsTo[$association]['foreignKey'];
-				if (isset($data[$this->alias])) {
-					$data[$this->alias][$key] = $Model->id;
-				} else {
-					$data = array_merge(array($key => $Model->id), $data, array($key => $Model->id));
-				}
-				$options = $this->_addToWhiteList($key, $options);
-			} else {
-				$validationErrors[$association] = $Model->validationErrors;
-			}
+				$Model = $this->{$association};
 
-			$return[$association] = $validates;
-		}
-
-		if ($validates && !($this->create(null) !== null && $this->save($data, $options))) {
-			$validationErrors[$this->alias] = $this->validationErrors;
-			$validates = false;
-		}
-		$return[$this->alias] = $validates;
-
-		foreach ($data as $association => $values) {
-			if (!$validates) {
-				break;
-			}
-
-			$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
-			if ($isEmpty || !isset($associations[$association])) {
-				continue;
-			}
-
-			$Model = $this->{$association};
-
-			$type = $associations[$association];
-			$key = $this->{$type}[$association]['foreignKey'];
-			switch ($type) {
-				case 'hasOne':
-					if (isset($values[$association])) {
-						$values[$association][$key] = $this->id;
+				$validates = $Model->create(null) !== null;
+				$saved = false;
+				if ($validates) {
+					if ($options['deep']) {
+						$saved = $Model->saveAssociated($values, array('atomic' => false) + $options);
 					} else {
-						$values = array_merge(array($key => $this->id), $values, array($key => $this->id));
+						$saved = (bool)$Model->save($values, array('atomic' => false) + $options);
 					}
+					$validates = ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true)));
+				}
 
-					$validates = $Model->create(null) !== null;
-					$saved = false;
+				if ($validates) {
+					$key = $this->belongsTo[$association]['foreignKey'];
+					if (isset($data[$this->alias])) {
+						$data[$this->alias][$key] = $Model->id;
+					} else {
+						$data = array_merge(array($key => $Model->id), $data, array($key => $Model->id));
+					}
+					$options = $this->_addToWhiteList($key, $options);
+				} else {
+					$validationErrors[$association] = $Model->validationErrors;
+				}
+
+				$return[$association] = $validates;
+			}
+
+			if ($validates && !($this->create(null) !== null && $this->save($data, array('atomic' => false) + $options))) {
+				$validationErrors[$this->alias] = $this->validationErrors;
+				$validates = false;
+			}
+			$return[$this->alias] = $validates;
+
+			foreach ($data as $association => $values) {
+				if (!$validates) {
+					break;
+				}
+
+				$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
+				if ($isEmpty || !isset($associations[$association])) {
+					continue;
+				}
+
+				$Model = $this->{$association};
+
+				$type = $associations[$association];
+				$key = $this->{$type}[$association]['foreignKey'];
+				switch ($type) {
+					case 'hasOne':
+						if (isset($values[$association])) {
+							$values[$association][$key] = $this->id;
+						} else {
+							$values = array_merge(array($key => $this->id), $values, array($key => $this->id));
+						}
+
+						$validates = $Model->create(null) !== null;
+						$saved = false;
+
+						if ($validates) {
+							$options = $Model->_addToWhiteList($key, $options);
+							if ($options['deep']) {
+								$saved = $Model->saveAssociated($values, array('atomic' => false) + $options);
+							} else {
+								$saved = (bool)$Model->save($values, $options);
+							}
+						}
+
+						$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, Hash::flatten($saved), true))));
+						if (!$validates) {
+							$validationErrors[$association] = $Model->validationErrors;
+						}
+
+						$return[$association] = $validates;
+						break;
+					case 'hasMany':
+						foreach ($values as $i => $value) {
+							if (isset($values[$i][$association])) {
+								$values[$i][$association][$key] = $this->id;
+							} else {
+								$values[$i] = array_merge(array($key => $this->id), $value, array($key => $this->id));
+							}
+						}
 
-					if ($validates) {
 						$options = $Model->_addToWhiteList($key, $options);
-						if ($options['deep']) {
-							$saved = $Model->saveAssociated($values, array('atomic' => false) + $options);
-						} else {
-							$saved = $Model->save($values, $options);
+						$_return = $Model->saveMany($values, array('atomic' => false) + $options);
+						if (in_array(false, $_return, true)) {
+							$validationErrors[$association] = $Model->validationErrors;
+							$validates = false;
 						}
-					}
 
-					$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true))));
-					if (!$validates) {
-						$validationErrors[$association] = $Model->validationErrors;
-					}
-
-					$return[$association] = $validates;
-					break;
-				case 'hasMany':
-					foreach ($values as $i => $value) {
-						if (isset($values[$i][$association])) {
-							$values[$i][$association][$key] = $this->id;
-						} else {
-							$values[$i] = array_merge(array($key => $this->id), $value, array($key => $this->id));
-						}
-					}
-
-					$options = $Model->_addToWhiteList($key, $options);
-					$_return = $Model->saveMany($values, array('atomic' => false) + $options);
-					if (in_array(false, $_return, true)) {
-						$validationErrors[$association] = $Model->validationErrors;
-						$validates = false;
-					}
-
-					$return[$association] = $_return;
-					break;
+						$return[$association] = $_return;
+						break;
+				}
 			}
-		}
-		$this->validationErrors = $validationErrors;
+			$this->validationErrors = $validationErrors;
 
-		if (isset($validationErrors[$this->alias])) {
-			$this->validationErrors = $validationErrors[$this->alias];
-			unset($validationErrors[$this->alias]);
-			$this->validationErrors = array_merge($this->validationErrors, $validationErrors);
-		}
+			if (isset($validationErrors[$this->alias])) {
+				$this->validationErrors = $validationErrors[$this->alias];
+				unset($validationErrors[$this->alias]);
+				$this->validationErrors = array_merge($this->validationErrors, $validationErrors);
+			}
+
+			if (!$options['atomic']) {
+				return $return;
+			}
+			if ($validates) {
+				if ($transactionBegun) {
+					return $db->commit() !== false;
+				}
+
+				return true;
+			}
 
-		if (!$options['atomic']) {
-			return $return;
-		}
-		if ($validates) {
 			if ($transactionBegun) {
-				return $db->commit() !== false;
+				$db->rollback();
 			}
-
-			return true;
+			return false;
+		} catch (Exception $e) {
+			if ($transactionBegun) {
+				$db->rollback();
+			}
+			throw $e;
 		}
-
-		$db->rollback();
-		return false;
 	}
 
 /**
  * Helper method for saveAll() and friends, to add foreign key to fieldlist
  *
  * @param string $key fieldname to be added to list
- * @param array $options
- * @return array $options
+ * @param array $options Options list
+ * @return array options
  */
 	protected function _addToWhiteList($key, $options) {
 		if (empty($options['fieldList']) && $this->whitelist && !in_array($key, $this->whitelist)) {
@@ -2520,9 +2640,9 @@ class Model extends Object implements CakeEventListener {
  * If you do not want this to happen, make a copy of `$data` before passing it
  * to this method
  *
- * @param array $data Record data to validate. This should be an array indexed by association name.
+ * @param array &$data Record data to validate. This should be an array indexed by association name.
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
- * @return array|boolean If atomic: True on success, or false on failure.
+ * @return array|bool If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record validated successfully.
  */
@@ -2536,8 +2656,8 @@ class Model extends Object implements CakeEventListener {
  * @param array $fields Set of fields and values, indexed by fields.
  *    Fields are treated as SQL snippets, to insert literal values manually escape your data.
  * @param mixed $conditions Conditions to match, true for all records
- * @return boolean True on success, false on failure
- * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-array-conditions
+ * @return bool True on success, false on failure
+ * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html#model-updateall-array-fields-mixed-conditions
  */
 	public function updateAll($fields, $conditions = true) {
 		return $this->getDataSource()->update($this, $fields, null, $conditions);
@@ -2546,9 +2666,11 @@ class Model extends Object implements CakeEventListener {
 /**
  * Removes record for given ID. If no ID is given, the current ID is used. Returns true on success.
  *
- * @param integer|string $id ID of record to delete
- * @param boolean $cascade Set to true to delete records that depend on this record
- * @return boolean True on success
+ * @param int|string $id ID of record to delete
+ * @param bool $cascade Set to true to delete records that depend on this record
+ * @return bool True on success
+ * @triggers Model.beforeDelete $this, array($cascade)
+ * @triggers Model.afterDelete $this
  * @link http://book.cakephp.org/2.0/en/models/deleting-data.html
  */
 	public function delete($id = null, $cascade = true) {
@@ -2608,7 +2730,7 @@ class Model extends Object implements CakeEventListener {
  * Cascades model deletes through associated hasMany and hasOne child records.
  *
  * @param string $id ID of record that was deleted
- * @param boolean $cascade Set to true to delete records that depend on this record
+ * @param bool $cascade Set to true to delete records that depend on this record
  * @return void
  */
 	protected function _deleteDependent($id, $cascade) {
@@ -2688,9 +2810,9 @@ class Model extends Object implements CakeEventListener {
  * Deletes multiple model records based on a set of conditions.
  *
  * @param mixed $conditions Conditions to match
- * @param boolean $cascade Set to true to delete records that depend on this record
- * @param boolean $callbacks Run callbacks
- * @return boolean True on success, false on failure
+ * @param bool $cascade Set to true to delete records that depend on this record
+ * @param bool $callbacks Run callbacks
+ * @return bool True on success, false on failure
  * @link http://book.cakephp.org/2.0/en/models/deleting-data.html#deleteall
  */
 	public function deleteAll($conditions, $cascade = true, $callbacks = false) {
@@ -2744,7 +2866,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Collects foreign keys from associations.
  *
- * @param string $type
+ * @param string $type Association type.
  * @return array
  */
 	protected function _collectForeignKeys($type = 'belongsTo') {
@@ -2766,8 +2888,8 @@ class Model extends Object implements CakeEventListener {
  * and then performs a `Model::find('count')` on the currently configured datasource
  * to ascertain the existence of the record in persistent storage.
  *
- * @param integer|string $id ID of record to check for existence
- * @return boolean True if such a record exists
+ * @param int|string $id ID of record to check for existence
+ * @return bool True if such a record exists
  */
 	public function exists($id = null) {
 		if ($id === null) {
@@ -2778,6 +2900,10 @@ class Model extends Object implements CakeEventListener {
 			return false;
 		}
 
+		if ($this->useTable === false) {
+			return false;
+		}
+
 		return (bool)$this->find('count', array(
 			'conditions' => array(
 				$this->alias . '.' . $this->primaryKey => $id
@@ -2791,7 +2917,7 @@ class Model extends Object implements CakeEventListener {
  * Returns true if a record that meets given conditions exists.
  *
  * @param array $conditions SQL conditions array
- * @return boolean True if such a record exists
+ * @return bool True if such a record exists
  */
 	public function hasAny($conditions = null) {
 		return (bool)$this->find('count', array('conditions' => $conditions, 'recursive' => -1));
@@ -2806,7 +2932,7 @@ class Model extends Object implements CakeEventListener {
  * 'recursive', 'page', 'fields', 'offset', 'order', 'callbacks')
  *
  * Eg:
- * {{{
+ * ```
  * $model->find('all', array(
  *   'conditions' => array('name' => 'Thomas Anderson'),
  *   'fields' => array('name', 'email'),
@@ -2815,13 +2941,13 @@ class Model extends Object implements CakeEventListener {
  *   'group' => 'type',
  *   'callbacks' => false,
  * ));
- * }}}
+ * ```
  *
  * In addition to the standard query keys above, you can provide Datasource, and behavior specific
  * keys. For example, when using a SQL based datasource you can use the joins key to specify additional
  * joins that should be part of the query.
  *
- * {{{
+ * ```
  * $model->find('all', array(
  *   'conditions' => array('name' => 'Thomas Anderson'),
  *   'joins' => array(
@@ -2833,7 +2959,7 @@ class Model extends Object implements CakeEventListener {
  *     )
  *   )
  * ));
- * }}}
+ * ```
  *
  * ### Disabling callbacks
  *
@@ -2862,7 +2988,7 @@ class Model extends Object implements CakeEventListener {
  *
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
  * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
- * @return array Array of records, or Null on failure.
+ * @return array|null Array of records, or Null on failure.
  * @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html
  */
 	public function find($type = 'first', $query = array()) {
@@ -2883,7 +3009,7 @@ class Model extends Object implements CakeEventListener {
  * Model::_readDataSource() is used by all find() calls to read from the data source and can be overloaded to allow
  * caching of datasource calls.
  *
- * {{{
+ * ```
  * protected function _readDataSource($type, $query) {
  * 		$cacheName = md5(json_encode($query));
  * 		$cache = Cache::read($cacheName, 'cache-config-name');
@@ -2895,7 +3021,7 @@ class Model extends Object implements CakeEventListener {
  * 		Cache::write($cacheName, $results, 'cache-config-name');
  * 		return $results;
  * }
- * }}}
+ * ```
  *
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
  * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
@@ -2921,7 +3047,8 @@ class Model extends Object implements CakeEventListener {
  *
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
  * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
- * @return array Query array or null if it could not be build for some reasons
+ * @return array|null Query array or null if it could not be build for some reasons
+ * @triggers Model.beforeFind $this, array($query)
  * @see Model::find()
  */
 	public function buildQuery($type = 'first', $query = array()) {
@@ -2937,7 +3064,7 @@ class Model extends Object implements CakeEventListener {
 			$query = $this->{'_find' . ucfirst($type)}('before', $query);
 		}
 
-		if (!is_numeric($query['page']) || intval($query['page']) < 1) {
+		if (!is_numeric($query['page']) || (int)$query['page'] < 1) {
 			$query['page'] = 1;
 		}
 
@@ -2949,7 +3076,7 @@ class Model extends Object implements CakeEventListener {
 			$query['order'] = $this->order;
 		}
 
-		$query['order'] = array($query['order']);
+		$query['order'] = (array)$query['order'];
 
 		if ($query['callbacks'] === true || $query['callbacks'] === 'before') {
 			$event = new CakeEvent('Model.beforeFind', $this, array($query));
@@ -2970,8 +3097,8 @@ class Model extends Object implements CakeEventListener {
  * Handles the before/after filter logic for find('all') operations. Only called by Model::find().
  *
  * @param string $state Either "before" or "after"
- * @param array $query
- * @param array $results
+ * @param array $query Query.
+ * @param array $results Results.
  * @return array
  * @see Model::find()
  */
@@ -2987,8 +3114,8 @@ class Model extends Object implements CakeEventListener {
  * Handles the before/after filter logic for find('first') operations. Only called by Model::find().
  *
  * @param string $state Either "before" or "after"
- * @param array $query
- * @param array $results
+ * @param array $query Query.
+ * @param array $results Results.
  * @return array
  * @see Model::find()
  */
@@ -3009,9 +3136,9 @@ class Model extends Object implements CakeEventListener {
  * Handles the before/after filter logic for find('count') operations. Only called by Model::find().
  *
  * @param string $state Either "before" or "after"
- * @param array $query
- * @param array $results
- * @return integer The number of records found, or false
+ * @param array $query Query.
+ * @param array $results Results.
+ * @return int The number of records found, or false
  * @see Model::find()
  */
 	protected function _findCount($state, $query, $results = array()) {
@@ -3050,7 +3177,7 @@ class Model extends Object implements CakeEventListener {
 					return count($results);
 				}
 
-				return intval($results[0][$key]['count']);
+				return (int)$results[0][$key]['count'];
 			}
 		}
 
@@ -3061,8 +3188,8 @@ class Model extends Object implements CakeEventListener {
  * Handles the before/after filter logic for find('list') operations. Only called by Model::find().
  *
  * @param string $state Either "before" or "after"
- * @param array $query
- * @param array $results
+ * @param array $query Query.
+ * @param array $results Results.
  * @return array Key/value pairs of primary keys/display field values of all records found
  * @see Model::find()
  */
@@ -3073,7 +3200,7 @@ class Model extends Object implements CakeEventListener {
 				$list = array("{n}.{$this->alias}.{$this->primaryKey}", "{n}.{$this->alias}.{$this->displayField}", null);
 			} else {
 				if (!is_array($query['fields'])) {
-					$query['fields'] = String::tokenize($query['fields']);
+					$query['fields'] = CakeText::tokenize($query['fields']);
 				}
 
 				if (count($query['fields']) === 1) {
@@ -3122,8 +3249,8 @@ class Model extends Object implements CakeEventListener {
  * rows and return them.
  *
  * @param string $state Either "before" or "after"
- * @param array $query
- * @param array $results
+ * @param array $query Query.
+ * @param array $results Results.
  * @return array
  */
 	protected function _findNeighbors($state, $query, $results = array()) {
@@ -3183,9 +3310,9 @@ class Model extends Object implements CakeEventListener {
  * In the event of ambiguous results returned (multiple top level results, with different parent_ids)
  * top level results with different parent_ids to the first result will be dropped
  *
- * @param string $state
- * @param mixed $query
- * @param array $results
+ * @param string $state Either "before" or "after".
+ * @param array $query Query.
+ * @param array $results Results.
  * @return array Threaded results
  */
 	protected function _findThreaded($state, $query, $results = array()) {
@@ -3208,8 +3335,9 @@ class Model extends Object implements CakeEventListener {
  * Passes query results through model and behavior afterFind() methods.
  *
  * @param array $results Results to filter
- * @param boolean $primary If this is the primary model results (results from model where the find operation was performed)
+ * @param bool $primary If this is the primary model results (results from model where the find operation was performed)
  * @return array Set of filtered results
+ * @triggers Model.afterFind $this, array($results, $primary)
  */
 	protected function _filterResults($results, $primary = true) {
 		$event = new CakeEvent('Model.afterFind', $this, array($results, $primary));
@@ -3223,7 +3351,7 @@ class Model extends Object implements CakeEventListener {
  * to those originally defined in the model. Normally called at the end
  * of each call to Model::find()
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function resetAssociations() {
 		if (!empty($this->__backAssociation)) {
@@ -3251,16 +3379,32 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns false if any fields passed match any (by default, all if $or = false) of their matching values.
  *
+ * Can be used as a validation method. When used as a validation method, the `$or` parameter
+ * contains an array of fields to be validated.
+ *
  * @param array $fields Field/value pairs to search (if no values specified, they are pulled from $this->data)
- * @param boolean $or If false, all fields specified must match in order for a false return value
- * @return boolean False if any records matching any fields are found
+ * @param bool|array $or If false, all fields specified must match in order for a false return value
+ * @return bool False if any records matching any fields are found
  */
 	public function isUnique($fields, $or = true) {
+		if (is_array($or)) {
+			$isRule = (
+				array_key_exists('rule', $or) &&
+				array_key_exists('required', $or) &&
+				array_key_exists('message', $or)
+			);
+			if (!$isRule) {
+				$args = func_get_args();
+				$fields = $args[1];
+				$or = isset($args[2]) ? $args[2] : true;
+			}
+		}
 		if (!is_array($fields)) {
 			$fields = func_get_args();
-			if (is_bool($fields[count($fields) - 1])) {
-				$or = $fields[count($fields) - 1];
-				unset($fields[count($fields) - 1]);
+			$fieldCount = count($fields) - 1;
+			if (is_bool($fields[$fieldCount])) {
+				$or = $fields[$fieldCount];
+				unset($fields[$fieldCount]);
 			}
 		}
 
@@ -3295,11 +3439,14 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns a resultset for a given SQL statement. Custom SQL queries should be performed with this method.
  *
- * @param string $sql SQL statement
- * @param boolean|array $params Either a boolean to control query caching or an array of parameters
+ * The method can options 2nd and 3rd parameters.
+ *
+ * - 2nd param: Either a boolean to control query caching or an array of parameters
  *    for use with prepared statement placeholders.
- * @param boolean $cache If $params is provided, a boolean flag for enabling/disabled
- *    query caching.
+ * - 3rd param: If 2nd argument is provided, a boolean flag for enabling/disabled
+ *   query caching.
+ *
+ * @param string $sql SQL statement
  * @return mixed Resultset array or boolean indicating success / failure depending on the query executed
  * @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-query
  */
@@ -3316,7 +3463,7 @@ class Model extends Object implements CakeEventListener {
  * Will validate the currently set data. Use Model::set() or Model::create() to set the active data.
  *
  * @param array $options An optional array of custom options to be made available in the beforeValidate callback
- * @return boolean True if there are no errors
+ * @return bool True if there are no errors
  */
 	public function validates($options = array()) {
 		return $this->validator()->validates($options);
@@ -3352,7 +3499,7 @@ class Model extends Object implements CakeEventListener {
  * Returns true if given field name is a foreign key in this model.
  *
  * @param string $field Returns true if the input string ends in "_id"
- * @return boolean True if the field is a foreign key listed in the belongsTo array.
+ * @return bool True if the field is a foreign key listed in the belongsTo array.
  */
 	public function isForeignKey($field) {
 		$foreignKeys = array();
@@ -3393,7 +3540,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns the current record's ID
  *
- * @param integer $list Index on which the composed ID is located
+ * @param int $list Index on which the composed ID is located
  * @return mixed The ID of the current record, false if no ID
  */
 	public function getID($list = 0) {
@@ -3437,7 +3584,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Sets the ID of the last record this model inserted
  *
- * @param integer|string $id Last inserted ID
+ * @param int|string $id Last inserted ID
  * @return void
  */
 	public function setInsertID($id) {
@@ -3447,7 +3594,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns the number of rows returned from the last query.
  *
- * @return integer Number of rows
+ * @return int Number of rows
  */
 	public function getNumRows() {
 		return $this->getDataSource()->lastNumRows();
@@ -3456,7 +3603,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns the number of rows affected by the last query.
  *
- * @return integer Number of rows
+ * @return int Number of rows
  */
 	public function getAffectedRows() {
 		return $this->getDataSource()->lastAffected();
@@ -3480,14 +3627,19 @@ class Model extends Object implements CakeEventListener {
 		if (!empty($oldConfig) && isset($db->config['prefix'])) {
 			$oldDb = ConnectionManager::getDataSource($oldConfig);
 
-			if (!isset($this->tablePrefix) || (!isset($oldDb->config['prefix']) || $this->tablePrefix == $oldDb->config['prefix'])) {
+			if (!isset($this->tablePrefix) || (!isset($oldDb->config['prefix']) || $this->tablePrefix === $oldDb->config['prefix'])) {
 				$this->tablePrefix = $db->config['prefix'];
 			}
 		} elseif (isset($db->config['prefix'])) {
 			$this->tablePrefix = $db->config['prefix'];
 		}
 
-		$this->schemaName = (empty($this->schemaName) ? $db->getSchemaName() : $this->schemaName);
+		$schema = $db->getSchemaName();
+		$defaultProperties = get_class_vars(get_class($this));
+		if (isset($defaultProperties['schemaName'])) {
+			$schema = $defaultProperties['schemaName'];
+		}
+		$this->schemaName = $schema;
 	}
 
 /**
@@ -3517,7 +3669,7 @@ class Model extends Object implements CakeEventListener {
  * Gets all the models with which this model is associated.
  *
  * @param string $type Only result associations of this type
- * @return array Associations
+ * @return array|null Associations
  */
 	public function getAssociated($type = null) {
 		if (!$type) {
@@ -3606,7 +3758,7 @@ class Model extends Object implements CakeEventListener {
  * Return value should be the (modified) results.
  *
  * @param mixed $results The results of the find operation
- * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
+ * @param bool $primary Whether this model is being queried directly (vs. being queried as an association)
  * @return mixed Result of the find operation
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#afterfind
  */
@@ -3619,7 +3771,7 @@ class Model extends Object implements CakeEventListener {
  * to halt the save.
  *
  * @param array $options Options passed from Model::save().
- * @return boolean True if the operation should continue, false if it should abort
+ * @return bool True if the operation should continue, false if it should abort
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforesave
  * @see Model::save()
  */
@@ -3630,7 +3782,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Called after each successful save operation.
  *
- * @param boolean $created True if this save created a new record
+ * @param bool $created True if this save created a new record
  * @param array $options Options passed from Model::save().
  * @return void
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#aftersave
@@ -3642,8 +3794,8 @@ class Model extends Object implements CakeEventListener {
 /**
  * Called before every deletion operation.
  *
- * @param boolean $cascade If true records that depend on this record will also be deleted
- * @return boolean True if the operation should continue, false if it should abort
+ * @param bool $cascade If true records that depend on this record will also be deleted
+ * @return bool True if the operation should continue, false if it should abort
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforedelete
  */
 	public function beforeDelete($cascade = true) {
@@ -3664,7 +3816,7 @@ class Model extends Object implements CakeEventListener {
  * validation rules can be defined in $validate.
  *
  * @param array $options Options passed from Model::save().
- * @return boolean True if validate operation should continue, false to abort
+ * @return bool True if validate operation should continue, false to abort
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforevalidate
  * @see Model::save()
  */
@@ -3723,7 +3875,7 @@ class Model extends Object implements CakeEventListener {
 /**
  * Returns an instance of a model validator for this class
  *
- * @param ModelValidator Model validator instance.
+ * @param ModelValidator $instance Model validator instance.
  *  If null a new ModelValidator instance will be made using current model object
  * @return ModelValidator
  */
diff --git a/web/api/lib/Cake/Model/ModelBehavior.php b/web/api/lib/Cake/Model/ModelBehavior.php
index ee0bb81d0..4ec08cdeb 100644
--- a/web/api/lib/Cake/Model/ModelBehavior.php
+++ b/web/api/lib/Cake/Model/ModelBehavior.php
@@ -30,11 +30,11 @@
  * Behaviors can provide mixin like features by declaring public methods. These methods should expect
  * the model instance to be shifted onto the parameter list.
  *
- * {{{
+ * ```
  * function doSomething(Model $model, $arg1, $arg2) {
  *		//do something
  * }
- * }}}
+ * ```
  *
  * Would be called like `$this->Model->doSomething($arg1, $arg2);`.
  *
@@ -45,13 +45,13 @@
  * be declared in your behaviors `$mapMethods` array. The method signature for a mapped method is slightly different
  * than a normal behavior mixin method.
  *
- * {{{
+ * ```
  * public $mapMethods = array('/do(\w+)/' => 'doSomething');
  *
  * function doSomething(Model $model, $method, $arg1, $arg2) {
  *		//do something
  * }
- * }}}
+ * ```
  *
  * The above will map every doXXX() method call to the behavior. As you can see, the model is
  * still the first parameter, but the called method name will be the 2nd parameter. This allows
@@ -115,7 +115,7 @@ class ModelBehavior extends Object {
  *
  * @param Model $model Model using this behavior
  * @param array $query Data used to execute this query, i.e. conditions, order, etc.
- * @return boolean|array False or null will abort the operation. You can return an array to replace the
+ * @return bool|array False or null will abort the operation. You can return an array to replace the
  *   $query that will be eventually run.
  */
 	public function beforeFind(Model $model, $query) {
@@ -127,7 +127,7 @@ class ModelBehavior extends Object {
  *
  * @param Model $model Model using this behavior
  * @param mixed $results The results of the find operation
- * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
+ * @param bool $primary Whether this model is being queried directly (vs. being queried as an association)
  * @return mixed An array value will replace the value of $results - any other value will be ignored.
  */
 	public function afterFind(Model $model, $results, $primary = false) {
@@ -175,9 +175,9 @@ class ModelBehavior extends Object {
  * afterSave is called after a model is saved.
  *
  * @param Model $model Model using this behavior
- * @param boolean $created True if this save created a new record
+ * @param bool $created True if this save created a new record
  * @param array $options Options passed from Model::save().
- * @return boolean
+ * @return bool
  * @see Model::save()
  */
 	public function afterSave(Model $model, $created, $options = array()) {
@@ -189,7 +189,7 @@ class ModelBehavior extends Object {
  * beforeDelete is called. Returning false from a beforeDelete will abort the delete.
  *
  * @param Model $model Model using this behavior
- * @param boolean $cascade If true records that depend on this record will also be deleted
+ * @param bool $cascade If true records that depend on this record will also be deleted
  * @return mixed False if the operation should abort. Any other result will continue.
  */
 	public function beforeDelete(Model $model, $cascade = true) {
diff --git a/web/api/lib/Cake/Model/ModelValidator.php b/web/api/lib/Cake/Model/ModelValidator.php
index d61ba8b66..25b7c6e0b 100644
--- a/web/api/lib/Cake/Model/ModelValidator.php
+++ b/web/api/lib/Cake/Model/ModelValidator.php
@@ -36,7 +36,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Holds the CakeValidationSet objects array
  *
- * @var array
+ * @var CakeValidationSet[]
  */
 	protected $_fields = array();
 
@@ -93,7 +93,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * Will validate the currently set data. Use `Model::set()` or `Model::create()` to set the active data.
  *
  * @param array $options An optional array of custom options to be made available in the beforeValidate callback
- * @return boolean True if there are no errors
+ * @return bool True if there are no errors
  */
 	public function validates($options = array()) {
 		$errors = $this->errors($options);
@@ -119,9 +119,9 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * If you do not want this to happen, make a copy of `$data` before passing it
  * to this method
  *
- * @param array $data Record data to validate. This should be an array indexed by association name.
+ * @param array &$data Record data to validate. This should be an array indexed by association name.
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
- * @return array|boolean If atomic: True on success, or false on failure.
+ * @return array|bool If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record validated successfully.
  */
@@ -196,7 +196,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * If you do not want this to happen, make a copy of `$data` before passing it
  * to this method
  *
- * @param array $data Record data to validate. This should be a numerically-indexed array
+ * @param array &$data Record data to validate. This should be a numerically-indexed array
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
  * @return mixed If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
@@ -235,6 +235,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  *
  * @param string $options An optional array of custom options to be made available in the beforeValidate callback
  * @return array Array of invalid fields
+ * @triggers Model.afterValidate $model
  * @see ModelValidator::validates()
  */
 	public function errors($options = array()) {
@@ -318,7 +319,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * params are passed then it returns an array with all CakeValidationSet objects for each field
  *
  * @param string $name [optional] The fieldname to fetch. Defaults to null.
- * @return CakeValidationSet|array
+ * @return CakeValidationSet|array|null
  */
 	public function getField($name = null) {
 		$this->_parseRules();
@@ -335,7 +336,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * Sets the CakeValidationSet objects from the `Model::$validate` property
  * If `Model::$validate` is not set or empty, this method returns false. True otherwise.
  *
- * @return boolean true if `Model::$validate` was processed, false otherwise
+ * @return bool true if `Model::$validate` was processed, false otherwise
  */
 	protected function _parseRules() {
 		if ($this->_validate === $this->_model->validate) {
@@ -362,7 +363,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * Sets the I18n domain for validation messages. This method is chainable.
  *
  * @param string $validationDomain [optional] The validation domain to be used.
- * @return ModelValidator
+ * @return self
  */
 	public function setValidationDomain($validationDomain = null) {
 		if (empty($validationDomain)) {
@@ -385,7 +386,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * Processes the passed fieldList and returns the list of fields to be validated
  *
  * @param array $fieldList list of fields to be used for validation
- * @return array List of validation rules to be applied
+ * @return CakeValidationSet[] List of validation rules to be applied
  */
 	protected function _validationList($fieldList = array()) {
 		if (empty($fieldList) || Hash::dimensions($fieldList) > 1) {
@@ -408,7 +409,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * set and data in the data set.
  *
  * @param array $options Array of options to use on Validation of with models
- * @return boolean Failure of validation on with models.
+ * @return bool Failure of validation on with models.
  * @see Model::validates()
  */
 	protected function _validateWithModels($options) {
@@ -442,8 +443,9 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Propagates beforeValidate event
  *
- * @param array $options
- * @return boolean
+ * @param array $options Options to pass to callback.
+ * @return bool
+ * @triggers Model.beforeValidate $model, array($options)
  */
 	protected function _triggerBeforeValidate($options = array()) {
 		$model = $this->getModel();
@@ -460,7 +462,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * Returns whether a rule set is defined for a field or not
  *
  * @param string $field name of the field to check
- * @return boolean
+ * @return bool
  */
 	public function offsetExists($field) {
 		$this->_parseRules();
@@ -519,7 +521,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Returns the number of fields having validation rules
  *
- * @return integer
+ * @return int
  */
 	public function count() {
 		$this->_parseRules();
@@ -533,21 +535,21 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *		$validator
- *			->add('title', 'required', array('rule' => 'notEmpty', 'required' => true))
+ *			->add('title', 'required', array('rule' => 'notBlank', 'required' => true))
  *			->add('user_id', 'valid', array('rule' => 'numeric', 'message' => 'Invalid User'))
  *
  *		$validator->add('password', array(
- *			'size' => array('rule' => array('between', 8, 20)),
+ *			'size' => array('rule' => array('lengthBetween', 8, 20)),
  *			'hasSpecialCharacter' => array('rule' => 'validateSpecialchar', 'message' => 'not valid')
  *		));
- * }}}
+ * ```
  *
- * @param string $field The name of the field from which the rule will be removed
+ * @param string $field The name of the field where the rule is to be added
  * @param string|array|CakeValidationSet $name name of the rule to be added or list of rules for the field
  * @param array|CakeValidationRule $rule or list of rules to be added to the field's rule set
- * @return ModelValidator this instance
+ * @return self
  */
 	public function add($field, $name, $rule = null) {
 		$this->_parseRules();
@@ -578,15 +580,15 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *		$validator
  *			->remove('title', 'required')
  *			->remove('user_id')
- * }}}
+ * ```
  *
  * @param string $field The name of the field from which the rule will be removed
  * @param string $rule the name of the rule to be removed
- * @return ModelValidator this instance
+ * @return self
  */
 	public function remove($field, $rule = null) {
 		$this->_parseRules();
diff --git a/web/api/lib/Cake/Model/Permission.php b/web/api/lib/Cake/Model/Permission.php
index cc76c4f50..39c64ca57 100644
--- a/web/api/lib/Cake/Model/Permission.php
+++ b/web/api/lib/Cake/Model/Permission.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -28,7 +26,7 @@ class Permission extends AppModel {
 /**
  * Explicitly disable in-memory query caching
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -71,7 +69,7 @@ class Permission extends AppModel {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success (true if ARO has access to action in ACO, false otherwise)
+ * @return bool Success (true if ARO has access to action in ACO, false otherwise)
  */
 	public function check($aro, $aco, $action = '*') {
 		if (!$aro || !$aco) {
@@ -166,8 +164,8 @@ class Permission extends AppModel {
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $actions Action (defaults to *) Invalid permissions will result in an exception
- * @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
- * @return boolean Success
+ * @param int $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
+ * @return bool Success
  * @throws AclException on Invalid permission key.
  */
 	public function allow($aro, $aco, $actions = '*', $value = 1) {
diff --git a/web/api/lib/Cake/Model/Validator/CakeValidationRule.php b/web/api/lib/Cake/Model/Validator/CakeValidationRule.php
index 0a5d5e5de..3a58e5a5c 100644
--- a/web/api/lib/Cake/Model/Validator/CakeValidationRule.php
+++ b/web/api/lib/Cake/Model/Validator/CakeValidationRule.php
@@ -39,7 +39,7 @@ class CakeValidationRule {
 /**
  * Holds whether the record being validated exists in datasource or not
  *
- * @var boolean
+ * @var bool
  */
 	protected $_recordExists = false;
 
@@ -81,7 +81,7 @@ class CakeValidationRule {
 /**
  * The 'allowEmpty' key
  *
- * @var boolean
+ * @var bool
  */
 	public $allowEmpty = null;
 
@@ -95,7 +95,7 @@ class CakeValidationRule {
 /**
  * The 'last' key
  *
- * @var boolean
+ * @var bool
  */
 	public $last = true;
 
@@ -118,7 +118,7 @@ class CakeValidationRule {
 /**
  * Checks if the rule is valid
  *
- * @return boolean
+ * @return bool
  */
 	public function isValid() {
 		if (!$this->_valid || (is_string($this->_valid) && !empty($this->_valid))) {
@@ -131,7 +131,7 @@ class CakeValidationRule {
 /**
  * Returns whether the field can be left blank according to this rule
  *
- * @return boolean
+ * @return bool
  */
 	public function isEmptyAllowed() {
 		return $this->skip() || $this->allowEmpty === true;
@@ -140,7 +140,7 @@ class CakeValidationRule {
 /**
  * Checks if the field is required according to the `required` property
  *
- * @return boolean
+ * @return bool
  */
 	public function isRequired() {
 		if (in_array($this->required, array('create', 'update'), true)) {
@@ -157,8 +157,8 @@ class CakeValidationRule {
  * Checks whether the field failed the `field should be present` validation
  *
  * @param string $field Field name
- * @param array $data Data to check rule against
- * @return boolean
+ * @param array &$data Data to check rule against
+ * @return bool
  */
 	public function checkRequired($field, &$data) {
 		return (
@@ -174,8 +174,8 @@ class CakeValidationRule {
  * Checks if the allowEmpty key applies
  *
  * @param string $field Field name
- * @param array $data data to check rule against
- * @return boolean
+ * @param array &$data data to check rule against
+ * @return bool
  */
 	public function checkEmpty($field, &$data) {
 		if (empty($data[$field]) && $data[$field] != '0' && $this->allowEmpty === true) {
@@ -187,7 +187,7 @@ class CakeValidationRule {
 /**
  * Checks if the validation rule should be skipped
  *
- * @return boolean True if the ValidationRule can be skipped
+ * @return bool True if the ValidationRule can be skipped
  */
 	public function skip() {
 		if (!empty($this->on)) {
@@ -202,7 +202,7 @@ class CakeValidationRule {
  * Returns whether this rule should break validation process for associated field
  * after it fails
  *
- * @return boolean
+ * @return bool
  */
 	public function isLast() {
 		return (bool)$this->last;
@@ -245,8 +245,8 @@ class CakeValidationRule {
  * If called with no parameters it will return whether this rule
  * is configured for update operations or not.
  *
- * @param boolean $exists Boolean to indicate if records exists
- * @return boolean
+ * @param bool $exists Boolean to indicate if records exists
+ * @return bool
  */
 	public function isUpdate($exists = null) {
 		if ($exists === null) {
@@ -259,9 +259,9 @@ class CakeValidationRule {
  * Dispatches the validation rule to the given validator method
  *
  * @param string $field Field name
- * @param array $data Data array
- * @param array $methods Methods list
- * @return boolean True if the rule could be dispatched, false otherwise
+ * @param array &$data Data array
+ * @param array &$methods Methods list
+ * @return bool True if the rule could be dispatched, false otherwise
  */
 	public function process($field, &$data, &$methods) {
 		$this->_valid = true;
@@ -299,8 +299,8 @@ class CakeValidationRule {
 /**
  * Returns passed options for this rule
  *
- * @param string|integer $key Array index
- * @return array
+ * @param string|int $key Array index
+ * @return array|null
  */
 	public function getOptions($key) {
 		if (!isset($this->_passedOptions[$key])) {
@@ -334,7 +334,7 @@ class CakeValidationRule {
  * Parses the rule and sets the rule and ruleParams
  *
  * @param string $field Field name
- * @param array $data Data array
+ * @param array &$data Data array
  * @return void
  */
 	protected function _parseRule($field, &$data) {
diff --git a/web/api/lib/Cake/Model/Validator/CakeValidationSet.php b/web/api/lib/Cake/Model/Validator/CakeValidationSet.php
index 80b9a79cc..319eb3c60 100644
--- a/web/api/lib/Cake/Model/Validator/CakeValidationSet.php
+++ b/web/api/lib/Cake/Model/Validator/CakeValidationSet.php
@@ -32,7 +32,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Holds the CakeValidationRule objects
  *
- * @var array
+ * @var CakeValidationRule[]
  */
 	protected $_rules = array();
 
@@ -53,7 +53,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Whether the validation is stopped
  *
- * @var boolean
+ * @var bool
  */
 	public $isStopped = false;
 
@@ -74,8 +74,8 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Constructor
  *
- * @param string $fieldName The fieldname
- * @param array $ruleset
+ * @param string $fieldName The fieldname.
+ * @param array $ruleSet Rules set.
  */
 	public function __construct($fieldName, $ruleSet) {
 		$this->field = $fieldName;
@@ -93,7 +93,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Sets the list of methods to use for validation
  *
- * @param array $methods Methods list
+ * @param array &$methods Methods list
  * @return void
  */
 	public function setMethods(&$methods) {
@@ -115,7 +115,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  * validation errors
  *
  * @param array $data Data array
- * @param boolean $isUpdate Is record being updated or created
+ * @param bool $isUpdate Is record being updated or created
  * @return array list of validation errors for this field
  */
 	public function validate($data, $isUpdate = false) {
@@ -160,7 +160,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Gets a rule for a given name if exists
  *
- * @param string $name
+ * @param string $name Field name.
  * @return CakeValidationRule
  */
 	public function getRule($name) {
@@ -172,7 +172,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Returns all rules for this validation set
  *
- * @return array
+ * @return CakeValidationRule[]
  */
 	public function getRules() {
 		return $this->_rules;
@@ -183,15 +183,15 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *		$set
- *			->setRule('required', array('rule' => 'notEmpty', 'required' => true))
- *			->setRule('inRange', array('rule' => array('between', 4, 10))
- * }}}
+ *			->setRule('required', array('rule' => 'notBlank', 'required' => true))
+ *			->setRule('between', array('rule' => array('lengthBetween', 4, 10))
+ * ```
  *
  * @param string $name The name under which the rule should be set
  * @param CakeValidationRule|array $rule The validation rule to be set
- * @return CakeValidationSet this instance
+ * @return self
  */
 	public function setRule($name, $rule) {
 		if (!($rule instanceof CakeValidationRule)) {
@@ -206,14 +206,14 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *		$set
  *			->removeRule('required')
  *			->removeRule('inRange')
- * }}}
+ * ```
  *
  * @param string $name The name under which the rule should be unset
- * @return CakeValidationSet this instance
+ * @return self
  */
 	public function removeRule($name) {
 		unset($this->_rules[$name]);
@@ -225,16 +225,16 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  *
  * ## Example:
  *
- * {{{
+ * ```
  *		$set->setRules(array(
- *			'required' => array('rule' => 'notEmpty', 'required' => true),
+ *			'required' => array('rule' => 'notBlank', 'required' => true),
  *			'inRange' => array('rule' => array('between', 4, 10)
  * 		));
- * }}}
+ * ```
  *
  * @param array $rules The rules to be set
- * @param boolean $mergeVars [optional] If true, merges vars instead of replace. Defaults to true.
- * @return ModelField
+ * @param bool $mergeVars [optional] If true, merges vars instead of replace. Defaults to true.
+ * @return self
  */
 	public function setRules($rules = array(), $mergeVars = true) {
 		if ($mergeVars === false) {
@@ -308,7 +308,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  * Returns whether an index exists in the rule set
  *
  * @param string $index name of the rule
- * @return boolean
+ * @return bool
  */
 	public function offsetExists($index) {
 		return isset($this->_rules[$index]);
@@ -330,11 +330,10 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
  * This is a wrapper for ArrayAccess. Use setRule() directly for
  * chainable access.
  *
- * @see http://www.php.net/manual/en/arrayobject.offsetset.php
- *
- * @param string $index name of the rule
- * @param CakeValidationRule|array rule to add to $index
+ * @param string $index Name of the rule.
+ * @param CakeValidationRule|array $rule Rule to add to $index.
  * @return void
+ * @see http://www.php.net/manual/en/arrayobject.offsetset.php
  */
 	public function offsetSet($index, $rule) {
 		$this->setRule($index, $rule);
@@ -362,7 +361,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
 /**
  * Returns the number of rules in this set
  *
- * @return integer
+ * @return int
  */
 	public function count() {
 		return count($this->_rules);
diff --git a/web/api/lib/Cake/Network/CakeRequest.php b/web/api/lib/Cake/Network/CakeRequest.php
index 02c0eae41..05b0ad24a 100644
--- a/web/api/lib/Cake/Network/CakeRequest.php
+++ b/web/api/lib/Cake/Network/CakeRequest.php
@@ -106,12 +106,14 @@ class CakeRequest implements ArrayAccess {
 		'ajax' => array('env' => 'HTTP_X_REQUESTED_WITH', 'value' => 'XMLHttpRequest'),
 		'flash' => array('env' => 'HTTP_USER_AGENT', 'pattern' => '/^(Shockwave|Adobe) Flash/'),
 		'mobile' => array('env' => 'HTTP_USER_AGENT', 'options' => array(
-			'Android', 'AvantGo', 'BlackBerry', 'DoCoMo', 'Fennec', 'iPod', 'iPhone', 'iPad',
+			'Android', 'AvantGo', 'BB10', 'BlackBerry', 'DoCoMo', 'Fennec', 'iPod', 'iPhone', 'iPad',
 			'J2ME', 'MIDP', 'NetFront', 'Nokia', 'Opera Mini', 'Opera Mobi', 'PalmOS', 'PalmSource',
 			'portalmmm', 'Plucker', 'ReqwirelessWeb', 'SonyEricsson', 'Symbian', 'UP\\.Browser',
 			'webOS', 'Windows CE', 'Windows Phone OS', 'Xiino'
 		)),
-		'requested' => array('param' => 'requested', 'value' => 1)
+		'requested' => array('param' => 'requested', 'value' => 1),
+		'json' => array('accept' => array('application/json'), 'param' => 'ext', 'value' => 'json'),
+		'xml' => array('accept' => array('application/xml', 'text/xml'), 'param' => 'ext', 'value' => 'xml'),
 	);
 
 /**
@@ -126,7 +128,7 @@ class CakeRequest implements ArrayAccess {
  * Constructor
  *
  * @param string $url Trimmed URL string to use. Should not contain the application base path.
- * @param boolean $parseEnvironment Set to false to not auto parse the environment. ie. GET, POST and FILES.
+ * @param bool $parseEnvironment Set to false to not auto parse the environment. ie. GET, POST and FILES.
  */
 	public function __construct($url = null, $parseEnvironment = true) {
 		$this->_base();
@@ -162,8 +164,7 @@ class CakeRequest implements ArrayAccess {
 	protected function _processPost() {
 		if ($_POST) {
 			$this->data = $_POST;
-		} elseif (
-			($this->is('put') || $this->is('delete')) &&
+		} elseif (($this->is('put') || $this->is('delete')) &&
 			strpos(env('CONTENT_TYPE'), 'application/x-www-form-urlencoded') === 0
 		) {
 				$data = $this->_readInput();
@@ -172,9 +173,13 @@ class CakeRequest implements ArrayAccess {
 		if (ini_get('magic_quotes_gpc') === '1') {
 			$this->data = stripslashes_deep($this->data);
 		}
+
+		$override = null;
 		if (env('HTTP_X_HTTP_METHOD_OVERRIDE')) {
 			$this->data['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE');
+			$override = $this->data['_method'];
 		}
+
 		$isArray = is_array($this->data);
 		if ($isArray && isset($this->data['_method'])) {
 			if (!empty($_SERVER)) {
@@ -182,8 +187,14 @@ class CakeRequest implements ArrayAccess {
 			} else {
 				$_ENV['REQUEST_METHOD'] = $this->data['_method'];
 			}
+			$override = $this->data['_method'];
 			unset($this->data['_method']);
 		}
+
+		if ($override && !in_array($override, array('POST', 'PUT', 'PATCH', 'DELETE'))) {
+			$this->data = array();
+		}
+
 		if ($isArray && isset($this->data['data'])) {
 			$data = $this->data['data'];
 			if (count($this->data) <= 1) {
@@ -207,7 +218,7 @@ class CakeRequest implements ArrayAccess {
 			$query = $_GET;
 		}
 
-		$unsetUrl = '/' . str_replace('.', '_', urldecode($this->url));
+		$unsetUrl = '/' . str_replace(array('.', ' '), '_', urldecode($this->url));
 		unset($query[$unsetUrl]);
 		unset($query[$this->base . $unsetUrl]);
 		if (strpos($this->url, '?') !== false) {
@@ -261,8 +272,7 @@ class CakeRequest implements ArrayAccess {
 		}
 		$endsWithIndex = '/webroot/index.php';
 		$endsWithLength = strlen($endsWithIndex);
-		if (
-			strlen($uri) >= $endsWithLength &&
+		if (strlen($uri) >= $endsWithLength &&
 			substr($uri, -$endsWithLength) === $endsWithIndex
 		) {
 			$uri = '/';
@@ -295,6 +305,8 @@ class CakeRequest implements ArrayAccess {
 
 		if (!$baseUrl) {
 			$base = dirname(env('PHP_SELF'));
+			// Clean up additional / which cause following code to fail..
+			$base = preg_replace('#/+#', '/', $base);
 
 			$indexPos = strpos($base, '/webroot/index.php');
 			if ($indexPos !== false) {
@@ -371,7 +383,7 @@ class CakeRequest implements ArrayAccess {
 	protected function _processFileData($path, $data, $field) {
 		foreach ($data as $key => $fields) {
 			$newPath = $key;
-			if (!empty($path)) {
+			if (strlen($path) > 0) {
 				$newPath = $path . '.' . $key;
 			}
 			if (is_array($fields)) {
@@ -386,7 +398,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the IP the client is using, or says they are using.
  *
- * @param boolean $safe Use safe = false when you think the user might manipulate their HTTP_CLIENT_IP
+ * @param bool $safe Use safe = false when you think the user might manipulate their HTTP_CLIENT_IP
  *   header. Setting $safe = false will also look at HTTP_X_FORWARDED_FOR
  * @return string The client IP.
  */
@@ -414,7 +426,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Returns the referer that referred this request.
  *
- * @param boolean $local Attempt to return a local address. Local addresses do not contain hostnames.
+ * @param bool $local Attempt to return a local address. Local addresses do not contain hostnames.
  * @return string The referring address for this request.
  */
 	public function referer($local = false) {
@@ -471,7 +483,7 @@ class CakeRequest implements ArrayAccess {
  * on routing parameters.
  *
  * @param string $name The property being accessed.
- * @return boolean Existence
+ * @return bool Existence
  */
 	public function __isset($name) {
 		return isset($this->params[$name]);
@@ -486,7 +498,7 @@ class CakeRequest implements ArrayAccess {
  *
  * @param string|array $type The type of request you want to check. If an array
  *   this method will return true if the request matches any type.
- * @return boolean Whether or not the request is the type you are checking.
+ * @return bool Whether or not the request is the type you are checking.
  */
 	public function is($type) {
 		if (is_array($type)) {
@@ -498,6 +510,100 @@ class CakeRequest implements ArrayAccess {
 			return false;
 		}
 		$detect = $this->_detectors[$type];
+		if (isset($detect['env']) && $this->_environmentDetector($detect)) {
+			return true;
+		}
+		if (isset($detect['header']) && $this->_headerDetector($detect)) {
+			return true;
+		}
+		if (isset($detect['accept']) && $this->_acceptHeaderDetector($detect)) {
+			return true;
+		}
+		if (isset($detect['param']) && $this->_paramDetector($detect)) {
+			return true;
+		}
+		if (isset($detect['callback']) && is_callable($detect['callback'])) {
+			return call_user_func($detect['callback'], $this);
+		}
+		return false;
+	}
+
+/**
+ * Detects if a URL extension is present.
+ *
+ * @param array $detect Detector options array.
+ * @return bool Whether or not the request is the type you are checking.
+ */
+	protected function _extensionDetector($detect) {
+		if (is_string($detect['extension'])) {
+			$detect['extension'] = array($detect['extension']);
+		}
+		if (in_array($this->params['ext'], $detect['extension'])) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Detects if a specific accept header is present.
+ *
+ * @param array $detect Detector options array.
+ * @return bool Whether or not the request is the type you are checking.
+ */
+	protected function _acceptHeaderDetector($detect) {
+		$acceptHeaders = explode(',', (string)env('HTTP_ACCEPT'));
+		foreach ($detect['accept'] as $header) {
+			if (in_array($header, $acceptHeaders)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Detects if a specific header is present.
+ *
+ * @param array $detect Detector options array.
+ * @return bool Whether or not the request is the type you are checking.
+ */
+	protected function _headerDetector($detect) {
+		foreach ($detect['header'] as $header => $value) {
+			$header = env('HTTP_' . strtoupper($header));
+			if (!is_null($header)) {
+				if (!is_string($value) && !is_bool($value) && is_callable($value)) {
+					return call_user_func($value, $header);
+				}
+				return ($header === $value);
+			}
+		}
+		return false;
+	}
+
+/**
+ * Detects if a specific request parameter is present.
+ *
+ * @param array $detect Detector options array.
+ * @return bool Whether or not the request is the type you are checking.
+ */
+	protected function _paramDetector($detect) {
+		$key = $detect['param'];
+		if (isset($detect['value'])) {
+			$value = $detect['value'];
+			return isset($this->params[$key]) ? $this->params[$key] == $value : false;
+		}
+		if (isset($detect['options'])) {
+			return isset($this->params[$key]) ? in_array($this->params[$key], $detect['options']) : false;
+		}
+		return false;
+	}
+
+/**
+ * Detects if a specific environment variable is present.
+ *
+ * @param array $detect Detector options array.
+ * @return bool Whether or not the request is the type you are checking.
+ */
+	protected function _environmentDetector($detect) {
 		if (isset($detect['env'])) {
 			if (isset($detect['value'])) {
 				return env($detect['env']) == $detect['value'];
@@ -510,19 +616,6 @@ class CakeRequest implements ArrayAccess {
 				return (bool)preg_match($pattern, env($detect['env']));
 			}
 		}
-		if (isset($detect['param'])) {
-			$key = $detect['param'];
-			if (isset($detect['value'])) {
-				$value = $detect['value'];
-				return isset($this->params[$key]) ? $this->params[$key] == $value : false;
-			}
-			if (isset($detect['options'])) {
-				return isset($this->params[$key]) ? in_array($this->params[$key], $detect['options']) : false;
-			}
-		}
-		if (isset($detect['callback']) && is_callable($detect['callback'])) {
-			return call_user_func($detect['callback'], $this);
-		}
 		return false;
 	}
 
@@ -534,7 +627,7 @@ class CakeRequest implements ArrayAccess {
  * built-in types.
  *
  * @param array $types The types to check.
- * @return boolean Success.
+ * @return bool Success.
  * @see CakeRequest::is()
  */
 	public function isAll(array $types) {
@@ -602,7 +695,7 @@ class CakeRequest implements ArrayAccess {
  * This modifies the parameters available through `$request->params`.
  *
  * @param array $params Array of parameters to merge in
- * @return The current object, you can chain this method.
+ * @return self
  */
 	public function addParams($params) {
 		$this->params = array_merge($this->params, (array)$params);
@@ -614,7 +707,7 @@ class CakeRequest implements ArrayAccess {
  * Provides an easy way to modify, here, webroot and base.
  *
  * @param array $paths Array of paths to merge in
- * @return CakeRequest the current object, you can chain this method.
+ * @return self
  */
 	public function addPaths($paths) {
 		foreach (array('webroot', 'here', 'base') as $element) {
@@ -628,7 +721,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the value of the current requests URL. Will include named parameters and querystring arguments.
  *
- * @param boolean $base Include the base path, set to false to trim the base path off.
+ * @param bool $base Include the base path, set to false to trim the base path off.
  * @return string the current request URL including query string args.
  */
 	public function here($base = true) {
@@ -650,7 +743,7 @@ class CakeRequest implements ArrayAccess {
  */
 	public static function header($name) {
 		$name = 'HTTP_' . strtoupper(str_replace('-', '_', $name));
-		if (!empty($_SERVER[$name])) {
+		if (isset($_SERVER[$name])) {
 			return $_SERVER[$name];
 		}
 		return false;
@@ -676,7 +769,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the host that the request was handled on.
  *
- * @param boolean $trustProxy Whether or not to trust the proxy host.
+ * @param bool $trustProxy Whether or not to trust the proxy host.
  * @return string
  */
 	public function host($trustProxy = false) {
@@ -689,7 +782,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the domain name and include $tldLength segments of the tld.
  *
- * @param integer $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
+ * @param int $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
  *   While `example.co.uk` contains 2.
  * @return string Domain name without subdomains.
  */
@@ -702,7 +795,7 @@ class CakeRequest implements ArrayAccess {
 /**
  * Get the subdomains for a host.
  *
- * @param integer $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
+ * @param int $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
  *   While `example.co.uk` contains 2.
  * @return array An array of subdomains.
  */
@@ -760,17 +853,17 @@ class CakeRequest implements ArrayAccess {
  *
  * Get the list of accepted languages:
  *
- * {{{ CakeRequest::acceptLanguage(); }}}
+ * ``` CakeRequest::acceptLanguage(); ```
  *
  * Check if a specific language is accepted:
  *
- * {{{ CakeRequest::acceptLanguage('es-es'); }}}
+ * ``` CakeRequest::acceptLanguage('es-es'); ```
  *
  * @param string $language The language to test.
  * @return mixed If a $language is provided, a boolean. Otherwise the array of accepted languages.
  */
 	public static function acceptLanguage($language = null) {
-		$raw = self::_parseAcceptWithQualifier(self::header('Accept-Language'));
+		$raw = static::_parseAcceptWithQualifier(static::header('Accept-Language'));
 		$accept = array();
 		foreach ($raw as $languages) {
 			foreach ($languages as &$lang) {
@@ -793,7 +886,7 @@ class CakeRequest implements ArrayAccess {
  * Only qualifiers will be extracted, any other accept extensions will be
  * discarded as they are not frequently used.
  *
- * @param string $header
+ * @param string $header Header to parse.
  * @return array
  */
 	protected static function _parseAcceptWithQualifier($header) {
@@ -854,12 +947,12 @@ class CakeRequest implements ArrayAccess {
  * You can write to any value, even paths/keys that do not exist, and the arrays
  * will be created for you.
  *
- * @param string $name,... Dot separated name of the value to read/write
- * @return mixed Either the value being read, or this so you can chain consecutive writes.
+ * @param string $name Dot separated name of the value to read/write, one or more args.
+ * @return mixed|self Either the value being read, or $this so you can chain consecutive writes.
  */
 	public function data($name) {
 		$args = func_get_args();
-		if (count($args) == 2) {
+		if (count($args) === 2) {
 			$this->data = Hash::insert($this->data, $name, $args[1]);
 			return $this;
 		}
@@ -874,8 +967,13 @@ class CakeRequest implements ArrayAccess {
  *   return false if the parameter doesn't exist or is falsey.
  */
 	public function param($name) {
+		$args = func_get_args();
+		if (count($args) === 2) {
+			$this->params = Hash::insert($this->params, $name, $args[1]);
+			return $this;
+		}
 		if (!isset($this->params[$name])) {
-			return false;
+			return Hash::get($this->params, $name, false);
 		}
 		return $this->params[$name];
 	}
@@ -910,6 +1008,17 @@ class CakeRequest implements ArrayAccess {
 		return $input;
 	}
 
+/**
+ * Modify data originally from `php://input`. Useful for altering json/xml data
+ * in middleware or DispatcherFilters before it gets to RequestHandlerComponent
+ *
+ * @param string $input A string to replace original parsed data from input()
+ * @return void
+ */
+	public function setInput($input) {
+		$this->_input = $input;
+	}
+
 /**
  * Allow only certain HTTP request methods. If the request method does not match
  * a 405 error will be shown and the required "Allow" response header will be set.
@@ -924,7 +1033,7 @@ class CakeRequest implements ArrayAccess {
  * and a 405 error will be returned.
  *
  * @param string|array $methods Allowed HTTP request methods.
- * @return boolean true
+ * @return bool true
  * @throws MethodNotAllowedException
  */
 	public function allowMethod($methods) {
@@ -945,11 +1054,11 @@ class CakeRequest implements ArrayAccess {
 /**
  * Alias of CakeRequest::allowMethod() for backwards compatibility.
  *
- * @see CakeRequest::allowMethod()
- * @deprecated 2.5 Use CakeRequest::allowMethod() instead.
  * @param string|array $methods Allowed HTTP request methods.
- * @return boolean true
+ * @return bool true
  * @throws MethodNotAllowedException
+ * @see CakeRequest::allowMethod()
+ * @deprecated 3.0.0 Since 2.5, use CakeRequest::allowMethod() instead.
  */
 	public function onlyAllow($methods) {
 		if (!is_array($methods)) {
@@ -1007,7 +1116,7 @@ class CakeRequest implements ArrayAccess {
  * Array access isset() implementation
  *
  * @param string $name thing to check.
- * @return boolean
+ * @return bool
  */
 	public function offsetExists($name) {
 		return isset($this->params[$name]);
diff --git a/web/api/lib/Cake/Network/CakeResponse.php b/web/api/lib/Cake/Network/CakeResponse.php
index 30b5a3a06..6815c8c11 100644
--- a/web/api/lib/Cake/Network/CakeResponse.php
+++ b/web/api/lib/Cake/Network/CakeResponse.php
@@ -68,6 +68,7 @@ class CakeResponse {
 		415 => 'Unsupported Media Type',
 		416 => 'Requested range not satisfiable',
 		417 => 'Expectation Failed',
+		429 => 'Too Many Requests',
 		500 => 'Internal Server Error',
 		501 => 'Not Implemented',
 		502 => 'Bad Gateway',
@@ -95,7 +96,7 @@ class CakeResponse {
 		'cpio' => 'application/x-cpio',
 		'cpt' => 'application/mac-compactpro',
 		'csh' => 'application/x-csh',
-		'csv' => array('text/csv', 'application/vnd.ms-excel', 'text/plain'),
+		'csv' => array('text/csv', 'application/vnd.ms-excel'),
 		'dcr' => 'application/x-director',
 		'dir' => 'application/x-director',
 		'dms' => 'application/octet-stream',
@@ -312,7 +313,7 @@ class CakeResponse {
 /**
  * Status code to send to the client
  *
- * @var integer
+ * @var int
  */
 	protected $_status = 200;
 
@@ -320,7 +321,7 @@ class CakeResponse {
  * Content type to send. This can be an 'extension' that will be transformed using the $_mimetypes array
  * or a complete mime-type
  *
- * @var integer
+ * @var int
  */
 	protected $_contentType = 'text/html';
 
@@ -451,7 +452,7 @@ class CakeResponse {
 
 /**
  * Formats the Content-Type header based on the configured contentType and charset
- * the charset will only be set in the header if the response is of type text/*
+ * the charset will only be set in the header if the response is of type text
  *
  * @return void
  */
@@ -464,8 +465,7 @@ class CakeResponse {
 		);
 
 		$charset = false;
-		if (
-			$this->_charset &&
+		if ($this->_charset &&
 			(strpos($this->_contentType, 'text/') === 0 || in_array($this->_contentType, $whitelist))
 		) {
 			$charset = true;
@@ -514,17 +514,20 @@ class CakeResponse {
 /**
  * Sends a header to the client.
  *
+ * Will skip sending headers if headers have already been sent.
+ *
  * @param string $name the header name
  * @param string $value the header value
  * @return void
  */
 	protected function _sendHeader($name, $value = null) {
-		if (!headers_sent()) {
-			if ($value === null) {
-				header($name);
-			} else {
-				header("{$name}: {$value}");
-			}
+		if (headers_sent($filename, $linenum)) {
+			return;
+		}
+		if ($value === null) {
+			header($name);
+		} else {
+			header("{$name}: {$value}");
 		}
 	}
 
@@ -559,10 +562,10 @@ class CakeResponse {
  *  e.g `header('WWW-Authenticate: Negotiate'); header('WWW-Authenticate: Not-Negotiate');`
  * will have the same effect as only doing `header('WWW-Authenticate: Not-Negotiate');`
  *
- * @param string|array $header. An array of header strings or a single header string
+ * @param string|array $header An array of header strings or a single header string
  *	- an associative array of "header name" => "header value" is also accepted
  *	- an array of string headers is also accepted
- * @param string|array $value. The header value(s)
+ * @param string|array $value The header value(s)
  * @return array list of headers to be sent
  */
 	public function header($header = null, $value = null) {
@@ -583,9 +586,10 @@ class CakeResponse {
 	}
 
 /**
- * Acccessor for the location header.
+ * Accessor for the location header.
  *
  * Get/Set the Location header value.
+ *
  * @param null|string $url Either null to get the current location, or a string to set one.
  * @return string|null When setting the location null will be returned. When reading the location
  *    a string of the current location header value (if any) will be returned.
@@ -596,6 +600,7 @@ class CakeResponse {
 			return isset($headers['Location']) ? $headers['Location'] : null;
 		}
 		$this->header('Location', $url);
+		return null;
 	}
 
 /**
@@ -616,8 +621,8 @@ class CakeResponse {
  * Sets the HTTP status code to be sent
  * if $code is null the current code is returned
  *
- * @param integer $code the HTTP status code
- * @return integer current status code
+ * @param int $code the HTTP status code
+ * @return int current status code
  * @throws CakeException When an unknown status code is reached.
  */
 	public function statusCode($code = null) {
@@ -633,7 +638,7 @@ class CakeResponse {
 /**
  * Queries & sets valid HTTP response codes & messages.
  *
- * @param integer|array $code If $code is an integer, then the corresponding code/message is
+ * @param int|array $code If $code is an integer, then the corresponding code/message is
  *        returned if it exists, null if it does not exist. If $code is an array, then the
  *        keys are used as codes and the values as messages to add to the default HTTP
  *        codes. The codes must be integers greater than 99 and less than 1000. Keep in
@@ -702,7 +707,7 @@ class CakeResponse {
  *
  * e.g `type(array('jpg' => 'text/plain'));`
  *
- * @param string $contentType
+ * @param string $contentType Content type key.
  * @return mixed current content type or false if supplied an invalid content type
  */
 	public function type($contentType = null) {
@@ -765,7 +770,7 @@ class CakeResponse {
  * Sets the response charset
  * if $charset is null the current charset is returned
  *
- * @param string $charset
+ * @param string $charset Character set string.
  * @return string current charset
  */
 	public function charset($charset = null) {
@@ -813,11 +818,11 @@ class CakeResponse {
  * This method controls the `public` or `private` directive in the Cache-Control
  * header
  *
- * @param boolean $public If set to true, the Cache-Control header will be set as public
+ * @param bool $public If set to true, the Cache-Control header will be set as public
  *   if set to false, the response will be set to private
  *   if no value is provided, it will return whether the response is sharable or not
- * @param integer $time time in seconds after which the response should no longer be considered fresh
- * @return boolean
+ * @param int $time time in seconds after which the response should no longer be considered fresh
+ * @return bool
  */
 	public function sharable($public = null, $time = null) {
 		if ($public === null) {
@@ -827,18 +832,18 @@ class CakeResponse {
 			if (!$public && !$private && !$noCache) {
 				return null;
 			}
-			$sharable = $public || ! ($private || $noCache);
+			$sharable = $public || !($private || $noCache);
 			return $sharable;
 		}
 		if ($public) {
 			$this->_cacheDirectives['public'] = true;
 			unset($this->_cacheDirectives['private']);
-			$this->sharedMaxAge($time);
 		} else {
 			$this->_cacheDirectives['private'] = true;
 			unset($this->_cacheDirectives['public']);
-			$this->maxAge($time);
 		}
+
+		$this->maxAge($time);
 		if (!$time) {
 			$this->_setCacheControl();
 		}
@@ -851,8 +856,8 @@ class CakeResponse {
  * a good candidate to be fetched from a shared cache (like in a proxy server).
  * If called with no parameters, this function will return the current max-age value if any
  *
- * @param integer $seconds if null, the method will return the current s-maxage value
- * @return integer
+ * @param int $seconds if null, the method will return the current s-maxage value
+ * @return int
  */
 	public function sharedMaxAge($seconds = null) {
 		if ($seconds !== null) {
@@ -871,8 +876,8 @@ class CakeResponse {
  * a good candidate to be fetched from the local (client) cache.
  * If called with no parameters, this function will return the current max-age value if any
  *
- * @param integer $seconds if null, the method will return the current max-age value
- * @return integer
+ * @param int $seconds if null, the method will return the current max-age value
+ * @return int
  */
 	public function maxAge($seconds = null) {
 		if ($seconds !== null) {
@@ -892,9 +897,9 @@ class CakeResponse {
  * with the origin.
  * If called with no parameters, this function will return whether must-revalidate is present.
  *
- * @param integer $seconds if null, the method will return the current
- *   must-revalidate value
- * @return boolean
+ * @param bool $enable If null returns whether directive is set, if boolean
+ *   sets or unsets directive.
+ * @return bool
  */
 	public function mustRevalidate($enable = null) {
 		if ($enable !== null) {
@@ -934,7 +939,7 @@ class CakeResponse {
  * `$response->expires(new DateTime('+1 day'))` Will set the expiration in next 24 hours
  * `$response->expires()` Will return the current expiration header value
  *
- * @param string|DateTime $time
+ * @param string|DateTime $time Valid time string or DateTime object.
  * @return string
  */
 	public function expires($time = null) {
@@ -949,7 +954,7 @@ class CakeResponse {
 	}
 
 /**
- * Sets the Last-Modified header for the response by taking an modification time
+ * Sets the Last-Modified header for the response by taking a modification time
  * If called with no parameters it will return the current Last-Modified value
  *
  * ## Examples:
@@ -958,7 +963,7 @@ class CakeResponse {
  * `$response->modified(new DateTime('+1 day'))` Will set the modification date in the past 24 hours
  * `$response->modified()` Will return the current Last-Modified header value
  *
- * @param string|DateTime $time
+ * @param string|DateTime $time Valid time string or DateTime object.
  * @return string
  */
 	public function modified($time = null) {
@@ -1002,7 +1007,7 @@ class CakeResponse {
  * parameters are passed, then an array with the current Vary header
  * value is returned
  *
- * @param string|array $cacheVariances a single Vary string or a array
+ * @param string|array $cacheVariances a single Vary string or an array
  *   containing the list for variances.
  * @return array
  */
@@ -1033,8 +1038,8 @@ class CakeResponse {
  *
  * If no parameters are passed, current Etag header is returned.
  *
- * @param string $hash the unique has that identifies this response
- * @param boolean $weak whether the response is semantically the same as
+ * @param string $tag Tag to set.
+ * @param bool $weak whether the response is semantically the same as
  *   other with the same hash or not
  * @return string
  */
@@ -1052,7 +1057,7 @@ class CakeResponse {
  * Returns a DateTime object initialized at the $time param and using UTC
  * as timezone
  *
- * @param string|integer|DateTime $time
+ * @param string|DateTime $time Valid time string or unix timestamp or DateTime object.
  * @return DateTime
  */
 	protected function _getUTCDate($time = null) {
@@ -1071,7 +1076,7 @@ class CakeResponse {
  * Sets the correct output buffering handler to send a compressed response. Responses will
  * be compressed with zlib, if the extension is available.
  *
- * @return boolean false if client does not accept compressed responses or no handler is available, true otherwise
+ * @return bool false if client does not accept compressed responses or no handler is available, true otherwise
  */
 	public function compress() {
 		$compressionEnabled = ini_get("zlib.output_compression") !== '1' &&
@@ -1083,7 +1088,7 @@ class CakeResponse {
 /**
  * Returns whether the resulting output will be compressed by PHP
  *
- * @return boolean
+ * @return bool
  */
 	public function outputCompressed() {
 		return strpos(env('HTTP_ACCEPT_ENCODING'), 'gzip') !== false
@@ -1104,7 +1109,7 @@ class CakeResponse {
  * Sets the protocol to be used when sending the response. Defaults to HTTP/1.1
  * If called with no arguments, it will return the current configured protocol
  *
- * @param string protocol to be used for sending response
+ * @param string $protocol Protocol to be used for sending response.
  * @return string protocol currently set
  */
 	public function protocol($protocol = null) {
@@ -1118,8 +1123,8 @@ class CakeResponse {
  * Sets the Content-Length header for the response
  * If called with no arguments returns the last Content-Length set
  *
- * @param integer $bytes Number of bytes
- * @return integer|null
+ * @param int $bytes Number of bytes
+ * @return int|null
  */
 	public function length($bytes = null) {
 		if ($bytes !== null) {
@@ -1134,7 +1139,7 @@ class CakeResponse {
 /**
  * Checks whether a response has not been modified according to the 'If-None-Match'
  * (Etags) and 'If-Modified-Since' (last modification date) request
- * headers headers. If the response is detected to be not modified, it
+ * headers. If the response is detected to be not modified, it
  * is marked as so accordingly so the client can be informed of that.
  *
  * In order to mark a response as not modified, you need to set at least
@@ -1142,7 +1147,7 @@ class CakeResponse {
  * a comparison will not be possible.
  *
  * @param CakeRequest $request Request object
- * @return boolean whether the response was marked as not modified or not.
+ * @return bool whether the response was marked as not modified or not.
  */
 	public function checkNotModified(CakeRequest $request) {
 		$etags = preg_split('/\s*,\s*/', $request->header('If-None-Match'), null, PREG_SPLIT_NO_EMPTY);
@@ -1151,7 +1156,7 @@ class CakeResponse {
 			$etagMatches = in_array('*', $etags) || in_array($responseTag, $etags);
 		}
 		if ($modifiedSince) {
-			$timeMatches = strtotime($this->modified()) == strtotime($modifiedSince);
+			$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
 		}
 		$checks = compact('etagMatches', 'timeMatches');
 		if (empty($checks)) {
@@ -1287,8 +1292,8 @@ class CakeResponse {
 /**
  * Normalize the origin to regular expressions and put in an array format
  *
- * @param array $domains
- * @param boolean $requestIsSSL
+ * @param array $domains Domains to normalize
+ * @param bool $requestIsSSL Whether it's a SSL request.
  * @return array
  */
 	protected function _normalizeCorsDomains($domains, $requestIsSSL = false) {
@@ -1320,7 +1325,8 @@ class CakeResponse {
  * - name: Alternate download name
  * - download: If `true` sets download header and forces file to be downloaded rather than displayed in browser
  *
- * @param string $path Path to file
+ * @param string $path Path to file. If the path is not an absolute path that resolves
+ *   to a file, `APP` will be prepended to the path.
  * @param array $options Options See above.
  * @return void
  * @throws NotFoundException
@@ -1331,6 +1337,13 @@ class CakeResponse {
 			'download' => null
 		);
 
+		if (strpos($path, '../') !== false || strpos($path, '..\\') !== false) {
+			throw new NotFoundException(__d(
+				'cake_dev',
+				'The requested file contains `..` and will not be read.'
+			));
+		}
+
 		if (!is_file($path)) {
 			$path = APP . $path;
 		}
@@ -1368,18 +1381,17 @@ class CakeResponse {
 				$name = $options['name'];
 			}
 			$this->download($name);
-			$this->header('Accept-Ranges', 'bytes');
 			$this->header('Content-Transfer-Encoding', 'binary');
+		}
 
-			$httpRange = env('HTTP_RANGE');
-			if (isset($httpRange)) {
-				$this->_fileRange($file, $httpRange);
-			} else {
-				$this->header('Content-Length', $fileSize);
-			}
+		$this->header('Accept-Ranges', 'bytes');
+		$httpRange = env('HTTP_RANGE');
+		if (isset($httpRange)) {
+			$this->_fileRange($file, $httpRange);
 		} else {
 			$this->header('Content-Length', $fileSize);
 		}
+
 		$this->_clearBuffer();
 		$this->_file = $file;
 	}
@@ -1431,7 +1443,7 @@ class CakeResponse {
  *
  * @param File $file File object
  * @param array $range The range to read out of the file.
- * @return boolean True is whole file is echoed successfully or false if client connection is lost in between
+ * @return bool True is whole file is echoed successfully or false if client connection is lost in between
  */
 	protected function _sendFile($file, $range) {
 		$compress = $this->outputCompressed();
@@ -1472,7 +1484,7 @@ class CakeResponse {
 /**
  * Returns true if connection is still active
  *
- * @return boolean
+ * @return bool
  */
 	protected function _isActive() {
 		return connection_status() === CONNECTION_NORMAL && !connection_aborted();
@@ -1481,12 +1493,13 @@ class CakeResponse {
 /**
  * Clears the contents of the topmost output buffer and discards them
  *
- * @return boolean
+ * @return bool
  */
 	protected function _clearBuffer() {
-		//@codingStandardsIgnoreStart
-		return @ob_end_clean();
-		//@codingStandardsIgnoreEnd
+		if (ob_get_length()) {
+			return ob_end_clean();
+		}
+		return true;
 	}
 
 /**
@@ -1497,7 +1510,9 @@ class CakeResponse {
 	protected function _flushBuffer() {
 		//@codingStandardsIgnoreStart
 		@flush();
-		@ob_flush();
+		if (ob_get_level()) {
+			@ob_flush();
+		}
 		//@codingStandardsIgnoreEnd
 	}
 
diff --git a/web/api/lib/Cake/Network/CakeSocket.php b/web/api/lib/Cake/Network/CakeSocket.php
index d947a27b4..4d380ad2a 100644
--- a/web/api/lib/Cake/Network/CakeSocket.php
+++ b/web/api/lib/Cake/Network/CakeSocket.php
@@ -64,7 +64,7 @@ class CakeSocket {
 /**
  * This boolean contains the current state of the CakeSocket class
  *
- * @var boolean
+ * @var bool
  */
 	public $connected = false;
 
@@ -78,7 +78,7 @@ class CakeSocket {
 /**
  * True if the socket stream is encrypted after a CakeSocket::enableCrypto() call
  *
- * @var boolean
+ * @var bool
  */
 	public $encrypted = false;
 
@@ -116,15 +116,12 @@ class CakeSocket {
  */
 	public function __construct($config = array()) {
 		$this->config = array_merge($this->_baseConfig, $config);
-		if (!is_numeric($this->config['protocol'])) {
-			$this->config['protocol'] = getprotobyname($this->config['protocol']);
-		}
 	}
 
 /**
- * Connect the socket to the given host and port.
+ * Connects the socket to the given host and port.
  *
- * @return boolean Success
+ * @return bool Success
  * @throws SocketException
  */
 	public function connect() {
@@ -132,10 +129,23 @@ class CakeSocket {
 			$this->disconnect();
 		}
 
-		$scheme = null;
-		if (isset($this->config['request']['uri']) && $this->config['request']['uri']['scheme'] === 'https') {
-			$scheme = 'ssl://';
+		$hasProtocol = strpos($this->config['host'], '://') !== false;
+		if ($hasProtocol) {
+			list($this->config['protocol'], $this->config['host']) = explode('://', $this->config['host']);
 		}
+		$scheme = null;
+		if (!empty($this->config['protocol'])) {
+			$scheme = $this->config['protocol'] . '://';
+		}
+		if (!empty($this->config['proxy'])) {
+			$scheme = 'tcp://';
+		}
+
+		$host = $this->config['host'];
+		if (isset($this->config['request']['uri']['host'])) {
+			$host = $this->config['request']['uri']['host'];
+		}
+		$this->_setSslContext($host);
 
 		if (!empty($this->config['context'])) {
 			$context = stream_context_create($this->config['context']);
@@ -172,18 +182,83 @@ class CakeSocket {
 		$this->connected = is_resource($this->connection);
 		if ($this->connected) {
 			stream_set_timeout($this->connection, $this->config['timeout']);
+
+			if (!empty($this->config['request']) &&
+				$this->config['request']['uri']['scheme'] === 'https' &&
+				!empty($this->config['proxy'])
+			) {
+				$req = array();
+				$req[] = 'CONNECT ' . $this->config['request']['uri']['host'] . ':' .
+					$this->config['request']['uri']['port'] . ' HTTP/1.1';
+				$req[] = 'Host: ' . $this->config['host'];
+				$req[] = 'User-Agent: php proxy';
+				if (!empty($this->config['proxyauth'])) {
+					$req[] = 'Proxy-Authorization: ' . $this->config['proxyauth'];
+				}
+
+				fwrite($this->connection, implode("\r\n", $req) . "\r\n\r\n");
+
+				while (!feof($this->connection)) {
+					$s = rtrim(fgets($this->connection, 4096));
+					if (preg_match('/^$/', $s)) {
+						break;
+					}
+				}
+
+				$this->enableCrypto('tls', 'client');
+			}
 		}
 		return $this->connected;
 	}
 
+/**
+ * Configure the SSL context options.
+ *
+ * @param string $host The host name being connected to.
+ * @return void
+ */
+	protected function _setSslContext($host) {
+		foreach ($this->config as $key => $value) {
+			if (substr($key, 0, 4) !== 'ssl_') {
+				continue;
+			}
+			$contextKey = substr($key, 4);
+			if (empty($this->config['context']['ssl'][$contextKey])) {
+				$this->config['context']['ssl'][$contextKey] = $value;
+			}
+			unset($this->config[$key]);
+		}
+		if (version_compare(PHP_VERSION, '5.3.2', '>=')) {
+			if (!isset($this->config['context']['ssl']['SNI_enabled'])) {
+				$this->config['context']['ssl']['SNI_enabled'] = true;
+			}
+			if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
+				if (empty($this->config['context']['ssl']['peer_name'])) {
+					$this->config['context']['ssl']['peer_name'] = $host;
+				}
+			} else {
+				if (empty($this->config['context']['ssl']['SNI_server_name'])) {
+					$this->config['context']['ssl']['SNI_server_name'] = $host;
+				}
+			}
+		}
+		if (empty($this->config['context']['ssl']['cafile'])) {
+			$this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem';
+		}
+		if (!empty($this->config['context']['ssl']['verify_host'])) {
+			$this->config['context']['ssl']['CN_match'] = $host;
+		}
+		unset($this->config['context']['ssl']['verify_host']);
+	}
+
 /**
  * socket_stream_client() does not populate errNum, or $errStr when there are
  * connection errors, as in the case of SSL verification failure.
  *
  * Instead we need to handle those errors manually.
  *
- * @param integer $code
- * @param string $message
+ * @param int $code Code.
+ * @param string $message Message.
  * @return void
  */
 	protected function _connectionErrorHandler($code, $message) {
@@ -191,19 +266,19 @@ class CakeSocket {
 	}
 
 /**
- * Get the connection context.
+ * Gets the connection context.
  *
  * @return null|array Null when there is no connection, an array when there is.
  */
 	public function context() {
 		if (!$this->connection) {
-			return;
+			return null;
 		}
 		return stream_context_get_options($this->connection);
 	}
 
 /**
- * Get the host name of the current connection.
+ * Gets the host name of the current connection.
  *
  * @return string Host name
  */
@@ -215,7 +290,7 @@ class CakeSocket {
 	}
 
 /**
- * Get the IP address of the current connection.
+ * Gets the IP address of the current connection.
  *
  * @return string IP address
  */
@@ -227,7 +302,7 @@ class CakeSocket {
 	}
 
 /**
- * Get all IP addresses associated with the current connection.
+ * Gets all IP addresses associated with the current connection.
  *
  * @return array IP addresses
  */
@@ -239,9 +314,9 @@ class CakeSocket {
 	}
 
 /**
- * Get the last error as a string.
+ * Gets the last error as a string.
  *
- * @return string Last error
+ * @return string|null Last error
  */
 	public function lastError() {
 		if (!empty($this->lastError)) {
@@ -251,9 +326,9 @@ class CakeSocket {
 	}
 
 /**
- * Set the last error.
+ * Sets the last error.
  *
- * @param integer $errNum Error code
+ * @param int $errNum Error code
  * @param string $errStr Error string
  * @return void
  */
@@ -262,10 +337,10 @@ class CakeSocket {
 	}
 
 /**
- * Write data to the socket.
+ * Writes data to the socket.
  *
  * @param string $data The data to write to the socket
- * @return boolean Success
+ * @return bool Success
  */
 	public function write($data) {
 		if (!$this->connected) {
@@ -284,10 +359,10 @@ class CakeSocket {
 	}
 
 /**
- * Read data from the socket. Returns false if no data is available or no connection could be
+ * Reads data from the socket. Returns false if no data is available or no connection could be
  * established.
  *
- * @param integer $length Optional buffer length to read; defaults to 1024
+ * @param int $length Optional buffer length to read; defaults to 1024
  * @return mixed Socket data
  */
 	public function read($length = 1024) {
@@ -310,9 +385,9 @@ class CakeSocket {
 	}
 
 /**
- * Disconnect the socket from the current connection.
+ * Disconnects the socket from the current connection.
  *
- * @return boolean Success
+ * @return bool Success
  */
 	public function disconnect() {
 		if (!is_resource($this->connection)) {
@@ -338,7 +413,7 @@ class CakeSocket {
  * Resets the state of this Socket instance to it's initial state (before Object::__construct got executed)
  *
  * @param array $state Array with key and values to reset
- * @return boolean True on success
+ * @return bool True on success
  */
 	public function reset($state = null) {
 		if (empty($state)) {
@@ -356,14 +431,14 @@ class CakeSocket {
 	}
 
 /**
- * Encrypts current stream socket, using one of the defined encryption methods
+ * Encrypts current stream socket, using one of the defined encryption methods.
  *
- * @param string $type can be one of 'ssl2', 'ssl3', 'ssl23' or 'tls'
- * @param string $clientOrServer can be one of 'client', 'server'. Default is 'client'
- * @param boolean $enable enable or disable encryption. Default is true (enable)
- * @return boolean True on success
+ * @param string $type Type which can be one of 'sslv2', 'sslv3', 'sslv23' or 'tls'.
+ * @param string $clientOrServer Can be one of 'client', 'server'. Default is 'client'.
+ * @param bool $enable Enable or disable encryption. Default is true (enable)
+ * @return bool True on success
  * @throws InvalidArgumentException When an invalid encryption scheme is chosen.
- * @throws SocketException When attempting to enable SSL/TLS fails
+ * @throws SocketException When attempting to enable SSL/TLS fails.
  * @see stream_socket_enable_crypto
  */
 	public function enableCrypto($type, $clientOrServer = 'client', $enable = true) {
@@ -372,7 +447,8 @@ class CakeSocket {
 		}
 		$enableCryptoResult = false;
 		try {
-			$enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable, $this->_encryptMethods[$type . '_' . $clientOrServer]);
+			$enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable,
+				$this->_encryptMethods[$type . '_' . $clientOrServer]);
 		} catch (Exception $e) {
 			$this->setLastError(null, $e->getMessage());
 			throw new SocketException($e->getMessage());
@@ -385,5 +461,4 @@ class CakeSocket {
 		$this->setLastError(null, $errorMessage);
 		throw new SocketException($errorMessage);
 	}
-
 }
diff --git a/web/api/lib/Cake/Network/Email/AbstractTransport.php b/web/api/lib/Cake/Network/Email/AbstractTransport.php
index d6cb8a9a8..f735aaa00 100644
--- a/web/api/lib/Cake/Network/Email/AbstractTransport.php
+++ b/web/api/lib/Cake/Network/Email/AbstractTransport.php
@@ -33,7 +33,7 @@ abstract class AbstractTransport {
 /**
  * Send mail
  *
- * @param CakeEmail $email
+ * @param CakeEmail $email CakeEmail instance.
  * @return array
  */
 	abstract public function send(CakeEmail $email);
@@ -41,7 +41,7 @@ abstract class AbstractTransport {
 /**
  * Set the config
  *
- * @param array $config
+ * @param array $config Configuration options.
  * @return array Returns configs
  */
 	public function config($config = null) {
@@ -55,7 +55,7 @@ abstract class AbstractTransport {
  * Help to convert headers in string
  *
  * @param array $headers Headers in format key => value
- * @param string $eol
+ * @param string $eol End of line string.
  * @return string
  */
 	protected function _headersToString($headers, $eol = "\r\n") {
diff --git a/web/api/lib/Cake/Network/Email/CakeEmail.php b/web/api/lib/Cake/Network/Email/CakeEmail.php
index 7e38d42ab..bb55333f1 100644
--- a/web/api/lib/Cake/Network/Email/CakeEmail.php
+++ b/web/api/lib/Cake/Network/Email/CakeEmail.php
@@ -17,7 +17,7 @@
 App::uses('Multibyte', 'I18n');
 App::uses('AbstractTransport', 'Network/Email');
 App::uses('File', 'Utility');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('View', 'View');
 
 /**
@@ -40,14 +40,14 @@ class CakeEmail {
 /**
  * Line length - no should more - RFC 2822 - 2.1.1
  *
- * @var integer
+ * @var int
  */
 	const LINE_LENGTH_SHOULD = 78;
 
 /**
  * Line length - no must more - RFC 2822 - 2.1.1
  *
- * @var integer
+ * @var int
  */
 	const LINE_LENGTH_MUST = 998;
 
@@ -65,6 +65,13 @@ class CakeEmail {
  */
 	const MESSAGE_TEXT = 'text';
 
+/**
+ * Holds the regex pattern for email validation
+ *
+ * @var string
+ */
+	const EMAIL_PATTERN = '/^((?:[\p{L}0-9.!#$%&\'*+\/=?^_`{|}~-]+)*@[\p{L}0-9-.]+)$/ui';
+
 /**
  * Recipient of the email
  *
@@ -133,7 +140,7 @@ class CakeEmail {
 /**
  * Message ID
  *
- * @var boolean|string True to generate, False to ignore, String with value
+ * @var bool|string
  */
 	protected $_messageId = true;
 
@@ -314,11 +321,13 @@ class CakeEmail {
 
 /**
  * Regex for email validation
- * If null, filter_var() will be used.
+ *
+ * If null, filter_var() will be used. Use the emailPattern() method
+ * to set a custom pattern.'
  *
  * @var string
  */
-	protected $_emailPattern = null;
+	protected $_emailPattern = self::EMAIL_PATTERN;
 
 /**
  * The class name used for email configuration.
@@ -327,6 +336,13 @@ class CakeEmail {
  */
 	protected $_configClass = 'EmailConfig';
 
+/**
+ * An instance of the EmailConfig class can be set here
+ *
+ * @var EmailConfig
+ */
+	protected $_configInstance;
+
 /**
  * Constructor
  *
@@ -344,6 +360,11 @@ class CakeEmail {
 
 		if ($config) {
 			$this->config($config);
+		} elseif (config('email') && class_exists($this->_configClass)) {
+			$this->_configInstance = new $this->_configClass();
+			if (isset($this->_configInstance->default)) {
+				$this->config('default');
+			}
 		}
 		if (empty($this->headerCharset)) {
 			$this->headerCharset = $this->charset;
@@ -353,8 +374,9 @@ class CakeEmail {
 /**
  * From
  *
- * @param string|array $email
- * @param string $name
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
  * @return array|CakeEmail
  * @throws SocketException
  */
@@ -368,8 +390,9 @@ class CakeEmail {
 /**
  * Sender
  *
- * @param string|array $email
- * @param string $name
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
  * @return array|CakeEmail
  * @throws SocketException
  */
@@ -383,8 +406,9 @@ class CakeEmail {
 /**
  * Reply-To
  *
- * @param string|array $email
- * @param string $name
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
  * @return array|CakeEmail
  * @throws SocketException
  */
@@ -398,8 +422,9 @@ class CakeEmail {
 /**
  * Read Receipt (Disposition-Notification-To header)
  *
- * @param string|array $email
- * @param string $name
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
  * @return array|CakeEmail
  * @throws SocketException
  */
@@ -413,8 +438,9 @@ class CakeEmail {
 /**
  * Return Path
  *
- * @param string|array $email
- * @param string $name
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
  * @return array|CakeEmail
  * @throws SocketException
  */
@@ -428,9 +454,10 @@ class CakeEmail {
 /**
  * To
  *
- * @param string|array $email Null to get, String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return array|CakeEmail
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return array|self
  */
 	public function to($email = null, $name = null) {
 		if ($email === null) {
@@ -442,9 +469,10 @@ class CakeEmail {
 /**
  * Add To
  *
- * @param string|array $email String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return CakeEmail $this
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return self
  */
 	public function addTo($email, $name = null) {
 		return $this->_addEmail('_to', $email, $name);
@@ -453,9 +481,10 @@ class CakeEmail {
 /**
  * Cc
  *
- * @param string|array $email String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return array|CakeEmail
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return array|self
  */
 	public function cc($email = null, $name = null) {
 		if ($email === null) {
@@ -467,9 +496,10 @@ class CakeEmail {
 /**
  * Add Cc
  *
- * @param string|array $email String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return CakeEmail $this
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return self
  */
 	public function addCc($email, $name = null) {
 		return $this->_addEmail('_cc', $email, $name);
@@ -478,9 +508,10 @@ class CakeEmail {
 /**
  * Bcc
  *
- * @param string|array $email String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return array|CakeEmail
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return array|self
  */
 	public function bcc($email = null, $name = null) {
 		if ($email === null) {
@@ -492,9 +523,10 @@ class CakeEmail {
 /**
  * Add Bcc
  *
- * @param string|array $email String with email, Array with email as key, name as value or email as value (without name)
- * @param string $name
- * @return CakeEmail $this
+ * @param string|array $email Null to get, String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return self
  */
 	public function addBcc($email, $name = null) {
 		return $this->_addEmail('_bcc', $email, $name);
@@ -503,8 +535,8 @@ class CakeEmail {
 /**
  * Charset setter/getter
  *
- * @param string $charset
- * @return string $this->charset
+ * @param string $charset Character set.
+ * @return string this->charset
  */
 	public function charset($charset = null) {
 		if ($charset === null) {
@@ -520,8 +552,8 @@ class CakeEmail {
 /**
  * HeaderCharset setter/getter
  *
- * @param string $charset
- * @return string $this->charset
+ * @param string $charset Character set.
+ * @return string this->charset
  */
 	public function headerCharset($charset = null) {
 		if ($charset === null) {
@@ -533,11 +565,13 @@ class CakeEmail {
 /**
  * EmailPattern setter/getter
  *
- * @param string $regex for email address validation
- * @return string|CakeEmail
+ * @param string|bool|null $regex The pattern to use for email address validation,
+ *   null to unset the pattern and make use of filter_var() instead, false or
+ *   nothing to return the current value
+ * @return string|self
  */
-	public function emailPattern($regex = null) {
-		if ($regex === null) {
+	public function emailPattern($regex = false) {
+		if ($regex === false) {
 			return $this->_emailPattern;
 		}
 		$this->_emailPattern = $regex;
@@ -547,10 +581,11 @@ class CakeEmail {
 /**
  * Set email
  *
- * @param string $varName
- * @param string|array $email
- * @param string $name
- * @return CakeEmail $this
+ * @param string $varName Property name
+ * @param string|array $email String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return self
  */
 	protected function _setEmail($varName, $email, $name) {
 		if (!is_array($email)) {
@@ -576,28 +611,30 @@ class CakeEmail {
 /**
  * Validate email address
  *
- * @param string $email
+ * @param string $email Email
  * @return void
  * @throws SocketException If email address does not validate
  */
 	protected function _validateEmail($email) {
-		$valid = (($this->_emailPattern !== null &&
-			preg_match($this->_emailPattern, $email)) ||
-			filter_var($email, FILTER_VALIDATE_EMAIL)
-		);
-		if (!$valid) {
-			throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
+		if ($this->_emailPattern === null) {
+			if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
+				return;
+			}
+		} elseif (preg_match($this->_emailPattern, $email)) {
+			return;
 		}
+		throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
 	}
 
 /**
  * Set only 1 email
  *
- * @param string $varName
- * @param string|array $email
- * @param string $name
- * @param string $throwMessage
- * @return CakeEmail $this
+ * @param string $varName Property name
+ * @param string|array $email String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @param string $throwMessage Exception message
+ * @return self
  * @throws SocketException
  */
 	protected function _setEmailSingle($varName, $email, $name, $throwMessage) {
@@ -613,10 +650,11 @@ class CakeEmail {
 /**
  * Add email
  *
- * @param string $varName
- * @param string|array $email
- * @param string $name
- * @return CakeEmail $this
+ * @param string $varName Property name
+ * @param string|array $email String with email,
+ *   Array with email as key, name as value or email as value (without name)
+ * @param string $name Name
+ * @return self
  * @throws SocketException
  */
 	protected function _addEmail($varName, $email, $name) {
@@ -643,8 +681,8 @@ class CakeEmail {
 /**
  * Get/Set Subject.
  *
- * @param string $subject
- * @return string|CakeEmail
+ * @param string $subject Subject string.
+ * @return string|self
  */
 	public function subject($subject = null) {
 		if ($subject === null) {
@@ -658,7 +696,7 @@ class CakeEmail {
  * Sets headers for the message
  *
  * @param array $headers Associative array containing headers to be set.
- * @return CakeEmail $this
+ * @return self
  * @throws SocketException
  */
 	public function setHeaders($headers) {
@@ -672,8 +710,8 @@ class CakeEmail {
 /**
  * Add header for the message
  *
- * @param array $headers
- * @return object $this
+ * @param array $headers Headers to set.
+ * @return self
  * @throws SocketException
  */
 	public function addHeaders($headers) {
@@ -698,14 +736,19 @@ class CakeEmail {
  * - `bcc`
  * - `subject`
  *
- * @param array $include
+ * @param array $include List of headers.
  * @return array
  */
 	public function getHeaders($include = array()) {
 		if ($include == array_values($include)) {
 			$include = array_fill_keys($include, true);
 		}
-		$defaults = array_fill_keys(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), false);
+		$defaults = array_fill_keys(
+			array(
+				'from', 'sender', 'replyTo', 'readReceipt', 'returnPath',
+				'to', 'cc', 'bcc', 'subject'),
+			false
+		);
 		$include += $defaults;
 
 		$headers = array();
@@ -738,14 +781,14 @@ class CakeEmail {
 
 		$headers += $this->_headers;
 		if (!isset($headers['X-Mailer'])) {
-			$headers['X-Mailer'] = self::EMAIL_CLIENT;
+			$headers['X-Mailer'] = static::EMAIL_CLIENT;
 		}
 		if (!isset($headers['Date'])) {
 			$headers['Date'] = date(DATE_RFC2822);
 		}
 		if ($this->_messageId !== false) {
 			if ($this->_messageId === true) {
-				$headers['Message-ID'] = '<' . str_replace('-', '', String::UUID()) . '@' . $this->_domain . '>';
+				$headers['Message-ID'] = '<' . str_replace('-', '', CakeText::UUID()) . '@' . $this->_domain . '>';
 			} else {
 				$headers['Message-ID'] = $this->_messageId;
 			}
@@ -756,8 +799,10 @@ class CakeEmail {
 		}
 
 		$headers['MIME-Version'] = '1.0';
-		if (!empty($this->_attachments) || $this->_emailFormat === 'both') {
+		if (!empty($this->_attachments)) {
 			$headers['Content-Type'] = 'multipart/mixed; boundary="' . $this->_boundary . '"';
+		} elseif ($this->_emailFormat === 'both') {
+			$headers['Content-Type'] = 'multipart/alternative; boundary="' . $this->_boundary . '"';
 		} elseif ($this->_emailFormat === 'text') {
 			$headers['Content-Type'] = 'text/plain; charset=' . $this->_getContentTypeCharset();
 		} elseif ($this->_emailFormat === 'html') {
@@ -775,7 +820,7 @@ class CakeEmail {
  * be quoted as characters like `:` and `,` are known to cause issues
  * in address header fields.
  *
- * @param array $address
+ * @param array $address Addresses to format.
  * @return array
  */
 	protected function _formatAddress($address) {
@@ -797,9 +842,9 @@ class CakeEmail {
 /**
  * Template and layout
  *
- * @param boolean|string $template Template name or null to not use
- * @param boolean|string $layout Layout name or null to not use
- * @return array|CakeEmail
+ * @param bool|string $template Template name or null to not use
+ * @param bool|string $layout Layout name or null to not use
+ * @return array|self
  */
 	public function template($template = false, $layout = false) {
 		if ($template === false) {
@@ -818,8 +863,8 @@ class CakeEmail {
 /**
  * View class for render
  *
- * @param string $viewClass
- * @return string|CakeEmail
+ * @param string $viewClass View class name.
+ * @return string|self
  */
 	public function viewRender($viewClass = null) {
 		if ($viewClass === null) {
@@ -832,8 +877,8 @@ class CakeEmail {
 /**
  * Variables to be set on render
  *
- * @param array $viewVars
- * @return array|CakeEmail
+ * @param array $viewVars Variables to set for view.
+ * @return array|self
  */
 	public function viewVars($viewVars = null) {
 		if ($viewVars === null) {
@@ -846,8 +891,8 @@ class CakeEmail {
 /**
  * Theme to use when rendering
  *
- * @param string $theme
- * @return string|CakeEmail
+ * @param string $theme Theme name.
+ * @return string|self
  */
 	public function theme($theme = null) {
 		if ($theme === null) {
@@ -860,8 +905,8 @@ class CakeEmail {
 /**
  * Helpers to be used in render
  *
- * @param array $helpers
- * @return array|CakeEmail
+ * @param array $helpers Helpers list.
+ * @return array|self
  */
 	public function helpers($helpers = null) {
 		if ($helpers === null) {
@@ -874,8 +919,8 @@ class CakeEmail {
 /**
  * Email format
  *
- * @param string $format
- * @return string|CakeEmail
+ * @param string $format Formatting string.
+ * @return string|self
  * @throws SocketException
  */
 	public function emailFormat($format = null) {
@@ -892,8 +937,8 @@ class CakeEmail {
 /**
  * Transport name
  *
- * @param string $name
- * @return string|CakeEmail
+ * @param string $name Transport name.
+ * @return string|self
  */
 	public function transport($name = null) {
 		if ($name === null) {
@@ -907,7 +952,7 @@ class CakeEmail {
 /**
  * Return the transport class
  *
- * @return CakeEmail
+ * @return AbstractTransport
  * @throws SocketException
  */
 	public function transportClass() {
@@ -929,8 +974,8 @@ class CakeEmail {
 /**
  * Message-ID
  *
- * @param boolean|string $message True to generate a new Message-ID, False to ignore (not send in email), String to set as Message-ID
- * @return boolean|string|CakeEmail
+ * @param bool|string $message True to generate a new Message-ID, False to ignore (not send in email), String to set as Message-ID
+ * @return bool|string|self
  * @throws SocketException
  */
 	public function messageId($message = null) {
@@ -952,7 +997,7 @@ class CakeEmail {
  * Domain as top level (the part after @)
  *
  * @param string $domain Manually set the domain for CLI mailing
- * @return string|CakeEmail
+ * @return string|self
  */
 	public function domain($domain = null) {
 		if ($domain === null) {
@@ -969,35 +1014,35 @@ class CakeEmail {
  *
  * Attach a single file:
  *
- * {{{
+ * ```
  * $email->attachments('path/to/file');
- * }}}
+ * ```
  *
  * Attach a file with a different filename:
  *
- * {{{
+ * ```
  * $email->attachments(array('custom_name.txt' => 'path/to/file.txt'));
- * }}}
+ * ```
  *
  * Attach a file and specify additional properties:
  *
- * {{{
+ * ```
  * $email->attachments(array('custom_name.png' => array(
  *		'file' => 'path/to/file',
  *		'mimetype' => 'image/png',
  *		'contentId' => 'abc123',
  *		'contentDisposition' => false
  * ));
- * }}}
+ * ```
  *
  * Attach a file from string and specify additional properties:
  *
- * {{{
+ * ```
  * $email->attachments(array('custom_name.png' => array(
  *		'data' => file_get_contents('path/to/file'),
  *		'mimetype' => 'image/png'
  * ));
- * }}}
+ * ```
  *
  * The `contentId` key allows you to specify an inline attachment. In your email text, you
  * can use `<img src="cid:abc123" />` to display the image inline.
@@ -1006,7 +1051,7 @@ class CakeEmail {
  * attachment compatibility with outlook email clients.
  *
  * @param string|array $attachments String with the filename or array with filenames
- * @return array|CakeEmail Either the array of attachments when getting or $this when setting.
+ * @return array|self Either the array of attachments when getting or $this when setting.
  * @throws SocketException
  */
 	public function attachments($attachments = null) {
@@ -1049,7 +1094,7 @@ class CakeEmail {
  * Add attachments
  *
  * @param string|array $attachments String with the filename or array with filenames
- * @return CakeEmail $this
+ * @return self
  * @throws SocketException
  * @see CakeEmail::attachments()
  */
@@ -1068,9 +1113,9 @@ class CakeEmail {
  */
 	public function message($type = null) {
 		switch ($type) {
-			case self::MESSAGE_HTML:
+			case static::MESSAGE_HTML:
 				return $this->_htmlMessage;
-			case self::MESSAGE_TEXT:
+			case static::MESSAGE_TEXT:
 				return $this->_textMessage;
 		}
 		return $this->_message;
@@ -1090,7 +1135,7 @@ class CakeEmail {
  * `$email->config(array('to' => 'bill@example.com'));`
  *
  * @param string|array $config String with configuration name (from email.php), array with config or null to return current config
- * @return string|array|CakeEmail
+ * @return string|array|self
  */
 	public function config($config = null) {
 		if ($config === null) {
@@ -1153,12 +1198,13 @@ class CakeEmail {
  * @param string $subject String of subject or null to use 'subject' from transport config
  * @param string|array $message String with message or array with variables to be used in render
  * @param string|array $transportConfig String to use config from EmailConfig or array with configs
- * @param boolean $send Send the email or just return the instance pre-configured
- * @return CakeEmail Instance of CakeEmail
+ * @param bool $send Send the email or just return the instance pre-configured
+ * @return self Instance of CakeEmail
  * @throws SocketException
  */
 	public static function deliver($to = null, $subject = null, $message = null, $transportConfig = 'fast', $send = true) {
 		$class = __CLASS__;
+		/** @var CakeEmail $instance */
 		$instance = new $class($transportConfig);
 		if ($to !== null) {
 			$instance->to($to);
@@ -1183,21 +1229,23 @@ class CakeEmail {
 /**
  * Apply the config to an instance
  *
- * @param array $config
+ * @param array $config Configuration options.
  * @return void
  * @throws ConfigureException When configuration file cannot be found, or is missing
  *   the named config.
  */
 	protected function _applyConfig($config) {
 		if (is_string($config)) {
-			if (!class_exists($this->_configClass) && !config('email')) {
-				throw new ConfigureException(__d('cake_dev', '%s not found.', APP . 'Config' . DS . 'email.php'));
+			if (!$this->_configInstance) {
+				if (!class_exists($this->_configClass) && !config('email')) {
+					throw new ConfigureException(__d('cake_dev', '%s not found.', APP . 'Config' . DS . 'email.php'));
+				}
+				$this->_configInstance = new $this->_configClass();
 			}
-			$configs = new $this->_configClass();
-			if (!isset($configs->{$config})) {
+			if (!isset($this->_configInstance->{$config})) {
 				throw new ConfigureException(__d('cake_dev', 'Unknown email configuration "%s".', $config));
 			}
-			$config = $configs->{$config};
+			$config = $this->_configInstance->{$config};
 		}
 		$this->_config = $config + $this->_config;
 		if (!empty($config['charset'])) {
@@ -1224,22 +1272,21 @@ class CakeEmail {
 			$this->setHeaders($config['headers']);
 			unset($config['headers']);
 		}
+
 		if (array_key_exists('template', $config)) {
-			$layout = false;
-			if (array_key_exists('layout', $config)) {
-				$layout = $config['layout'];
-				unset($config['layout']);
-			}
-			$this->template($config['template'], $layout);
-			unset($config['template']);
+			$this->_template = $config['template'];
 		}
+		if (array_key_exists('layout', $config)) {
+			$this->_layout = $config['layout'];
+		}
+
 		$this->transportClass()->config($config);
 	}
 
 /**
  * Reset all CakeEmail internal variables to be able to send out a new email.
  *
- * @return CakeEmail $this
+ * @return self
  */
 	public function reset() {
 		$this->_to = array();
@@ -1269,7 +1316,7 @@ class CakeEmail {
 		$this->headerCharset = null;
 		$this->_attachments = array();
 		$this->_config = array();
-		$this->_emailPattern = null;
+		$this->_emailPattern = static::EMAIL_PATTERN;
 		return $this;
 	}
 
@@ -1314,7 +1361,7 @@ class CakeEmail {
  * Wrap the message to follow the RFC 2822 - 2.1.1
  *
  * @param string $message Message to wrap
- * @param integer $wrapLength The line length
+ * @param int $wrapLength The line length
  * @return array Wrapped message
  */
 	protected function _wrap($message, $wrapLength = CakeEmail::LINE_LENGTH_MUST) {
@@ -1327,7 +1374,7 @@ class CakeEmail {
 		$cut = ($wrapLength == CakeEmail::LINE_LENGTH_MUST);
 
 		foreach ($lines as $line) {
-			if (empty($line)) {
+			if (empty($line) && $line !== '0') {
 				$formatted[] = '';
 				continue;
 			}
@@ -1389,7 +1436,7 @@ class CakeEmail {
 				$tmpLine .= $char;
 				$tmpLineLength++;
 				if ($tmpLineLength === $wrapLength) {
-					$nextChar = $line[$i + 1];
+					$nextChar = isset($line[$i + 1]) ? $line[$i + 1] : '';
 					if ($nextChar === ' ' || $nextChar === '<') {
 						$formatted[] = trim($tmpLine);
 						$tmpLine = '';
@@ -1449,8 +1496,7 @@ class CakeEmail {
 			$msg[] = '--' . $boundary;
 			$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
 			$msg[] = 'Content-Transfer-Encoding: base64';
-			if (
-				!isset($fileInfo['contentDisposition']) ||
+			if (!isset($fileInfo['contentDisposition']) ||
 				$fileInfo['contentDisposition']
 			) {
 				$msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"';
@@ -1522,6 +1568,7 @@ class CakeEmail {
 		$hasInlineAttachments = count($contentIds) > 0;
 		$hasAttachments = !empty($this->_attachments);
 		$hasMultipleTypes = count($rendered) > 1;
+		$multiPart = ($hasAttachments || $hasMultipleTypes);
 
 		$boundary = $relBoundary = $textBoundary = $this->_boundary;
 
@@ -1532,7 +1579,7 @@ class CakeEmail {
 			$relBoundary = $textBoundary = 'rel-' . $boundary;
 		}
 
-		if ($hasMultipleTypes) {
+		if ($hasMultipleTypes && $hasAttachments) {
 			$msg[] = '--' . $relBoundary;
 			$msg[] = 'Content-Type: multipart/alternative; boundary="alt-' . $boundary . '"';
 			$msg[] = '';
@@ -1540,7 +1587,7 @@ class CakeEmail {
 		}
 
 		if (isset($rendered['text'])) {
-			if ($textBoundary !== $boundary || $hasAttachments) {
+			if ($multiPart) {
 				$msg[] = '--' . $textBoundary;
 				$msg[] = 'Content-Type: text/plain; charset=' . $this->_getContentTypeCharset();
 				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
@@ -1553,7 +1600,7 @@ class CakeEmail {
 		}
 
 		if (isset($rendered['html'])) {
-			if ($textBoundary !== $boundary || $hasAttachments) {
+			if ($multiPart) {
 				$msg[] = '--' . $textBoundary;
 				$msg[] = 'Content-Type: text/html; charset=' . $this->_getContentTypeCharset();
 				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
@@ -1565,7 +1612,7 @@ class CakeEmail {
 			$msg[] = '';
 		}
 
-		if ($hasMultipleTypes) {
+		if ($textBoundary !== $relBoundary) {
 			$msg[] = '--' . $textBoundary . '--';
 			$msg[] = '';
 		}
@@ -1627,6 +1674,7 @@ class CakeEmail {
 			App::uses($viewClass, $plugin . 'View');
 		}
 
+		/** @var View $View */
 		$View = new $viewClass(null);
 		$View->viewVars = $this->_viewVars;
 		$View->helpers = $this->_helpers;
@@ -1675,7 +1723,7 @@ class CakeEmail {
 /**
  * Return the Content-Transfer Encoding value based on the set charset
  *
- * @return void
+ * @return string
  */
 	protected function _getContentTransferEncoding() {
 		$charset = strtoupper($this->charset);
diff --git a/web/api/lib/Cake/Network/Email/SmtpTransport.php b/web/api/lib/Cake/Network/Email/SmtpTransport.php
index d2587038c..64d0090b5 100644
--- a/web/api/lib/Cake/Network/Email/SmtpTransport.php
+++ b/web/api/lib/Cake/Network/Email/SmtpTransport.php
@@ -58,7 +58,7 @@ class SmtpTransport extends AbstractTransport {
  *
  * A response consists of one or more lines containing a response
  * code and an optional response message text:
- * {{{
+ * ```
  * array(
  *     array(
  *         'code' => '250',
@@ -74,7 +74,7 @@ class SmtpTransport extends AbstractTransport {
  *     ),
  *     // etc...
  * )
- * }}}
+ * ```
  *
  * @return array
  */
@@ -104,7 +104,7 @@ class SmtpTransport extends AbstractTransport {
 /**
  * Set the configuration
  *
- * @param array $config
+ * @param array $config Configuration options.
  * @return array Returns configs
  */
 	public function config($config = null) {
@@ -118,7 +118,8 @@ class SmtpTransport extends AbstractTransport {
 			'username' => null,
 			'password' => null,
 			'client' => null,
-			'tls' => false
+			'tls' => false,
+			'ssl_allow_self_signed' => false
 		);
 		$this->_config = array_merge($default, $this->_config, $config);
 		return $this->_config;
@@ -127,7 +128,7 @@ class SmtpTransport extends AbstractTransport {
 /**
  * Parses and stores the reponse lines in `'code' => 'message'` format.
  *
- * @param array $responseLines
+ * @param array $responseLines Response lines to parse.
  * @return void
  */
 	protected function _bufferResponseLines(array $responseLines) {
@@ -191,18 +192,22 @@ class SmtpTransport extends AbstractTransport {
  */
 	protected function _auth() {
 		if (isset($this->_config['username']) && isset($this->_config['password'])) {
-			$authRequired = $this->_smtpSend('AUTH LOGIN', '334|503');
-			if ($authRequired == '334') {
-				if (!$this->_smtpSend(base64_encode($this->_config['username']), '334')) {
+			$replyCode = $this->_smtpSend('AUTH LOGIN', '334|500|502|504');
+			if ($replyCode == '334') {
+				try {
+					$this->_smtpSend(base64_encode($this->_config['username']), '334');
+				} catch (SocketException $e) {
 					throw new SocketException(__d('cake_dev', 'SMTP server did not accept the username.'));
 				}
-				if (!$this->_smtpSend(base64_encode($this->_config['password']), '235')) {
+				try {
+					$this->_smtpSend(base64_encode($this->_config['password']), '235');
+				} catch (SocketException $e) {
 					throw new SocketException(__d('cake_dev', 'SMTP server did not accept the password.'));
 				}
-			} elseif ($authRequired == '504') {
-				throw new SocketException(__d('cake_dev', 'SMTP authentication method not allowed, check if SMTP server requires TLS'));
-			} elseif ($authRequired != '503') {
-				throw new SocketException(__d('cake_dev', 'SMTP does not require authentication.'));
+			} elseif ($replyCode == '504') {
+				throw new SocketException(__d('cake_dev', 'SMTP authentication method not allowed, check if SMTP server requires TLS.'));
+			} else {
+				throw new SocketException(__d('cake_dev', 'AUTH command not recognized or not implemented, SMTP server may not require authentication.'));
 			}
 		}
 	}
@@ -335,9 +340,9 @@ class SmtpTransport extends AbstractTransport {
 /**
  * Protected method for sending data to SMTP connection
  *
- * @param string $data data to be sent to SMTP server
- * @param string|boolean $checkCode code to check for in server response, false to skip
- * @return void
+ * @param string|null $data Data to be sent to SMTP server
+ * @param string|bool $checkCode Code to check for in server response, false to skip
+ * @return string|null The matched code, or null if nothing matched
  * @throws SocketException
  */
 	protected function _smtpSend($data, $checkCode = '250') {
diff --git a/web/api/lib/Cake/Network/Http/BasicAuthentication.php b/web/api/lib/Cake/Network/Http/BasicAuthentication.php
index a9d34f2a3..df33252ff 100644
--- a/web/api/lib/Cake/Network/Http/BasicAuthentication.php
+++ b/web/api/lib/Cake/Network/Http/BasicAuthentication.php
@@ -26,36 +26,36 @@ class BasicAuthentication {
 /**
  * Authentication
  *
- * @param HttpSocket $http
- * @param array $authInfo
+ * @param HttpSocket $http Http socket instance.
+ * @param array &$authInfo Authentication info.
  * @return void
  * @see http://www.ietf.org/rfc/rfc2617.txt
  */
 	public static function authentication(HttpSocket $http, &$authInfo) {
 		if (isset($authInfo['user'], $authInfo['pass'])) {
-			$http->request['header']['Authorization'] = self::_generateHeader($authInfo['user'], $authInfo['pass']);
+			$http->request['header']['Authorization'] = static::_generateHeader($authInfo['user'], $authInfo['pass']);
 		}
 	}
 
 /**
  * Proxy Authentication
  *
- * @param HttpSocket $http
- * @param array $proxyInfo
+ * @param HttpSocket $http Http socket instance.
+ * @param array &$proxyInfo Proxy info.
  * @return void
  * @see http://www.ietf.org/rfc/rfc2617.txt
  */
 	public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) {
 		if (isset($proxyInfo['user'], $proxyInfo['pass'])) {
-			$http->request['header']['Proxy-Authorization'] = self::_generateHeader($proxyInfo['user'], $proxyInfo['pass']);
+			$http->request['header']['Proxy-Authorization'] = static::_generateHeader($proxyInfo['user'], $proxyInfo['pass']);
 		}
 	}
 
 /**
  * Generate basic [proxy] authentication header
  *
- * @param string $user
- * @param string $pass
+ * @param string $user Username.
+ * @param string $pass Password.
  * @return string
  */
 	protected static function _generateHeader($user, $pass) {
diff --git a/web/api/lib/Cake/Network/Http/DigestAuthentication.php b/web/api/lib/Cake/Network/Http/DigestAuthentication.php
index f1c49914c..f38cfc0fa 100644
--- a/web/api/lib/Cake/Network/Http/DigestAuthentication.php
+++ b/web/api/lib/Cake/Network/Http/DigestAuthentication.php
@@ -26,26 +26,26 @@ class DigestAuthentication {
 /**
  * Authentication
  *
- * @param HttpSocket $http
- * @param array $authInfo
+ * @param HttpSocket $http Http socket instance.
+ * @param array &$authInfo Authentication info.
  * @return void
  * @link http://www.ietf.org/rfc/rfc2617.txt
  */
 	public static function authentication(HttpSocket $http, &$authInfo) {
 		if (isset($authInfo['user'], $authInfo['pass'])) {
-			if (!isset($authInfo['realm']) && !self::_getServerInformation($http, $authInfo)) {
+			if (!isset($authInfo['realm']) && !static::_getServerInformation($http, $authInfo)) {
 				return;
 			}
-			$http->request['header']['Authorization'] = self::_generateHeader($http, $authInfo);
+			$http->request['header']['Authorization'] = static::_generateHeader($http, $authInfo);
 		}
 	}
 
 /**
  * Retrieve information about the authentication
  *
- * @param HttpSocket $http
- * @param array $authInfo
- * @return boolean
+ * @param HttpSocket $http Http socket instance.
+ * @param array &$authInfo Authentication info.
+ * @return bool
  */
 	protected static function _getServerInformation(HttpSocket $http, &$authInfo) {
 		$originalRequest = $http->request;
@@ -70,8 +70,8 @@ class DigestAuthentication {
 /**
  * Generate the header Authorization
  *
- * @param HttpSocket $http
- * @param array $authInfo
+ * @param HttpSocket $http Http socket instance.
+ * @param array &$authInfo Authentication info.
  * @return string
  */
 	protected static function _generateHeader(HttpSocket $http, &$authInfo) {
diff --git a/web/api/lib/Cake/Network/Http/HttpResponse.php b/web/api/lib/Cake/Network/Http/HttpResponse.php
index eebd3f5cc..dd861e95b 100644
--- a/web/api/lib/Cake/Network/Http/HttpResponse.php
+++ b/web/api/lib/Cake/Network/Http/HttpResponse.php
@@ -28,7 +28,7 @@ if (class_exists('HttpResponse')) {
  * HTTP Response from HttpSocket.
  *
  * @package       Cake.Network.Http
- * @deprecated This class is deprecated as it has naming conflicts with pecl/http
+ * @deprecated 3.0.0 This class is deprecated as it has naming conflicts with pecl/http
  */
 class HttpResponse extends HttpSocketResponse {
 
diff --git a/web/api/lib/Cake/Network/Http/HttpSocket.php b/web/api/lib/Cake/Network/Http/HttpSocket.php
index 842ff185b..308487094 100644
--- a/web/api/lib/Cake/Network/Http/HttpSocket.php
+++ b/web/api/lib/Cake/Network/Http/HttpSocket.php
@@ -35,7 +35,7 @@ class HttpSocket extends CakeSocket {
  * enforce RFC 2616 (HTTP/1.1 specs).
  * will be disabled and additional measures to deal with non-standard responses will be enabled.
  *
- * @var boolean
+ * @var bool
  */
 	public $quirksMode = false;
 
@@ -139,12 +139,12 @@ class HttpSocket extends CakeSocket {
  *
  * Or use an array to configure multiple options:
  *
- * {{{
+ * ```
  * $http = new HttpSocket(array(
  *    'host' => 'cakephp.org',
  *    'timeout' => 20
  * ));
- * }}}
+ * ```
  *
  * See HttpSocket::$config for options that can be used.
  *
@@ -169,21 +169,21 @@ class HttpSocket extends CakeSocket {
  * Accepts two forms of parameters. If all you need is a username + password, as with
  * Basic authentication you can do the following:
  *
- * {{{
+ * ```
  * $http->configAuth('Basic', 'mark', 'secret');
- * }}}
+ * ```
  *
  * If you are using an authentication strategy that requires more inputs, like Digest authentication
  * you can call `configAuth()` with an array of user information.
  *
- * {{{
+ * ```
  * $http->configAuth('Digest', array(
  *		'user' => 'mark',
  *		'pass' => 'secret',
  *		'realm' => 'my-realm',
  *		'nonce' => 1235
  * ));
- * }}}
+ * ```
  *
  * To remove any set authentication strategy, call `configAuth()` with no parameters:
  *
@@ -210,7 +210,7 @@ class HttpSocket extends CakeSocket {
  * Set proxy settings
  *
  * @param string|array $host Proxy host. Can be an array with settings to authentication class
- * @param integer $port Port. Default 3128.
+ * @param int $port Port. Default 3128.
  * @param string $method Proxy method (ie, Basic, Digest). If empty, disable proxy authentication
  * @param string $user Username if your proxy need authentication
  * @param string $pass Password to proxy authentication
@@ -231,7 +231,7 @@ class HttpSocket extends CakeSocket {
 /**
  * Set the resource to receive the request content. This resource must support fwrite.
  *
- * @param resource|boolean $resource Resource or false to disable the resource use
+ * @param resource|bool $resource Resource or false to disable the resource use
  * @return void
  * @throws SocketException
  */
@@ -294,6 +294,7 @@ class HttpSocket extends CakeSocket {
 		if (isset($host)) {
 			$this->config['host'] = $host;
 		}
+
 		$this->_setProxy();
 		$this->request['proxy'] = $this->_proxy;
 
@@ -311,8 +312,7 @@ class HttpSocket extends CakeSocket {
 			if (isset($this->request['uri']['port'])) {
 				$port = $this->request['uri']['port'];
 			}
-			if (
-				($scheme === 'http' && $port != 80) ||
+			if (($scheme === 'http' && $port != 80) ||
 				($scheme === 'https' && $port != 443) ||
 				($port != 80 && $port != 443)
 			) {
@@ -326,8 +326,11 @@ class HttpSocket extends CakeSocket {
 		} elseif (isset($this->request['auth'], $this->request['auth']['method'], $this->request['auth']['user'], $this->request['auth']['pass'])) {
 			$this->configAuth($this->request['auth']['method'], $this->request['auth']['user'], $this->request['auth']['pass']);
 		}
-		$this->_setAuth();
-		$this->request['auth'] = $this->_auth;
+		$authHeader = Hash::get($this->request, 'header.Authorization');
+		if (empty($authHeader)) {
+			$this->_setAuth();
+			$this->request['auth'] = $this->_auth;
+		}
 
 		if (is_array($this->request['body'])) {
 			$this->request['body'] = http_build_query($this->request['body'], '', '&');
@@ -340,6 +343,9 @@ class HttpSocket extends CakeSocket {
 		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Length'])) {
 			$this->request['header']['Content-Length'] = strlen($this->request['body']);
 		}
+		if (isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https' && in_array($this->config['protocol'], array(false, 'tcp'))) {
+			$this->config['protocol'] = 'ssl';
+		}
 
 		$connectionType = null;
 		if (isset($this->request['header']['Connection'])) {
@@ -355,8 +361,6 @@ class HttpSocket extends CakeSocket {
 			return false;
 		}
 
-		$this->_configContext($this->request['uri']['host']);
-
 		$this->request['raw'] = '';
 		if ($this->request['line'] !== false) {
 			$this->request['raw'] = $this->request['line'];
@@ -368,11 +372,13 @@ class HttpSocket extends CakeSocket {
 
 		$this->request['raw'] .= "\r\n";
 		$this->request['raw'] .= $this->request['body'];
+
+		// SSL context is set during the connect() method.
 		$this->write($this->request['raw']);
 
 		$response = null;
 		$inHeader = true;
-		while ($data = $this->read()) {
+		while (($data = $this->read()) !== false) {
 			if ($this->_contentResource) {
 				if ($inHeader) {
 					$response .= $data;
@@ -413,7 +419,8 @@ class HttpSocket extends CakeSocket {
 		}
 
 		if ($this->request['redirect'] && $this->response->isRedirect()) {
-			$request['uri'] = trim(urldecode($this->response->getHeader('Location')), '=');
+			$location = trim($this->response->getHeader('Location'), '=');
+			$request['uri'] = str_replace('%2F', '/', $location);
 			$request['redirect'] = is_int($this->request['redirect']) ? $this->request['redirect'] - 1 : $this->request['redirect'];
 			$this->response = $this->request($request);
 		}
@@ -432,12 +439,12 @@ class HttpSocket extends CakeSocket {
  *
  * You could express the same thing using a uri array and query string parameters:
  *
- * {{{
+ * ```
  * $response = $http->get(
  *     array('host' => 'google.com', 'path' => '/search'),
  *     array('q' => 'cakephp', 'client' => 'safari')
  * );
- * }}}
+ * ```
  *
  * @param string|array $uri URI to request. Either a string uri, or a uri array, see HttpSocket::_parseUri()
  * @param array $query Querystring parameters to append to URI
@@ -459,17 +466,43 @@ class HttpSocket extends CakeSocket {
 		return $this->request($request);
 	}
 
+/**
+ * Issues a HEAD request to the specified URI, query, and request.
+ *
+ * By definition HEAD request are identical to GET request except they return no response body. This means that all
+ * information and examples relevant to GET also applys to HEAD.
+ *
+ * @param string|array $uri URI to request. Either a string URI, or a URI array, see HttpSocket::_parseUri()
+ * @param array $query Querystring parameters to append to URI
+ * @param array $request An indexed array with indexes such as 'method' or uri
+ * @return mixed Result of request, either false on failure or the response to the request.
+ */
+	public function head($uri = null, $query = array(), $request = array()) {
+		if (!empty($query)) {
+			$uri = $this->_parseUri($uri, $this->config['request']['uri']);
+			if (isset($uri['query'])) {
+				$uri['query'] = array_merge($uri['query'], $query);
+			} else {
+				$uri['query'] = $query;
+			}
+			$uri = $this->_buildUri($uri);
+		}
+
+		$request = Hash::merge(array('method' => 'HEAD', 'uri' => $uri), $request);
+		return $this->request($request);
+	}
+
 /**
  * Issues a POST request to the specified URI, query, and request.
  *
  * `post()` can be used to post simple data arrays to a URL:
  *
- * {{{
+ * ```
  * $response = $http->post('http://example.com', array(
  *     'username' => 'batman',
  *     'password' => 'bruce_w4yne'
  * ));
- * }}}
+ * ```
  *
  * @param string|array $uri URI to request. See HttpSocket::_parseUri()
  * @param array $data Array of request body data keys and values.
@@ -530,10 +563,10 @@ class HttpSocket extends CakeSocket {
  * After configuring part of the request parameters, you can use url() to generate
  * URLs.
  *
- * {{{
+ * ```
  * $http = new HttpSocket('http://www.cakephp.org');
  * $url = $http->url('/search?q=bar');
- * }}}
+ * ```
  *
  * Would return `http://www.cakephp.org/search?q=bar`
  *
@@ -543,7 +576,7 @@ class HttpSocket extends CakeSocket {
  *
  * Would return `/search?q=socket`.
  *
- * @param string|array Either a string or array of URL options to create a URL with.
+ * @param string|array $url Either a string or array of URL options to create a URL with.
  * @param string $uriTemplate A template string to use for URL formatting.
  * @return mixed Either false on failure or a string containing the composed URL.
  */
@@ -619,6 +652,7 @@ class HttpSocket extends CakeSocket {
 		}
 		$this->config['host'] = $this->_proxy['host'];
 		$this->config['port'] = $this->_proxy['port'];
+		$this->config['proxy'] = true;
 
 		if (empty($this->_proxy['method']) || !isset($this->_proxy['user'], $this->_proxy['pass'])) {
 			return;
@@ -634,13 +668,20 @@ class HttpSocket extends CakeSocket {
 			throw new SocketException(__d('cake_dev', 'The %s does not support proxy authentication.', $authClass));
 		}
 		call_user_func_array("$authClass::proxyAuthentication", array($this, &$this->_proxy));
+
+		if (!empty($this->request['header']['Proxy-Authorization'])) {
+			$this->config['proxyauth'] = $this->request['header']['Proxy-Authorization'];
+			if ($this->request['uri']['scheme'] === 'https') {
+				$this->request['header'] = Hash::remove($this->request['header'], 'Proxy-Authorization');
+			}
+		}
 	}
 
 /**
  * Parses and sets the specified URI into current request configuration.
  *
  * @param string|array $uri URI, See HttpSocket::_parseUri()
- * @return boolean If uri has merged in config
+ * @return bool If uri has merged in config
  */
 	protected function _configUri($uri = null) {
 		if (empty($uri)) {
@@ -666,33 +707,6 @@ class HttpSocket extends CakeSocket {
 		return true;
 	}
 
-/**
- * Configure the socket's context. Adds in configuration
- * that can not be declared in the class definition.
- *
- * @param string $host The host you're connecting to.
- * @return void
- */
-	protected function _configContext($host) {
-		foreach ($this->config as $key => $value) {
-			if (substr($key, 0, 4) !== 'ssl_') {
-				continue;
-			}
-			$contextKey = substr($key, 4);
-			if (empty($this->config['context']['ssl'][$contextKey])) {
-				$this->config['context']['ssl'][$contextKey] = $value;
-			}
-			unset($this->config[$key]);
-		}
-		if (empty($this->config['context']['ssl']['cafile'])) {
-			$this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem';
-		}
-		if (!empty($this->config['context']['ssl']['verify_host'])) {
-			$this->config['context']['ssl']['CN_match'] = $host;
-		}
-		unset($this->config['context']['ssl']['verify_host']);
-	}
-
 /**
  * Takes a $uri array and turns it into a fully qualified URL string
  *
@@ -745,7 +759,7 @@ class HttpSocket extends CakeSocket {
  * such as 'scheme', 'port', 'query'.
  *
  * @param string|array $uri URI to parse
- * @param boolean|array $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
+ * @param bool|array $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
  * @return array Parsed URI
  */
 	protected function _parseUri($uri = null, $base = array()) {
@@ -873,11 +887,10 @@ class HttpSocket extends CakeSocket {
  * Builds a request line according to HTTP/1.1 specs. Activate quirks mode to work outside specs.
  *
  * @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
- * @param string $versionToken The version token to use, defaults to HTTP/1.1
  * @return string Request line
  * @throws SocketException
  */
-	protected function _buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
+	protected function _buildRequestLine($request = array()) {
 		$asteriskMethods = array('OPTIONS');
 
 		if (is_string($request)) {
@@ -894,7 +907,7 @@ class HttpSocket extends CakeSocket {
 
 		$request['uri'] = $this->_parseUri($request['uri']);
 		$request += array('method' => 'GET');
-		if (!empty($this->_proxy['host'])) {
+		if (!empty($this->_proxy['host']) && $request['uri']['scheme'] !== 'https') {
 			$request['uri'] = $this->_buildUri($request['uri'], '%scheme://%host:%port/%path?%query');
 		} else {
 			$request['uri'] = $this->_buildUri($request['uri'], '/%path?%query');
@@ -903,14 +916,15 @@ class HttpSocket extends CakeSocket {
 		if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
 			throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods)));
 		}
-		return $request['method'] . ' ' . $request['uri'] . ' ' . $versionToken . "\r\n";
+		$version = isset($request['version']) ? $request['version'] : '1.1';
+		return $request['method'] . ' ' . $request['uri'] . ' HTTP/' . $version . "\r\n";
 	}
 
 /**
  * Builds the header.
  *
  * @param array $header Header to build
- * @param string $mode
+ * @param string $mode Mode
  * @return string Header built from array
  */
 	protected function _buildHeader($header, $mode = 'standard') {
@@ -972,7 +986,7 @@ class HttpSocket extends CakeSocket {
  * Escapes a given $token according to RFC 2616 (HTTP 1.1 specs)
  *
  * @param string $token Token to escape
- * @param array $chars
+ * @param array $chars Characters to escape
  * @return string Escaped token
  */
 	protected function _escapeToken($token, $chars = null) {
@@ -984,8 +998,8 @@ class HttpSocket extends CakeSocket {
 /**
  * Gets escape chars according to RFC 2616 (HTTP 1.1 specs).
  *
- * @param boolean $hex true to get them as HEX values, false otherwise
- * @param array $chars
+ * @param bool $hex true to get them as HEX values, false otherwise
+ * @param array $chars Characters to escape
  * @return array Escape chars
  */
 	protected function _tokenEscapeChars($hex = true, $chars = null) {
@@ -1012,8 +1026,8 @@ class HttpSocket extends CakeSocket {
  * Resets the state of this HttpSocket instance to it's initial state (before Object::__construct got executed) or does
  * the same thing partially for the request and the response property only.
  *
- * @param boolean $full If set to false only HttpSocket::response and HttpSocket::request are reset
- * @return boolean True on success
+ * @param bool $full If set to false only HttpSocket::response and HttpSocket::request are reset
+ * @return bool True on success
  */
 	public function reset($full = true) {
 		static $initalState = array();
@@ -1030,3 +1044,4 @@ class HttpSocket extends CakeSocket {
 	}
 
 }
+
diff --git a/web/api/lib/Cake/Network/Http/HttpSocketResponse.php b/web/api/lib/Cake/Network/Http/HttpSocketResponse.php
index b20e0643b..99d875c31 100644
--- a/web/api/lib/Cake/Network/Http/HttpSocketResponse.php
+++ b/web/api/lib/Cake/Network/Http/HttpSocketResponse.php
@@ -53,7 +53,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * Response code
  *
- * @var integer
+ * @var int
  */
 	public $code = 0;
 
@@ -82,7 +82,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * Constructor
  *
- * @param string $message
+ * @param string $message Message to parse.
  */
 	public function __construct($message = null) {
 		if ($message !== null) {
@@ -102,8 +102,8 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * Get header in case insensitive
  *
- * @param string $name Header name
- * @param array $headers
+ * @param string $name Header name.
+ * @param array $headers Headers to format.
  * @return mixed String if header exists or null
  */
 	public function getHeader($name, $headers = null) {
@@ -124,7 +124,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * If return is 200 (OK)
  *
- * @return boolean
+ * @return bool
  */
 	public function isOk() {
 		return in_array($this->code, array(200, 201, 202, 203, 204, 205, 206));
@@ -133,7 +133,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * If return is a valid 3xx (Redirection)
  *
- * @return boolean
+ * @return bool
  */
 	public function isRedirect() {
 		return in_array($this->code, array(301, 302, 303, 307)) && $this->getHeader('Location') !== null;
@@ -159,10 +159,12 @@ class HttpSocketResponse implements ArrayAccess {
 		$this->raw = $message;
 		$this->body = (string)substr($message, strlen($match[0]));
 
-		if (preg_match("/(.+) ([0-9]{3})\s*([^ ]*)\r\n/DU", $statusLine, $match)) {
+		if (preg_match("/(.+) ([0-9]{3})(?:\s+(\w.+))?\s*\r\n/DU", $statusLine, $match)) {
 			$this->httpVersion = $match[1];
 			$this->code = $match[2];
-			$this->reasonPhrase = $match[3];
+			if (isset($match[3])) {
+				$this->reasonPhrase = $match[3];
+			}
 		}
 
 		$this->headers = $this->_parseHeader($header);
@@ -184,7 +186,7 @@ class HttpSocketResponse implements ArrayAccess {
  * 'body' and 'header' or false on failure.
  *
  * @param string $body A string containing the body to decode.
- * @param string|boolean $encoding Can be false in case no encoding is being used, or a string representing the encoding.
+ * @param string|bool $encoding Can be false in case no encoding is being used, or a string representing the encoding.
  * @return mixed Array of response headers and body or false.
  */
 	protected function _decodeBody($body, $encoding = 'chunked') {
@@ -219,28 +221,29 @@ class HttpSocketResponse implements ArrayAccess {
 		$chunkLength = null;
 
 		while ($chunkLength !== 0) {
-			if (!preg_match('/^([0-9a-f]+) *(?:;(.+)=(.+))?(?:\r\n|\n)/iU', $body, $match)) {
-				throw new SocketException(__d('cake_dev', 'HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.'));
+			if (!preg_match('/^([0-9a-f]+)[ ]*(?:;(.+)=(.+))?(?:\r\n|\n)/iU', $body, $match)) {
+				// Handle remaining invalid data as one big chunk.
+				preg_match('/^(.*?)\r\n/', $body, $invalidMatch);
+				$length = isset($invalidMatch[1]) ? strlen($invalidMatch[1]) : 0;
+				$match = array(
+					0 => '',
+					1 => dechex($length)
+				);
 			}
-
 			$chunkSize = 0;
 			$hexLength = 0;
-			$chunkExtensionValue = '';
 			if (isset($match[0])) {
 				$chunkSize = $match[0];
 			}
 			if (isset($match[1])) {
 				$hexLength = $match[1];
 			}
-			if (isset($match[3])) {
-				$chunkExtensionValue = $match[3];
-			}
 
-			$body = substr($body, strlen($chunkSize));
 			$chunkLength = hexdec($hexLength);
-			$chunk = substr($body, 0, $chunkLength);
-			$decodedBody .= $chunk;
-			if ($chunkLength !== 0) {
+			$body = substr($body, strlen($chunkSize));
+
+			$decodedBody .= substr($body, 0, $chunkLength);
+			if ($chunkLength) {
 				$body = substr($body, $chunkLength + strlen("\r\n"));
 			}
 		}
@@ -329,8 +332,8 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * Unescapes a given $token according to RFC 2616 (HTTP 1.1 specs)
  *
- * @param string $token Token to unescape
- * @param array $chars
+ * @param string $token Token to unescape.
+ * @param array $chars Characters to unescape.
  * @return string Unescaped token
  */
 	protected function _unescapeToken($token, $chars = null) {
@@ -342,8 +345,8 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * Gets escape chars according to RFC 2616 (HTTP 1.1 specs).
  *
- * @param boolean $hex true to get them as HEX values, false otherwise
- * @param array $chars
+ * @param bool $hex True to get them as HEX values, false otherwise.
+ * @param array $chars Characters to uescape.
  * @return array Escape chars
  */
 	protected function _tokenEscapeChars($hex = true, $chars = null) {
@@ -369,8 +372,8 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * ArrayAccess - Offset Exists
  *
- * @param string $offset
- * @return boolean
+ * @param string $offset Offset to check.
+ * @return bool
  */
 	public function offsetExists($offset) {
 		return in_array($offset, array('raw', 'status', 'header', 'body', 'cookies'));
@@ -379,7 +382,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * ArrayAccess - Offset Get
  *
- * @param string $offset
+ * @param string $offset Offset to get.
  * @return mixed
  */
 	public function offsetGet($offset) {
@@ -416,8 +419,8 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * ArrayAccess - Offset Set
  *
- * @param string $offset
- * @param mixed $value
+ * @param string $offset Offset to set.
+ * @param mixed $value Value.
  * @return void
  */
 	public function offsetSet($offset, $value) {
@@ -426,7 +429,7 @@ class HttpSocketResponse implements ArrayAccess {
 /**
  * ArrayAccess - Offset Unset
  *
- * @param string $offset
+ * @param string $offset Offset to unset.
  * @return void
  */
 	public function offsetUnset($offset) {
diff --git a/web/api/lib/Cake/Routing/Dispatcher.php b/web/api/lib/Cake/Routing/Dispatcher.php
index 0d410fcdc..35a2df21e 100644
--- a/web/api/lib/Cake/Routing/Dispatcher.php
+++ b/web/api/lib/Cake/Routing/Dispatcher.php
@@ -85,7 +85,7 @@ class Dispatcher implements CakeEventListener {
  * Attaches all event listeners for this dispatcher instance. Loads the
  * dispatcher filters from the configured locations.
  *
- * @param CakeEventManager $manager
+ * @param CakeEventManager $manager Event manager instance.
  * @return void
  * @throws MissingDispatcherFilterException
  */
@@ -97,7 +97,7 @@ class Dispatcher implements CakeEventListener {
 
 		foreach ($filters as $index => $filter) {
 			$settings = array();
-			if (is_array($filter) && !is_int($index)) {
+			if (is_array($filter) && !is_int($index) && class_exists($index)) {
 				$settings = $filter;
 				$filter = $index;
 			}
@@ -137,7 +137,9 @@ class Dispatcher implements CakeEventListener {
  * @param CakeRequest $request Request object to dispatch.
  * @param CakeResponse $response Response object to put the results of the dispatch into.
  * @param array $additionalParams Settings array ("bare", "return") which is melded with the GET and POST params
- * @return string|void if `$request['return']` is set then it returns response body, null otherwise
+ * @return string|null if `$request['return']` is set then it returns response body, null otherwise
+ * @triggers Dispatcher.beforeDispatch $this, compact('request', 'response', 'additionalParams')
+ * @triggers Dispatcher.afterDispatch $this, compact('request', 'response')
  * @throws MissingControllerException When the controller is missing.
  */
 	public function dispatch(CakeRequest $request, CakeResponse $response, $additionalParams = array()) {
@@ -150,7 +152,7 @@ class Dispatcher implements CakeEventListener {
 				return $beforeEvent->result->body();
 			}
 			$beforeEvent->result->send();
-			return;
+			return null;
 		}
 
 		$controller = $this->_getController($request, $response);
@@ -244,8 +246,8 @@ class Dispatcher implements CakeEventListener {
 /**
  * Load controller and return controller class name
  *
- * @param CakeRequest $request
- * @return string|boolean Name of controller class name
+ * @param CakeRequest $request Request instance.
+ * @return string|bool Name of controller class name
  */
 	protected function _loadController($request) {
 		$pluginName = $pluginPath = $controller = null;
diff --git a/web/api/lib/Cake/Routing/DispatcherFilter.php b/web/api/lib/Cake/Routing/DispatcherFilter.php
index 649f84c28..e8d86e080 100644
--- a/web/api/lib/Cake/Routing/DispatcherFilter.php
+++ b/web/api/lib/Cake/Routing/DispatcherFilter.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -30,7 +28,7 @@ abstract class DispatcherFilter implements CakeEventListener {
 /**
  * Default priority for all methods in this filter
  *
- * @var integer
+ * @var int
  */
 	public $priority = 10;
 
@@ -44,7 +42,7 @@ abstract class DispatcherFilter implements CakeEventListener {
 /**
  * Constructor.
  *
- * @param string $setting Configuration settings for the filter.
+ * @param array $settings Configuration settings for the filter.
  */
 	public function __construct($settings = array()) {
 		$this->settings = Hash::merge($this->settings, $settings);
@@ -80,7 +78,7 @@ abstract class DispatcherFilter implements CakeEventListener {
  *
  * @param CakeEvent $event container object having the `request`, `response` and `additionalParams`
  *	keys in the data property.
- * @return CakeResponse|boolean
+ * @return CakeResponse|bool
  */
 	public function beforeDispatch(CakeEvent $event) {
 	}
diff --git a/web/api/lib/Cake/Routing/Filter/AssetDispatcher.php b/web/api/lib/Cake/Routing/Filter/AssetDispatcher.php
index 0c91c3cd7..c90a8235c 100644
--- a/web/api/lib/Cake/Routing/Filter/AssetDispatcher.php
+++ b/web/api/lib/Cake/Routing/Filter/AssetDispatcher.php
@@ -28,7 +28,7 @@ class AssetDispatcher extends DispatcherFilter {
  * Default priority for all methods in this filter
  * This filter should run before the request gets parsed by router
  *
- * @var integer
+ * @var int
  */
 	public $priority = 9;
 
@@ -42,7 +42,7 @@ class AssetDispatcher extends DispatcherFilter {
 	public function beforeDispatch(CakeEvent $event) {
 		$url = urldecode($event->data['request']->url);
 		if (strpos($url, '..') !== false || strpos($url, '.') === false) {
-			return;
+			return null;
 		}
 
 		if ($result = $this->_filterAsset($event)) {
@@ -51,19 +51,12 @@ class AssetDispatcher extends DispatcherFilter {
 		}
 
 		$assetFile = $this->_getAssetFile($url);
-		if ($assetFile === null) {
+		if ($assetFile === null || !file_exists($assetFile)) {
 			return null;
 		}
-
 		$response = $event->data['response'];
 		$event->stopPropagation();
 
-		if (!file_exists($assetFile)) {
-			$response->statusCode(404);
-			$response->send();
-			return $response;
-		}
-
 		$response->modified(filemtime($assetFile));
 		if ($response->checkNotModified($event->data['request'])) {
 			return $response;
@@ -71,6 +64,7 @@ class AssetDispatcher extends DispatcherFilter {
 
 		$pathSegments = explode('.', $url);
 		$ext = array_pop($pathSegments);
+
 		$this->_deliverAsset($response, $assetFile, $ext);
 		return $response;
 	}
@@ -114,7 +108,7 @@ class AssetDispatcher extends DispatcherFilter {
 /**
  * Builds asset file path based off url
  *
- * @param string $url
+ * @param string $url URL
  * @return string Absolute path for asset file
  */
 	protected function _getAssetFile($url) {
@@ -147,7 +141,7 @@ class AssetDispatcher extends DispatcherFilter {
 	protected function _deliverAsset(CakeResponse $response, $assetFile, $ext) {
 		ob_start();
 		$compressionEnabled = Configure::read('Asset.compress') && $response->compress();
-		if ($response->type($ext) == $ext) {
+		if ($response->type($ext) === $ext) {
 			$contentType = 'application/octet-stream';
 			$agent = env('HTTP_USER_AGENT');
 			if (preg_match('%Opera(/| )([0-9].[0-9]{1,2})%', $agent) || preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
@@ -155,12 +149,11 @@ class AssetDispatcher extends DispatcherFilter {
 			}
 			$response->type($contentType);
 		}
-		if (!$compressionEnabled) {
-			$response->header('Content-Length', filesize($assetFile));
-		}
+		$response->length(false);
 		$response->cache(filemtime($assetFile));
 		$response->send();
 		ob_clean();
+
 		if ($ext === 'css' || $ext === 'js') {
 			include $assetFile;
 		} else {
diff --git a/web/api/lib/Cake/Routing/Filter/CacheDispatcher.php b/web/api/lib/Cake/Routing/Filter/CacheDispatcher.php
index 109b2cfd8..24361bf3b 100644
--- a/web/api/lib/Cake/Routing/Filter/CacheDispatcher.php
+++ b/web/api/lib/Cake/Routing/Filter/CacheDispatcher.php
@@ -27,7 +27,7 @@ class CacheDispatcher extends DispatcherFilter {
  * Default priority for all methods in this filter
  * This filter should run before the request gets parsed by router
  *
- * @var integer
+ * @var int
  */
 	public $priority = 9;
 
@@ -39,7 +39,7 @@ class CacheDispatcher extends DispatcherFilter {
  */
 	public function beforeDispatch(CakeEvent $event) {
 		if (Configure::read('Cache.check') !== true) {
-			return;
+			return null;
 		}
 
 		$path = $event->data['request']->here();
diff --git a/web/api/lib/Cake/Routing/Route/CakeRoute.php b/web/api/lib/Cake/Routing/Route/CakeRoute.php
index 74595c400..080e3c72f 100644
--- a/web/api/lib/Cake/Routing/Route/CakeRoute.php
+++ b/web/api/lib/Cake/Routing/Route/CakeRoute.php
@@ -97,7 +97,7 @@ class CakeRoute {
 /**
  * Check if a Route has been compiled into a regular expression.
  *
- * @return boolean
+ * @return bool
  */
 	public function compiled() {
 		return !empty($this->_compiledRoute);
@@ -334,7 +334,7 @@ class CakeRoute {
  * @param string $val The value of the named parameter
  * @param array $rule The rule(s) to apply, can also be a match string
  * @param string $context An array with additional context information (controller / action)
- * @return boolean
+ * @return bool
  */
 	protected function _matchNamed($val, $rule, $context) {
 		if ($rule === true || $rule === false) {
@@ -448,8 +448,7 @@ class CakeRoute {
 			}
 
 			// pull out named params if named params are greedy or a rule exists.
-			if (
-				($greedyNamed || isset($allowedNamedParams[$key])) &&
+			if (($greedyNamed || isset($allowedNamedParams[$key])) &&
 				($value !== false && $value !== null) &&
 				(!in_array($key, $prefixes))
 			) {
@@ -536,11 +535,32 @@ class CakeRoute {
 			$out = str_replace($search, $replace, $out);
 		}
 
-		if (strpos($this->template, '*')) {
+		if (strpos($this->template, '**') !== false) {
+			$out = str_replace('**', $params['pass'], $out);
+			$out = str_replace('%2F', '/', $out);
+		} elseif (strpos($this->template, '*') !== false) {
 			$out = str_replace('*', $params['pass'], $out);
 		}
 		$out = str_replace('//', '/', $out);
 		return $out;
 	}
 
+/**
+ * Set state magic method to support var_export
+ *
+ * This method helps for applications that want to implement
+ * router caching.
+ *
+ * @param array $fields Key/Value of object attributes
+ * @return CakeRoute A new instance of the route
+ */
+	public static function __set_state($fields) {
+		$class = function_exists('get_called_class') ? get_called_class() : __CLASS__;
+		$obj = new $class('');
+		foreach ($fields as $field => $value) {
+			$obj->$field = $value;
+		}
+		return $obj;
+	}
+
 }
diff --git a/web/api/lib/Cake/Routing/Route/RedirectRoute.php b/web/api/lib/Cake/Routing/Route/RedirectRoute.php
index 322d276ed..bf0a9bb82 100644
--- a/web/api/lib/Cake/Routing/Route/RedirectRoute.php
+++ b/web/api/lib/Cake/Routing/Route/RedirectRoute.php
@@ -43,7 +43,7 @@ class RedirectRoute extends CakeRoute {
 /**
  * Flag for disabling exit() when this route parses a URL.
  *
- * @var boolean
+ * @var bool
  */
 	public $stop = true;
 
@@ -64,7 +64,7 @@ class RedirectRoute extends CakeRoute {
  * redirection
  *
  * @param string $url The URL to parse
- * @return boolean False on failure
+ * @return bool False on failure
  */
 	public function parse($url) {
 		$params = parent::parse($url);
@@ -113,7 +113,7 @@ class RedirectRoute extends CakeRoute {
  * Stop execution of the current script. Wraps exit() making
  * testing easier.
  *
- * @param integer|string $status see http://php.net/exit for values
+ * @param int|string $code See http://php.net/exit for values
  * @return void
  */
 	protected function _stop($code = 0) {
diff --git a/web/api/lib/Cake/Routing/Router.php b/web/api/lib/Cake/Routing/Router.php
index 19af89fdd..5575fb6f0 100644
--- a/web/api/lib/Cake/Routing/Router.php
+++ b/web/api/lib/Cake/Routing/Router.php
@@ -50,7 +50,7 @@ class Router {
 /**
  * Have routes been loaded
  *
- * @var boolean
+ * @var bool
  */
 	public static $initialized = false;
 
@@ -73,7 +73,7 @@ class Router {
 /**
  * Directive for Router to parse out file extensions for mapping to Content-types.
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_parseExtensions = false;
 
@@ -207,16 +207,16 @@ class Router {
 /**
  * Set the default route class to use or return the current one
  *
- * @param string $routeClass to set as default
- * @return mixed void|string
+ * @param string $routeClass The route class to set as default.
+ * @return string|null The default route class.
  * @throws RouterException
  */
 	public static function defaultRouteClass($routeClass = null) {
 		if ($routeClass === null) {
-			return self::$_routeClass;
+			return static::$_routeClass;
 		}
 
-		self::$_routeClass = self::_validateRouteClass($routeClass);
+		static::$_routeClass = static::_validateRouteClass($routeClass);
 	}
 
 /**
@@ -227,8 +227,7 @@ class Router {
  * @throws RouterException
  */
 	protected static function _validateRouteClass($routeClass) {
-		if (
-			$routeClass !== 'CakeRoute' &&
+		if ($routeClass !== 'CakeRoute' &&
 			(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
 		) {
 			throw new RouterException(__d('cake_dev', 'Route class not found, or route class is not a subclass of CakeRoute'));
@@ -244,7 +243,7 @@ class Router {
 	protected static function _setPrefixes() {
 		$routing = Configure::read('Routing');
 		if (!empty($routing['prefixes'])) {
-			self::$_prefixes = array_merge(self::$_prefixes, (array)$routing['prefixes']);
+			static::$_prefixes = array_merge(static::$_prefixes, (array)$routing['prefixes']);
 		}
 	}
 
@@ -255,7 +254,7 @@ class Router {
  * @see Router::$_namedExpressions
  */
 	public static function getNamedExpressions() {
-		return self::$_namedExpressions;
+		return static::$_namedExpressions;
 	}
 
 /**
@@ -267,9 +266,9 @@ class Router {
  */
 	public static function resourceMap($resourceMap = null) {
 		if ($resourceMap === null) {
-			return self::$_resourceMap;
+			return static::$_resourceMap;
 		}
-		self::$_resourceMap = $resourceMap;
+		static::$_resourceMap = $resourceMap;
 	}
 
 /**
@@ -290,13 +289,13 @@ class Router {
  *
  * The above shows the use of route parameter defaults, and providing routing parameters for a static route.
  *
- * {{{
+ * ```
  * Router::connect(
  *   '/:lang/:controller/:action/:id',
  *   array(),
  *   array('id' => '[0-9]+', 'lang' => '[a-z]{3}')
  * );
- * }}}
+ * ```
  *
  * Shows connecting a route with custom route parameters as well as providing patterns for those parameters.
  * Patterns for routing parameters do not need capturing groups, as one will be added for each route params.
@@ -343,9 +342,9 @@ class Router {
  * @throws RouterException
  */
 	public static function connect($route, $defaults = array(), $options = array()) {
-		self::$initialized = true;
+		static::$initialized = true;
 
-		foreach (self::$_prefixes as $prefix) {
+		foreach (static::$_prefixes as $prefix) {
 			if (isset($defaults[$prefix])) {
 				if ($defaults[$prefix]) {
 					$defaults['prefix'] = $prefix;
@@ -355,29 +354,28 @@ class Router {
 				break;
 			}
 		}
-		if (isset($defaults['prefix'])) {
-			self::$_prefixes[] = $defaults['prefix'];
-			self::$_prefixes = array_keys(array_flip(self::$_prefixes));
+		if (isset($defaults['prefix']) && !in_array($defaults['prefix'], static::$_prefixes)) {
+			static::$_prefixes[] = $defaults['prefix'];
 		}
 		$defaults += array('plugin' => null);
 		if (empty($options['action'])) {
 			$defaults += array('action' => 'index');
 		}
-		$routeClass = self::$_routeClass;
+		$routeClass = static::$_routeClass;
 		if (isset($options['routeClass'])) {
 			if (strpos($options['routeClass'], '.') === false) {
 				$routeClass = $options['routeClass'];
 			} else {
 				list(, $routeClass) = pluginSplit($options['routeClass'], true);
 			}
-			$routeClass = self::_validateRouteClass($routeClass);
+			$routeClass = static::_validateRouteClass($routeClass);
 			unset($options['routeClass']);
 		}
 		if ($routeClass === 'RedirectRoute' && isset($defaults['redirect'])) {
 			$defaults = $defaults['redirect'];
 		}
-		self::$routes[] = new $routeClass($route, $defaults, $options);
-		return self::$routes;
+		static::$routes[] = new $routeClass($route, $defaults, $options);
+		return static::$routes;
 	}
 
 /**
@@ -418,7 +416,7 @@ class Router {
 		if (is_string($url)) {
 			$url = array('redirect' => $url);
 		}
-		return self::connect($route, $url, $options);
+		return static::connect($route, $url, $options);
 	}
 
 /**
@@ -428,37 +426,37 @@ class Router {
  *
  * Do not parse any named parameters:
  *
- * {{{ Router::connectNamed(false); }}}
+ * ``` Router::connectNamed(false); ```
  *
  * Parse only default parameters used for CakePHP's pagination:
  *
- * {{{ Router::connectNamed(false, array('default' => true)); }}}
+ * ``` Router::connectNamed(false, array('default' => true)); ```
  *
  * Parse only the page parameter if its value is a number:
  *
- * {{{ Router::connectNamed(array('page' => '[\d]+'), array('default' => false, 'greedy' => false)); }}}
+ * ``` Router::connectNamed(array('page' => '[\d]+'), array('default' => false, 'greedy' => false)); ```
  *
  * Parse only the page parameter no matter what.
  *
- * {{{ Router::connectNamed(array('page'), array('default' => false, 'greedy' => false)); }}}
+ * ``` Router::connectNamed(array('page'), array('default' => false, 'greedy' => false)); ```
  *
  * Parse only the page parameter if the current action is 'index'.
  *
- * {{{
+ * ```
  * Router::connectNamed(
  *    array('page' => array('action' => 'index')),
  *    array('default' => false, 'greedy' => false)
  * );
- * }}}
+ * ```
  *
  * Parse only the page parameter if the current action is 'index' and the controller is 'pages'.
  *
- * {{{
+ * ```
  * Router::connectNamed(
  *    array('page' => array('action' => 'index', 'controller' => 'pages')),
  *    array('default' => false, 'greedy' => false)
  * );
- * }}}
+ * ```
  *
  * ### Options
  *
@@ -475,7 +473,7 @@ class Router {
  */
 	public static function connectNamed($named, $options = array()) {
 		if (isset($options['separator'])) {
-			self::$_namedConfig['separator'] = $options['separator'];
+			static::$_namedConfig['separator'] = $options['separator'];
 			unset($options['separator']);
 		}
 
@@ -486,23 +484,23 @@ class Router {
 			$options += array('default' => false, 'reset' => false, 'greedy' => true);
 		}
 
-		if ($options['reset'] || self::$_namedConfig['rules'] === false) {
-			self::$_namedConfig['rules'] = array();
+		if ($options['reset'] || static::$_namedConfig['rules'] === false) {
+			static::$_namedConfig['rules'] = array();
 		}
 
 		if ($options['default']) {
-			$named = array_merge($named, self::$_namedConfig['default']);
+			$named = array_merge($named, static::$_namedConfig['default']);
 		}
 
 		foreach ($named as $key => $val) {
 			if (is_numeric($key)) {
-				self::$_namedConfig['rules'][$val] = true;
+				static::$_namedConfig['rules'][$val] = true;
 			} else {
-				self::$_namedConfig['rules'][$key] = $val;
+				static::$_namedConfig['rules'][$key] = $val;
 			}
 		}
-		self::$_namedConfig['greedyNamed'] = $options['greedy'];
-		return self::$_namedConfig;
+		static::$_namedConfig['greedyNamed'] = $options['greedy'];
+		return static::$_namedConfig;
 	}
 
 /**
@@ -512,7 +510,7 @@ class Router {
  * @see Router::$_namedConfig
  */
 	public static function namedConfig() {
-		return self::$_namedConfig;
+		return static::$_namedConfig;
 	}
 
 /**
@@ -535,7 +533,7 @@ class Router {
 		$options += array(
 			'connectOptions' => array(),
 			'prefix' => '/',
-			'id' => self::ID . '|' . self::UUID
+			'id' => static::ID . '|' . static::UUID
 		);
 
 		$prefix = $options['prefix'];
@@ -556,7 +554,7 @@ class Router {
 				$prefix = '/' . $plugin . '/';
 			}
 
-			foreach (self::$_resourceMap as $params) {
+			foreach (static::$_resourceMap as $params) {
 				$url = $prefix . $urlName . (($params['id']) ? '/:id' : '');
 
 				Router::connect($url,
@@ -572,9 +570,9 @@ class Router {
 					)
 				);
 			}
-			self::$_resourceMapped[] = $urlName;
+			static::$_resourceMapped[] = $urlName;
 		}
-		return self::$_resourceMapped;
+		return static::$_resourceMapped;
 	}
 
 /**
@@ -583,7 +581,7 @@ class Router {
  * @return array A list of prefixes used in connected routes
  */
 	public static function prefixes() {
-		return self::$_prefixes;
+		return static::$_prefixes;
 	}
 
 /**
@@ -593,8 +591,8 @@ class Router {
  * @return array Parsed elements from URL
  */
 	public static function parse($url) {
-		if (!self::$initialized) {
-			self::_loadRoutes();
+		if (!static::$initialized) {
+			static::_loadRoutes();
 		}
 
 		$ext = null;
@@ -608,13 +606,11 @@ class Router {
 			parse_str($queryParameters, $queryParameters);
 		}
 
-		extract(self::_parseExtension($url));
-
-		for ($i = 0, $len = count(self::$routes); $i < $len; $i++) {
-			$route =& self::$routes[$i];
+		extract(static::_parseExtension($url));
 
+		foreach (static::$routes as $route) {
 			if (($r = $route->parse($url)) !== false) {
-				self::$_currentRoute[] =& $route;
+				static::$_currentRoute[] = $route;
 				$out = $r;
 				break;
 			}
@@ -636,20 +632,20 @@ class Router {
 /**
  * Parses a file extension out of a URL, if Router::parseExtensions() is enabled.
  *
- * @param string $url
+ * @param string $url URL.
  * @return array Returns an array containing the altered URL and the parsed extension.
  */
 	protected static function _parseExtension($url) {
 		$ext = null;
 
-		if (self::$_parseExtensions) {
+		if (static::$_parseExtensions) {
 			if (preg_match('/\.[0-9a-zA-Z]*$/', $url, $match) === 1) {
 				$match = substr($match[0], 1);
-				if (empty(self::$_validExtensions)) {
+				if (empty(static::$_validExtensions)) {
 					$url = substr($url, 0, strpos($url, '.' . $match));
 					$ext = $match;
 				} else {
-					foreach (self::$_validExtensions as $name) {
+					foreach (static::$_validExtensions as $name) {
 						if (strcasecmp($name, $match) === 0) {
 							$url = substr($url, 0, strpos($url, '.' . $name));
 							$ext = $match;
@@ -678,13 +674,13 @@ class Router {
  */
 	public static function setRequestInfo($request) {
 		if ($request instanceof CakeRequest) {
-			self::$_requests[] = $request;
+			static::$_requests[] = $request;
 		} else {
 			$requestObj = new CakeRequest();
 			$request += array(array(), array());
 			$request[0] += array('controller' => false, 'action' => false, 'plugin' => null);
 			$requestObj->addParams($request[0])->addPaths($request[1]);
-			self::$_requests[] = $requestObj;
+			static::$_requests[] = $requestObj;
 		}
 	}
 
@@ -696,35 +692,35 @@ class Router {
  * @see Object::requestAction()
  */
 	public static function popRequest() {
-		return array_pop(self::$_requests);
+		return array_pop(static::$_requests);
 	}
 
 /**
- * Get the either the current request object, or the first one.
+ * Gets the current request object, or the first one.
  *
- * @param boolean $current Whether you want the request from the top of the stack or the first one.
- * @return CakeRequest or null.
+ * @param bool $current True to get the current request object, or false to get the first one.
+ * @return CakeRequest|null Null if stack is empty.
  */
 	public static function getRequest($current = false) {
 		if ($current) {
-			$i = count(self::$_requests) - 1;
-			return isset(self::$_requests[$i]) ? self::$_requests[$i] : null;
+			$i = count(static::$_requests) - 1;
+			return isset(static::$_requests[$i]) ? static::$_requests[$i] : null;
 		}
-		return isset(self::$_requests[0]) ? self::$_requests[0] : null;
+		return isset(static::$_requests[0]) ? static::$_requests[0] : null;
 	}
 
 /**
  * Gets parameter information
  *
- * @param boolean $current Get current request parameter, useful when using requestAction
+ * @param bool $current Get current request parameter, useful when using requestAction
  * @return array Parameter information
  */
 	public static function getParams($current = false) {
-		if ($current && self::$_requests) {
-			return self::$_requests[count(self::$_requests) - 1]->params;
+		if ($current && static::$_requests) {
+			return static::$_requests[count(static::$_requests) - 1]->params;
 		}
-		if (isset(self::$_requests[0])) {
-			return self::$_requests[0]->params;
+		if (isset(static::$_requests[0])) {
+			return static::$_requests[0]->params;
 		}
 		return array();
 	}
@@ -733,8 +729,8 @@ class Router {
  * Gets URL parameter by name
  *
  * @param string $name Parameter name
- * @param boolean $current Current parameter, useful when using requestAction
- * @return string Parameter value
+ * @param bool $current Current parameter, useful when using requestAction
+ * @return string|null Parameter value
  */
 	public static function getParam($name = 'controller', $current = false) {
 		$params = Router::getParams($current);
@@ -747,17 +743,17 @@ class Router {
 /**
  * Gets path information
  *
- * @param boolean $current Current parameter, useful when using requestAction
+ * @param bool $current Current parameter, useful when using requestAction
  * @return array
  */
 	public static function getPaths($current = false) {
 		if ($current) {
-			return self::$_requests[count(self::$_requests) - 1];
+			return static::$_requests[count(static::$_requests) - 1];
 		}
-		if (!isset(self::$_requests[0])) {
+		if (!isset(static::$_requests[0])) {
 			return array('base' => null);
 		}
-		return array('base' => self::$_requests[0]->base);
+		return array('base' => static::$_requests[0]->base);
 	}
 
 /**
@@ -767,36 +763,36 @@ class Router {
  * @return void
  */
 	public static function reload() {
-		if (empty(self::$_initialState)) {
-			self::$_initialState = get_class_vars('Router');
-			self::_setPrefixes();
+		if (empty(static::$_initialState)) {
+			static::$_initialState = get_class_vars('Router');
+			static::_setPrefixes();
 			return;
 		}
-		foreach (self::$_initialState as $key => $val) {
+		foreach (static::$_initialState as $key => $val) {
 			if ($key !== '_initialState') {
-				self::${$key} = $val;
+				static::${$key} = $val;
 			}
 		}
-		self::_setPrefixes();
+		static::_setPrefixes();
 	}
 
 /**
  * Promote a route (by default, the last one added) to the beginning of the list
  *
- * @param integer $which A zero-based array index representing the route to move. For example,
+ * @param int $which A zero-based array index representing the route to move. For example,
  *    if 3 routes have been added, the last route would be 2.
- * @return boolean Returns false if no route exists at the position specified by $which.
+ * @return bool Returns false if no route exists at the position specified by $which.
  */
 	public static function promote($which = null) {
 		if ($which === null) {
-			$which = count(self::$routes) - 1;
+			$which = count(static::$routes) - 1;
 		}
-		if (!isset(self::$routes[$which])) {
+		if (!isset(static::$routes[$which])) {
 			return false;
 		}
-		$route =& self::$routes[$which];
-		unset(self::$routes[$which]);
-		array_unshift(self::$routes, $route);
+		$route =& static::$routes[$which];
+		unset(static::$routes[$which]);
+		array_unshift(static::$routes, $route);
 		return true;
 	}
 
@@ -823,15 +819,15 @@ class Router {
  *   or an array specifying any of the following: 'controller', 'action',
  *   and/or 'plugin', in addition to named arguments (keyed array elements),
  *   and standard URL arguments (indexed array elements)
- * @param boolean|array $full If (bool) true, the full base URL will be prepended to the result.
+ * @param bool|array $full If (bool) true, the full base URL will be prepended to the result.
  *   If an array accepts the following keys
  *    - escape - used when making URLs embedded in html escapes query string '&'
  *    - full - if true the full base URL will be prepended.
  * @return string Full translated URL with base path.
  */
 	public static function url($url = null, $full = false) {
-		if (!self::$initialized) {
-			self::_loadRoutes();
+		if (!static::$initialized) {
+			static::_loadRoutes();
 		}
 
 		$params = array('plugin' => null, 'controller' => null, 'action' => 'index');
@@ -843,8 +839,8 @@ class Router {
 		}
 
 		$path = array('base' => null);
-		if (!empty(self::$_requests)) {
-			$request = self::$_requests[count(self::$_requests) - 1];
+		if (!empty(static::$_requests)) {
+			$request = static::$_requests[count(static::$_requests) - 1];
 			$params = $request->params;
 			$path = array('base' => $request->base, 'here' => $request->here);
 		}
@@ -858,7 +854,7 @@ class Router {
 		if (empty($url)) {
 			$output = isset($path['here']) ? $path['here'] : '/';
 			if ($full) {
-				$output = self::fullBaseUrl() . $output;
+				$output = static::fullBaseUrl() . $output;
 			}
 			return $output;
 		} elseif (is_array($url)) {
@@ -890,8 +886,8 @@ class Router {
 				}
 			}
 
-			$prefixExists = (array_intersect_key($url, array_flip(self::$_prefixes)));
-			foreach (self::$_prefixes as $prefix) {
+			$prefixExists = (array_intersect_key($url, array_flip(static::$_prefixes)));
+			foreach (static::$_prefixes as $prefix) {
 				if (!empty($params[$prefix]) && !$prefixExists) {
 					$url[$prefix] = true;
 				} elseif (isset($url[$prefix]) && !$url[$prefix]) {
@@ -906,19 +902,19 @@ class Router {
 
 			$match = false;
 
-			for ($i = 0, $len = count(self::$routes); $i < $len; $i++) {
+			foreach (static::$routes as $route) {
 				$originalUrl = $url;
 
-				$url = self::$routes[$i]->persistParams($url, $params);
+				$url = $route->persistParams($url, $params);
 
-				if ($match = self::$routes[$i]->match($url)) {
+				if ($match = $route->match($url)) {
 					$output = trim($match, '/');
 					break;
 				}
 				$url = $originalUrl;
 			}
 			if ($match === false) {
-				$output = self::_handleNoRoute($url);
+				$output = static::_handleNoRoute($url);
 			}
 		} else {
 			if (preg_match('/^([a-z][a-z0-9.+\-]+:|:?\/\/|[#?])/i', $url)) {
@@ -927,7 +923,7 @@ class Router {
 			if (substr($url, 0, 1) === '/') {
 				$output = substr($url, 1);
 			} else {
-				foreach (self::$_prefixes as $prefix) {
+				foreach (static::$_prefixes as $prefix) {
 					if (isset($params[$prefix])) {
 						$output .= $prefix . '/';
 						break;
@@ -944,13 +940,13 @@ class Router {
 			$output = str_replace('//', '/', $base . '/' . $output);
 
 			if ($full) {
-				$output = self::fullBaseUrl() . $output;
+				$output = static::fullBaseUrl() . $output;
 			}
 			if (!empty($extension)) {
 				$output = rtrim($output, '/');
 			}
 		}
-		return $output . $extension . self::queryString($q, array(), $escape) . $frag;
+		return $output . $extension . static::queryString($q, array(), $escape) . $frag;
 	}
 
 /**
@@ -970,13 +966,13 @@ class Router {
  */
 	public static function fullBaseUrl($base = null) {
 		if ($base !== null) {
-			self::$_fullBaseUrl = $base;
+			static::$_fullBaseUrl = $base;
 			Configure::write('App.fullBaseUrl', $base);
 		}
-		if (empty(self::$_fullBaseUrl)) {
-			self::$_fullBaseUrl = Configure::read('App.fullBaseUrl');
+		if (empty(static::$_fullBaseUrl)) {
+			static::$_fullBaseUrl = Configure::read('App.fullBaseUrl');
 		}
-		return self::$_fullBaseUrl;
+		return static::$_fullBaseUrl;
 	}
 
 /**
@@ -991,16 +987,14 @@ class Router {
 		$named = $args = array();
 		$skip = array_merge(
 			array('bare', 'action', 'controller', 'plugin', 'prefix'),
-			self::$_prefixes
+			static::$_prefixes
 		);
 
 		$keys = array_values(array_diff(array_keys($url), $skip));
-		$count = count($keys);
 
 		// Remove this once parsed URL parameters can be inserted into 'pass'
-		for ($i = 0; $i < $count; $i++) {
-			$key = $keys[$i];
-			if (is_numeric($keys[$i])) {
+		foreach ($keys as $key) {
+			if (is_numeric($key)) {
 				$args[] = $url[$key];
 			} else {
 				$named[$key] = $url[$key];
@@ -1008,7 +1002,7 @@ class Router {
 		}
 
 		list($args, $named) = array(Hash::filter($args), Hash::filter($named));
-		foreach (self::$_prefixes as $prefix) {
+		foreach (static::$_prefixes as $prefix) {
 			$prefixed = $prefix . '_';
 			if (!empty($url[$prefix]) && strpos($url['action'], $prefixed) === 0) {
 				$url['action'] = substr($url['action'], strlen($prefixed) * -1);
@@ -1026,7 +1020,7 @@ class Router {
 			array_unshift($urlOut, $url['plugin']);
 		}
 
-		foreach (self::$_prefixes as $prefix) {
+		foreach (static::$_prefixes as $prefix) {
 			if (isset($url[$prefix])) {
 				array_unshift($urlOut, $prefix);
 				break;
@@ -1043,10 +1037,10 @@ class Router {
 				if (is_array($value)) {
 					$flattend = Hash::flatten($value, '%5D%5B');
 					foreach ($flattend as $namedKey => $namedValue) {
-						$output .= '/' . $name . "%5B{$namedKey}%5D" . self::$_namedConfig['separator'] . rawurlencode($namedValue);
+						$output .= '/' . $name . "%5B{$namedKey}%5D" . static::$_namedConfig['separator'] . rawurlencode($namedValue);
 					}
 				} else {
-					$output .= '/' . $name . self::$_namedConfig['separator'] . rawurlencode($value);
+					$output .= '/' . $name . static::$_namedConfig['separator'] . rawurlencode($value);
 				}
 			}
 		}
@@ -1059,7 +1053,7 @@ class Router {
  * @param string|array $q Query string Either a string of already compiled query string arguments or
  *    an array of arguments to convert into a query string.
  * @param array $extra Extra querystring parameters.
- * @param boolean $escape Whether or not to use escaped &
+ * @param bool $escape Whether or not to use escaped &
  * @return array
  */
 	public static function queryString($q, $extra = array(), $escape = false) {
@@ -1103,7 +1097,7 @@ class Router {
  * are used for CakePHP internals and should not normally be part of an output URL.
  *
  * @param CakeRequest|array $params The params array or CakeRequest object that needs to be reversed.
- * @param boolean $full Set to true to include the full URL including the protocol when reversing
+ * @param bool $full Set to true to include the full URL including the protocol when reversing
  *     the URL.
  * @return string The string that is the reversed result of the array
  */
@@ -1169,7 +1163,7 @@ class Router {
  * @return CakeRoute Matching route object.
  */
 	public static function requestRoute() {
-		return self::$_currentRoute[0];
+		return static::$_currentRoute[0];
 	}
 
 /**
@@ -1178,8 +1172,8 @@ class Router {
  * @return CakeRoute Matching route object.
  */
 	public static function currentRoute() {
-		$count = count(self::$_currentRoute) - 1;
-		return ($count >= 0) ? self::$_currentRoute[$count] : false;
+		$count = count(static::$_currentRoute) - 1;
+		return ($count >= 0) ? static::$_currentRoute[$count] : false;
 	}
 
 /**
@@ -1206,7 +1200,7 @@ class Router {
 /**
  * Instructs the router to parse out file extensions from the URL.
  *
- * For example, http://example.com/posts.rss would yield an file extension of "rss".
+ * For example, http://example.com/posts.rss would yield a file extension of "rss".
  * The file extension itself is made available in the controller as
  * `$this->params['ext']`, and is used by the RequestHandler component to
  * automatically switch to alternate layouts and templates, and load helpers
@@ -1221,9 +1215,9 @@ class Router {
  * @see RequestHandler::startup()
  */
 	public static function parseExtensions() {
-		self::$_parseExtensions = true;
+		static::$_parseExtensions = true;
 		if (func_num_args() > 0) {
-			self::setExtensions(func_get_args(), false);
+			static::setExtensions(func_get_args(), false);
 		}
 	}
 
@@ -1236,11 +1230,11 @@ class Router {
  * @return array Array of extensions Router is configured to parse.
  */
 	public static function extensions() {
-		if (!self::$initialized) {
-			self::_loadRoutes();
+		if (!static::$initialized) {
+			static::_loadRoutes();
 		}
 
-		return self::$_validExtensions;
+		return static::$_validExtensions;
 	}
 
 /**
@@ -1249,17 +1243,17 @@ class Router {
  * To have the extensions parsed you still need to call `Router::parseExtensions()`
  *
  * @param array $extensions List of extensions to be added as valid extension
- * @param boolean $merge Default true will merge extensions. Set to false to override current extensions
+ * @param bool $merge Default true will merge extensions. Set to false to override current extensions
  * @return array
  */
 	public static function setExtensions($extensions, $merge = true) {
 		if (!is_array($extensions)) {
-			return self::$_validExtensions;
+			return static::$_validExtensions;
 		}
 		if (!$merge) {
-			return self::$_validExtensions = $extensions;
+			return static::$_validExtensions = $extensions;
 		}
-		return self::$_validExtensions = array_merge(self::$_validExtensions, $extensions);
+		return static::$_validExtensions = array_merge(static::$_validExtensions, $extensions);
 	}
 
 /**
@@ -1268,7 +1262,7 @@ class Router {
  * @return void
  */
 	protected static function _loadRoutes() {
-		self::$initialized = true;
+		static::$initialized = true;
 		include APP . 'Config' . DS . 'routes.php';
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/BasicsTest.php b/web/api/lib/Cake/Test/Case/BasicsTest.php
index eb4edee82..65821693e 100644
--- a/web/api/lib/Cake/Test/Case/BasicsTest.php
+++ b/web/api/lib/Cake/Test/Case/BasicsTest.php
@@ -20,6 +20,7 @@ require_once CAKE . 'basics.php';
 
 App::uses('Folder', 'Utility');
 App::uses('CakeResponse', 'Network');
+App::uses('Debugger', 'Utility');
 
 /**
  * BasicsTest class
@@ -380,6 +381,14 @@ class BasicsTest extends CakeTestCase {
 		$expected = 'Some string with multiple arguments';
 		$this->assertEquals($expected, $result);
 
+		$result = __('Some string with %s and a null argument', null);
+		$expected = 'Some string with %s and a null argument';
+		$this->assertEquals($expected, $result);
+
+		$result = __('Some string with multiple %s%s, first being null', null, 'arguments');
+		$expected = 'Some string with multiple arguments, first being null';
+		$this->assertEquals($expected, $result);
+
 		$result = __('Some string with %s %s', array('multiple', 'arguments'));
 		$expected = 'Some string with multiple arguments';
 		$this->assertEquals($expected, $result);
@@ -943,10 +952,10 @@ EXPECTED;
 ###########################
 
 EXPECTED;
-		if (php_sapi_name() === 'cli') {
+		if (PHP_SAPI === 'cli') {
 			$expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18);
 		} else {
-			$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19);
+			$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 20);
 		}
 		$this->assertEquals($expected, $result);
 
@@ -968,7 +977,7 @@ EXPECTED;
 ###########################
 
 EXPECTED;
-		if (php_sapi_name() === 'cli') {
+		if (PHP_SAPI === 'cli') {
 			$expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18);
 		} else {
 			$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19);
@@ -1034,7 +1043,7 @@ EXPECTED;
  * @return void
  */
 	public function testPr() {
-		$this->skipIf(php_sapi_name() == 'cli', 'Skipping web test in cli mode');
+		$this->skipIf(PHP_SAPI === 'cli', 'Skipping web test in cli mode');
 		ob_start();
 		pr('this is a test');
 		$result = ob_get_clean();
@@ -1054,7 +1063,7 @@ EXPECTED;
  * @return void
  */
 	public function testPrCli() {
-		$this->skipIf(php_sapi_name() != 'cli', 'Skipping cli test in web mode');
+		$this->skipIf(PHP_SAPI !== 'cli', 'Skipping cli test in web mode');
 		ob_start();
 		pr('this is a test');
 		$result = ob_get_clean();
@@ -1140,6 +1149,24 @@ EXPECTED;
 		$this->assertEquals($expected, stripslashes_deep($nested));
 	}
 
+/**
+ * Tests that the stackTrace() method is a shortcut for Debugger::trace()
+ *
+ * @return void
+ */
+	public function testStackTrace() {
+		ob_start();
+		list(, $expected) = array(stackTrace(), Debugger::trace());
+		$result = ob_get_clean();
+		$this->assertEquals($expected, $result);
+
+		$opts = array('args' => true);
+		ob_start();
+		list(, $expected) = array(stackTrace($opts), Debugger::trace($opts));
+		$result = ob_get_clean();
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * test pluginSplit
  *
diff --git a/web/api/lib/Cake/Test/Case/Cache/CacheTest.php b/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
index 0bdb3f1fa..985adb4f6 100644
--- a/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
@@ -519,4 +519,23 @@ class CacheTest extends CakeTestCase {
 	public function cacher() {
 		return 'This is some data ' . $this->_count;
 	}
+
+/**
+ * Test add method.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'default');
+
+		$result = Cache::add('test_add_key', 'test data', 'default');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'default');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'default');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
index 91f019b62..171e9d551 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
@@ -34,7 +34,7 @@ class ApcEngineTest extends CakeTestCase {
 		parent::setUp();
 		$this->skipIf(!function_exists('apc_store'), 'Apc is not installed or configured properly.');
 
-		if (php_sapi_name() === 'cli') {
+		if (PHP_SAPI === 'cli') {
 			$this->skipIf(!ini_get('apc.enable_cli'), 'APC is not enabled for the CLI.');
 		}
 
@@ -273,4 +273,23 @@ class ApcEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::clearGroup('group_b', 'apc_groups'));
 		$this->assertFalse(Cache::read('test_groups', 'apc_groups'));
 	}
+
+/**
+ * Test add method.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'apc');
+
+		$result = Cache::add('test_add_key', 'test data', 'apc');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'apc');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'apc');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
index cfd4ae916..ced8b45bd 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -550,4 +550,22 @@ class FileEngineTest extends CakeTestCase {
 		$this->assertFalse(Cache::read('key_2', 'file_groups'), 'Did not delete');
 	}
 
+/**
+ * Test add method.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'file_test');
+
+		$result = Cache::add('test_add_key', 'test data', 'file_test');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'file_test');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'file_test');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
index fbe99dbbb..2060d1527 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -161,6 +161,17 @@ class MemcacheEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 	}
 
+/**
+ * test domain starts with u
+ *
+ * @return void
+ */
+	public function testParseServerStringWithU() {
+		$Memcached = new TestMemcachedEngine();
+		$result = $Memcached->parseServerString('udomain.net:13211');
+		$this->assertEquals(array('udomain.net', '13211'), $result);
+	}
+
 /**
  * test non latin domains.
  *
@@ -479,4 +490,23 @@ class MemcacheEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::clearGroup('group_b', 'memcache_groups'));
 		$this->assertFalse(Cache::read('test_groups', 'memcache_groups'));
 	}
+
+/**
+ * Test that failed add write return false.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'memcache');
+
+		$result = Cache::add('test_add_key', 'test data', 'memcache');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'memcache');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'memcache');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
old mode 100755
new mode 100644
index 6ae5e3896..867422b55
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
@@ -103,7 +103,8 @@ class MemcachedEngineTest extends CakeTestCase {
 			'login' => null,
 			'password' => null,
 			'groups' => array(),
-			'serialize' => 'php'
+			'serialize' => 'php',
+			'options' => array()
 		);
 		$this->assertEquals($expecting, $settings);
 	}
@@ -133,6 +134,23 @@ class MemcachedEngineTest extends CakeTestCase {
 		$this->assertTrue($MemcachedCompressed->getMemcached()->getOption(Memcached::OPT_COMPRESSION));
 	}
 
+/**
+ * test setting options
+ *
+ * @return void
+ */
+	public function testOptionsSetting() {
+		$memcached = new TestMemcachedEngine();
+		$memcached->init(array(
+			'engine' => 'Memcached',
+			'servers' => array('127.0.0.1:11211'),
+			'options' => array(
+				Memcached::OPT_BINARY_PROTOCOL => true
+			)
+		));
+		$this->assertEquals(1, $memcached->getMemcached()->getOption(Memcached::OPT_BINARY_PROTOCOL));
+	}
+
 /**
  * test accepts only valid serializer engine
  *
@@ -331,14 +349,7 @@ class MemcachedEngineTest extends CakeTestCase {
 			'password' => 'password'
 		);
 
-		$this->skipIf(
-			method_exists($Memcached->getMemcached(), 'setSaslAuthData'),
-			'Memcached extension is installed with SASL support'
-		);
-
-		$this->setExpectedException(
-			'CacheException', 'Memcached extension is not build with SASL support'
-		);
+		$this->setExpectedException('PHPUnit_Framework_Error_Warning');
 		$Memcached->init($settings);
 	}
 
@@ -389,6 +400,17 @@ class MemcachedEngineTest extends CakeTestCase {
 		$this->assertTrue($result);
 	}
 
+/**
+ * test domain starts with u
+ *
+ * @return void
+ */
+	public function testParseServerStringWithU() {
+		$Memcached = new TestMemcachedEngine();
+		$result = $Memcached->parseServerString('udomain.net:13211');
+		$this->assertEquals(array('udomain.net', '13211'), $result);
+	}
+
 /**
  * test non latin domains.
  *
@@ -411,7 +433,7 @@ class MemcachedEngineTest extends CakeTestCase {
 	public function testParseServerStringUnix() {
 		$Memcached = new TestMemcachedEngine();
 		$result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock');
-		$this->assertEquals(array('unix:///path/to/memcachedd.sock', 0), $result);
+		$this->assertEquals(array('/path/to/memcachedd.sock', 0), $result);
 	}
 
 /**
@@ -689,6 +711,8 @@ class MemcachedEngineTest extends CakeTestCase {
  * @return void
  */
 	public function testLongDurationEqualToZero() {
+		$this->markTestSkipped('Cannot run as Memcached cannot be reflected');
+
 		$memcached = new TestMemcachedEngine();
 		$memcached->settings['compress'] = false;
 
@@ -773,4 +797,24 @@ class MemcachedEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::clearGroup('group_b', 'memcached_groups'));
 		$this->assertFalse(Cache::read('test_groups', 'memcached_groups'));
 	}
+
+/**
+ * Test add method.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::set(array('duration' => 1), null, 'memcached');
+		Cache::delete('test_add_key', 'default');
+
+		$result = Cache::add('test_add_key', 'test data', 'default');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'default');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'default');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
index c39b871c5..bbc7228d4 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/RedisEngineTest.php
@@ -77,6 +77,7 @@ class RedisEngineTest extends CakeTestCase {
 			'persistent' => true,
 			'password' => false,
 			'database' => 0,
+			'unix_socket' => false,
 		);
 		$this->assertEquals($expecting, $settings);
 	}
@@ -380,4 +381,22 @@ class RedisEngineTest extends CakeTestCase {
 		$this->assertFalse(Cache::read('test_groups', 'redis_groups'));
 	}
 
+/**
+ * Test add method.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'redis');
+
+		$result = Cache::add('test_add_key', 'test data', 'redis');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'redis');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'redis');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
index 2dd68c85c..316ee0040 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/WincacheEngineTest.php
@@ -259,4 +259,23 @@ class WincacheEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::clearGroup('group_b', 'wincache_groups'));
 		$this->assertFalse(Cache::read('test_groups', 'wincache_groups'));
 	}
+
+/**
+ * Test that failed add write return false.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::delete('test_add_key', 'wincache');
+
+		$result = Cache::add('test_add_key', 'test data', 'wincache');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'wincache');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'wincache');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php b/web/api/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
index fef083a1c..16c8643cb 100644
--- a/web/api/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/Engine/XcacheEngineTest.php
@@ -268,4 +268,24 @@ class XcacheEngineTest extends CakeTestCase {
 		$this->assertTrue(Cache::clearGroup('group_b', 'xcache_groups'));
 		$this->assertFalse(Cache::read('test_groups', 'xcache_groups'));
 	}
+
+/**
+ * Test that failed add write return false.
+ *
+ * @return void
+ */
+	public function testAdd() {
+		Cache::set(array('duration' => 1), null);
+		Cache::delete('test_add_key', 'default');
+
+		$result = Cache::add('test_add_key', 'test data', 'default');
+		$this->assertTrue($result);
+
+		$expected = 'test data';
+		$result = Cache::read('test_add_key', 'default');
+		$this->assertEquals($expected, $result);
+
+		$result = Cache::add('test_add_key', 'test data 2', 'default');
+		$this->assertFalse($result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/web/api/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
index 7ef3ef53a..b28db0c65 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
@@ -125,7 +125,7 @@ class CompletionShellTest extends CakeTestCase {
 		$this->Shell->runCommand('commands', array());
 		$output = $this->Shell->stdout->output;
 
-		$expected = "TestPlugin.example TestPluginTwo.example TestPluginTwo.welcome acl api bake command_list completion console i18n schema server test testsuite upgrade sample\n";
+		$expected = "TestPlugin.example TestPlugin.test_plugin TestPluginTwo.example TestPluginTwo.welcome acl api bake command_list completion console i18n schema server test testsuite upgrade sample\n";
 		$this->assertEquals($expected, $output);
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/web/api/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index 6256e04c5..793d8daf8 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -617,19 +617,19 @@ class SchemaShellTest extends CakeTestCase {
 		$this->Shell->params = array(
 			'plugin' => 'TestPlugin',
 			'connection' => 'test',
-			'name' => 'custom_name',
+			'name' => 'custom_names',
 			'force' => false,
 			'overwrite' => true,
 		);
 		$this->Shell->startup();
-		if (file_exists($this->Shell->Schema->path . DS . 'custom_name.php')) {
-			unlink($this->Shell->Schema->path . DS . 'custom_name.php');
+		if (file_exists($this->Shell->Schema->path . DS . 'custom_names.php')) {
+			unlink($this->Shell->Schema->path . DS . 'custom_names.php');
 		}
 		$this->Shell->generate();
 
-		$contents = file_get_contents($this->Shell->Schema->path . DS . 'custom_name.php');
-		$this->assertRegExp('/class CustomNameSchema/', $contents);
-		unlink($this->Shell->Schema->path . DS . 'custom_name.php');
+		$contents = file_get_contents($this->Shell->Schema->path . DS . 'custom_names.php');
+		$this->assertRegExp('/class CustomNamesSchema/', $contents);
+		unlink($this->Shell->Schema->path . DS . 'custom_names.php');
 		CakePlugin::unload();
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php
index 6a1293259..1aa91ffd7 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/CommandTaskTest.php
@@ -85,9 +85,10 @@ class CommandTaskTest extends CakeTestCase {
 				'upgrade'
 			),
 			'TestPlugin' => array(
-				'example'
+				'example',
+				'test_plugin'
 			),
-				'TestPluginTwo' => array(
+			'TestPluginTwo' => array(
 				'example',
 				'welcome'
 			),
@@ -108,6 +109,7 @@ class CommandTaskTest extends CakeTestCase {
 
 		$expected = array(
 			'TestPlugin.example',
+			'TestPlugin.test_plugin',
 			'TestPluginTwo.example',
 			'TestPluginTwo.welcome',
 			'acl',
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
index ded7e9596..9d8c9e2b2 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -222,7 +222,7 @@ class ControllerTaskTest extends CakeTestCase {
 	public function testDoComponentsNo() {
 		$this->Task->expects($this->any())->method('in')->will($this->returnValue('n'));
 		$result = $this->Task->doComponents();
-		$this->assertSame(array('Paginator'), $result);
+		$this->assertSame(array('Paginator', 'Flash'), $result);
 	}
 
 /**
@@ -235,7 +235,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security  '));
 
 		$result = $this->Task->doComponents();
-		$expected = array('Paginator', 'RequestHandler', 'Security');
+		$expected = array('Paginator', 'Flash', 'RequestHandler', 'Security');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -249,7 +249,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security, , '));
 
 		$result = $this->Task->doComponents();
-		$expected = array('Paginator', 'RequestHandler', 'Security');
+		$expected = array('Paginator', 'Flash', 'RequestHandler', 'Security');
 		$this->assertEquals($expected, $result);
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index e93a31eb4..ab13f1b45 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -135,23 +135,23 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->assertRegExp($pattern, $result);
 
 		// extract.ctp
-		$pattern = '/\#: (\\\\|\/)extract\.ctp:15;6\n';
+		$pattern = '/\#: extract\.ctp:15;6\n';
 		$pattern .= 'msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
 		$this->assertRegExp($pattern, $result);
 
 		$pattern = '/msgid "You have %d new message."\nmsgstr ""/';
 		$this->assertNotRegExp($pattern, $result, 'No duplicate msgid');
 
-		$pattern = '/\#: (\\\\|\/)extract\.ctp:7\n';
+		$pattern = '/\#: extract\.ctp:7\n';
 		$pattern .= 'msgid "You deleted %d message."\nmsgid_plural "You deleted %d messages."/';
 		$this->assertRegExp($pattern, $result);
 
-		$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
-		$pattern .= '\#: (\\\\|\/)home\.ctp:68\n';
+		$pattern = '/\#: extract\.ctp:14\n';
+		$pattern .= '\#: home\.ctp:68\n';
 		$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
 		$this->assertRegExp($pattern, $result);
 
-		$pattern = '/\#: (\\\\|\/)extract\.ctp:22\nmsgid "';
+		$pattern = '/\#: extract\.ctp:22\nmsgid "';
 		$pattern .= 'Hot features!';
 		$pattern .= '\\\n - No Configuration: Set-up the database and let the magic begin';
 		$pattern .= '\\\n - Extremely Simple: Just look at the name...It\'s Cake';
@@ -162,6 +162,21 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->assertContains('msgid "double \\"quoted\\""', $result, 'Strings with quotes not handled correctly');
 		$this->assertContains("msgid \"single 'quoted'\"", $result, 'Strings with quotes not handled correctly');
 
+		$pattern = '/\#: extract\.ctp:36\nmsgid "letter"/';
+		$this->assertRegExp($pattern, $result, 'Strings with context should not overwrite strings without context');
+
+		$pattern = '/\#: extract\.ctp:37;39\nmsgctxt "A"\nmsgid "letter"/';
+		$this->assertRegExp($pattern, $result, 'Should contain string with context "A"');
+
+		$pattern = '/\#: extract\.ctp:38\nmsgctxt "B"\nmsgid "letter"/';
+		$this->assertRegExp($pattern, $result, 'Should contain string with context "B"');
+
+		$pattern = '/\#: extract\.ctp:40\nmsgid "%d letter"\nmsgid_plural "%d letters"/';
+		$this->assertRegExp($pattern, $result, 'Plural strings with context should not overwrite strings without context');
+
+		$pattern = '/\#: extract\.ctp:41\nmsgctxt "A"\nmsgid "%d letter"\nmsgid_plural "%d letters"/';
+		$this->assertRegExp($pattern, $result, 'Should contain plural string with context "A"');
+
 		// extract.ctp - reading the domain.pot
 		$result = file_get_contents($this->path . DS . 'domain.pot');
 
@@ -194,12 +209,44 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Task->expects($this->never())->method('_stop');
 
 		$this->Task->execute();
-		$this->assertTrue(file_exists($this->path . DS . 'LC_TIME' . DS . 'default.pot'));
+		$this->assertTrue(file_exists($this->path . DS . 'LC_NUMERIC' . DS . 'default.pot'));
+		$this->assertFalse(file_exists($this->path . DS . 'LC_TIME' . DS . 'default.pot'));
 
 		$result = file_get_contents($this->path . DS . 'default.pot');
 
 		$pattern = '/\#: .*extract\.ctp:31\n/';
 		$this->assertNotRegExp($pattern, $result);
+
+		$pattern = '/\#: .*extract\.ctp:33\n/';
+		$this->assertNotRegExp($pattern, $result);
+	}
+
+/**
+ * testExtractWithoutLocations method
+ *
+ * @return void
+ */
+	public function testExtractWithoutLocations() {
+		$this->Task->interactive = false;
+
+		$this->Task->params['paths'] = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Pages';
+		$this->Task->params['output'] = $this->path . DS;
+		$this->Task->params['extract-core'] = 'no';
+		$this->Task->params['merge'] = 'no';
+		$this->Task->params['no-location'] = true;
+
+		$this->Task->expects($this->never())->method('err');
+		$this->Task->expects($this->any())->method('in')
+			->will($this->returnValue('y'));
+		$this->Task->expects($this->never())->method('_stop');
+
+		$this->Task->execute();
+		$this->assertTrue(file_exists($this->path . DS . 'default.pot'));
+
+		$result = file_get_contents($this->path . DS . 'default.pot');
+
+		$pattern = '/\n\#: .*\n/';
+		$this->assertNotRegExp($pattern, $result);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
index 3357d328b..a649b7b75 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -42,7 +42,7 @@ class FixtureTaskTest extends CakeTestCase {
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
@@ -186,6 +186,9 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->interactive = true;
 		$this->Task->expects($this->at(0))->method('in')
 			->will($this->returnValue('WHERE 1=1'));
+		$this->Task->expects($this->at(1))->method('in')
+			->with($this->anything(), $this->anything(), '3')
+			->will($this->returnValue('2'));
 
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
@@ -197,9 +200,8 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->assertContains('class ArticleFixture extends CakeTestFixture', $result);
 		$this->assertContains('public $records', $result);
 		$this->assertContains('public $import', $result);
-		$this->assertContains("'title' => 'First Article'", $result, 'Missing import data %s');
-		$this->assertContains('Second Article', $result, 'Missing import data %s');
-		$this->assertContains('Third Article', $result, 'Missing import data %s');
+		$this->assertContains("'title' => 'First Article'", $result, 'Missing import data');
+		$this->assertContains('Second Article', $result, 'Missing import data');
 	}
 
 /**
@@ -245,7 +247,6 @@ class FixtureTaskTest extends CakeTestCase {
 /**
  * test that execute passes runs bake depending with named model.
  *
- *
  * @return void
  */
 	public function testExecuteWithNamedModel() {
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
index c16cc1e20..da5b8d7cb 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
@@ -268,7 +268,7 @@ class ModelTaskTest extends CakeTestCase {
  */
 	public function testInitValidations() {
 		$result = $this->Task->initValidations();
-		$this->assertTrue(in_array('notEmpty', $result));
+		$this->assertTrue(in_array('notBlank', $result));
 	}
 
 /**
@@ -282,7 +282,7 @@ class ModelTaskTest extends CakeTestCase {
 		$this->Task->initValidations();
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
-		$expected = array('notEmpty' => 'notEmpty');
+		$expected = array('notBlank' => 'notBlank');
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false));
@@ -318,7 +318,7 @@ class ModelTaskTest extends CakeTestCase {
 			->will($this->onConsecutiveCalls('24', 'y', '18', 'n'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
-		$expected = array('notEmpty' => 'notEmpty', 'maxLength' => 'maxLength');
+		$expected = array('notBlank' => 'notBlank', 'maxLength' => 'maxLength');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -339,7 +339,7 @@ class ModelTaskTest extends CakeTestCase {
 			->with($this->stringContains('make a valid'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
-		$expected = array('notEmpty' => 'notEmpty');
+		$expected = array('notBlank' => 'notBlank');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -371,7 +371,7 @@ class ModelTaskTest extends CakeTestCase {
 			->will($this->onConsecutiveCalls('24', 'y', 's'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
-		$expected = array('notEmpty' => 'notEmpty', '_skipFields' => true);
+		$expected = array('notBlank' => 'notBlank', '_skipFields' => true);
 		$this->assertEquals($expected, $result);
 	}
 
@@ -387,7 +387,7 @@ class ModelTaskTest extends CakeTestCase {
 			->will($this->onConsecutiveCalls('24', 's'));
 
 		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
-		$expected = array('notEmpty' => 'notEmpty', '_skipFields' => true);
+		$expected = array('notBlank' => 'notBlank', '_skipFields' => true);
 		$this->assertEquals($expected, $result);
 	}
 
@@ -400,7 +400,7 @@ class ModelTaskTest extends CakeTestCase {
 	public function testInteractiveDoValidationWithSkipping() {
 		$this->Task->expects($this->any())
 			->method('in')
-			->will($this->onConsecutiveCalls('35', '24', 'n', '11', 's'));
+			->will($this->onConsecutiveCalls('35', '24', 'n', '10', 's'));
 		$this->Task->interactive = true;
 		$Model = $this->getMock('Model');
 		$Model->primaryKey = 'id';
@@ -444,7 +444,7 @@ class ModelTaskTest extends CakeTestCase {
 		$result = $this->Task->doValidation($Model);
 		$expected = array(
 			'name' => array(
-				'notEmpty' => 'notEmpty'
+				'notBlank' => 'notBlank'
 			),
 			'email' => array(
 				'email' => 'email',
@@ -502,7 +502,7 @@ class ModelTaskTest extends CakeTestCase {
 		$result = $this->Task->doValidation($Model);
 		$expected = array(
 			'name' => array(
-				'notEmpty' => 'notEmpty'
+				'notBlank' => 'notBlank'
 			),
 			'email' => array(
 				'email' => 'email',
@@ -838,7 +838,7 @@ class ModelTaskTest extends CakeTestCase {
 	public function testBakeValidation() {
 		$validate = array(
 			'name' => array(
-				'notempty' => 'notEmpty'
+				'notBlank' => 'notBlank'
 			),
 			'email' => array(
 				'email' => 'email',
@@ -855,8 +855,8 @@ class ModelTaskTest extends CakeTestCase {
 		$this->assertRegExp('/\$validate \= array\(/', $result);
 		$expected = <<< STRINGEND
 array(
-			'notempty' => array(
-				'rule' => array('notEmpty'),
+			'notBlank' => array(
+				'rule' => array('notBlank'),
 				//'message' => 'Your custom message here',
 				//'allowEmpty' => false,
 				//'required' => false,
@@ -1052,8 +1052,8 @@ TEXT;
 		$this->Task->args = array('all');
 		$this->Task->expects($this->once())->method('_checkUnitTest')->will($this->returnValue(true));
 
-		$this->Task->Fixture->expects($this->exactly(5))->method('bake');
-		$this->Task->Test->expects($this->exactly(5))->method('bake');
+		$this->Task->Fixture->expects($this->exactly(6))->method('bake');
+		$this->Task->Test->expects($this->exactly(6))->method('bake');
 
 		$filename = '/my/path/BakeArticle.php';
 		$this->Task->expects($this->at(1))->method('createFile')
@@ -1083,6 +1083,10 @@ TEXT;
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with($filename, $this->stringContains('class CategoryThread'));
 
+		$filename = '/my/path/NumberTree.php';
+		$this->Task->expects($this->at(6))->method('createFile')
+			->with($filename, $this->stringContains('class NumberTree'));
+
 		$this->Task->execute();
 
 		$this->assertEquals(count(ClassRegistry::keys()), 0);
@@ -1216,7 +1220,7 @@ TEXT;
 		$this->Task->path = '/my/path/';
 		$this->Task->args = array('all');
 		$this->Task->expects($this->once())->method('_checkUnitTest')->will($this->returnValue(true));
-		$this->Task->skipTables = array('bake_tags');
+		$this->Task->skipTables = array('bake_tags', 'number_trees');
 
 		$this->Task->Fixture->expects($this->exactly(4))->method('bake');
 		$this->Task->Test->expects($this->exactly(4))->method('bake');
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
index 2bf983e5f..3405a4544 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
@@ -58,7 +58,7 @@ class PluginTaskTest extends CakeTestCase {
 				array_splice($paths, $i, 1);
 			}
 		}
-		$this->_testPath = array_push($paths, TMP . 'tests' . DS);
+		$this->_testPath = array_push($paths, TMP . 'tests' . DS) - 1;
 		App::build(array('plugins' => $paths));
 	}
 
@@ -80,17 +80,23 @@ class PluginTaskTest extends CakeTestCase {
  * @return void
  */
 	public function testBakeFoldersAndFiles() {
-		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue($this->_testPath));
-		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue('y'));
+		$this->Task->expects($this->at(0))
+			->method('in')
+			->will($this->returnValue($this->_testPath));
+		$this->Task->expects($this->at(1))
+			->method('in')
+			->will($this->returnValue('y'));
 
 		$path = $this->Task->path . 'BakeTestPlugin';
 
 		$file = $path . DS . 'Controller' . DS . 'BakeTestPluginAppController.php';
-		$this->Task->expects($this->at(2))->method('createFile')
+		$this->Task->expects($this->at(2))
+			->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
 		$file = $path . DS . 'Model' . DS . 'BakeTestPluginAppModel.php';
-		$this->Task->expects($this->at(3))->method('createFile')
+		$this->Task->expects($this->at(3))
+			->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
 		$this->Task->bake('BakeTestPlugin');
@@ -100,18 +106,25 @@ class PluginTaskTest extends CakeTestCase {
 
 		$directories = array(
 			'Config' . DS . 'Schema',
-			'Model' . DS . 'Behavior',
-			'Model' . DS . 'Datasource',
 			'Console' . DS . 'Command' . DS . 'Task',
+			'Console' . DS . 'Templates',
 			'Controller' . DS . 'Component',
 			'Lib',
-			'View' . DS . 'Helper',
+			'Locale' . DS . 'eng' . DS . 'LC_MESSAGES',
+			'Model' . DS . 'Behavior',
+			'Model' . DS . 'Datasource',
 			'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
-			'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
+			'Test' . DS . 'Case' . DS . 'Lib',
 			'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
+			'Test' . DS . 'Case' . DS . 'Model' . DS . 'Datasource',
+			'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
 			'Test' . DS . 'Fixture',
-			'Vendor',
-			'webroot'
+			'View' . DS . 'Elements',
+			'View' . DS . 'Helper',
+			'View' . DS . 'Layouts',
+			'webroot' . DS . 'css',
+			'webroot' . DS . 'js',
+			'webroot' . DS . 'img',
 		);
 		foreach ($directories as $dir) {
 			$this->assertTrue(is_dir($path . DS . $dir), 'Missing directory for ' . $dir);
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
index b288b9cd7..15ec76798 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
@@ -197,7 +197,6 @@ class ProjectTaskTest extends CakeTestCase {
 			'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' => 'empty',
 			'Test' . DS . 'Fixture' => 'empty',
 			'Vendor' => 'empty',
-			'View' . DS . 'Elements' => 'empty',
 			'View' . DS . 'Scaffolds' => 'empty',
 			'tmp' . DS . 'cache' . DS . 'models' => 'empty',
 			'tmp' . DS . 'cache' . DS . 'persistent' => 'empty',
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
index 6b02d12ba..c5ab4762f 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
@@ -323,10 +323,11 @@ class ViewTaskTest extends CakeTestCase {
 	public function testBakeIndex() {
 		$this->Task->controllerName = 'ViewTaskComments';
 
+		$expected = file_get_contents(CAKE . 'Test' . DS . 'bake_compare' . DS . 'View' . DS . 'index.ctp');
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
 				TMP . 'ViewTaskComments' . DS . 'index.ctp',
-				$this->stringContains("\$viewTaskComment['Article']['title']")
+				$expected
 			);
 		$this->Task->bake('index', true);
 	}
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/web/api/lib/Cake/Test/Case/Console/Command/TestShellTest.php
index 132f6ed1e..d3d379a1d 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/TestShellTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/TestShellTest.php
@@ -341,4 +341,22 @@ class TestShellTest extends CakeTestCase {
 			);
 		$this->Shell->main();
 	}
+
+/**
+ * Tests that the 'quiet' parameter gets swallowed before calling PHPUnit
+ *
+ * @return void
+ */
+	public function testRunnerOptionsQuiet() {
+		$this->Shell->startup();
+		$this->Shell->args = array('core', 'Basics');
+		$this->Shell->params = array('quiet' => true);
+
+		$this->Shell->expects($this->once())->method('_run')
+			->with(
+				array('app' => false, 'plugin' => null, 'core' => true, 'output' => 'text', 'case' => 'Basics'),
+				array('--colors')
+			);
+		$this->Shell->main();
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php b/web/api/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
index 7d640a862..83cae8095 100644
--- a/web/api/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
@@ -147,4 +147,31 @@ class ConsoleErrorHandlerTest extends CakeTestCase {
 		$this->Error->handleException($exception);
 	}
 
+/**
+ * test a exception with non-integer code
+ *
+ * @return void
+ */
+	public function testNonIntegerExceptionCode() {
+		if (PHP_VERSION_ID < 50300) {
+			$this->markTestSkipped('ReflectionProperty::setAccessible() is available since 5.3');
+		}
+
+		$exception = new Exception('Non-integer exception code');
+
+		$class = new ReflectionClass('Exception');
+		$property = $class->getProperty('code');
+		$property->setAccessible(true);
+		$property->setValue($exception, '42S22');
+
+		ConsoleErrorHandler::$stderr->expects($this->once())->method('write')
+			->with($this->stringContains('Non-integer exception code'));
+
+		$this->Error->expects($this->once())
+			->method('_stop')
+			->with(1);
+
+		$this->Error->handleException($exception);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/web/api/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
index eabfbdd1c..5a194db08 100644
--- a/web/api/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -37,7 +37,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$this->assertEquals($parser, $result, 'Setting description is not chainable');
 		$this->assertEquals('A test', $parser->description(), 'getting value is wrong.');
 
-		$result = $parser->description(array('A test', 'something'));
+		$parser->description(array('A test', 'something'));
 		$this->assertEquals("A test\nsomething", $parser->description(), 'getting value is wrong.');
 	}
 
@@ -53,7 +53,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$this->assertEquals($parser, $result, 'Setting epilog is not chainable');
 		$this->assertEquals('A test', $parser->epilog(), 'getting value is wrong.');
 
-		$result = $parser->epilog(array('A test', 'something'));
+		$parser->epilog(array('A test', 'something'));
 		$this->assertEquals("A test\nsomething", $parser->epilog(), 'getting value is wrong.');
 	}
 
@@ -294,7 +294,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$expected = array('name' => 'mark', 'help' => false);
 		$this->assertEquals($expected, $result[0], 'Got the correct value.');
 
-		$result = $parser->parse(array('--name', 'jimmy'));
+		$parser->parse(array('--name', 'jimmy'));
 	}
 
 /**
@@ -384,7 +384,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$result = $parser->parse($expected);
 		$this->assertEquals($expected, $result[1], 'Arguments are not as expected');
 
-		$result = $parser->parse(array('one', 'two', 'three'));
+		$parser->parse(array('one', 'two', 'three'));
 	}
 
 /**
@@ -430,7 +430,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$expected = array('mark', 'samurai', 'sword');
 		$this->assertEquals($expected, $result[1], 'Got the correct value.');
 
-		$result = $parser->parse(array('jose', 'coder'));
+		$parser->parse(array('jose', 'coder'));
 	}
 
 /**
@@ -476,6 +476,21 @@ class ConsoleOptionParserTest extends CakeTestCase {
 		$this->assertEquals('test', $result['test']->name());
 	}
 
+/**
+ * test removeSubcommand with an object.
+ *
+ * @return void
+ */
+	public function testRemoveSubcommand() {
+		$parser = new ConsoleOptionParser('test', false);
+		$parser->addSubcommand(new ConsoleInputSubcommand('test'));
+		$result = $parser->subcommands();
+		$this->assertEquals(1, count($result));
+		$parser->removeSubcommand('test');
+		$result = $parser->subcommands();
+		$this->assertEquals(0, count($result), 'Remove a subcommand does not work');
+	}
+
 /**
  * test adding multiple subcommands
  *
diff --git a/web/api/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/web/api/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
index 4b26aae25..8925428b4 100644
--- a/web/api/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
@@ -94,6 +94,27 @@ class ConsoleOutputTest extends CakeTestCase {
 		$this->output->write(array('Line', 'Line', 'Line'));
 	}
 
+/**
+ * test writing an array of messages.
+ *
+ * @return void
+ */
+	public function testOverwrite() {
+		$testString = "Text";
+
+		$this->output->expects($this->at(0))->method('_write')
+			->with($testString);
+
+		$this->output->expects($this->at(1))->method('_write')
+			->with("");
+
+		$this->output->expects($this->at(2))->method('_write')
+			->with("Overwriting text");
+
+		$this->output->write($testString, 0);
+		$this->output->overwrite("Overwriting text");
+	}
+
 /**
  * test getting a style.
  *
@@ -231,6 +252,17 @@ class ConsoleOutputTest extends CakeTestCase {
 		$this->output->write('<error>Bad</error> Regular', false);
 	}
 
+/**
+ * test plain output when php://output, as php://output is
+ * not compatible with posix_ functions.
+ *
+ * @return void
+ */
+	public function testOutputAsPlainWhenOutputStream() {
+		$output = $this->getMock('ConsoleOutput', array('_write'), array('php://output'));
+		$this->assertEquals(ConsoleOutput::PLAIN, $output->outputAs());
+	}
+
 /**
  * test plain output only strips tags used for formatting.
  *
diff --git a/web/api/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php b/web/api/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php
new file mode 100644
index 000000000..cab20c361
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/Console/Helper/ProgressShellHelperTest.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("ProgressShellHelper", "Console/Helper");
+App::uses("ConsoleOutputStub", "TestSuite/Stub");
+
+/**
+ * ProgressHelper test.
+ * @property ConsoleOutputStub $consoleOutput
+ * @property ProgressShellHelper $helper
+ */
+class ProgressShellHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+
+		$this->consoleOutput = new ConsoleOutputStub();
+		$this->helper = new ProgressShellHelper($this->consoleOutput);
+	}
+
+/**
+ * Test that a callback is required.*
+ *
+ * @expectedException \RuntimeException
+ * @return void
+ */
+	public function testOutputFailure() {
+		$this->helper->output(array('not a callback'));
+	}
+
+/**
+ * Test that the callback is invoked until 100 is reached.
+ *
+ * @return void
+ */
+	public function testOutputSuccess() {
+		$this->helper->output(array(function ($progress) {
+			$progress->increment(20);
+		}));
+		$expected = array(
+			'',
+			'==============>                                                              20%',
+			'',
+			'=============================>                                               40%',
+			'',
+			'============================================>                                60%',
+			'',
+			'===========================================================>                 80%',
+			'',
+			'==========================================================================> 100%',
+			'',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output with options
+ *
+ * @return void
+ */
+	public function testOutputSuccessOptions() {
+		$this->helper->output(array(
+			'total' => 10,
+			'width' => 20,
+			'callback' => function ($progress) {
+				$progress->increment(2);
+			}
+		));
+		$expected = array(
+			'',
+			'==>              20%',
+			'',
+			'=====>           40%',
+			'',
+			'========>        60%',
+			'',
+			'===========>     80%',
+			'',
+			'==============> 100%',
+			'',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test using the helper manually.
+ *
+ * @return void
+ */
+	public function testIncrementAndRender() {
+		$this->helper->init();
+		$this->helper->increment(20);
+		$this->helper->draw();
+		$this->helper->increment(40);
+		$this->helper->draw();
+		$this->helper->increment(40);
+		$this->helper->draw();
+		$expected = array(
+			'',
+			'==============>                                                              20%',
+			'',
+			'============================================>                                60%',
+			'',
+			'==========================================================================> 100%',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test negative numbers
+ *
+ * @return void
+ */
+	public function testIncrementWithNegatives() {
+		$this->helper->init();
+		$this->helper->increment(40);
+		$this->helper->draw();
+		$this->helper->increment(-60);
+		$this->helper->draw();
+		$this->helper->increment(80);
+		$this->helper->draw();
+		$expected = array(
+			'',
+			'=============================>                                               40%',
+			'',
+			'                                                                              0%',
+			'',
+			'===========================================================>                 80%',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test increment and draw with options
+ *
+ * @return void
+ */
+	public function testIncrementWithOptions() {
+		$this->helper->init(array(
+			'total' => 10,
+			'width' => 20,
+		));
+		$this->helper->increment(4);
+		$this->helper->draw();
+		$this->helper->increment(4);
+		$this->helper->draw();
+		$this->helper->increment(4);
+		$this->helper->draw();
+
+		$expected = array(
+			'',
+			'=====>           40%',
+			'',
+			'===========>     80%',
+			'',
+			'==============> 100%',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test increment and draw with value that makes the pad
+ * be a float
+ *
+ * @return void
+ */
+	public function testIncrementFloatPad() {
+		$this->helper->init(array(
+			'total' => 50
+		));
+		$this->helper->increment(7);
+		$this->helper->draw();
+		$this->helper->increment(7);
+		$this->helper->draw();
+		$this->helper->increment(7);
+		$this->helper->draw();
+		$this->helper->increment(7);
+		$this->helper->draw();
+		$this->helper->increment(7);
+		$this->helper->draw();
+		$this->helper->increment(3);
+		$this->helper->draw();
+		$this->helper->increment(4);
+		$this->helper->draw();
+		$this->helper->increment(8);
+		$this->helper->draw();
+		$expected = array(
+			'',
+			'=========>                                                                   14%',
+			'',
+			'====================>                                                        28%',
+			'',
+			'==============================>                                              42%',
+			'',
+			'=========================================>                                   56%',
+			'',
+			'===================================================>                         70%',
+			'',
+			'========================================================>                    76%',
+			'',
+			'==============================================================>              84%',
+			'',
+			'==========================================================================> 100%',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php b/web/api/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php
new file mode 100644
index 000000000..7508dcd74
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/Console/Helper/TableShellHelperTest.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("TableShellHelper", "Console/Helper");
+App::uses("ConsoleOutputStub", "TestSuite/Stub");
+
+/**
+ * ProgressHelper test.
+ * @property ConsoleOutputStub $consoleOutput
+ * @property TableShellHelper $helper
+ */
+class TableShellHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+
+		$this->consoleOutput = new ConsoleOutputStub();
+		$this->helper = new TableShellHelper($this->consoleOutput);
+	}
+
+/**
+ * Test output
+ *
+ * @return void
+ */
+	public function testDefaultOutput() {
+		$data = array(
+			array('Header 1', 'Header', 'Long Header'),
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value'),
+		);
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| <info>Header 1</info>     | <info>Header</info>        | <info>Long Header</info>   |',
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output with multibyte characters
+ *
+ * @return void
+ */
+	public function testOutputUtf8() {
+		$data = array(
+			array('Header 1', 'Head', 'Long Header'),
+			array('short', 'ÄÄÄÜÜÜ', 'short'),
+			array('Longer thing', 'longerish', 'Longest Value'),
+		);
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+-----------+---------------+',
+			'| <info>Header 1</info>     | <info>Head</info>      | <info>Long Header</info>   |',
+			'+--------------+-----------+---------------+',
+			'| short        | ÄÄÄÜÜÜ    | short         |',
+			'| Longer thing | longerish | Longest Value |',
+			'+--------------+-----------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output without headers
+ *
+ * @return void
+ */
+	public function testOutputWithoutHeaderStyle() {
+		$data = array(
+			array('Header 1', 'Header', 'Long Header'),
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value'),
+		);
+		$this->helper->config(array('headerStyle' => false));
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| Header 1     | Header        | Long Header   |',
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output with different header style
+ *
+ * @return void
+ */
+	public function testOutputWithDifferentHeaderStyle() {
+		$data = array(
+			array('Header 1', 'Header', 'Long Header'),
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value'),
+		);
+		$this->helper->config(array('headerStyle' => 'error'));
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| <error>Header 1</error>     | <error>Header</error>        | <error>Long Header</error>   |',
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output without table headers
+ *
+ * @return void
+ */
+	public function testOutputWithoutHeaders() {
+		$data = array(
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value'),
+		);
+		$this->helper->config(array('headers' => false));
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output with row separator
+ *
+ * @return void
+ */
+	public function testOutputWithRowSeparator() {
+		$data = array(
+			array('Header 1', 'Header', 'Long Header'),
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value')
+		);
+		$this->helper->config(array('rowSeparator' => true));
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| <info>Header 1</info>     | <info>Header</info>        | <info>Long Header</info>   |',
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'+--------------+---------------+---------------+',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+
+/**
+ * Test output with row separator and no headers
+ *
+ * @return void
+ */
+	public function testOutputWithRowSeparatorAndHeaders() {
+		$data = array(
+			array('Header 1', 'Header', 'Long Header'),
+			array('short', 'Longish thing', 'short'),
+			array('Longer thing', 'short', 'Longest Value'),
+		);
+		$this->helper->config(array('rowSeparator' => true));
+		$this->helper->output($data);
+		$expected = array(
+			'+--------------+---------------+---------------+',
+			'| <info>Header 1</info>     | <info>Header</info>        | <info>Long Header</info>   |',
+			'+--------------+---------------+---------------+',
+			'| short        | Longish thing | short         |',
+			'+--------------+---------------+---------------+',
+			'| Longer thing | short         | Longest Value |',
+			'+--------------+---------------+---------------+',
+		);
+		$this->assertEquals($expected, $this->consoleOutput->messages());
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/Case/Console/ShellDispatcherTest.php b/web/api/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
index 2d3aa5bf5..20473db63 100644
--- a/web/api/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
@@ -427,6 +427,14 @@ class ShellDispatcherTest extends CakeTestCase {
 		$Dispatcher = new TestShellDispatcher();
 		$result = $Dispatcher->getShell('TestPlugin.example');
 		$this->assertInstanceOf('ExampleShell', $result);
+
+		$Dispatcher = new TestShellDispatcher();
+		$result = $Dispatcher->getShell('test_plugin');
+		$this->assertInstanceOf('TestPluginShell', $result);
+
+		$Dispatcher = new TestShellDispatcher();
+		$result = $Dispatcher->getShell('TestPlugin');
+		$this->assertInstanceOf('TestPluginShell', $result);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Console/ShellTest.php b/web/api/lib/Cake/Test/Case/Console/ShellTest.php
index b25b087b0..38c7a08f9 100644
--- a/web/api/lib/Cake/Test/Case/Console/ShellTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/ShellTest.php
@@ -21,6 +21,7 @@
 App::uses('ShellDispatcher', 'Console');
 App::uses('Shell', 'Console');
 App::uses('Folder', 'Utility');
+App::uses("ProgressHelper", "Console/Helper");
 
 /**
  * ShellTestShell class
@@ -39,7 +40,7 @@ class ShellTestShell extends Shell {
 /**
  * stopped property
  *
- * @var integer
+ * @var int
  */
 	public $stopped;
 
@@ -53,7 +54,7 @@ class ShellTestShell extends Shell {
 /**
  * stop method
  *
- * @param integer $status
+ * @param int $status
  * @return void
  */
 	protected function _stop($status = 0) {
@@ -368,6 +369,36 @@ class ShellTest extends CakeTestCase {
 		$this->Shell->out('Quiet', 1, Shell::QUIET);
 	}
 
+/**
+ * Test overwriting.
+ *
+ * @return void
+ */
+	public function testOverwrite() {
+		$number = strlen('Some text I want to overwrite');
+
+		$this->Shell->stdout->expects($this->at(0))
+			->method('write')
+			->with('Some <info>text</info> I want to overwrite', 0)
+			->will($this->returnValue($number));
+
+		$this->Shell->stdout->expects($this->at(1))
+			->method('write')
+			->with(str_repeat("\x08", $number), 0);
+
+		$this->Shell->stdout->expects($this->at(2))
+			->method('write')
+			->with('Less text', 0)
+			->will($this->returnValue(9));
+
+		$this->Shell->stdout->expects($this->at(3))
+			->method('write')
+			->with(str_repeat(' ', $number - 9), 0);
+
+		$this->Shell->out('Some <info>text</info> I want to overwrite', 0);
+		$this->Shell->overwrite('Less text');
+	}
+
 /**
  * testErr method
  *
@@ -638,7 +669,7 @@ class ShellTest extends CakeTestCase {
  * @return void
  */
 	public function testCreateFileNoPermissions() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
+		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on Windows.');
 
 		$path = TMP . 'shell_test';
 		$file = $path . DS . 'no_perms';
@@ -825,6 +856,51 @@ TEXT;
 		$this->assertEquals($expected, $this->Shell->TestApple->name);
 	}
 
+/**
+ * Test reading params
+ *
+ * @dataProvider paramReadingDataProvider
+ */
+	public function testParamReading($toRead, $expected) {
+		$this->Shell->params = array(
+			'key' => 'value',
+			'help' => false,
+			'emptykey' => '',
+			'truthy' => true
+		);
+		$this->assertSame($expected, $this->Shell->param($toRead));
+	}
+
+/**
+ * Data provider for testing reading values with Shell::param()
+ *
+ * @return array
+ */
+	public function paramReadingDataProvider() {
+		return array(
+			array(
+				'key',
+				'value',
+			),
+			array(
+				'help',
+				false,
+			),
+			array(
+				'emptykey',
+				'',
+			),
+			array(
+				'truthy',
+				true,
+			),
+			array(
+				'does_not_exist',
+				null,
+			)
+		);
+	}
+
 /**
  * Test that option parsers are created with the correct name/command.
  *
@@ -900,4 +976,23 @@ TEXT;
 		$this->Shell->runCommand('foo', array('--quiet'));
 	}
 
+/**
+ * Test getting an instance of a helper
+ *
+ * @return void
+ */
+	public function testGetInstanceOfHelper() {
+		$actual = $this->Shell->helper("progress");
+		$this->assertInstanceOf("ProgressShellHelper", $actual);
+	}
+
+/**
+ * Test getting an invalid helper
+ *
+ * @expectedException RunTimeException
+ * @return void
+ */
+	public function testGetInvalidHelper() {
+		$this->Shell->helper("tomato");
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
index 23e44d269..b1f927a58 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
@@ -40,7 +40,7 @@ class AclNodeTwoTestBase extends AclNode {
 /**
  * cacheSources property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheSources = false;
 }
@@ -127,7 +127,7 @@ class PermissionTwoTest extends Permission {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -141,7 +141,7 @@ class PermissionTwoTest extends Permission {
 /**
  * actsAs property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $actsAs = null;
 }
@@ -155,7 +155,6 @@ class DbAclTwoTest extends DbAcl {
 
 /**
  * construct method
- *
  */
 	public function __construct() {
 		$this->Aro = new AroTwoTest();
@@ -487,7 +486,7 @@ class DbAclTest extends CakeTestCase {
  * Generates a list of the current aro and aco structures and a grid dump of the permissions that are defined
  * Only designed to work with the db based ACL
  *
- * @param boolean $treesToo
+ * @param bool $treesToo
  * @return void
  */
 	protected function _debug($printTreesToo = false) {
@@ -534,7 +533,7 @@ class DbAclTest extends CakeTestCase {
  * Used by debug to format strings used in the data dump
  *
  * @param string $string
- * @param integer $len
+ * @param int $len
  * @return void
  */
 	protected function _pad($string = '', $len = 14) {
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
index 375d03067..66d991c4b 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
@@ -78,7 +78,7 @@ class AclComponentTest extends CakeTestCase {
 	}
 
 /**
- * test that adapter() whines when the class is not an AclBase
+ * test that adapter() whines when the class does not implement AclInterface
  *
  * @expectedException CakeException
  * @return void
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
index 0e0e8bf02..df18703c4 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
@@ -36,7 +36,7 @@ class BasicAuthenticateTest extends CakeTestCase {
  *
  * @var array
  */
-	public $fixtures = array('core.user', 'core.auth_user');
+	public $fixtures = array('core.user', 'core.auth_user', 'core.article');
 
 /**
  * setup
@@ -126,10 +126,35 @@ class BasicAuthenticateTest extends CakeTestCase {
 		$_SERVER['PHP_AUTH_PW'] = "' OR 1 = 1";
 
 		$this->assertFalse($this->auth->getUser($request));
-
 		$this->assertFalse($this->auth->authenticate($request, $this->response));
 	}
 
+/**
+ * Test that username of 0 works.
+ *
+ * @return void
+ */
+	public function testAuthenticateUsernameZero() {
+		$User = ClassRegistry::init('User');
+		$User->updateAll(array('user' => $User->getDataSource()->value('0')), array('user' => 'mariano'));
+
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array(
+			'user' => '0',
+			'password' => 'password'
+		));
+		$_SERVER['PHP_AUTH_USER'] = '0';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+
+		$expected = array(
+			'id' => 1,
+			'user' => '0',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		);
+		$this->assertEquals($expected, $this->auth->authenticate($request, $this->response));
+	}
+
 /**
  * test that challenge headers are sent when no credentials are found.
  *
@@ -172,6 +197,84 @@ class BasicAuthenticateTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test contain success
+ *
+ * @return void
+ */
+	public function testAuthenticateContainSuccess() {
+		$User = ClassRegistry::init('User');
+		$User->bindModel(array('hasMany' => array('Article')));
+		$User->Behaviors->load('Containable');
+		$this->auth->settings['contain'] = 'Article';
+		$request = new CakeRequest('posts/index', false);
+		$request->addParams(array('pass' => array(), 'named' => array()));
+
+		$_SERVER['PHP_AUTH_USER'] = 'mariano';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+
+		$result = $this->auth->authenticate($request, $this->response);
+		$expected = array(
+			'id' => 1,
+			'user_id' => 1,
+			'title' => 'First Article',
+			'body' => 'First Article Body',
+			'published' => 'Y',
+			'created' => '2007-03-18 10:39:23',
+			'updated' => '2007-03-18 10:41:31'
+		);
+		$this->assertEquals($expected, $result['Article'][0]);
+	}
+
+/**
+ * test userFields success
+ *
+ * @return void
+ */
+	public function testAuthenticateUserFieldsSuccess() {
+		$this->auth->settings['userFields'] = array('id', 'user');
+		$request = new CakeRequest('posts/index', false);
+		$request->addParams(array('pass' => array(), 'named' => array()));
+
+		$_SERVER['PHP_AUTH_USER'] = 'mariano';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+
+		$result = $this->auth->authenticate($request, $this->response);
+		$expected = array(
+			'id' => 1,
+			'user' => 'mariano',
+		);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test userFields and related models success
+ *
+ * @return void
+ */
+	public function testAuthenticateUserFieldsRelatedModelsSuccess() {
+		$User = ClassRegistry::init('User');
+		$User->bindModel(array('hasOne' => array(
+			'Article' => array(
+				'order' => 'Article.id ASC'
+			)
+		)));
+		$this->auth->settings['recursive'] = 0;
+		$this->auth->settings['userFields'] = array('Article.id', 'Article.title');
+		$request = new CakeRequest('posts/index', false);
+		$request->addParams(array('pass' => array(), 'named' => array()));
+
+		$_SERVER['PHP_AUTH_USER'] = 'mariano';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+
+		$result = $this->auth->authenticate($request, $this->response);
+		$expected = array(
+			'id' => 1,
+			'title' => 'First Article',
+		);
+		$this->assertEquals($expected, $result['Article']);
+	}
+
 /**
  * test scope failure.
  *
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php
index 747f0c9e8..7fc200db1 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/BlowfishAuthenticateTest.php
@@ -200,7 +200,7 @@ class BlowfishAuthenticateTest extends CakeTestCase {
 			'username' => 'gwoo',
 			'created' => '2007-03-17 01:16:23'
 		);
-		$this->assertEquals(self::date(), $result['updated']);
+		$this->assertEquals(static::date(), $result['updated']);
 		unset($result['updated']);
 		$this->assertEquals($expected, $result);
 		CakePlugin::unload();
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
index 8c57c6e76..3216cdc3a 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
@@ -45,14 +45,23 @@ class ControllerAuthorizeTest extends CakeTestCase {
 	}
 
 /**
+ * testControllerTypeError
+ *
  * @expectedException PHPUnit_Framework_Error
+ * @throws PHPUnit_Framework_Error
  * @return void
  */
 	public function testControllerTypeError() {
-		$this->auth->controller(new StdClass());
+		try {
+			$this->auth->controller(new StdClass());
+		} catch (Throwable $t) {
+			throw new PHPUnit_Framework_Error($t);
+		}
 	}
 
 /**
+ * testControllerErrorOnMissingMethod
+ *
  * @expectedException CakeException
  * @return void
  */
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
index 395524751..c9373ab09 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
@@ -217,7 +217,7 @@ DIGEST;
 			Digest username="Mufasa",
 			realm="testrealm@host.com",
 			nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
-			uri="/dir/index.html",
+			uri="/dir/index.html?query=string&value=some%20value",
 			qop=auth,
 			nc=00000001,
 			cnonce="0a4f113b",
@@ -228,7 +228,7 @@ DIGEST;
 			'username' => 'Mufasa',
 			'realm' => 'testrealm@host.com',
 			'nonce' => 'dcd98b7102dd2f0e8b11d0f600bfb0c093',
-			'uri' => '/dir/index.html',
+			'uri' => '/dir/index.html?query=string&value=some%20value',
 			'qop' => 'auth',
 			'nc' => '00000001',
 			'cnonce' => '0a4f113b',
@@ -242,6 +242,29 @@ DIGEST;
 		$this->assertNull($result);
 	}
 
+/**
+ * Test parsing a full URI. While not part of the spec some mobile clients will do it wrong.
+ *
+ * @return void
+ */
+	public function testParseAuthDataFullUri() {
+		$digest = <<<DIGEST
+			Digest username="admin",
+			realm="192.168.0.2",
+			nonce="53a7f9b83f61b",
+			uri="http://192.168.0.2/pvcollection/sites/pull/HFD%200001.json#fragment",
+			qop=auth,
+			nc=00000001,
+			cnonce="b85ff144e496e6e18d1c73020566ea3b",
+			response="5894f5d9cd41d012bac09eeb89d2ddf2",
+			opaque="6f65e91667cf98dd13464deaf2739fde"
+DIGEST;
+
+		$expected = 'http://192.168.0.2/pvcollection/sites/pull/HFD%200001.json#fragment';
+		$result = $this->auth->parseAuthData($digest);
+		$this->assertSame($expected, $result['uri']);
+	}
+
 /**
  * test parsing digest information with email addresses
  *
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
index 90f5797c9..9b0a196f1 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * FormAuthenticateTest file
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -166,6 +164,13 @@ class FormAuthenticateTest extends CakeTestCase {
 		));
 		$this->assertFalse($this->auth->authenticate($request, $this->response));
 
+		$request->data = array(
+			'User' => array(
+				'user' => array(),
+				'password' => 'my password'
+		));
+		$this->assertFalse($this->auth->authenticate($request, $this->response));
+
 		$request->data = array(
 			'User' => array(
 				'user' => 'mariano',
@@ -226,6 +231,30 @@ class FormAuthenticateTest extends CakeTestCase {
 		$this->assertFalse($this->auth->authenticate($request, $this->response));
 	}
 
+/**
+ * Test that username of 0 works.
+ *
+ * @return void
+ */
+	public function testAuthenticateUsernameZero() {
+		$User = ClassRegistry::init('User');
+		$User->updateAll(array('user' => $User->getDataSource()->value('0')), array('user' => 'mariano'));
+
+		$request = new CakeRequest('posts/index', false);
+		$request->data = array('User' => array(
+			'user' => '0',
+			'password' => 'password'
+		));
+
+		$expected = array(
+			'id' => 1,
+			'user' => '0',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		);
+		$this->assertEquals($expected, $this->auth->authenticate($request, $this->response));
+	}
+
 /**
  * test a model in a plugin.
  *
@@ -259,7 +288,7 @@ class FormAuthenticateTest extends CakeTestCase {
 			'username' => 'gwoo',
 			'created' => '2007-03-17 01:16:23'
 		);
-		$this->assertEquals(self::date(), $result['updated']);
+		$this->assertEquals(static::date(), $result['updated']);
 		unset($result['updated']);
 		$this->assertEquals($expected, $result);
 		CakePlugin::unload();
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
index e76f65c32..8faae470a 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -19,7 +19,54 @@
 App::uses('Controller', 'Controller');
 App::uses('AuthComponent', 'Controller/Component');
 App::uses('AclComponent', 'Controller/Component');
+App::uses('BaseAuthenticate', 'Controller/Component/Auth');
 App::uses('FormAuthenticate', 'Controller/Component/Auth');
+App::uses('CakeEvent', 'Event');
+
+/**
+ * TestFormAuthenticate class
+ *
+ * @package       Cake.Test.Case.Controller.Component
+ */
+class TestBaseAuthenticate extends BaseAuthenticate {
+
+/**
+ * Implemented events
+ *
+ * @return array of events => callbacks.
+ */
+	public function implementedEvents() {
+		return array(
+			'Auth.afterIdentify' => 'afterIdentify'
+		);
+	}
+
+	public $afterIdentifyCallable = null;
+
+/**
+ * Test function to be used in event dispatching
+ *
+ * @return void
+ */
+	public function afterIdentify($event) {
+		call_user_func($this->afterIdentifyCallable, $event);
+	}
+
+/**
+ * Authenticate a user based on the request information.
+ *
+ * @param CakeRequest $request Request to get authentication information from.
+ * @param CakeResponse $response A response object that can have headers added.
+ * @return mixed Either false on failure, or an array of user data on success.
+ */
+	public function authenticate(CakeRequest $request, CakeResponse $response) {
+		return array(
+			'id' => 1,
+			'username' => 'mark'
+		);
+	}
+
+}
 
 /**
  * TestAuthComponent class
@@ -31,25 +78,36 @@ class TestAuthComponent extends AuthComponent {
 /**
  * testStop property
  *
- * @var boolean
+ * @var bool
  */
 	public $testStop = false;
 
 /**
  * Helper method to add/set an authenticate object instance
  *
- * @param integer $index The index at which to add/set the object
- * @param Object $object The object to add/set
+ * @param int $index The index at which to add/set the object
+ * @param object $object The object to add/set
  * @return void
  */
 	public function setAuthenticateObject($index, $object) {
 		$this->_authenticateObjects[$index] = $object;
 	}
 
+/**
+ * Helper method to get an authenticate object instance
+ *
+ * @param int $index The index at which to get the object
+ * @return object $object
+ */
+	public function getAuthenticateObject($index) {
+		$this->constructAuthenticate();
+		return isset($this->_authenticateObjects[$index]) ? $this->_authenticateObjects[$index] : null;
+	}
+
 /**
  * Helper method to add/set an authorize object instance
  *
- * @param integer $index The index at which to add/set the object
+ * @param int $index The index at which to add/set the object
  * @param Object $object The object to add/set
  * @return void
  */
@@ -67,7 +125,7 @@ class TestAuthComponent extends AuthComponent {
 	}
 
 	public static function clearUser() {
-		self::$_user = array();
+		static::$_user = array();
 	}
 
 }
@@ -107,18 +165,17 @@ class AuthTestController extends Controller {
  *
  * @var array
  */
-	public $components = array('Session', 'Auth');
+	public $components = array('Session', 'Flash', 'Auth');
 
 /**
  * testUrl property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $testUrl = null;
 
 /**
  * construct method
- *
  */
 	public function __construct($request, $response) {
 		$request->addParams(Router::parse('/auth_test'));
@@ -225,7 +282,7 @@ class AjaxAuthController extends Controller {
 /**
  * testUrl property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $testUrl = null;
 
@@ -266,6 +323,27 @@ class AjaxAuthController extends Controller {
 
 }
 
+/**
+ * Mock class used to test event dispatching
+ *
+ * @package Cake.Test.Case.Event
+ */
+class AuthEventTestListener {
+
+	public $callStack = array();
+
+/**
+ * Test function to be used in event dispatching
+ *
+ * @return void
+ */
+	public function listenerFunction() {
+		$this->callStack[] = __FUNCTION__;
+	}
+
+}
+
+
 /**
  * AuthComponentTest class
  *
@@ -290,7 +368,7 @@ class AuthComponentTest extends CakeTestCase {
 /**
  * initialized property
  *
- * @var boolean
+ * @var bool
  */
 	public $initialized = false;
 
@@ -411,6 +489,33 @@ class AuthComponentTest extends CakeTestCase {
 		$this->assertEquals($user, $this->Auth->user());
 	}
 
+/**
+ * testLogin afterIdentify event method
+ *
+ * @return void
+ */
+	public function testLoginAfterIdentify() {
+		$this->Auth->authenticate = array(
+			'TestBase',
+		);
+
+		$user = array(
+			'id' => 1,
+			'username' => 'mark'
+		);
+
+		$auth = $this->Auth->getAuthenticateObject(0);
+		$listener = $this->getMock('AuthEventTestListener');
+		$auth->afterIdentifyCallable = array($listener, 'listenerFunction');
+		$event = new CakeEvent('Auth.afterIdentify', $this->Auth, array('user' => $user));
+		$listener->expects($this->once())->method('listenerFunction')->with($event);
+
+		$result = $this->Auth->login();
+		$this->assertTrue($result);
+		$this->assertTrue($this->Auth->loggedIn());
+		$this->assertEquals($user, $this->Auth->user());
+	}
+
 /**
  * testRedirectVarClearing method
  *
@@ -590,6 +695,27 @@ class AuthComponentTest extends CakeTestCase {
 		$this->assertEquals('AuthUser', $result->settings['userModel']);
 	}
 
+/**
+ * test defining the same Authenticate object but with different password hashers
+ *
+ * @return void
+ */
+	public function testSameAuthenticateWithDifferentHashers() {
+		$this->Controller->Auth->authenticate = array(
+			'FormSimple' => array('className' => 'Form', 'passwordHasher' => 'Simple'),
+			'FormBlowfish' => array('className' => 'Form', 'passwordHasher' => 'Blowfish'),
+		);
+
+		$objects = $this->Controller->Auth->constructAuthenticate();
+		$this->assertEquals(2, count($objects));
+
+		$this->assertInstanceOf('FormAuthenticate', $objects[0]);
+		$this->assertInstanceOf('FormAuthenticate', $objects[1]);
+
+		$this->assertInstanceOf('SimplePasswordHasher', $objects[0]->passwordHasher());
+		$this->assertInstanceOf('BlowfishPasswordHasher', $objects[1]->passwordHasher());
+	}
+
 /**
  * Tests that deny always takes precedence over allow
  *
@@ -938,7 +1064,7 @@ class AuthComponentTest extends CakeTestCase {
 			array($CakeRequest, $CakeResponse)
 		);
 
-		$expected = Router::url($this->Auth->loginRedirect, true);
+		$expected = Router::url($this->Auth->loginRedirect);
 		$Controller->expects($this->once())
 			->method('redirect')
 			->with($this->equalTo($expected));
@@ -966,9 +1092,9 @@ class AuthComponentTest extends CakeTestCase {
 			array('on', 'redirect'),
 			array($CakeRequest, $CakeResponse)
 		);
-		$this->Auth->Session = $this->getMock(
-			'SessionComponent',
-			array('setFlash'),
+		$this->Auth->Flash = $this->getMock(
+			'FlashComponent',
+			array('set'),
 			array($Controller->Components)
 		);
 
@@ -978,8 +1104,8 @@ class AuthComponentTest extends CakeTestCase {
 		$Controller->expects($this->once())
 			->method('redirect')
 			->with($this->equalTo($expected));
-		$this->Auth->Session->expects($this->once())
-			->method('setFlash');
+		$this->Auth->Flash->expects($this->once())
+			->method('set');
 		$this->Auth->startup($Controller);
 	}
 
@@ -1005,9 +1131,9 @@ class AuthComponentTest extends CakeTestCase {
 			array('on', 'redirect'),
 			array($CakeRequest, $CakeResponse)
 		);
-		$this->Auth->Session = $this->getMock(
-			'SessionComponent',
-			array('setFlash'),
+		$this->Auth->Flash = $this->getMock(
+			'FlashComponent',
+			array('set'),
 			array($Controller->Components)
 		);
 
@@ -1017,8 +1143,8 @@ class AuthComponentTest extends CakeTestCase {
 		$Controller->expects($this->once())
 			->method('redirect')
 			->with($this->equalTo($expected));
-		$this->Auth->Session->expects($this->never())
-			->method('setFlash');
+		$this->Auth->Flash->expects($this->never())
+			->method('set');
 		$this->Auth->startup($Controller);
 	}
 
@@ -1134,6 +1260,71 @@ class AuthComponentTest extends CakeTestCase {
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
 
+/**
+ * testAjaxLoginResponseCode
+ *
+ * @return void
+ */
+	public function testAjaxLoginResponseCode() {
+		App::build(array(
+			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+		));
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+
+		$url = '/ajax_auth/add';
+		$this->Auth->request->addParams(Router::parse($url));
+		$this->Auth->request->query['url'] = ltrim($url, '/');
+		$this->Auth->request->base = '';
+		$this->Auth->ajaxLogin = 'test_element';
+
+		Router::setRequestInfo($this->Auth->request);
+
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
+		$this->Controller->response->expects($this->at(0))
+			->method('_sendHeader')
+			->with('HTTP/1.1 403 Forbidden', null);
+		$this->Auth->initialize($this->Controller);
+
+		ob_start();
+		$result = $this->Auth->startup($this->Controller);
+		ob_end_clean();
+
+		$this->assertFalse($result);
+		$this->assertEquals('this is the test element', $this->Controller->response->body());
+		$this->assertArrayNotHasKey('Location', $this->Controller->response->header());
+		$this->assertNull($this->Controller->testUrl, 'redirect() not called');
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
+/**
+ * test ajax login with no element
+ *
+ * @return void
+ */
+	public function testAjaxLoginResponseCodeNoElement() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+
+		$url = '/ajax_auth/add';
+		$this->Auth->request->addParams(Router::parse($url));
+		$this->Auth->request->query['url'] = ltrim($url, '/');
+		$this->Auth->request->base = '';
+		$this->Auth->ajaxLogin = false;
+
+		Router::setRequestInfo($this->Auth->request);
+
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
+		$this->Controller->response->expects($this->at(0))
+			->method('_sendHeader')
+			->with('HTTP/1.1 403 Forbidden', null);
+		$this->Auth->initialize($this->Controller);
+
+		$this->Auth->startup($this->Controller);
+
+		$this->assertArrayNotHasKey('Location', $this->Controller->response->header());
+		$this->assertNull($this->Controller->testUrl, 'redirect() not called');
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
 /**
  * testLoginActionRedirect method
  *
@@ -1252,6 +1443,45 @@ class AuthComponentTest extends CakeTestCase {
 		$this->Auth->logout();
 	}
 
+/**
+ * Test mapActions as a getter
+ *
+ * @return void
+ */
+	public function testMapActions() {
+		$MapActionMockAuthorize = $this->getMock(
+			'BaseAuthorize',
+			array('authorize'),
+			array(),
+			'',
+			false
+		);
+		$this->Auth->authorize = array('MapActionAuthorize');
+		$this->Auth->setAuthorizeObject(0, $MapActionMockAuthorize);
+
+		$actions = array('my_action' => 'create');
+		$this->Auth->mapActions($actions);
+		$actions = array(
+			'create' => array('my_other_action'),
+			'update' => array('updater')
+		);
+		$this->Auth->mapActions($actions);
+
+		$actions = $this->Auth->mapActions();
+
+		$result = $actions['my_action'];
+		$expected = 'create';
+		$this->assertEquals($expected, $result);
+
+		$result = $actions['my_other_action'];
+		$expected = 'create';
+		$this->assertEquals($expected, $result);
+
+		$result = $actions['updater'];
+		$expected = 'update';
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * test mapActions loading and delegating to authorize objects.
  *
@@ -1316,10 +1546,10 @@ class AuthComponentTest extends CakeTestCase {
  * @return void
  */
 	public function testFlashSettings() {
-		$this->Auth->Session = $this->getMock('SessionComponent', array(), array(), '', false);
-		$this->Auth->Session->expects($this->once())
-			->method('setFlash')
-			->with('Auth failure', 'custom', array(1), 'auth-key');
+		$this->Auth->Flash = $this->getMock('FlashComponent', array(), array(), '', false);
+		$this->Auth->Flash->expects($this->once())
+			->method('set')
+			->with('Auth failure', array('element' => 'custom', 'params' => array(1), 'key' => 'auth-key'));
 
 		$this->Auth->flash = array(
 			'element' => 'custom',
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
index ce13a4c9d..aee72160d 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
@@ -58,7 +58,7 @@ class DebugCompTransport extends AbstractTransport {
  * Send mail
  *
  * @params object $email CakeEmail
- * @return boolean
+ * @return bool
  */
 	public function send(CakeEmail $email) {
 		$email->addHeaders(array('Date' => EmailComponentTest::$sentDate));
@@ -77,7 +77,7 @@ class DebugCompTransport extends AbstractTransport {
 		$last .= sprintf("%s\n\n%s", 'Message:', $message);
 		$last .= '</pre>';
 
-		self::$lastEmail = $last;
+		static::$lastEmail = $last;
 
 		return true;
 	}
@@ -94,7 +94,7 @@ class EmailTestController extends Controller {
 /**
  * uses property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $uses = null;
 
@@ -149,7 +149,7 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->Components->init($this->Controller);
 		$this->Controller->EmailTest->initialize($this->Controller, array());
 
-		self::$sentDate = date(DATE_RFC2822);
+		static::$sentDate = date(DATE_RFC2822);
 
 		App::build(array(
 			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
@@ -170,7 +170,7 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 		$this->Controller->EmailTest->messageId = false;
 
-		$date = self::$sentDate;
+		$date = static::$sentDate;
 		$message = <<<MSGBLOC
 <pre>To: postmaster@example.com
 From: noreply@example.com
@@ -217,7 +217,7 @@ MSGBLOC;
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 		$this->Controller->EmailTest->messageId = false;
 
-		$date = self::$sentDate;
+		$date = static::$sentDate;
 		$header = <<<HEADBLOC
 To: postmaster@example.com
 From: noreply@example.com
@@ -272,20 +272,17 @@ HTMLBLOC;
 		$this->assertTextEquals($expected, DebugCompTransport::$lastEmail);
 
 		$this->Controller->EmailTest->sendAs = 'both';
-		$expected = str_replace('{CONTENTTYPE}', 'multipart/mixed; boundary="{boundary}"', $header);
+		$expected = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="{boundary}"', $header);
 		$expected .= "--{boundary}\n" .
-			'Content-Type: multipart/alternative; boundary="alt-{boundary}"' . "\n\n" .
-			'--alt-{boundary}' . "\n" .
 			'Content-Type: text/plain; charset=UTF-8' . "\n" .
 			'Content-Transfer-Encoding: 8bit' . "\n\n" .
 			$text .
 			"\n\n" .
-			'--alt-{boundary}' . "\n" .
+			'--{boundary}' . "\n" .
 			'Content-Type: text/html; charset=UTF-8' . "\n" .
 			'Content-Transfer-Encoding: 8bit' . "\n\n" .
 			$html .
-			"\n\n" .
-			'--alt-{boundary}--' . "\n\n\n" .
+			"\n\n\n" .
 			'--{boundary}--' . "\n";
 
 		$expected = '<pre>' . $expected . '</pre>';
@@ -342,6 +339,32 @@ HTMLBLOC;
 		$this->assertRegExp('/http\:\/\/example\.com/', $result);
 	}
 
+/**
+ * test send with null properties
+ *
+ * @return void
+ */
+	public function testSendNullProperties() {
+		$this->Controller->EmailTest->to = 'test@example.com';
+		$this->Controller->EmailTest->from = 'test@example.com';
+		$this->Controller->EmailTest->subject = null;
+		$this->Controller->EmailTest->replyTo = null;
+		$this->Controller->EmailTest->messageId = null;
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'DebugComp';
+		$this->assertTrue($this->Controller->EmailTest->send(null));
+		$result = DebugCompTransport::$lastEmail;
+
+		$this->assertRegExp('/To: test@example.com\n/', $result);
+		$this->assertRegExp('/Subject: \n/', $result);
+		$this->assertRegExp('/From: test@example.com\n/', $result);
+		$this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result);
+		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
+	}
+
 /**
  * testSendDebug method
  *
@@ -366,7 +389,7 @@ HTMLBLOC;
 		$this->assertRegExp('/From: noreply@example.com\n/', $result);
 		$this->assertRegExp('/Cc: cc@example.com\n/', $result);
 		$this->assertRegExp('/Bcc: bcc@example.com\n/', $result);
-		$this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
+		$this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result);
 		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
 		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
 		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
@@ -395,7 +418,7 @@ HTMLBLOC;
 		$this->assertRegExp('/Subject: Cake Debug Test\n/', $result);
 		$this->assertRegExp('/Reply-To: noreply@example.com\n/', $result);
 		$this->assertRegExp('/From: noreply@example.com\n/', $result);
-		$this->assertRegExp('/Date: ' . preg_quote(self::$sentDate) . '\n/', $result);
+		$this->assertRegExp('/Date: ' . preg_quote(static::$sentDate) . '\n/', $result);
 		$this->assertRegExp('/X-Mailer: CakePHP Email Component\n/', $result);
 		$this->assertRegExp('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
 		$this->assertRegExp('/Content-Transfer-Encoding: 8bitMessage:\n/', $result);
@@ -566,7 +589,7 @@ HTMLBLOC;
 		$this->Controller->EmailTest->to = 'postmaster@example.com';
 		$this->Controller->EmailTest->from = 'noreply@example.com';
 		$this->Controller->EmailTest->subject = 'Cake Debug Test';
-		$this->Controller->EmailTest->date = self::$sentDate = 'Today!';
+		$this->Controller->EmailTest->date = static::$sentDate = 'Today!';
 		$this->Controller->EmailTest->template = null;
 		$this->Controller->EmailTest->delivery = 'DebugComp';
 
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
new file mode 100644
index 000000000..64fe0ec7f
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/FlashComponentTest.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * FlashComponentTest file
+ *
+ * Series of tests for flash component.
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+ * @package       Cake.Test.Case.Controller.Component
+ * @since         CakePHP(tm) v 2.7.0-dev
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('FlashComponent', 'Controller/Component');
+App::uses('ComponentCollection', 'Controller');
+
+/**
+ * FlashComponentTest class
+ *
+ * @package		Cake.Test.Case.Controller.Component
+ */
+class FlashComponentTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+		$this->Components = new ComponentCollection();
+		$this->Flash = new FlashComponent($this->Components);
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		CakeSession::destroy();
+	}
+
+/**
+ * testSet method
+ *
+ * @return void
+ */
+	public function testSet() {
+		$this->assertNull(CakeSession::read('Message.flash'));
+
+		$this->Flash->set('This is a test message');
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'flash',
+			'element' => 'Flash/default',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+
+		$this->Flash->set('This is a test message', array(
+			'element' => 'test',
+			'params' => array('foo' => 'bar')
+		));
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'flash',
+			'element' => 'Flash/test',
+			'params' => array('foo' => 'bar')
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+
+		$this->Flash->set('This is a test message', array('element' => 'MyPlugin.alert'));
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'flash',
+			'element' => 'MyPlugin.Flash/alert',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+
+		$this->Flash->set('This is a test message', array('key' => 'foobar'));
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'foobar',
+			'element' => 'Flash/default',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.foobar');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testSetWithException method
+ *
+ * @return void
+ */
+	public function testSetWithException() {
+		$this->assertNull(CakeSession::read('Message.flash'));
+
+		$this->Flash->set(new Exception('This is a test message', 404));
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'flash',
+			'element' => 'Flash/default',
+			'params' => array('code' => 404)
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testSetWithComponentConfiguration method
+ *
+ * @return void
+ */
+	public function testSetWithComponentConfiguration() {
+		$this->assertNull(CakeSession::read('Message.flash'));
+
+		$FlashWithSettings = $this->Components->load('Flash', array('element' => 'test'));
+		$FlashWithSettings->set('This is a test message');
+		$expected = array(
+			'message' => 'This is a test message',
+			'key' => 'flash',
+			'element' => 'Flash/test',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * Test magic call method.
+ *
+ * @return void
+ */
+	public function testCall() {
+		$this->assertNull(CakeSession::read('Message.flash'));
+
+		$this->Flash->success('It worked');
+		$expected = array(
+			'message' => 'It worked',
+			'key' => 'flash',
+			'element' => 'Flash/success',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+
+		$this->Flash->alert('It worked', array('plugin' => 'MyPlugin'));
+		$expected = array(
+			'message' => 'It worked',
+			'key' => 'flash',
+			'element' => 'MyPlugin.Flash/alert',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result);
+
+		$this->Flash->error('It did not work', array('element' => 'error_thing'));
+		$expected = array(
+			'message' => 'It did not work',
+			'key' => 'flash',
+			'element' => 'Flash/error',
+			'params' => array()
+		);
+		$result = CakeSession::read('Message.flash');
+		$this->assertEquals($expected, $result, 'Element is ignored in magic call.');
+	}
+}
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
index 74d17cbf3..087b92029 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -118,7 +118,7 @@ class ControllerPaginateModel extends CakeTestModel {
 /**
  * paginate method
  *
- * @return boolean
+ * @return bool
  */
 	public function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
 		$this->extra = $extra;
@@ -185,8 +185,8 @@ class PaginatorAuthor extends CakeTestModel {
  * @var string
  */
 	public $virtualFields = array(
-			'joined_offset' => 'PaginatorAuthor.id + 1'
-		);
+		'joined_offset' => 'PaginatorAuthor.id + 1'
+	);
 
 }
 
@@ -358,16 +358,16 @@ class PaginatorComponentTest extends CakeTestCase {
 		$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
 		$this->assertEquals(array(3, 2, 1), $results);
 
-		$Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc');
+		$Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc', 'limit' => 2);
 		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
-		$this->assertEquals(array(), $Controller->PaginatorControllerPost->lastQueries[1]['order'][0], 'no order should be set.');
+		$this->assertEquals(array(), $Controller->PaginatorControllerPost->lastQueries[1]['order'], 'no order should be set.');
 
 		$Controller->request->params['named'] = array(
 			'sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase'
 		);
 		$results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
-		$this->assertEquals(array('PaginatorControllerPost.author_id' => 'asc'), $Controller->PaginatorControllerPost->lastQueries[1]['order'][0]);
+		$this->assertEquals(array('PaginatorControllerPost.author_id' => 'asc'), $Controller->PaginatorControllerPost->lastQueries[0]['order']);
 		$this->assertEquals(array(1, 3, 2), $results);
 
 		$Controller->request->params['named'] = array();
@@ -454,6 +454,13 @@ class PaginatorComponentTest extends CakeTestCase {
 		$this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
 		$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
 
+		$Controller->Paginator->settings = array(
+			'order' => array('PaginatorControllerPost.author_id')
+		);
+		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
+		$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
+		$this->assertEquals(array(1, 3, 2), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
+
 		$Controller->request->params['named'] = array('page' => '-1');
 		$Controller->Paginator->settings = array(
 			'PaginatorControllerPost' => array(
@@ -466,7 +473,7 @@ class PaginatorComponentTest extends CakeTestCase {
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
 		$this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
-		$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
+		$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQueries[0]['contain']));
 
 		$Controller->Paginator->settings = array(
 			'PaginatorControllerPost' => array(
@@ -475,14 +482,14 @@ class PaginatorComponentTest extends CakeTestCase {
 		);
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEquals(array(2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
-		$this->assertEquals(array('PaginatorControllerPost.id > ' => '1'), $Controller->PaginatorControllerPost->lastQueries[1]['conditions']);
+		$this->assertEquals(array('PaginatorControllerPost.id > ' => '1'), $Controller->PaginatorControllerPost->lastQueries[0]['conditions']);
 
 		$Controller->request->params['named'] = array('limit' => 12);
 		$Controller->Paginator->settings = array('limit' => 30, 'maxLimit' => 100, 'paramType' => 'named');
-		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
+		$Controller->Paginator->paginate('PaginatorControllerPost');
 		$paging = $Controller->params['paging']['PaginatorControllerPost'];
 
-		$this->assertEquals(12, $Controller->PaginatorControllerPost->lastQueries[1]['limit']);
+		$this->assertEquals(12, $Controller->PaginatorControllerPost->lastQueries[0]['limit']);
 		$this->assertEquals(12, $paging['options']['limit']);
 
 		$Controller = new PaginatorTestController($this->request);
@@ -497,7 +504,7 @@ class PaginatorComponentTest extends CakeTestCase {
 				'paramType' => 'named'
 			)
 		);
-		$result = $Controller->Paginator->paginate('ControllerPaginateModel');
+		$Controller->Paginator->paginate('ControllerPaginateModel');
 		$expected = array(
 			'contain' => array('ControllerPaginateModel'),
 			'group' => 'Comment.author_id',
@@ -551,7 +558,7 @@ class PaginatorComponentTest extends CakeTestCase {
 
 		$this->assertEquals(array(2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
 		$this->assertEquals(
-			$Controller->PaginatorControllerPost->lastQueries[1]['conditions'],
+			$Controller->PaginatorControllerPost->lastQueries[0]['conditions'],
 			array('PaginatorControllerPost.id > ' => '1')
 		);
 		$this->assertFalse(isset($Controller->params['paging']['PaginatorControllerPost']['options'][0]));
@@ -606,7 +613,7 @@ class PaginatorComponentTest extends CakeTestCase {
 
 		$Controller->PaginatorControllerPost->order = array('PaginatorControllerPost.id');
 		$result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array());
-		$this->assertEmpty($result['order']);
+		$this->assertEquals(array('PaginatorControllerPost.id' => 'asc'), $result['order']);
 
 		$Controller->PaginatorControllerPost->order = 'PaginatorControllerPost.id';
 		$result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array());
@@ -617,7 +624,10 @@ class PaginatorComponentTest extends CakeTestCase {
 			'PaginatorControllerPost.created' => 'asc'
 		);
 		$result = $Controller->Paginator->validateSort($Controller->PaginatorControllerPost, array());
-		$expected = array('PaginatorControllerPost.created' => 'asc');
+		$expected = array(
+			'PaginatorControllerPost.id' => 'asc',
+			'PaginatorControllerPost.created' => 'asc'
+		);
 		$this->assertEquals($expected, $result['order']);
 	}
 
@@ -843,7 +853,7 @@ class PaginatorComponentTest extends CakeTestCase {
 			'paramType' => 'named',
 		);
 		$result = $this->Paginator->mergeOptions('Post');
-		$expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 200, 'paramType' => 'named');
+		$expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 100, 'paramType' => 'named');
 		$this->assertEquals($expected, $result);
 
 		$this->Paginator->settings = array(
@@ -862,7 +872,7 @@ class PaginatorComponentTest extends CakeTestCase {
 			'paramType' => 'named',
 		);
 		$result = $this->Paginator->mergeOptions('Post');
-		$expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 150, 'paramType' => 'named');
+		$expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 100, 'paramType' => 'named');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -902,7 +912,6 @@ class PaginatorComponentTest extends CakeTestCase {
 /**
  * Test that a really REALLY large page number gets clamped to the max page size.
  *
- *
  * @expectedException NotFoundException
  * @return void
  */
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index 6688ad565..aa20baeff 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -33,7 +33,7 @@ class RequestHandlerTestController extends Controller {
 /**
  * uses property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $uses = null;
 
@@ -197,6 +197,20 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertEquals('json', $this->RequestHandler->ext);
 	}
 
+/**
+ * Test that RequestHandler does not set extension to csv for text/plain mimetype
+ *
+ * @return void
+ */
+	public function testInitializeContentTypeWithjQueryTextPlainAccept() {
+		$_SERVER['HTTP_ACCEPT'] = 'text/plain, */*; q=0.01';
+		$this->assertNull($this->RequestHandler->ext);
+		Router::parseExtensions('csv');
+
+		$this->RequestHandler->initialize($this->Controller);
+		$this->assertNull($this->RequestHandler->ext);
+	}
+
 /**
  * Test that RequestHandler sets $this->ext when jQuery sends its wonky-ish headers
  * and the application is configured to handle multiple extensions
@@ -601,6 +615,9 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$result = $this->RequestHandler->requestedWith(array('rss', 'atom'));
 		$this->assertFalse($result);
 
+		$_SERVER['REQUEST_METHOD'] = 'DELETE';
+		$this->assertEquals('json', $this->RequestHandler->requestedWith());
+
 		$_SERVER['REQUEST_METHOD'] = 'POST';
 		unset($_SERVER['CONTENT_TYPE']);
 		$_SERVER['HTTP_CONTENT_TYPE'] = 'application/json';
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
index 455758a60..e579b6c05 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
@@ -30,7 +30,7 @@ class TestSecurityComponent extends SecurityComponent {
  * validatePost method
  *
  * @param Controller $controller
- * @return boolean
+ * @return bool
  */
 	public function validatePost(Controller $controller) {
 		return $this->_validatePost($controller);
@@ -55,7 +55,7 @@ class SecurityTestController extends Controller {
 /**
  * failed property
  *
- * @var boolean false
+ * @var bool
  */
 	public $failed = false;
 
@@ -142,8 +142,12 @@ class SecurityComponentTest extends CakeTestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$request = new CakeRequest('posts/index', false);
+		$request = $this->getMock('CakeRequest', array('here'), array('posts/index', false));
 		$request->addParams(array('controller' => 'posts', 'action' => 'index'));
+		$request->expects($this->any())
+			->method('here')
+			->will($this->returnValue('/posts/index'));
+
 		$this->Controller = new SecurityTestController($request);
 		$this->Controller->Components->init($this->Controller);
 		$this->Controller->Security = $this->Controller->TestSecurity;
@@ -326,19 +330,23 @@ class SecurityComponentTest extends CakeTestCase {
  */
 	public function testRequireAuthSucceed() {
 		$_SERVER['REQUEST_METHOD'] = 'AUTH';
+		$this->Controller->Security->unlockedActions = array('posted');
 		$this->Controller->request['action'] = 'posted';
 		$this->Controller->Security->requireAuth('posted');
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertFalse($this->Controller->failed);
 
 		$this->Controller->Security->Session->write('_Token', array(
-			'allowedControllers' => array('SecurityTest'), 'allowedActions' => array('posted')
+			'allowedControllers' => array('SecurityTest'),
+			'allowedActions' => array('posted')
 		));
 		$this->Controller->request['controller'] = 'SecurityTest';
 		$this->Controller->request['action'] = 'posted';
 
 		$this->Controller->request->data = array(
-			'username' => 'willy', 'password' => 'somePass', '_Token' => ''
+			'username' => 'willy',
+			'password' => 'somePass',
+			'_Token' => ''
 		);
 		$this->Controller->action = 'posted';
 		$this->Controller->Security->requireAuth('posted');
@@ -476,6 +484,29 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->assertFalse($this->Controller->failed);
 	}
 
+/**
+ * Test that validatePost fires on GET with request data.
+ * This could happen when method overriding is used.
+ *
+ * @return void
+ * @triggers Controller.startup $this->Controller
+ */
+	public function testValidatePostOnGetWithData() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->Controller->Security->startup($this->Controller);
+
+		$fields = 'an-invalid-token';
+		$unlocked = '';
+
+		$this->Controller->request->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('fields', 'unlocked')
+		);
+		$this->assertFalse($this->Controller->failed, 'Should not be failed yet');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed, 'Should fail because of validatePost.');
+	}
+
 /**
  * Simple hash validation test
  *
@@ -485,7 +516,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
+		$fields = '01c1f6dbba02ac6f21b229eab1cc666839b14303%3AModel.valid';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -565,7 +596,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'f7d573650a295b94e0938d32b323fde775e5f32b%3A';
+		$fields = '38504e4a341d4e6eadb437217efd91270e558d55%3A';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -584,7 +615,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '540ac9c60d323c22bafe997b72c0790f39a8bdef%3A';
+		$fields = 'c5bc49a6c938c820e7e538df3d8ab7bffbc97ef9%3A';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -605,7 +636,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '69f493434187b867ea14b901fdf58b55d27c935d%3A';
+		$fields = '5415d31b4483c1e09ddb58d2a91ba9650b12aa83%3A';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -626,7 +657,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'c9118120e680a7201b543f562e5301006ccfcbe2%3AAddresses.0.id%7CAddresses.1.id';
+		$fields = 'b72a99e923687687bb5e64025d3cc65e1cecced4%3AAddresses.0.id%7CAddresses.1.id';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -655,7 +686,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->startup($this->Controller);
 
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '422cde416475abc171568be690a98cad20e66079%3A';
+		$fields = '8a764bdb989132c1d46f9a45f64ce2da5f9eebb9%3A';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -679,7 +710,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 
-		$fields = '19464422eafe977ee729c59222af07f983010c5f%3A';
+		$fields = '722de3615e63fdff899e86e85e6498b11c50bb66%3A';
 		$this->Controller->request->data = array(
 			'User.password' => 'bar', 'User.name' => 'foo', 'User.is_valid' => '1',
 			'Tag' => array('Tag' => array(1)),
@@ -700,7 +731,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testValidatePostCheckbox() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
+		$fields = '01c1f6dbba02ac6f21b229eab1cc666839b14303%3AModel.valid';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -711,7 +742,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$result = $this->Controller->Security->validatePost($this->Controller);
 		$this->assertTrue($result);
 
-		$fields = '874439ca69f89b4c4a5f50fb9c36ff56a28f5d42%3A';
+		$fields = 'efbcf463a2c31e97c85d95eedc41dff9e9c6a026%3A';
 
 		$this->Controller->request->data = array(
 			'Model' => array('username' => '', 'password' => '', 'valid' => '0'),
@@ -742,7 +773,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testValidatePostHidden() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '51ccd8cb0997c7b3d4523ecde5a109318405ef8c%3AModel.hidden%7CModel.other_hidden';
+		$fields = 'baaf832a714b39a0618238ac89c7065fc8ec853e%3AModel.hidden%7CModel.other_hidden';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -765,7 +796,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Controller->Security->disabledFields = array('Model.username', 'Model.password');
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'ef1082968c449397bcd849f963636864383278b1%3AModel.hidden';
+		$fields = 'aa7f254ebd8bf2ef118bc5ca1e191d1ae96857f5%3AModel.hidden';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -789,7 +820,12 @@ class SecurityComponentTest extends CakeTestCase {
 		$key = $this->Controller->request->params['_Token']['key'];
 		$unlocked = 'Model.username';
 		$fields = array('Model.hidden', 'Model.password');
-		$fields = urlencode(Security::hash(serialize($fields) . $unlocked . Configure::read('Security.salt')));
+		$fields = urlencode(Security::hash(
+			'/posts/index' .
+			serialize($fields) .
+			$unlocked .
+			Configure::read('Security.salt'))
+		);
 
 		$this->Controller->request->data = array(
 			'Model' => array(
@@ -864,7 +900,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testValidateHiddenMultipleModel() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = 'a2d01072dc4660eea9d15007025f35a7a5b58e18%3AModel.valid%7CModel2.valid%7CModel3.valid';
+		$fields = '38dd8a37bbb52e67ee4eb812bf1725a6a18b989b%3AModel.valid%7CModel2.valid%7CModel3.valid';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -885,7 +921,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testValidateHasManyModel() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '51e3b55a6edd82020b3f29c9ae200e14bbeb7ee5%3AModel.0.hidden%7CModel.0.valid';
+		$fields = 'dcef68de6634c60d2e60484ad0e2faec003456e6%3AModel.0.hidden%7CModel.0.valid';
 		$fields .= '%7CModel.1.hidden%7CModel.1.valid';
 		$unlocked = '';
 
@@ -915,7 +951,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testValidateHasManyRecordsPass() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '7a203edb3d345bbf38fe0dccae960da8842e11d7%3AAddress.0.id%7CAddress.0.primary%7C';
+		$fields = '8b6880fbbd4b69279155f899652ecffdd9b4c5a1%3AAddress.0.id%7CAddress.0.primary%7C';
 		$fields .= 'Address.1.id%7CAddress.1.primary';
 		$unlocked = '';
 
@@ -959,7 +995,13 @@ class SecurityComponentTest extends CakeTestCase {
 		$key = $this->Controller->request->params['_Token']['key'];
 		$unlocked = '';
 		$hashFields = array('TaxonomyData');
-		$fields = urlencode(Security::hash(serialize($hashFields) . $unlocked . Configure::read('Security.salt')));
+		$fields = urlencode(
+			Security::hash(
+			'/posts/index' .
+			serialize($hashFields) .
+			$unlocked .
+			Configure::read('Security.salt'), 'sha1')
+		);
 
 		$this->Controller->request->data = array(
 			'TaxonomyData' => array(
@@ -1024,7 +1066,7 @@ class SecurityComponentTest extends CakeTestCase {
 	public function testFormDisabledFields() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '11842060341b9d0fc3808b90ba29fdea7054d6ad%3An%3A0%3A%7B%7D';
+		$fields = '216ee717efd1a251a6d6e9efbb96005a9d09f1eb%3An%3A0%3A%7B%7D';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -1052,10 +1094,10 @@ class SecurityComponentTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testRadio() {
+	public function testValidatePostRadio() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
-		$fields = '575ef54ca4fc8cab468d6d898e9acd3a9671c17e%3An%3A0%3A%7B%7D';
+		$fields = '3be63770e7953c6d2119f5377a9303372040f66f%3An%3A0%3A%7B%7D';
 		$unlocked = '';
 
 		$this->Controller->request->data = array(
@@ -1086,6 +1128,37 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->assertTrue($result);
 	}
 
+/**
+ * test validatePost uses here() as a hash input.
+ *
+ * @return void
+ */
+	public function testValidatePostUrlAsHashInput() {
+		$this->Controller->Security->startup($this->Controller);
+
+		$key = $this->Controller->request->params['_Token']['key'];
+		$fields = '5415d31b4483c1e09ddb58d2a91ba9650b12aa83%3A';
+		$unlocked = '';
+
+		$this->Controller->request->data = array(
+			'Model' => array('username' => '', 'password' => ''),
+			'_Token' => compact('key', 'fields', 'unlocked')
+		);
+		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
+
+		$request = $this->getMock('CakeRequest', array('here'), array('articles/edit/1', false));
+		$request->expects($this->at(0))
+			->method('here')
+			->will($this->returnValue('/posts/index?page=1'));
+		$request->expects($this->at(1))
+			->method('here')
+			->will($this->returnValue('/posts/edit/1'));
+
+		$this->Controller->Security->request = $request;
+		$this->assertFalse($this->Controller->Security->validatePost($this->Controller));
+		$this->assertFalse($this->Controller->Security->validatePost($this->Controller));
+	}
+
 /**
  * test that a requestAction's controller will have the _Token appended to
  * the params.
@@ -1168,8 +1241,7 @@ class SecurityComponentTest extends CakeTestCase {
 		$token = $this->Security->Session->read('_Token');
 		$this->assertEquals(2, count($token['csrfTokens']), 'Missing the csrf token.');
 		foreach ($token['csrfTokens'] as $expires) {
-			$diff = $csrfExpires - $expires;
-			$this->assertTrue($diff === 0 || $diff === 1, 'Token expiry does not match');
+			$this->assertWithinMargin($expires, $csrfExpires, 2, 'Token expiry does not match');
 		}
 	}
 
@@ -1185,11 +1257,6 @@ class SecurityComponentTest extends CakeTestCase {
 
 		$this->Security->Session->write('_Token.csrfTokens', array('nonce1' => strtotime('+10 minutes')));
 
-		$this->Controller->request = $this->getMock('CakeRequest', array('is'));
-		$this->Controller->request->expects($this->once())->method('is')
-			->with(array('post', 'put'))
-			->will($this->returnValue(true));
-
 		$this->Controller->request->params['action'] = 'index';
 		$this->Controller->request->data = array(
 			'_Token' => array(
@@ -1204,6 +1271,23 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->assertFalse(isset($token['csrfTokens']['nonce1']), 'Token was not consumed');
 	}
 
+/**
+ * tests that reusable CSRF-token expiry is renewed
+ */
+	public function testCsrfReusableTokenRenewal() {
+		$this->Security->validatePost = false;
+		$this->Security->csrfCheck = true;
+		$this->Security->csrfUseOnce = false;
+		$csrfExpires = '+10 minutes';
+		$this->Security->csrfExpires = $csrfExpires;
+
+		$this->Security->Session->write('_Token.csrfTokens', array('token' => strtotime('+1 minutes')));
+
+		$this->Security->startup($this->Controller);
+		$tokens = $this->Security->Session->read('_Token.csrfTokens');
+		$this->assertWithinMargin($tokens['token'], strtotime($csrfExpires), 2, 'Token expiry was not renewed');
+	}
+
 /**
  * test that expired values in the csrfTokens are cleaned up.
  *
@@ -1237,11 +1321,6 @@ class SecurityComponentTest extends CakeTestCase {
 
 		$this->Security->Session->write('_Token.csrfTokens', array('nonce1' => strtotime('+10 minutes')));
 
-		$this->Controller->request = $this->getMock('CakeRequest', array('is'));
-		$this->Controller->request->expects($this->once())->method('is')
-			->with(array('post', 'put'))
-			->will($this->returnValue(true));
-
 		$this->Controller->request->params['action'] = 'index';
 		$this->Controller->request->data = array(
 			'_Token' => array(
@@ -1267,11 +1346,6 @@ class SecurityComponentTest extends CakeTestCase {
 
 		$this->Security->Session->write('_Token.csrfTokens', array('nonce1' => strtotime('-5 minutes')));
 
-		$this->Controller->request = $this->getMock('CakeRequest', array('is'));
-		$this->Controller->request->expects($this->once())->method('is')
-			->with(array('post', 'put'))
-			->will($this->returnValue(true));
-
 		$this->Controller->request->params['action'] = 'index';
 		$this->Controller->request->data = array(
 			'_Token' => array(
@@ -1324,10 +1398,6 @@ class SecurityComponentTest extends CakeTestCase {
 		$this->Security->Session->write('_Token.csrfTokens', array('nonce1' => strtotime('+10 minutes')));
 
 		$this->Controller->request = $this->getMock('CakeRequest', array('is'));
-		$this->Controller->request->expects($this->once())->method('is')
-			->with(array('post', 'put'))
-			->will($this->returnValue(true));
-
 		$this->Controller->request->params['action'] = 'index';
 		$this->Controller->request->data = array(
 			'_Token' => array(
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
index 214ee9d3a..294d46670 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
@@ -91,7 +91,7 @@ class SessionComponentTest extends CakeTestCase {
  * @return void
  */
 	public static function setupBeforeClass() {
-		self::$_sessionBackup = Configure::read('Session');
+		static::$_sessionBackup = Configure::read('Session');
 		Configure::write('Session', array(
 			'defaults' => 'php',
 			'timeout' => 100,
@@ -105,7 +105,7 @@ class SessionComponentTest extends CakeTestCase {
  * @return void
  */
 	public static function teardownAfterClass() {
-		Configure::write('Session', self::$_sessionBackup);
+		Configure::write('Session', static::$_sessionBackup);
 	}
 
 /**
@@ -202,7 +202,6 @@ class SessionComponentTest extends CakeTestCase {
 		$this->assertEquals($Session->read('Test'), $array);
 		$Session->delete('Test');
 
-		$this->assertTrue($Session->write(array('Test'), 'some value'));
 		$this->assertTrue($Session->write(array('Test' => 'some value')));
 		$this->assertEquals('some value', $Session->read('Test'));
 		$Session->delete('Test');
diff --git a/web/api/lib/Cake/Test/Case/Controller/ComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/ComponentTest.php
index eaa3bc568..8dbbfa537 100644
--- a/web/api/lib/Cake/Test/Case/Controller/ComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/ComponentTest.php
@@ -67,7 +67,7 @@ class AppleComponent extends Component {
 /**
  * testName property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $testName = null;
 
diff --git a/web/api/lib/Cake/Test/Case/Controller/ControllerTest.php b/web/api/lib/Cake/Test/Case/Controller/ControllerTest.php
index 8b52f417e..2f5091225 100644
--- a/web/api/lib/Cake/Test/Case/Controller/ControllerTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -74,7 +74,7 @@ class ControllerPost extends CakeTestModel {
 /**
  * lastQuery property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $lastQuery = null;
 
@@ -653,7 +653,7 @@ class ControllerTest extends CakeTestCase {
 		$expected = $Controller->ControllerComment->validationErrors;
 
 		$Controller->viewPath = 'Posts';
-		$result = $Controller->render('index');
+		$Controller->render('index');
 		$View = $Controller->View;
 		$this->assertTrue(isset($View->validationErrors['ControllerComment']));
 		$this->assertEquals($expected, $View->validationErrors['ControllerComment']);
@@ -993,6 +993,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->constructClasses();
 
 		$this->assertFalse(isset($Controller->Session));
+		$this->assertFalse(isset($Controller->Flash));
 	}
 
 /**
@@ -1031,6 +1032,30 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEquals('/', $result);
 	}
 
+/**
+ * Test that the referer is not absolute if it is '/'.
+ *
+ * This avoids the base path being applied twice on string urls.
+ *
+ * @return void
+ */
+	public function testRefererSlash() {
+		$request = $this->getMock('CakeRequest', array('referer'));
+		$request->base = '/base';
+		$request->expects($this->any())
+			->method('referer')
+			->will($this->returnValue('/'));
+		Router::setRequestInfo($request);
+
+		$controller = new Controller($request);
+		$result = $controller->referer('/', true);
+		$this->assertEquals('/', $result);
+
+		$controller = new Controller($request);
+		$result = $controller->referer('/some/path', true);
+		$this->assertEquals('/base/some/path', $result);
+	}
+
 /**
  * testSetAction method
  *
@@ -1082,7 +1107,7 @@ class ControllerTest extends CakeTestCase {
 		$TestController = new TestController();
 
 		$Post = new ControllerPost();
-		$Post->validate = array('title' => 'notEmpty');
+		$Post->validate = array('title' => 'notBlank');
 		$Post->set('title', '');
 		$result = $TestController->validateErrors($Post);
 
@@ -1423,6 +1448,25 @@ class ControllerTest extends CakeTestCase {
 		$Controller->invokeAction($url);
 	}
 
+/**
+ * test invoking controller methods.
+ *
+ * @expectedException PrivateActionException
+ * @expectedExceptionMessage Private Action TestController::Admin_add() is not directly accessible.
+ * @return void
+ */
+	public function testInvokeActionPrefixProtectionCasing() {
+		Router::reload();
+		Router::connect('/admin/:controller/:action/*', array('prefix' => 'admin'));
+
+		$url = new CakeRequest('test/Admin_add/');
+		$url->addParams(array('controller' => 'test_controller', 'action' => 'Admin_add'));
+		$response = $this->getMock('CakeResponse');
+
+		$Controller = new TestController($url, $response);
+		$Controller->invokeAction($url);
+	}
+
 /**
  * test invoking controller methods.
  *
diff --git a/web/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/web/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php
index 5381b074b..fc512c5e5 100644
--- a/web/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/ScaffoldTest.php
@@ -63,8 +63,8 @@ class ScaffoldMockControllerWithFields extends Controller {
 /**
  * function beforeScaffold
  *
- * @param string method
- * @return boolean true
+ * @param string $method Method name.
+ * @return bool true
  */
 	public function beforeScaffold($method) {
 		$this->set('scaffoldFields', array('title'));
@@ -73,6 +73,39 @@ class ScaffoldMockControllerWithFields extends Controller {
 
 }
 
+/**
+ * ScaffoldMockControllerWithError class
+ *
+ * @package       Cake.Test.Case.Controller
+ */
+class ScaffoldMockControllerWithError extends Controller {
+
+/**
+ * name property
+ *
+ * @var string
+ */
+	public $name = 'ScaffoldMock';
+
+/**
+ * scaffold property
+ *
+ * @var mixed
+ */
+	public $scaffold;
+
+/**
+ * function beforeScaffold
+ *
+ * @param string $method Method name.
+ * @return bool false
+ */
+	public function beforeScaffold($method) {
+		return false;
+	}
+
+}
+
 /**
  * TestScaffoldMock class
  *
@@ -83,7 +116,7 @@ class TestScaffoldMock extends Scaffold {
 /**
  * Overload _scaffold
  *
- * @param CakeRequest $request
+ * @param CakeRequest $request Request object for scaffolding
  * @return void
  */
 	protected function _scaffold(CakeRequest $request) {
@@ -344,4 +377,40 @@ class ScaffoldTest extends CakeTestCase {
 		$this->assertNotRegExp('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
 	}
 
+/**
+ * test in case of scaffold error
+ *
+ * @return void
+ */
+	public function testScaffoldError() {
+		$request = new CakeRequest(null, false);
+		$this->Controller = new ScaffoldMockControllerWithError($request);
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
+
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' => 'scaffold_mock/edit'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		$this->Controller->request->base = '';
+		$this->Controller->request->webroot = '/';
+		$this->Controller->request->here = '/scaffold_mock/edit';
+		$this->Controller->request->addParams($params);
+
+		//set router.
+		Router::reload();
+		Router::setRequestInfo($this->Controller->request);
+
+		$this->Controller->constructClasses();
+		ob_start();
+		new Scaffold($this->Controller, $this->Controller->request);
+		$this->Controller->response->send();
+		$result = ob_get_clean();
+
+		$this->assertRegExp('/Scaffold Error/', $result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Core/AppTest.php b/web/api/lib/Cake/Test/Case/Core/AppTest.php
index 24419edfc..ecaa4bd92 100644
--- a/web/api/lib/Cake/Test/Case/Core/AppTest.php
+++ b/web/api/lib/Cake/Test/Case/Core/AppTest.php
@@ -430,27 +430,6 @@ class AppTest extends CakeTestCase {
 		App::build();
 	}
 
-/**
- * test that pluginPath can find paths for plugins.
- *
- * @return void
- */
-	public function testPluginPath() {
-		App::build(array(
-			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
-		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
-
-		$path = App::pluginPath('TestPlugin');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS;
-		$this->assertEquals($expected, $path);
-
-		$path = App::pluginPath('TestPluginTwo');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPluginTwo' . DS;
-		$this->assertEquals($expected, $path);
-		App::build();
-	}
-
 /**
  * test that themePath can find paths for themes.
  *
@@ -850,4 +829,36 @@ class AppTest extends CakeTestCase {
 		App::uses('TestPluginOtherLibrary', 'TestPlugin.Lib');
 		$this->assertTrue(class_exists('TestPluginOtherLibrary'));
 	}
+
+/**
+ * Test that increaseMemoryLimit increases the maximum amount of memory actually
+ *
+ * @dataProvider memoryVariationProvider
+ * @return void
+ */
+	public function testIncreaseMemoryLimit($memoryLimit, $additionalKb, $expected) {
+		$this->skipIf(!function_exists('ini_set'));
+
+		$originalMemoryLimit = ini_get('memory_limit');
+
+		ini_set('memory_limit', $memoryLimit);
+		App::increaseMemoryLimit($additionalKb);
+		$this->assertEquals($expected, ini_get('memory_limit'));
+
+		ini_set('memory_limit', $originalMemoryLimit);
+	}
+
+/**
+ * Data provider function for testIncreaseMemoryLimit 
+ *
+ * @return void
+ */
+	public function memoryVariationProvider() {
+		return array(
+			array('131072K', 100000, '231072K'),
+			array('256M', 1, '262145K'),
+			array('1G', 1, '1048577K'),
+			array('-1', 100000, '-1')
+		);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Core/CakePluginTest.php b/web/api/lib/Cake/Test/Case/Core/CakePluginTest.php
index 94bc3c5ac..3398d1661 100644
--- a/web/api/lib/Cake/Test/Case/Core/CakePluginTest.php
+++ b/web/api/lib/Cake/Test/Case/Core/CakePluginTest.php
@@ -20,7 +20,6 @@ App::uses('CakePlugin', 'Core');
 
 /**
  * CakePluginTest class
- *
  */
 class CakePluginTest extends CakeTestCase {
 
diff --git a/web/api/lib/Cake/Test/Case/Core/ConfigureTest.php b/web/api/lib/Cake/Test/Case/Core/ConfigureTest.php
index f91218418..6a1b4bbbd 100644
--- a/web/api/lib/Cake/Test/Case/Core/ConfigureTest.php
+++ b/web/api/lib/Cake/Test/Case/Core/ConfigureTest.php
@@ -69,6 +69,7 @@ class ConfigureTest extends CakeTestCase {
 
 /**
  * Test to ensure bootrapping doesn't overwrite prior configs set under 'App' key
+ *
  * @return void
  */
 	public function testBootstrap() {
@@ -148,6 +149,39 @@ class ConfigureTest extends CakeTestCase {
 		$this->assertEquals('4', $result);
 	}
 
+/**
+ * Test the consume method.
+ *
+ * @return void
+ */
+	public function testConsume() {
+		$this->assertNull(Configure::consume('DoesNotExist'), 'Should be null on empty value');
+		Configure::write('Test', array('key' => 'value', 'key2' => 'value2'));
+
+		$result = Configure::consume('Test.key');
+		$this->assertEquals('value', $result);
+
+		$result = Configure::read('Test.key2');
+		$this->assertEquals('value2', $result, 'Other values should remain.');
+
+		$result = Configure::consume('Test');
+		$expected = array('key2' => 'value2');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testConsumeEmpty
+ *
+ * @return void
+ */
+	public function testConsumeEmpty() {
+		Configure::write('Test', array('key' => 'value', 'key2' => 'value2'));
+		$result = Configure::consume('');
+		$this->assertNull($result);
+		$result = Configure::consume(null);
+		$this->assertNull($result);
+	}
+
 /**
  * test setting display_errors with debug.
  *
@@ -175,7 +209,7 @@ class ConfigureTest extends CakeTestCase {
 
 		Configure::delete('SomeName.someKey');
 		$result = Configure::read('SomeName.someKey');
-		$this->assertTrue($result === null);
+		$this->assertNull($result);
 
 		Configure::write('SomeName', array('someKey' => 'myvalue', 'otherKey' => 'otherValue'));
 
@@ -188,10 +222,10 @@ class ConfigureTest extends CakeTestCase {
 		Configure::delete('SomeName');
 
 		$result = Configure::read('SomeName.someKey');
-		$this->assertTrue($result === null);
+		$this->assertNull($result);
 
 		$result = Configure::read('SomeName.otherKey');
-		$this->assertTrue($result === null);
+		$this->assertNull($result);
 	}
 
 /**
@@ -245,7 +279,8 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	public function testCheckEmpty() {
-		$this->assertFalse(Configure::check());
+		$this->assertFalse(Configure::check(''));
+		$this->assertFalse(Configure::check(null));
 	}
 
 /**
@@ -415,11 +450,17 @@ class ConfigureTest extends CakeTestCase {
  * test reader() throwing exceptions on missing interface.
  *
  * @expectedException PHPUnit_Framework_Error
+ * @throws PHPUnit_Framework_Error
  * @return void
  */
 	public function testReaderExceptionOnIncorrectClass() {
 		$reader = new StdClass();
-		Configure::config('test', $reader);
+
+		try {
+			Configure::config('test', $reader);
+		} catch (Throwable $t) {
+			throw new PHPUnit_Framework_Error($t);
+		}
 	}
 
 /**
@@ -435,6 +476,8 @@ class ConfigureTest extends CakeTestCase {
 	}
 
 /**
+ * testDumpNoAdapter
+ *
  * @expectedException ConfigureException
  * @return void
  */
diff --git a/web/api/lib/Cake/Test/Case/Core/ObjectTest.php b/web/api/lib/Cake/Test/Case/Core/ObjectTest.php
index c44291a3f..1556baa89 100644
--- a/web/api/lib/Cake/Test/Case/Core/ObjectTest.php
+++ b/web/api/lib/Cake/Test/Case/Core/ObjectTest.php
@@ -73,7 +73,7 @@ class RequestActionController extends Controller {
 /**
  * normal_request_action method
  *
- * @return void
+ * @return string Hello World!
  */
 	public function normal_request_action() {
 		return 'Hello World';
@@ -82,7 +82,7 @@ class RequestActionController extends Controller {
 /**
  * returns $this->here
  *
- * @return void
+ * @return string $this->here.
  */
 	public function return_here() {
 		return $this->here;
@@ -91,7 +91,7 @@ class RequestActionController extends Controller {
 /**
  * paginate_request_action method
  *
- * @return void
+ * @return true
  */
 	public function paginate_request_action() {
 		$this->paginate();
@@ -251,8 +251,9 @@ class TestObject extends Object {
 	}
 
 /**
- * undocumented function
+ * Set properties.
  *
+ * @param array $properties The $properties.
  * @return void
  */
 	public function set($properties = array()) {
diff --git a/web/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/web/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
index 6ec656036..18930737b 100644
--- a/web/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
+++ b/web/api/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
@@ -19,6 +19,24 @@
 App::uses('ErrorHandler', 'Error');
 App::uses('Controller', 'Controller');
 App::uses('Router', 'Routing');
+App::uses('Debugger', 'Utility');
+
+/**
+ * A faulty ExceptionRenderer to test nesting.
+ */
+class FaultyExceptionRenderer extends ExceptionRenderer {
+
+/**
+ * Dummy rendering implementation.
+ *
+ * @return void
+ * @throws Exception
+ */
+	public function render() {
+		throw new Exception('Error from renderer.');
+	}
+
+}
 
 /**
  * ErrorHandlerTest class
@@ -75,6 +93,8 @@ class ErrorHandlerTest extends CakeTestCase {
 		set_error_handler('ErrorHandler::handleError');
 		$this->_restoreError = true;
 
+		Debugger::getInstance()->output('html');
+
 		ob_start();
 		$wrong .= '';
 		$result = ob_get_clean();
@@ -106,6 +126,8 @@ class ErrorHandlerTest extends CakeTestCase {
 		set_error_handler('ErrorHandler::handleError');
 		$this->_restoreError = true;
 
+		Debugger::getInstance()->output('html');
+
 		ob_start();
 		trigger_error('Test error', $error);
 
@@ -320,4 +342,48 @@ class ErrorHandlerTest extends CakeTestCase {
 		$this->assertContains('[FatalErrorException] Something wrong', $log[1], 'message missing.');
 	}
 
+/**
+ * testExceptionRendererNestingDebug method
+ *
+ * @return void
+ */
+	public function testExceptionRendererNestingDebug() {
+		Configure::write('debug', 2);
+		Configure::write('Exception.renderer', 'FaultyExceptionRenderer');
+
+		$result = false;
+		try {
+			ob_start();
+			ob_start();
+			ErrorHandler::handleFatalError(E_USER_ERROR, 'Initial error', __FILE__, __LINE__);
+		} catch (Exception $e) {
+			$result = $e instanceof FatalErrorException;
+		}
+
+		restore_error_handler();
+		$this->assertTrue($result);
+	}
+
+/**
+ * testExceptionRendererNestingProduction method
+ *
+ * @return void
+ */
+	public function testExceptionRendererNestingProduction() {
+		Configure::write('debug', 0);
+		Configure::write('Exception.renderer', 'FaultyExceptionRenderer');
+
+		$result = false;
+		try {
+			ob_start();
+			ob_start();
+			ErrorHandler::handleFatalError(E_USER_ERROR, 'Initial error', __FILE__, __LINE__);
+		} catch (Exception $e) {
+			$result = $e instanceof InternalErrorException;
+		}
+
+		restore_error_handler();
+		$this->assertTrue($result);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/web/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
index d24bbb55c..51cc4ef70 100644
--- a/web/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
+++ b/web/api/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
@@ -764,6 +764,73 @@ class ExceptionRendererTest extends CakeTestCase {
 		$this->assertEquals('Errors', $ExceptionRenderer->controller->viewPath);
 	}
 
+/**
+ * Test that missing plugin disables Controller::$plugin if the two are the same plugin.
+ *
+ * @return void
+ */
+	public function testMissingPluginRenderSafe() {
+		$exception = new NotFoundException();
+		$ExceptionRenderer = new ExceptionRenderer($exception);
+
+		$ExceptionRenderer->controller = $this->getMock('Controller', array('render'));
+		$ExceptionRenderer->controller->plugin = 'TestPlugin';
+		$ExceptionRenderer->controller->request = $this->getMock('CakeRequest');
+
+		$exception = new MissingPluginException(array('plugin' => 'TestPlugin'));
+		$ExceptionRenderer->controller->expects($this->once())
+			->method('render')
+			->with('error400')
+			->will($this->throwException($exception));
+
+		$response = $this->getMock('CakeResponse');
+		$response->expects($this->once())
+			->method('body')
+			->with($this->logicalAnd(
+				$this->logicalNot($this->stringContains('test plugin error500')),
+				$this->stringContains('Not Found')
+			));
+
+		$ExceptionRenderer->controller->response = $response;
+		$ExceptionRenderer->render();
+	}
+
+/**
+ * Test that missing plugin doesn't disable Controller::$plugin if the two aren't the same plugin.
+ *
+ * @return void
+ */
+	public function testMissingPluginRenderSafeWithPlugin() {
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+		), App::RESET);
+		CakePlugin::load('TestPlugin');
+		$exception = new NotFoundException();
+		$ExceptionRenderer = new ExceptionRenderer($exception);
+
+		$ExceptionRenderer->controller = $this->getMock('Controller', array('render'));
+		$ExceptionRenderer->controller->plugin = 'TestPlugin';
+		$ExceptionRenderer->controller->request = $this->getMock('CakeRequest');
+
+		$exception = new MissingPluginException(array('plugin' => 'TestPluginTwo'));
+		$ExceptionRenderer->controller->expects($this->once())
+			->method('render')
+			->with('error400')
+			->will($this->throwException($exception));
+
+		$response = $this->getMock('CakeResponse');
+		$response->expects($this->once())
+			->method('body')
+			->with($this->logicalAnd(
+				$this->stringContains('test plugin error500'),
+				$this->stringContains('Not Found')
+			));
+
+		$ExceptionRenderer->controller->response = $response;
+		$ExceptionRenderer->render();
+		CakePlugin::unload();
+	}
+
 /**
  * Test that exceptions can be rendered when an request hasn't been registered
  * with Router
diff --git a/web/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/web/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
index e6ff8fa7a..db16e6b7f 100644
--- a/web/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
+++ b/web/api/lib/Cake/Test/Case/Event/CakeEventManagerTest.php
@@ -88,7 +88,6 @@ class CustomTestEventListener extends CakeEventTestListener implements CakeEvent
 
 /**
  * Tests the CakeEventManager class functionality
- *
  */
 class CakeEventManagerTest extends CakeTestCase {
 
@@ -193,6 +192,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatch() {
 		$manager = new CakeEventManager();
@@ -227,6 +227,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching with a return value
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchReturnValue() {
 		$this->skipIf(
@@ -254,6 +255,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests that returning false in a callback stops the event
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchFalseStopsEvent() {
 		$this->skipIf(
@@ -281,6 +283,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching using priorities
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchPrioritized() {
 		$manager = new CakeEventManager();
@@ -298,6 +301,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching with passed params
  *
  * @return void
+ * @triggers fake.event $this, array('some' => 'data')
  */
 	public function testDispatchPassingParams() {
 		$manager = new CakeEventManager();
@@ -316,6 +320,9 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests subscribing a listener object and firing the events it subscribed to
  *
  * @return void
+ * @triggers fake.event
+ * @triggers another.event $this, array('some' => 'data')
+ * @triggers multiple.handlers
  */
 	public function testAttachSubscriber() {
 		$manager = new CakeEventManager();
@@ -380,6 +387,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests that the global event manager gets the event too from any other manager
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchWithGlobal() {
 		$generalManager = $this->getMock('CakeEventManager', array('prioritisedListeners'));
@@ -396,6 +404,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests that stopping an event will not notify the rest of the listeners
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testStopPropagation() {
 		$generalManager = $this->getMock('CakeEventManager');
@@ -423,6 +432,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching using priorities
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchPrioritizedWithGlobal() {
 		$generalManager = $this->getMock('CakeEventManager');
@@ -454,6 +464,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * Tests event dispatching using priorities
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testDispatchGlobalBeforeLocal() {
 		$generalManager = $this->getMock('CakeEventManager');
@@ -490,6 +501,7 @@ class CakeEventManagerTest extends CakeTestCase {
 /**
  * Tests events dispatched by a local manager can be handled by
  * handler registered in the global event manager
+ * @triggers my_event $manager
  */
 	public function testDispatchLocalHandledByGlobal() {
 		$callback = array($this, 'onMyEvent');
@@ -505,6 +517,7 @@ class CakeEventManagerTest extends CakeTestCase {
  * listeners at the same priority.
  *
  * @return void
+ * @triggers fake.event $this
  */
 	public function testDispatchWithGlobalAndLocalEvents() {
 		$listener = new CustomTestEventListener();
diff --git a/web/api/lib/Cake/Test/Case/Event/CakeEventTest.php b/web/api/lib/Cake/Test/Case/Event/CakeEventTest.php
index c4155db9a..3bb4771f9 100644
--- a/web/api/lib/Cake/Test/Case/Event/CakeEventTest.php
+++ b/web/api/lib/Cake/Test/Case/Event/CakeEventTest.php
@@ -22,7 +22,6 @@ App::uses('CakeEvent', 'Event');
 
 /**
  * Tests the CakeEvent class functionality
- *
  */
 class CakeEventTest extends CakeTestCase {
 
@@ -30,6 +29,7 @@ class CakeEventTest extends CakeTestCase {
  * Tests the name() method
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testName() {
 		$event = new CakeEvent('fake.event');
@@ -40,6 +40,8 @@ class CakeEventTest extends CakeTestCase {
  * Tests the subject() method
  *
  * @return void
+ * @triggers fake.event $this
+ * @triggers fake.event
  */
 	public function testSubject() {
 		$event = new CakeEvent('fake.event', $this);
@@ -53,6 +55,7 @@ class CakeEventTest extends CakeTestCase {
  * Tests the event propagation stopping property
  *
  * @return void
+ * @triggers fake.event
  */
 	public function testPropagation() {
 		$event = new CakeEvent('fake.event');
@@ -65,6 +68,7 @@ class CakeEventTest extends CakeTestCase {
  * Tests that it is possible to get/set custom data in a event
  *
  * @return void
+ * @triggers fake.event $this, array('some' => 'data')
  */
 	public function testEventData() {
 		$event = new CakeEvent('fake.event', $this, array('some' => 'data'));
@@ -75,6 +79,7 @@ class CakeEventTest extends CakeTestCase {
  * Tests that it is possible to get the name and subject directly
  *
  * @return void
+ * @triggers fake.event $this
  */
 	public function testEventDirectPropertyAccess() {
 		$event = new CakeEvent('fake.event', $this);
diff --git a/web/api/lib/Cake/Test/Case/I18n/I18nTest.php b/web/api/lib/Cake/Test/Case/I18n/I18nTest.php
index 35ff4b056..51ab95259 100644
--- a/web/api/lib/Cake/Test/Case/I18n/I18nTest.php
+++ b/web/api/lib/Cake/Test/Case/I18n/I18nTest.php
@@ -75,15 +75,15 @@ class I18nTest extends CakeTestCase {
 		$this->assertEquals('Dom 1 Foo', I18n::translate('dom1.foo', false, 'dom1'));
 		$this->assertEquals('Dom 1 Bar', I18n::translate('dom1.bar', false, 'dom1'));
 		$domains = I18n::domains();
-		$this->assertEquals('Dom 1 Foo', $domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo']);
+		$this->assertEquals('Dom 1 Foo', $domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo']['']);
 
 		// reset internally stored entries
 		I18n::clear();
 
 		// now only dom1 should be in cache
 		$cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_');
-		$this->assertEquals('Dom 1 Foo', $cachedDom1['LC_MESSAGES']['dom1.foo']);
-		$this->assertEquals('Dom 1 Bar', $cachedDom1['LC_MESSAGES']['dom1.bar']);
+		$this->assertEquals('Dom 1 Foo', $cachedDom1['LC_MESSAGES']['dom1.foo']['']);
+		$this->assertEquals('Dom 1 Bar', $cachedDom1['LC_MESSAGES']['dom1.bar']['']);
 		// dom2 not in cache
 		$this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_'));
 
@@ -92,11 +92,11 @@ class I18nTest extends CakeTestCase {
 
 		// verify dom2 was cached through manual read from cache
 		$cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_');
-		$this->assertEquals('Dom 2 Foo', $cachedDom2['LC_MESSAGES']['dom2.foo']);
-		$this->assertEquals('Dom 2 Bar', $cachedDom2['LC_MESSAGES']['dom2.bar']);
+		$this->assertEquals('Dom 2 Foo', $cachedDom2['LC_MESSAGES']['dom2.foo']['']);
+		$this->assertEquals('Dom 2 Bar', $cachedDom2['LC_MESSAGES']['dom2.bar']['']);
 
 		// modify cache entry manually to verify that dom1 entries now will be read from cache
-		$cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO';
+		$cachedDom1['LC_MESSAGES']['dom1.foo'][''] = 'FOO';
 		Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_');
 		$this->assertEquals('FOO', I18n::translate('dom1.foo', false, 'dom1'));
 	}
@@ -1512,6 +1512,127 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
 	}
 
+/**
+ * testMoRulesFifteen method
+ *
+ * @return void
+ */
+	public function testMoRulesFifteen() {
+		Configure::write('Config.language', 'rule_15_mo');
+		$this->assertRulesFifteen();
+	}
+
+/**
+ * testPoRulesFifteen method
+ *
+ * @return void
+ */
+	public function testPoRulesFifteen() {
+		Configure::write('Config.language', 'rule_15_po');
+		$this->assertRulesFifteen();
+	}
+
+/**
+ * Assertions for plural rules fifteen
+ *
+ * @return void
+ */
+	public function assertRulesFifteen() {
+		$singular = $this->_singular();
+		$this->assertEquals('Plural Rule 15 (translated)', $singular);
+
+		$plurals = $this->_plural(111);
+		$this->assertTrue(in_array('0 is 0 (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('5 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('6 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('7 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('31 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('42 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('53 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('64 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('75 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('86 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('97 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('98 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('99 ends with 11-99 (translated)', $plurals));
+		$this->assertTrue(in_array('100 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('101 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('102 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('103 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('104 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('105 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('106 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('107 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('108 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('109 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('110 ends with 03-10 (translated)', $plurals));
+		$this->assertTrue(in_array('111 ends with 11-99 (translated)', $plurals));
+
+		$coreSingular = $this->_singularFromCore();
+		$this->assertEquals('Plural Rule 15 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->_pluralFromCore(111);
+		$this->assertTrue(in_array('0 is 0 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('31 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('42 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('53 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('64 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('75 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('86 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('97 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('98 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('99 ends with 11-99 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('100 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('101 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('102 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('103 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('104 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('105 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('106 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('107 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('108 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('109 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('110 ends with 03-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('111 ends with 11-99 (from core translated)', $corePlurals));
+	}
+
 /**
  * testSetLanguageWithSession method
  *
@@ -1637,6 +1758,30 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals));
 	}
 
+/**
+ * Test that Configure::read('I18n.preferApp') will prefer app.
+ *
+ * @return void
+ */
+	public function testPluginTranslationPreferApp() {
+		// Reset internally stored entries
+		I18n::clear();
+		Cache::clear(false, '_cake_core_');
+
+		Configure::write('I18n.preferApp', true);
+
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+		));
+
+		Configure::write('Config.language', 'po');
+		$singular = $this->_domainSingular();
+		$this->assertEquals('Plural Rule 1', $singular);
+
+		$plurals = $this->_domainPlural();
+		$this->assertTrue(in_array('0 = 0 or > 1', $plurals));
+	}
+
 /**
  * testPoMultipleLineTranslation method
  *
@@ -1879,6 +2024,41 @@ class I18nTest extends CakeTestCase {
 		$this->assertSame($expected, $result['day']);
 	}
 
+/**
+ * Test basic context support
+ *
+ * @return void
+ */
+	public function testContext() {
+		Configure::write('Config.language', 'nld');
+
+		$this->assertSame("brief", __x('mail', 'letter'));
+		$this->assertSame("letter", __x('character', 'letter'));
+		$this->assertSame("bal", __x('spherical object', 'ball'));
+		$this->assertSame("danspartij", __x('social gathering', 'ball'));
+		$this->assertSame("balans", __('balance'));
+		$this->assertSame("saldo", __x('money', 'balance'));
+	}
+
+/**
+ * Test basic context support using mo files.
+ *
+ * @return void
+ */
+	public function testContextMoFile() {
+		Configure::write('Config.language', 'nld_mo');
+
+		$this->assertSame("brief", __x('mail', 'letter'));
+		$this->assertSame("letter", __x('character', 'letter'));
+		$this->assertSame("bal", __x('spherical object', 'ball'));
+		$this->assertSame("danspartij", __x('social gathering', 'ball'));
+		$this->assertSame("balans", __('balance'));
+		$this->assertSame("saldo", __x('money', 'balance'));
+
+		// MO file is sorted by msgid, 'zoo' should be last
+		$this->assertSame("dierentuin", __('zoo'));
+	}
+
 /**
  * Singular method
  *
@@ -1948,11 +2128,12 @@ class I18nTest extends CakeTestCase {
 /**
  * Plural method
  *
+ * @param int $upTo For numbers upto (default to 25)
  * @return void
  */
-	protected function _plural() {
+	protected function _plural($upTo = 25) {
 		$plurals = array();
-		for ($number = 0; $number <= 25; $number++) {
+		for ($number = 0; $number <= $upTo; $number++) {
 			$plurals[] = sprintf(__n('%d = 1', '%d = 0 or > 1', (float)$number), (float)$number);
 		}
 		return $plurals;
@@ -1971,11 +2152,12 @@ class I18nTest extends CakeTestCase {
 /**
  * pluralFromCore method
  *
+ * @param int $upTo For numbers upto (default to 25)
  * @return void
  */
-	protected function _pluralFromCore() {
+	protected function _pluralFromCore($upTo = 25) {
 		$plurals = array();
-		for ($number = 0; $number <= 25; $number++) {
+		for ($number = 0; $number <= $upTo; $number++) {
 			$plurals[] = sprintf(__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', (float)$number), (float)$number);
 		}
 		return $plurals;
diff --git a/web/api/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/web/api/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
index ea67a4058..f177488dc 100644
--- a/web/api/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
+++ b/web/api/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
@@ -35,7 +35,7 @@ class TestConsoleLog extends ConsoleLog {
 class TestCakeLog extends CakeLog {
 
 	public static function replace($key, &$engine) {
-		self::$_Collection->{$key} = $engine;
+		static::$_Collection->{$key} = $engine;
 	}
 
 }
@@ -139,7 +139,9 @@ class ConsoleLogTest extends CakeTestCase {
 		TestCakeLog::config('test_console_log', array(
 			'engine' => 'TestConsole',
 			));
-		if (DS === '\\' && !(bool)env('ANSICON')) {
+		if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
+			(function_exists('posix_isatty') && !posix_isatty(null))
+		) {
 			$expected = ConsoleOutput::PLAIN;
 		} else {
 			$expected = ConsoleOutput::COLOR;
diff --git a/web/api/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php b/web/api/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php
index debdf267c..bc898f99b 100644
--- a/web/api/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php
+++ b/web/api/lib/Cake/Test/Case/Log/Engine/SyslogLogTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Test/Case/Model/AclNodeTest.php b/web/api/lib/Cake/Test/Case/Model/AclNodeTest.php
index 26384d01a..ca40243e6 100644
--- a/web/api/lib/Cake/Test/Case/Model/AclNodeTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/AclNodeTest.php
@@ -36,7 +36,7 @@ class DbAclNodeTestBase extends AclNode {
 /**
  * cacheSources property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheSources = false;
 }
@@ -102,7 +102,7 @@ class DbPermissionTest extends CakeTestModel {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -181,8 +181,7 @@ class DbAroUserTest extends CakeTestModel {
 class TestDbAcl extends DbAcl {
 
 /**
- * construct method
- *
+ * Constructor
  */
 	public function __construct() {
 		$this->Aro = new DbAroTest();
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
index 1dcf5d58a..81737576a 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -28,7 +28,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -719,6 +719,54 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$this->assertCount(2, $result['Content']);
 	}
 
+/**
+ * testSaveAssociatedAtomic method
+ *
+ * @return void
+ */
+	public function testSaveAssociatedAtomic() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel = new TranslatedItem();
+		$data = array(
+			'slug' => 'fourth_translated',
+			'title' => array(
+				'eng' => 'Title #4'
+			),
+			'content' => array(
+				'eng' => 'Content #4'
+			),
+			'translated_article_id' => 1,
+		);
+		$Mock = $this->getMockForModel('TranslateTestModel', array('save'));
+		$TestModel->Behaviors->Translate->runtime[$TestModel->alias]['model'] = $Mock;
+
+		$with = array(
+			'TranslateTestModel' => array (
+				'model' => 'TranslatedItem',
+				'foreign_key' => '4',
+				'field' => 'content',
+				'locale' => 'eng',
+				'content' => 'Content #4',
+			)
+		);
+		$Mock->expects($this->at(0))->method('save')->with($with, array('atomic' => false));
+
+		$with = array(
+			'TranslateTestModel' => array (
+				'model' => 'TranslatedItem',
+				'foreign_key' => '4',
+				'field' => 'title',
+				'locale' => 'eng',
+				'content' => 'Title #4',
+			)
+		);
+		$Mock->expects($this->at(1))->method('save')->with($with, array('atomic' => false));
+
+		$TestModel->create();
+		$TestModel->saveAssociated($data, array('atomic' => false));
+	}
+
 /**
  * Test that saving only some of the translated fields allows the record to be found again.
  *
@@ -894,7 +942,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 
 		$TestModel = new TranslatedItem();
 		$TestModel->locale = 'eng';
-		$TestModel->validate['title'] = 'notEmpty';
+		$TestModel->validate['title'] = 'notBlank';
 		$data = array('TranslatedItem' => array(
 			'id' => 1,
 			'title' => array('eng' => 'New Title #1', 'deu' => 'Neue Titel #1', 'cze' => 'Novy Titulek #1'),
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
index bff9dbf31..653ea326b 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
@@ -31,7 +31,7 @@ class TreeBehaviorAfterTest extends CakeTestCase {
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
index fe8b25785..b9eb1ed25 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
@@ -33,7 +33,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
@@ -46,7 +46,8 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		'modelClass' => 'NumberTree',
 		'leftField' => 'lft',
 		'rightField' => 'rght',
-		'parentField' => 'parent_id'
+		'parentField' => 'parent_id',
+		'level' => 'level'
 	);
 
 /**
@@ -64,7 +65,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testInitialize() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->find('count');
@@ -82,7 +82,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectInvalidLeft() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->findByName('1.1');
@@ -93,7 +92,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->create();
 		$this->Tree->save($save);
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -110,7 +109,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectInvalidRight() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->findByName('1.1');
@@ -121,7 +119,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->create();
 		$this->Tree->save($save);
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -138,7 +136,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectInvalidParent() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->findByName('1.1');
@@ -147,7 +144,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => null), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -164,14 +161,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectNoneExistentParent() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->findByName('1.1');
 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover('MPTT');
 		$this->assertTrue($result);
@@ -188,7 +184,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRecoverUsingParentMode() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->Behaviors->disable('Tree');
 
 		$this->Tree->create();
@@ -212,7 +207,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->Tree->Behaviors->enable('Tree');
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -244,7 +239,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRecoverUsingParentModeAndDelete() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->Behaviors->disable('Tree');
 
 		$this->Tree->create();
@@ -280,7 +274,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		))));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$count = $this->Tree->find('count');
 		$this->assertEquals(6, $count);
@@ -318,14 +312,13 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRecoverFromMissingParent() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->findByName('1.1');
 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -342,13 +335,12 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectInvalidParents() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$this->Tree->updateAll(array($parentField => null));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -365,13 +357,12 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectInvalidLftsRghts() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$this->Tree->updateAll(array($leftField => 0, $rightField => 0));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$this->Tree->recover();
 
@@ -387,7 +378,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDetectEqualLftsRghts() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 3);
 
 		$result = $this->Tree->findByName('1.1');
@@ -398,7 +388,7 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 			array($rightField . ' >' => $result[$modelClass][$leftField]));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -415,7 +405,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testAddOrphan() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$this->Tree->create();
@@ -436,7 +425,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testAddMiddle() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.1')));
@@ -468,7 +456,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testAddWithPreSpecifiedId() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array(
@@ -499,7 +486,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testAddInvalid() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -525,7 +511,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testAddNotIndexedByModel() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$this->Tree->create();
@@ -546,7 +531,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMovePromote() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -565,6 +549,26 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->assertTrue($validTree);
 	}
 
+/**
+ * testGetLevel method
+ *
+ * @return void
+ */
+	public function testGetLevel() {
+		extract($this->settings);
+		$this->Tree = new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$result = $this->Tree->getLevel(5);
+		$this->assertEquals(1, $result);
+
+		$result = $this->Tree->getLevel(3);
+		$this->assertEquals(2, $result);
+
+		$this->assertFalse($this->Tree->getLevel(999));
+	}
+
 /**
  * testMoveWithWhitelist method
  *
@@ -573,7 +577,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveWithWhitelist() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -601,7 +604,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testInsertWithWhitelist() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$this->Tree->whitelist = array('name', $parentField);
@@ -621,7 +623,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveBefore() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -650,7 +651,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveAfter() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -679,7 +679,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveDemoteInvalid() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -712,7 +711,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveInvalid() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -737,7 +735,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveSelfInvalid() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->id = null;
 
@@ -763,7 +760,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveUpSuccess() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.2')));
@@ -785,7 +781,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveUpFail() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1.1')));
@@ -808,7 +803,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveUp2() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 10);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.5')));
@@ -839,7 +833,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveUpFirst() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 10);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.5')));
@@ -870,7 +863,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveDownSuccess() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.1')));
@@ -892,7 +884,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveDownFail() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1.2')));
@@ -914,7 +905,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveDownLast() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 10);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.5')));
@@ -945,7 +935,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveDown2() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 10);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.5')));
@@ -976,7 +965,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testSaveNoMove() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 10);
 
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.5')));
@@ -1007,7 +995,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testMoveToRootAndMoveUp() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(1, 1);
 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.1')));
 		$this->Tree->id = $data[$modelClass]['id'];
@@ -1032,7 +1019,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDelete() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$initialCount = $this->Tree->find('count');
@@ -1068,7 +1054,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testDeleteDoesNotExist() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$this->Tree->delete(99999);
 	}
@@ -1081,7 +1066,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRemove() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$initialCount = $this->Tree->find('count');
 		$result = $this->Tree->findByName('1.1');
@@ -1114,7 +1098,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRemoveLastTopParent() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$initialCount = $this->Tree->find('count');
@@ -1148,7 +1131,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRemoveNoChildren() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$initialCount = $this->Tree->find('count');
 
@@ -1183,7 +1165,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRemoveAndDelete() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$initialCount = $this->Tree->find('count');
@@ -1218,7 +1199,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testRemoveAndDeleteNoChildren() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 		$initialCount = $this->Tree->find('count');
 
@@ -1251,7 +1231,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testChildren() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1. Root')));
@@ -1282,7 +1261,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testCountChildren() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1. Root')));
@@ -1308,7 +1286,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testGetParentNode() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1.2.2')));
@@ -1327,7 +1304,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testGetPath() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find('first', array('conditions' => array($modelClass . '.name' => '1.2.2')));
@@ -1348,7 +1324,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testNoAmbiguousColumn() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
 			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
 		$this->Tree->initialize(2, 2);
@@ -1381,7 +1356,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testReorderTree() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(3, 3);
 		$nodes = $this->Tree->find('list', array('order' => $leftField));
 
@@ -1413,7 +1387,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testReorderBigTreeWithQueryCaching() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 10);
 
 		$original = $this->Tree->cacheQueries;
@@ -1431,7 +1404,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testGenerateTreeListWithSelfJoin() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
 			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
 		$this->Tree->initialize(2, 2);
@@ -1449,7 +1421,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testGenerateTreeListFormatting() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(2, 2);
 
 		$result = $this->Tree->generateTreeList(
@@ -1462,6 +1433,29 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		$this->assertEquals('__3 - 1.1.1', $result[3]);
 	}
 
+/**
+ * Test the formatting options of formatTreeList()
+ *
+ * @return void
+ */
+	public function testFormatTreeList() {
+		extract($this->settings);
+		$this->Tree = new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$options = array('order' => array('lft' => 'asc'));
+		$records = $this->Tree->find('all', $options);
+
+		$options = array(
+			'keyPath' => "{n}.$modelClass.id",
+			'valuePath' => array('%s - %s', "{n}.$modelClass.id", "{n}.$modelClass.name"),
+			'spacer' => '--');
+		$result = $this->Tree->formatTreeList($records, $options);
+		$this->assertEquals('1 - 1. Root', $result[1]);
+		$this->assertEquals('--2 - 1.1', $result[2]);
+		$this->assertEquals('----3 - 1.1.1', $result[3]);
+	}
+
 /**
  * testArraySyntax method
  *
@@ -1470,7 +1464,6 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 	public function testArraySyntax() {
 		extract($this->settings);
 		$this->Tree = new $modelClass();
-		$this->Tree->order = null;
 		$this->Tree->initialize(3, 3);
 		$this->assertSame($this->Tree->childCount(2), $this->Tree->childCount(array('id' => 2)));
 		$this->assertSame($this->Tree->getParentNode(2), $this->Tree->getParentNode(array('id' => 2)));
@@ -1558,4 +1551,61 @@ class TreeBehaviorNumberTest extends CakeTestCase {
 		);
 		$this->assertEquals($expected, $result);
 	}
+
+	public function testLevel() {
+		extract($this->settings);
+		$this->Tree = new $modelClass();
+		$this->Tree->Behaviors->attach('Tree', array('level' => 'level'));
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1. Root');
+		$this->assertEquals(0, $result[$modelClass][$level]);
+
+		$result = $this->Tree->findByName('1.1');
+		$this->assertEquals(1, $result[$modelClass][$level]);
+
+		$result = $this->Tree->findByName('1.2.2');
+		$this->assertEquals(2, $result[$modelClass][$level]);
+
+		$result = $this->Tree->findByName('1.2.1');
+		$this->assertEquals(2, $result[$modelClass][$level]);
+
+		// Save with parent_id not set
+		$this->Tree->save(array('id' => $result[$modelClass]['id'], 'name' => 'foo'));
+		$result = $this->Tree->findByName('foo');
+		$this->assertEquals(2, $result[$modelClass][$level]);
+
+		// Save with parent_id not changed
+		$this->Tree->save(array(
+			'id' => $result[$modelClass]['id'],
+			'parent_id' => $result[$modelClass]['parent_id'],
+			'name' => 'foo2'
+		));
+		$result = $this->Tree->findByName('foo2');
+		$this->assertEquals(2, $result[$modelClass][$level]);
+
+		// Save with parent_id changed
+		$result = $this->Tree->findByName('1.1');
+		$this->Tree->save(array(
+			'id' => $result[$modelClass]['id'],
+			'parent_id' => ''
+		));
+		$result = $this->Tree->findByName('1.1');
+		$this->assertEquals(0, $result[$modelClass][$level]);
+
+		$result = $this->Tree->findByName('1.1.2');
+		$this->assertEquals(1, $result[$modelClass][$level]);
+
+		$parent = $this->Tree->findByName('1.1.2');
+		$result = $this->Tree->findByName('1.2');
+		$this->Tree->save(array(
+			'id' => $result[$modelClass]['id'],
+			'parent_id' => $parent[$modelClass]['id']
+		));
+		$result = $this->Tree->findByName('1.2');
+		$this->assertEquals(2, $result[$modelClass][$level]);
+
+		$result = $this->Tree->findByName('1.2.2');
+		$this->assertEquals(3, $result[$modelClass][$level]);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
index 5cf3e4cbf..932d64628 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
@@ -33,7 +33,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
@@ -438,7 +438,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 		$this->Tree->Behaviors->enable('Tree');
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -485,7 +485,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -515,7 +515,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 		$this->Tree->updateAll(array($parentField => null));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
@@ -545,7 +545,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 		$this->Tree->updateAll(array($leftField => 0, $rightField => 0));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$this->Tree->recover();
 
@@ -579,7 +579,7 @@ class TreeBehaviorScopedTest extends CakeTestCase {
 			array($rightField . ' >' => $result[$modelClass][$leftField]));
 
 		$result = $this->Tree->verify();
-		$this->assertNotSame($result, true);
+		$this->assertNotSame(true, $result);
 
 		$result = $this->Tree->recover();
 		$this->assertTrue($result);
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
index 913f766b9..ee031bebb 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
@@ -20,7 +20,7 @@
 
 App::uses('Model', 'Model');
 App::uses('AppModel', 'Model');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 require_once dirname(dirname(__FILE__)) . DS . 'models.php';
 
@@ -34,7 +34,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
@@ -73,7 +73,7 @@ class TreeBehaviorUuidTest extends CakeTestCase {
 			'conditions' => array($modelClass . '.name' => '1.1')
 		));
 
-		$id = String::uuid();
+		$id = CakeText::uuid();
 		$this->Tree->create();
 		$result = $this->Tree->save(array($modelClass => array(
 			'id' => $id,
diff --git a/web/api/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/web/api/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
index 8439be0b0..0c39e13ff 100644
--- a/web/api/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
@@ -80,7 +80,7 @@ class TestBehavior extends ModelBehavior {
  *
  * @param Model $model
  * @param array $results
- * @param boolean $primary
+ * @param bool $primary
  * @return void
  */
 	public function afterFind(Model $model, $results, $primary = false) {
@@ -128,7 +128,7 @@ class TestBehavior extends ModelBehavior {
  * afterSave method
  *
  * @param Model $model
- * @param boolean $created
+ * @param bool $created
  * @param array $options Options passed from Model::save().
  * @return void
  */
@@ -161,7 +161,7 @@ class TestBehavior extends ModelBehavior {
  *
  * @param Model $Model Model invalidFields was called on.
  * @param array $options Options passed from Model::save().
- * @return boolean
+ * @return bool
  * @see Model::save()
  */
 	public function beforeValidate(Model $model, $options = array()) {
@@ -188,7 +188,7 @@ class TestBehavior extends ModelBehavior {
  * afterValidate method
  *
  * @param Model $model
- * @param boolean $cascade
+ * @param bool $cascade
  * @return void
  */
 	public function afterValidate(Model $model) {
@@ -209,7 +209,7 @@ class TestBehavior extends ModelBehavior {
  * beforeDelete method
  *
  * @param Model $model
- * @param boolean $cascade
+ * @param bool $cascade
  * @return void
  */
 	public function beforeDelete(Model $model, $cascade = true) {
@@ -281,7 +281,7 @@ class TestBehavior extends ModelBehavior {
  * testMethod method
  *
  * @param Model $model
- * @param boolean $param
+ * @param bool $param
  * @return void
  */
 	public function testMethod(Model $model, $param = true) {
diff --git a/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
index 0ede91eb5..67c4d8bd5 100644
--- a/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -436,25 +436,7 @@ class CakeSchemaTest extends CakeTestCase {
  */
 	public function testSchemaName() {
 		$Schema = new CakeSchema();
-		$this->assertEquals(Inflector::camelize(Inflector::slug(APP_DIR)), $Schema->name);
-
-		Configure::write('App.dir', 'Some.name.with.dots');
-		$Schema = new CakeSchema();
-		$this->assertEquals('SomeNameWithDots', $Schema->name);
-
-		Configure::write('App.dir', 'Some-name-with-dashes');
-		$Schema = new CakeSchema();
-		$this->assertEquals('SomeNameWithDashes', $Schema->name);
-
-		Configure::write('App.dir', 'Some name with spaces');
-		$Schema = new CakeSchema();
-		$this->assertEquals('SomeNameWithSpaces', $Schema->name);
-
-		Configure::write('App.dir', 'Some,name;with&weird=characters');
-		$Schema = new CakeSchema();
-		$this->assertEquals('SomeNameWithWeirdCharacters', $Schema->name);
-
-		Configure::write('App.dir', 'app');
+		$this->assertEquals('App', $Schema->name);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
index dc0e8c8cd..bb263076d 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -28,11 +28,11 @@ App::uses('CacheSession', 'Model/Datasource/Session');
 class TestCakeSession extends CakeSession {
 
 	public static function setUserAgent($value) {
-		self::$_userAgent = $value;
+		static::$_userAgent = $value;
 	}
 
 	public static function setHost($host) {
-		self::_setHost($host);
+		static::_setHost($host);
 	}
 
 }
@@ -86,7 +86,7 @@ class CakeSessionTest extends CakeTestCase {
  */
 	public static function setupBeforeClass() {
 		// Make sure garbage colector will be called
-		self::$_gcDivisor = ini_get('session.gc_divisor');
+		static::$_gcDivisor = ini_get('session.gc_divisor');
 		ini_set('session.gc_divisor', '1');
 	}
 
@@ -97,7 +97,7 @@ class CakeSessionTest extends CakeTestCase {
  */
 	public static function teardownAfterClass() {
 		// Revert to the default setting
-		ini_set('session.gc_divisor', self::$_gcDivisor);
+		ini_set('session.gc_divisor', static::$_gcDivisor);
 	}
 
 /**
@@ -280,7 +280,7 @@ class CakeSessionTest extends CakeTestCase {
  * @return void
  */
 	public function testReadyEmpty() {
-		$this->assertFalse(TestCakeSession::read(''));
+		$this->assertNull(TestCakeSession::read(''));
 	}
 
 /**
@@ -328,6 +328,28 @@ class CakeSessionTest extends CakeTestCase {
 		);
 	}
 
+/**
+ * Test consuming session data.
+ *
+ * @return void
+ */
+	public function testConsume() {
+		TestCakeSession::write('Some.string', 'value');
+		TestCakeSession::write('Some.array', array('key1' => 'value1', 'key2' => 'value2'));
+		$this->assertEquals('value', TestCakeSession::read('Some.string'));
+		$value = TestCakeSession::consume('Some.string');
+		$this->assertEquals('value', $value);
+		$this->assertFalse(TestCakeSession::check('Some.string'));
+		$value = TestCakeSession::consume('');
+		$this->assertNull($value);
+		$value = TestCakeSession::consume(null);
+		$this->assertNull($value);
+		$value = TestCakeSession::consume('Some.array');
+		$expected = array('key1' => 'value1', 'key2' => 'value2');
+		$this->assertEquals($expected, $value);
+		$this->assertFalse(TestCakeSession::check('Some.array'));
+	}
+
 /**
  * testId method
  *
@@ -371,11 +393,36 @@ class CakeSessionTest extends CakeTestCase {
 		$this->assertTrue(TestCakeSession::check('Delete'));
 
 		$this->assertTrue(TestCakeSession::write('Clearing.sale', 'everything must go'));
+		$this->assertFalse(TestCakeSession::delete(''));
+		$this->assertTrue(TestCakeSession::check('Clearing.sale'));
+		$this->assertFalse(TestCakeSession::delete(null));
+		$this->assertTrue(TestCakeSession::check('Clearing.sale'));
+
 		$this->assertTrue(TestCakeSession::delete('Clearing'));
 		$this->assertFalse(TestCakeSession::check('Clearing.sale'));
 		$this->assertFalse(TestCakeSession::check('Clearing'));
 	}
 
+/**
+ * testClear method
+ *
+ * @return void
+ */
+	public function testClear() {
+		$this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out'));
+		TestCakeSession::clear(false);
+		$this->assertFalse(TestCakeSession::check('Delete.me'));
+		$this->assertFalse(TestCakeSession::check('Delete'));
+
+		TestCakeSession::write('Some.string', 'value');
+		TestCakeSession::clear(false);
+		$this->assertNull(TestCakeSession::read('Some'));
+
+		TestCakeSession::write('Some.string.array', array('values'));
+		TestCakeSession::clear(false);
+		$this->assertFalse(TestCakeSession::read());
+	}
+
 /**
  * testDestroy method
  *
@@ -429,7 +476,8 @@ class CakeSessionTest extends CakeTestCase {
  * @return void
  */
 	public function testCheckEmpty() {
-		$this->assertFalse(TestCakeSession::check());
+		$this->assertFalse(TestCakeSession::check(''));
+		$this->assertFalse(TestCakeSession::check(null));
 	}
 
 /**
@@ -466,6 +514,22 @@ class CakeSessionTest extends CakeTestCase {
 		$this->assertEquals(null, TestCakeSession::read('SessionTestCase'));
 	}
 
+/**
+ * Test te cacheLimiter settings.
+ *
+ * @return void
+ */
+	public function testCacheLimiter() {
+		Configure::write('Session.cacheLimiter', 'public');
+		TestCakeSession::start();
+		$this->assertSame('public', session_cache_limiter());
+
+		Configure::write('Session.cacheLimiter', 'private');
+		TestCakeSession::destroy();
+		TestCakeSession::start();
+		$this->assertSame('private', session_cache_limiter());
+	}
+
 /**
  * testCheckUserAgentFalse method
  *
@@ -663,7 +727,7 @@ class CakeSessionTest extends CakeTestCase {
 		$this->assertEquals($expected, TestCakeSession::id());
 
 		TestCakeSession::renew();
-		$this->assertFalse($expected == TestCakeSession::id());
+		$this->assertFalse($expected === TestCakeSession::id());
 
 		$expected = session_id();
 		$this->assertEquals($expected, TestCakeSession::id());
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php
index feea3cfc5..50c007a78 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php
@@ -57,7 +57,7 @@ class TestSource extends DataSource {
 /**
  * listSources
  *
- * @return boolean
+ * @return bool
  */
 	public function listSources() {
 		return null;
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
index 4092c5e61..aa1353ecf 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -33,7 +33,7 @@ class MysqlTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -196,7 +196,6 @@ class MysqlTest extends CakeTestCase {
 /**
  * testTinyintCasting method
  *
- *
  * @return void
  */
 	public function testTinyintCasting() {
@@ -236,7 +235,6 @@ class MysqlTest extends CakeTestCase {
 /**
  * testLastAffected method
  *
- *
  * @return void
  */
 	public function testLastAffected() {
@@ -555,6 +553,10 @@ class MysqlTest extends CakeTestCase {
 		$result = $this->Dbo->column('decimal(14,7) unsigned');
 		$expected = 'decimal';
 		$this->assertEquals($expected, $result);
+
+		$result = $this->Dbo->column("set('a','b','c')");
+		$expected = "set('a','b','c')";
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -706,7 +708,8 @@ class MysqlTest extends CakeTestCase {
 				'tableParameters' => array(
 					'charset' => 'utf8',
 					'collate' => 'utf8_general_ci',
-					'engine' => 'InnoDB'
+					'engine' => 'InnoDB',
+					'comment' => 'Newly table added comment.',
 				)
 			)
 		));
@@ -714,6 +717,7 @@ class MysqlTest extends CakeTestCase {
 		$this->assertContains('DEFAULT CHARSET=utf8', $result);
 		$this->assertContains('ENGINE=InnoDB', $result);
 		$this->assertContains('COLLATE=utf8_general_ci', $result);
+		$this->assertContains('COMMENT=\'Newly table added comment.\'', $result);
 
 		$this->Dbo->rawQuery($result);
 		$result = $this->Dbo->listDetailedSources($this->Dbo->fullTableName('altertest', false, false));
@@ -777,13 +781,15 @@ class MysqlTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 
 		$table = $this->Dbo->fullTableName($tableName);
-		$this->Dbo->rawQuery('CREATE TABLE ' . $table . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_general_ci;');
+		$this->Dbo->rawQuery('CREATE TABLE ' . $table . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_general_ci COMMENT=\'Table\'\'s comment\';');
 		$result = $this->Dbo->readTableParameters($this->Dbo->fullTableName($tableName, false, false));
 		$this->Dbo->rawQuery('DROP TABLE ' . $table);
 		$expected = array(
 			'charset' => 'cp1250',
 			'collate' => 'cp1250_general_ci',
-			'engine' => 'MyISAM');
+			'engine' => 'MyISAM',
+			'comment' => 'Table\'s comment',
+		);
 		$this->assertEquals($expected, $result);
 	}
 
@@ -886,6 +892,78 @@ class MysqlTest extends CakeTestCase {
 		$this->assertTrue(isset($result['color']));
 	}
 
+/**
+ * Test that describe() ignores `default current_timestamp` in timestamp columns.
+ *
+ * @return void
+ */
+	public function testDescribeHandleCurrentTimestamp() {
+		$name = $this->Dbo->fullTableName('timestamp_default_values');
+		$sql = <<<SQL
+CREATE TABLE $name (
+	id INT(11) NOT NULL AUTO_INCREMENT,
+	phone VARCHAR(10),
+	limit_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	PRIMARY KEY(id)
+);
+SQL;
+		$this->Dbo->execute($sql);
+		$model = new Model(array(
+			'table' => 'timestamp_default_values',
+			'ds' => 'test',
+			'alias' => 'TimestampDefaultValue'
+		));
+		$result = $this->Dbo->describe($model);
+		$this->Dbo->execute('DROP TABLE ' . $name);
+
+		$this->assertNull($result['limit_date']['default']);
+
+		$schema = new CakeSchema(array(
+			'connection' => 'test',
+			'testdescribes' => $result
+		));
+		$result = $this->Dbo->createSchema($schema);
+		$this->assertContains('`limit_date` timestamp NOT NULL,', $result);
+	}
+
+/**
+ * Test that describe() ignores `default current_timestamp` in datetime columns.
+ * This is for MySQL >= 5.6.
+ *
+ * @return void
+ */
+	public function testDescribeHandleCurrentTimestampDatetime() {
+		$mysqlVersion = $this->Dbo->query('SELECT VERSION() as version', array('log' => false));
+		$this->skipIf(version_compare($mysqlVersion[0][0]['version'], '5.6.0', '<'));
+
+		$name = $this->Dbo->fullTableName('timestamp_default_values');
+		$sql = <<<SQL
+CREATE TABLE $name (
+	id INT(11) NOT NULL AUTO_INCREMENT,
+	phone VARCHAR(10),
+	limit_date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	PRIMARY KEY(id)
+);
+SQL;
+		$this->Dbo->execute($sql);
+		$model = new Model(array(
+			'table' => 'timestamp_default_values',
+			'ds' => 'test',
+			'alias' => 'TimestampDefaultValue'
+		));
+		$result = $this->Dbo->describe($model);
+		$this->Dbo->execute('DROP TABLE ' . $name);
+
+		$this->assertNull($result['limit_date']['default']);
+
+		$schema = new CakeSchema(array(
+			'connection' => 'test',
+			'testdescribes' => $result
+		));
+		$result = $this->Dbo->createSchema($schema);
+		$this->assertContains('`limit_date` datetime NOT NULL,', $result);
+	}
+
 /**
  * test that a describe() gets additional fieldParameters
  *
@@ -1144,11 +1222,14 @@ class MysqlTest extends CakeTestCase {
 				$linkModel = $this->Model->Category2->{$assoc};
 				$external = isset($assocData['external']);
 
-				if ($this->Model->Category2->alias == $linkModel->alias && $type !== 'hasAndBelongsToMany' && $type !== 'hasMany') {
+				if ($this->Model->Category2->alias === $linkModel->alias &&
+					$type !== 'hasAndBelongsToMany' &&
+					$type !== 'hasMany'
+				) {
 					$result = $this->Dbo->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external);
 					$this->assertFalse(empty($result));
 				} else {
-					if ($this->Model->Category2->useDbConfig == $linkModel->useDbConfig) {
+					if ($this->Model->Category2->useDbConfig === $linkModel->useDbConfig) {
 						$result = $this->Dbo->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external);
 						$this->assertFalse(empty($result));
 					}
@@ -1240,7 +1321,7 @@ class MysqlTest extends CakeTestCase {
  * @param Model $model
  * @param array $queryData
  * @param array $binding
- * @return void
+ * @return array The prepared association query
  */
 	protected function &_prepareAssociationQuery(Model $model, &$queryData, $binding) {
 		$type = $binding['type'];
@@ -2353,6 +2434,10 @@ class MysqlTest extends CakeTestCase {
 		$expected = " WHERE ((`User`.`user` = 'mariano') OR (`User`.`user` = 'nate'))";
 		$this->assertEquals($expected, $result);
 
+		$result = $this->Dbo->conditions(array('User.user RLIKE' => 'mariano|nate'));
+		$expected = " WHERE `User`.`user` RLIKE 'mariano|nate'";
+		$this->assertEquals($expected, $result);
+
 		$result = $this->Dbo->conditions(array('or' => array(
 			'score BETWEEN ? AND ?' => array('4', '5'), 'rating >' => '20'
 		)));
@@ -2824,10 +2909,15 @@ class MysqlTest extends CakeTestCase {
  * testDropSchemaNoSchema method
  *
  * @expectedException PHPUnit_Framework_Error
+ * @throws PHPUnit_Framework_Error
  * @return void
  */
 	public function testDropSchemaNoSchema() {
-		$this->Dbo->dropSchema(null);
+		try {
+			$this->Dbo->dropSchema(null);
+		} catch (Throwable $t) {
+			throw new PHPUnit_Framework_Error($t);
+		}
 	}
 
 /**
@@ -2988,7 +3078,7 @@ class MysqlTest extends CakeTestCase {
 		$this->assertSame($expected, $result);
 
 		$result = $this->Dbo->length(false);
-		$this->assertTrue($result === null);
+		$this->assertNull($result);
 
 		$result = $this->Dbo->length('datetime');
 		$expected = null;
@@ -3173,9 +3263,9 @@ class MysqlTest extends CakeTestCase {
  *
  * @param array $data Column data
  * @param string $expected Expected sql part
- * 
+ *
  * @return void
- * 
+ *
  * @dataProvider buildColumnUnsignedProvider
  */
 	public function testBuildColumnUnsigned($data, $expected) {
@@ -3281,7 +3371,7 @@ class MysqlTest extends CakeTestCase {
 
 /**
  * Test getting `unsigned` field parameter from DB
- * 
+ *
  * @return void
  */
 	public function testSchemaUnsigned() {
@@ -3400,6 +3490,35 @@ class MysqlTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test find() generating usable virtual fields to use in query without modifying custom subqueries.
+ *
+ * @return void
+ */
+	public function testVirtualFieldsWithSubquery() {
+		$this->loadFixtures('Article', 'Comment', 'User', 'Tag', 'ArticlesTag');
+		$this->Dbo->virtualFieldSeparator = '__';
+		$Article = ClassRegistry::init('Article');
+		$commentsTable = $this->Dbo->fullTableName('comments', false, false);
+		$Article->Comment->virtualFields = array(
+			'extra' => 'SELECT id FROM ' . $commentsTable . ' WHERE id = (SELECT 1)',
+		);
+		$conditions = array('Article.id' => array(1, 2));
+		$contain = array('Comment.extra');
+
+		$test = ConnectionManager::getDatasource('test');
+		$test->getLog();
+		$result = $Article->find('all', compact('conditions', 'contain'));
+
+		$expected = 'SELECT `Comment`.`id`, `Comment`.`article_id`, `Comment`.`user_id`, `Comment`.`comment`,' .
+			' `Comment`.`published`, `Comment`.`created`,' .
+			' `Comment`.`updated`, (SELECT id FROM comments WHERE id = (SELECT 1)) AS  `Comment__extra`' .
+			' FROM ' . $test->fullTableName('comments') . ' AS `Comment`   WHERE `Comment`.`article_id` IN (1, 2)';
+
+		$log = $test->getLog();
+		$this->assertTextEquals($expected, $log['log'][count($log['log']) - 2]['query']);
+	}
+
 /**
  * test conditions to generate query conditions for virtual fields
  *
@@ -3999,4 +4118,34 @@ class MysqlTest extends CakeTestCase {
 		$this->Dbo->useNestedTransactions = $nested;
 	}
 
+/**
+ * Test that value() quotes set values even when numeric.
+ *
+ * @return void
+ */
+	public function testSetValue() {
+		$column = "set('a','b','c')";
+		$result = $this->Dbo->value('1', $column);
+		$this->assertEquals("'1'", $result);
+
+		$result = $this->Dbo->value(1, $column);
+		$this->assertEquals("'1'", $result);
+
+		$result = $this->Dbo->value('a', $column);
+		$this->assertEquals("'a'", $result);
+	}
+
+/**
+ * Test isConnected
+ *
+ * @return void
+ */
+	public function testIsConnected() {
+		$this->Dbo->disconnect();
+		$this->assertFalse($this->Dbo->isConnected(), 'Not connected now.');
+
+		$this->Dbo->connect();
+		$this->assertTrue($this->Dbo->isConnected(), 'Should be connected.');
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
index cab74864f..20f96cd5c 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
@@ -67,7 +67,7 @@ class PostgresTestModel extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -148,7 +148,7 @@ class PostgresClientTestModel extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -162,8 +162,8 @@ class PostgresClientTestModel extends Model {
 			'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
 			'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 			'email' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
-			'created' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
-			'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			'created' => array('type' => 'datetime', 'null' => true, 'default' => null, 'length' => ''),
+			'updated' => array('type' => 'datetime', 'null' => true, 'default' => null, 'length' => null)
 		);
 	}
 
@@ -180,7 +180,7 @@ class PostgresTest extends CakeTestCase {
  * Do not automatically load fixtures for each test, they will be loaded manually
  * using CakeTestCase::loadFixtures
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -318,8 +318,8 @@ class PostgresTest extends CakeTestCase {
 		$this->assertEquals("0", $this->Dbo->value('0', 'integer'));
 		$this->assertEquals('NULL', $this->Dbo->value('', 'integer'));
 		$this->assertEquals('NULL', $this->Dbo->value('', 'float'));
-		$this->assertEquals("NULL", $this->Dbo->value('', 'integer', false));
-		$this->assertEquals("NULL", $this->Dbo->value('', 'float', false));
+		$this->assertEquals('""', $this->Dbo->value('', 'integer', false));
+		$this->assertEquals('""', $this->Dbo->value('', 'float', false));
 		$this->assertEquals("'0.0'", $this->Dbo->value('0.0', 'float'));
 
 		$this->assertEquals("'TRUE'", $this->Dbo->value('t', 'boolean'));
@@ -490,6 +490,10 @@ class PostgresTest extends CakeTestCase {
 		$this->assertSame(' WHERE "name" ~* \'[a-z_]+\'', $this->Dbo->conditions(array('name ~*' => '[a-z_]+')));
 		$this->assertSame(' WHERE "name" !~ \'[a-z_]+\'', $this->Dbo->conditions(array('name !~' => '[a-z_]+')));
 		$this->assertSame(' WHERE "name" !~* \'[a-z_]+\'', $this->Dbo->conditions(array('name !~*' => '[a-z_]+')));
+		$this->assertSame(
+			' WHERE EXTRACT( \'YEAR\' FROM "User"."birthday" ) = 2015',
+			$this->Dbo->conditions(array('EXTRACT( \'YEAR\' FROM User.birthday )' => 2015))
+		);
 	}
 
 /**
@@ -551,6 +555,7 @@ class PostgresTest extends CakeTestCase {
 			'connection' => 'test',
 			'models' => array('DatatypeTest')
 		));
+
 		$schema->tables = array(
 			'datatype_tests' => $result['tables']['missing']['datatype_tests']
 		);
@@ -730,6 +735,42 @@ class PostgresTest extends CakeTestCase {
 		$this->Dbo->query($this->Dbo->dropSchema($Old));
 	}
 
+/**
+ * Test the alterSchema changing text to integer
+ *
+ * @return void
+ */
+	public function testAlterSchemaTextToIntegerField() {
+		$default = array(
+			'connection' => 'test',
+			'name' => 'TextField',
+			'text_fields' => array(
+				'id' => array('type' => 'integer', 'key' => 'primary'),
+				'name' => array('type' => 'string', 'length' => 50),
+				'active' => array('type' => 'text', 'null' => false),
+			)
+		);
+		$Old = new CakeSchema($default);
+		$result = $this->Dbo->query($this->Dbo->createSchema($Old));
+		$this->assertTrue($result);
+
+		$modified = $default;
+		$modified['text_fields']['active'] = array('type' => 'integer', 'null' => true);
+
+		$New = new CakeSchema($modified);
+		$this->Dbo->query($this->Dbo->alterSchema($New->compare($Old)));
+		$result = $this->Dbo->describe('text_fields');
+
+		$this->Dbo->query($this->Dbo->dropSchema($Old));
+		$expected = array(
+			'type' => 'integer',
+			'null' => true,
+			'default' => null,
+			'length' => null,
+		);
+		$this->assertEquals($expected, $result['active']);
+	}
+
 /**
  * Test the alter index capabilities of postgres
  *
@@ -1098,4 +1139,69 @@ class PostgresTest extends CakeTestCase {
 		$this->assertNotContains($scientificNotation, $result);
 	}
 
+/**
+ * Test that postgres describes UUID columns correctly.
+ *
+ * @return void
+ */
+	public function testDescribeUuid() {
+		$db = $this->Dbo;
+		$db->execute('CREATE TABLE test_uuid_describe (id UUID PRIMARY KEY, name VARCHAR(255))');
+		$data = $db->describe('test_uuid_describe');
+
+		$expected = array(
+			'type' => 'string',
+			'null' => false,
+			'default' => null,
+			'length' => 36,
+		);
+		$this->assertSame($expected, $data['id']);
+		$db->execute('DROP TABLE test_uuid_describe');
+	}
+
+/**
+ * Test describe() behavior for timestamp columns.
+ *
+ * @return void
+ */
+	public function testDescribeTimestamp() {
+		$this->loadFixtures('User');
+		$model = ClassRegistry::init('User');
+		$result = $this->Dbo->describe($model);
+		$expected = array(
+			'id' => array(
+				'type' => 'integer',
+				'null' => false,
+				'default' => null,
+				'length' => 11,
+				'key' => 'primary'
+			),
+			'user' => array(
+				'type' => 'string',
+				'null' => true,
+				'default' => null,
+				'length' => 255
+			),
+			'password' => array(
+				'type' => 'string',
+				'null' => true,
+				'default' => null,
+				'length' => 255
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+			),
+			'updated' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+			)
+		);
+		$this->assertEquals($expected, $result);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
index c67d51950..14758c7d7 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
@@ -68,7 +68,7 @@ class SqliteTest extends CakeTestCase {
 /**
  * Do not automatically load fixtures for each test, they will be loaded manually using CakeTestCase::loadFixtures
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -518,4 +518,71 @@ class SqliteTest extends CakeTestCase {
 		$this->assertNotContains($scientificNotation, $result);
 	}
 
+/**
+ * Test that fields are parsed out in a reasonable fashion.
+ *
+ * @return void
+ */
+	public function testFetchRowColumnParsing() {
+		$this->loadFixtures('User');
+		$sql = 'SELECT "User"."id", "User"."user", "User"."password", "User"."created", (1 + 1) AS "two" ' .
+			'FROM "users" AS "User" WHERE ' .
+			'"User"."id" IN (SELECT MAX("id") FROM "users") ' .
+			'OR "User.id" IN (5, 6, 7, 8)';
+		$result = $this->Dbo->fetchRow($sql);
+
+		$expected = array(
+			'User' => array(
+				'id' => 4,
+				'user' => 'garrett',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:22:23'
+			),
+			0 => array(
+				'two' => 2
+			)
+		);
+		$this->assertEquals($expected, $result);
+
+		$sql = 'SELECT "User"."id", "User"."user" ' .
+			'FROM "users" AS "User" WHERE "User"."id" = 4 ' .
+			'UNION ' .
+			'SELECT "User"."id", "User"."user" ' .
+			'FROM "users" AS "User" WHERE "User"."id" = 3';
+		$result = $this->Dbo->fetchRow($sql);
+
+		$expected = array(
+			'User' => array(
+				'id' => 3,
+				'user' => 'larry',
+			),
+		);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * Test parsing more complex field names.
+ *
+ * @return void
+ */
+	public function testFetchColumnRowParsingMoreComplex() {
+		$this->loadFixtures('User');
+		$sql = 'SELECT
+			COUNT(*) AS User__count,
+			COUNT(CASE id WHEN 2 THEN 1 ELSE NULL END) as User__case,
+			AVG(CAST("User"."id" AS BIGINT)) AS User__bigint
+			FROM "users" AS "User"
+			WHERE "User"."id" > 0';
+		$result = $this->Dbo->fetchRow($sql);
+
+		$expected = array(
+			'0' => array(
+				'User__count' => '4',
+				'User__case' => '1',
+				'User__bigint' => '2.5',
+			),
+		);
+		$this->assertEquals($expected, $result);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
index a63f1a982..eb63c259b 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
@@ -116,7 +116,7 @@ class SqlserverTestModel extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -182,7 +182,7 @@ class SqlserverClientTestModel extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -248,7 +248,7 @@ class SqlserverTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -449,6 +449,15 @@ class SqlserverTest extends CakeTestCase {
 				'Null' => 'YES',
 				'Size' => '0',
 			),
+			(object)array(
+				'Default' => null,
+				'Field' => 'description',
+				'Key' => '0',
+				'Type' => 'text',
+				'Length' => 16,
+				'Null' => 'YES',
+				'Size' => '0',
+			),
 		));
 		$this->db->executeResultsStack = array($SqlserverTableDescription);
 		$dummyModel = $this->model;
@@ -485,6 +494,12 @@ class SqlserverTest extends CakeTestCase {
 				'default' => null,
 				'length' => 8,
 			),
+			'description' => array(
+				'type' => 'text',
+				'null' => true,
+				'default' => null,
+				'length' => null,
+			)
 		);
 		$this->assertEquals($expected, $result);
 		$this->assertSame($expected['parent_id'], $result['parent_id']);
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index c2f4465e1..8882282d4 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -33,6 +33,9 @@ require_once dirname(dirname(__FILE__)) . DS . 'models.php';
  */
 class MockPDO extends PDO {
 
+/**
+ * Constructor.
+ */
 	public function __construct() {
 	}
 
@@ -116,7 +119,7 @@ class DboSourceTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -539,10 +542,76 @@ class DboSourceTest extends CakeTestCase {
 		$result = $this->db->query('findByFieldName', array(), $this->Model);
 		$expected = false;
 		$this->assertEquals($expected, $result);
+
+		// findBy<X>And<Y>
+		$result = $this->db->query('findByFieldXAndFieldY', array('x', 'y'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_x' => 'x', 'TestModel.field_y' => 'y'),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEquals($expected, $result);
+
+		// findBy<X>Or<Y>
+		$result = $this->db->query('findByFieldXOrFieldY', array('x', 'y'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('OR' => array('TestModel.field_x' => 'x', 'TestModel.field_y' => 'y')),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEquals($expected, $result);
+
+		// findMyFancySearchBy<X>
+		$result = $this->db->query('findMyFancySearchByFieldX', array('x'), $this->Model);
+		$expected = array('myFancySearch', array(
+			'conditions' => array('TestModel.field_x' => 'x'),
+			'fields' => null, 'order' => null, 'limit' => null,
+			'page' => null, 'recursive' => null
+		));
+		$this->assertEquals($expected, $result);
+
+		// findFirstBy<X>
+		$result = $this->db->query('findFirstByFieldX', array('x'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_x' => 'x'),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEquals($expected, $result);
+
+		// findBy<X> with optional parameters
+		$result = $this->db->query('findByFieldX', array('x', 'y', 'priority', -1), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_x' => 'x'),
+			'fields' => 'y', 'order' => 'priority', 'recursive' => -1
+		));
+		$this->assertEquals($expected, $result);
+
+		// findBy<X>And<Y> with optional parameters
+		$result = $this->db->query('findByFieldXAndFieldY', array('x', 'y', 'z', 'priority', -1), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_x' => 'x', 'TestModel.field_y' => 'y'),
+			'fields' => 'z', 'order' => 'priority', 'recursive' => -1
+		));
+		$this->assertEquals($expected, $result);
+
+		// findAllBy<X> with optional parameters
+		$result = $this->db->query('findAllByFieldX', array('x', 'y', 'priority', 10, 2, -1), $this->Model);
+		$expected = array('all', array(
+			'conditions' => array('TestModel.field_x' => 'x'),
+			'fields' => 'y', 'order' => 'priority', 'limit' => 10,
+			'page' => 2, 'recursive' => -1
+		));
+		$this->assertEquals($expected, $result);
+
+		// findAllBy<X>And<Y> with optional parameters
+		$result = $this->db->query('findAllByFieldXAndFieldY', array('x', 'y', 'z', 'priority', 10, 2, -1), $this->Model);
+		$expected = array('all', array(
+			'conditions' => array('TestModel.field_x' => 'x', 'TestModel.field_y' => 'y'),
+			'fields' => 'z', 'order' => 'priority', 'limit' => 10,
+			'page' => 2, 'recursive' => -1
+		));
+		$this->assertEquals($expected, $result);
 	}
 
 /**
- *
  * @expectedException PDOException
  * @return void
  */
@@ -782,6 +851,35 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertTrue($result, 'Query did not return a boolean');
 	}
 
+/**
+ * Test NOT NULL on ENUM data type with empty string as a value
+ *
+ * @return void
+ */
+	public function testNotNullOnEnum() {
+		if (!$this->db instanceof Mysql) {
+			$this->markTestSkipped('This test can only run on MySQL');
+		}
+		$name = $this->db->fullTableName('enum_tests');
+		$query = "CREATE TABLE {$name} (mood ENUM('','happy','sad','ok') NOT NULL);";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
+		$EnumTest = ClassRegistry::init('EnumTest');
+		$enumResult = $EnumTest->save(array('mood' => ''));
+
+		$query = "DROP TABLE {$name};";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
+		$this->assertEquals(array(
+			'EnumTest' => array(
+				'mood' => '',
+				'id' => '0'
+			)
+		), $enumResult);
+	}
+
 /**
  * test order to generate query order clause for virtual fields
  *
@@ -1195,6 +1293,11 @@ class DboSourceTest extends CakeTestCase {
 				'table' => 'posts_tags',
 				'conditions' => array('1 = 1')
 			), 'CROSS JOIN cakephp.posts_tags AS PostsTag'),
+			array(array(
+				'type' => 'LEFT',
+				'alias' => 'PostsTag',
+				'table' => 'posts_tags',
+			), 'LEFT JOIN cakephp.posts_tags AS PostsTag'),
 			array(array(
 				'type' => 'LEFT',
 				'alias' => 'PostsTag',
@@ -1413,4 +1516,298 @@ class DboSourceTest extends CakeTestCase {
 		$result = $db->insertMulti('articles', array_keys($data[0]), $data);
 		$this->assertTrue($result, 'Data was saved');
 	}
+
+/**
+ * Test defaultConditions()
+ *
+ * @return void
+ */
+	public function testDefaultConditions() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+		$db = $Article->getDataSource();
+
+		// Creates a default set of conditions from the model if $conditions is null/empty.
+		$Article->id = 1;
+		$result = $db->defaultConditions($Article, null);
+		$this->assertEquals(array('Article.id' => 1), $result);
+
+		// $useAlias == false
+		$Article->id = 1;
+		$result = $db->defaultConditions($Article, null, false);
+		$this->assertEquals(array($db->fullTableName($Article, false) . '.id' => 1), $result);
+
+		// If conditions are supplied then they will be returned.
+		$Article->id = 1;
+		$result = $db->defaultConditions($Article, array('Article.title' => 'First article'));
+		$this->assertEquals(array('Article.title' => 'First article'), $result);
+
+		// If a model doesn't exist and no conditions were provided either null or false will be returned based on what was input.
+		$Article->id = 1000000;
+		$result = $db->defaultConditions($Article, null);
+		$this->assertNull($result);
+
+		$Article->id = 1000000;
+		$result = $db->defaultConditions($Article, false);
+		$this->assertFalse($result);
+
+		// Safe update mode
+		$Article->id = 1000000;
+		$Article->__safeUpdateMode = true;
+		$result = $db->defaultConditions($Article, null);
+		$this->assertFalse($result);
+	}
+
+/**
+ * Test that count how many times afterFind is called
+ *
+ * @return void
+ */
+	public function testCountAfterFindCalls() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Attachment', 'Tag', 'ArticlesTag');
+
+		// Use alias to make testing "primary = true" easy
+		$Primary = $this->getMock('Comment', array('afterFind'), array(array('alias' => 'Primary')), '', true);
+
+		$Article = $this->getMock('Article', array('afterFind'), array(), '', true);
+		$User = $this->getMock('User', array('afterFind'), array(), '', true);
+		$Comment = $this->getMock('Comment', array('afterFind'), array(), '', true);
+		$Tag = $this->getMock('Tag', array('afterFind'), array(), '', true);
+		$Attachment = $this->getMock('Attachment', array('afterFind'), array(), '', true);
+
+		$Primary->Article = $Article;
+		$Primary->Article->User = $User;
+		$Primary->Article->Tag = $Tag;
+		$Primary->Article->Comment = $Comment;
+		$Primary->Attachment = $Attachment;
+		$Primary->Attachment->Comment = $Comment;
+		$Primary->User = $User;
+
+		// primary = true
+		$Primary->expects($this->once())
+			->method('afterFind')->with($this->anything(), $this->isTrue())->will($this->returnArgument(0));
+
+		// primary = false
+		$Article->expects($this->once()) // Primary belongs to 1 Article
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+		$User->expects($this->exactly(2)) // Article belongs to 1 User and Primary belongs to 1 User
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+		$Tag->expects($this->exactly(2)) // Article has 2 Tags
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+		$Comment->expects($this->exactly(3)) // Article has 2 Comments and Attachment belongs to 1 Comment
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+		$Attachment->expects($this->once()) // Primary has 1 Attachment
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+
+		$result = $Primary->find('first', array('conditions' => array('Primary.id' => 5), 'recursive' => 2));
+		$this->assertCount(2, $result['Article']['Tag']);
+		$this->assertCount(2, $result['Article']['Comment']);
+
+		// hasMany special case
+		// Both User and Article has many Comments
+		$User = $this->getMock('User', array('afterFind'), array(), '', true);
+		$Article = $this->getMock('Article', array('afterFind'), array(), '', true);
+		$Comment = $this->getMock('Comment', array('afterFind'), array(), '', true);
+
+		$User->bindModel(array('hasMany' => array('Comment', 'Article')));
+		$Article->unbindModel(array('belongsTo' => array('User'), 'hasAndBelongsToMany' => array('Tag')));
+		$Comment->unbindModel(array('belongsTo' => array('User', 'Article'), 'hasOne' => 'Attachment'));
+
+		$User->Comment = $Comment;
+		$User->Article = $Article;
+		$User->Article->Comment = $Comment;
+
+		// primary = true
+		$User->expects($this->once())
+			->method('afterFind')->with($this->anything(), $this->isTrue())->will($this->returnArgument(0));
+
+		$Article->expects($this->exactly(2)) // User has 2 Articles
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+
+		$Comment->expects($this->exactly(7)) // User1 has 3 Comments, Article[id=1] has 4 Comments and Article[id=3] has 0 Comments
+			->method('afterFind')->with($this->anything(), $this->isFalse())->will($this->returnArgument(0));
+
+		$result = $User->find('first', array('conditions' => array('User.id' => 1), 'recursive' => 2));
+		$this->assertCount(3, $result['Comment']);
+		$this->assertCount(2, $result['Article']);
+		$this->assertCount(4, $result['Article'][0]['Comment']);
+		$this->assertCount(0, $result['Article'][1]['Comment']);
+	}
+
+/**
+ * Test format of $results in afterFind
+ *
+ * @return void
+ */
+	public function testUseConsistentAfterFind() {
+		$this->loadFixtures('Author', 'Post');
+
+		$expected = array(
+			'Author' => array(
+				'id' => '1',
+				'user' => 'mariano',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23',
+				'updated' => '2007-03-17 01:18:31',
+				'test' => 'working',
+			),
+			'Post' => array(
+				array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+				),
+				array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+				),
+			),
+		);
+
+		$Author = new Author();
+		$Post = $this->getMock('Post', array('afterFind'), array(), '', true);
+		$Post->expects($this->at(0))->method('afterFind')->with(array(array('Post' => $expected['Post'][0])), $this->isFalse())->will($this->returnArgument(0));
+		$Post->expects($this->at(1))->method('afterFind')->with(array(array('Post' => $expected['Post'][1])), $this->isFalse())->will($this->returnArgument(0));
+
+		$Author->bindModel(array('hasMany' => array('Post' => array('limit' => 2, 'order' => 'Post.id'))));
+		$Author->Post = $Post;
+
+		$result = $Author->find('first', array('conditions' => array('Author.id' => 1), 'recursive' => 1));
+		$this->assertEquals($expected, $result);
+
+		// Backward compatiblity
+		$Author = new Author();
+		$Post = $this->getMock('Post', array('afterFind'), array(), '', true);
+		$Post->expects($this->once())->method('afterFind')->with($expected['Post'], $this->isFalse())->will($this->returnArgument(0));
+		$Post->useConsistentAfterFind = false;
+
+		$Author->bindModel(array('hasMany' => array('Post' => array('limit' => 2, 'order' => 'Post.id'))));
+		$Author->Post = $Post;
+
+		$result = $Author->find('first', array('conditions' => array('Author.id' => 1), 'recursive' => 1));
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * Test that afterFind is called correctly for 'joins'
+ *
+ * @return void
+ */
+	public function testJoinsAfterFind() {
+		$this->loadFixtures('Article', 'User');
+
+		$User = new User();
+		$User->bindModel(array('hasOne' => array('Article')));
+
+		$Article = $this->getMock('Article', array('afterFind'), array(), '', true);
+		$Article->expects($this->once())
+			->method('afterFind')
+			->with(
+				array(
+					0 => array(
+						'Article' => array(
+							'id' => '1',
+							'user_id' => '1',
+							'title' => 'First Article',
+							'body' => 'First Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						)
+					)
+				),
+				$this->isFalse()
+			)
+			->will($this->returnArgument(0));
+
+		$User->Article = $Article;
+		$User->find('first', array(
+			'fields' => array(
+				'Article.id',
+				'Article.user_id',
+				'Article.title',
+				'Article.body',
+				'Article.published',
+				'Article.created',
+				'Article.updated'
+			),
+			'conditions' => array('User.id' => 1),
+			'recursive' => -1,
+			'joins' => array(
+				array(
+					'table' => 'articles',
+					'alias' => 'Article',
+					'type' => 'LEFT',
+					'conditions' => array(
+						'Article.user_id = User.id'
+					),
+				)
+			),
+			'order' => array('Article.id')
+		));
+	}
+
+/**
+ * Test that afterFind is called correctly for 'hasOne' association.
+ *
+ * @return void
+ */
+	public function testHasOneAfterFind() {
+		$this->loadFixtures('Article', 'User', 'Comment');
+
+		$User = new User();
+		$User->bindModel(array('hasOne' => array('Article')));
+
+		$Article = $this->getMock('Article', array('afterFind'), array(), '', true);
+		$Article->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment'),
+			'hasAndBelongsToMany' => array('Tag')
+		));
+		$Article->bindModel(array(
+			'hasOne' => array('Comment'),
+		));
+		$Article->expects($this->once())
+			->method('afterFind')
+			->with(
+				$this->equalTo(
+					array(
+						0 => array(
+							'Article' => array(
+								'id' => '1',
+								'user_id' => '1',
+								'title' => 'First Article',
+								'body' => 'First Article Body',
+								'published' => 'Y',
+								'created' => '2007-03-18 10:39:23',
+								'updated' => '2007-03-18 10:41:31',
+								'Comment' => array(
+									'id' => '1',
+									'article_id' => '1',
+									'user_id' => '2',
+									'comment' => 'First Comment for First Article',
+									'published' => 'Y',
+									'created' => '2007-03-18 10:45:23',
+									'updated' => '2007-03-18 10:47:31',
+								)
+							)
+						)
+					)
+				),
+				$this->isFalse()
+			)
+			->will($this->returnArgument(0));
+
+		$User->Article = $Article;
+		$User->find('first', array('conditions' => array('User.id' => 1), 'recursive' => 2));
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
index 42b4e7120..387c05fc1 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
@@ -39,7 +39,7 @@ class CacheSessionTest extends CakeTestCase {
 			'engine' => 'File',
 			'prefix' => 'session_test_'
 		));
-		self::$_sessionBackup = Configure::read('Session');
+		static::$_sessionBackup = Configure::read('Session');
 
 		Configure::write('Session.handler.config', 'session_test');
 	}
@@ -53,7 +53,7 @@ class CacheSessionTest extends CakeTestCase {
 		Cache::clear(false, 'session_test');
 		Cache::drop('session_test');
 
-		Configure::write('Session', self::$_sessionBackup);
+		Configure::write('Session', static::$_sessionBackup);
 	}
 
 /**
@@ -104,6 +104,8 @@ class CacheSessionTest extends CakeTestCase {
 	public function testRead() {
 		$this->storage->write('test_one', 'Some other value');
 		$this->assertEquals('Some other value', $this->storage->read('test_one'), 'Incorrect value.');
+		$this->storage->write('test_two', 0);
+		$this->assertEquals(0, $this->storage->read('test_two'));
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
index b39a32516..fb5b0bfef 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
@@ -54,7 +54,7 @@ class DatabaseSessionTest extends CakeTestCase {
  * @return void
  */
 	public static function setupBeforeClass() {
-		self::$_sessionBackup = Configure::read('Session');
+		static::$_sessionBackup = Configure::read('Session');
 		Configure::write('Session.handler', array(
 			'model' => 'SessionTestModel',
 		));
@@ -67,7 +67,7 @@ class DatabaseSessionTest extends CakeTestCase {
  * @return void
  */
 	public static function teardownAfterClass() {
-		Configure::write('Session', self::$_sessionBackup);
+		Configure::write('Session', static::$_sessionBackup);
 	}
 
 /**
@@ -122,19 +122,8 @@ class DatabaseSessionTest extends CakeTestCase {
  * @return void
  */
 	public function testWrite() {
-		$result = $this->storage->write('foo', 'Some value');
-		$expected = array(
-			'Session' => array(
-				'id' => 'foo',
-				'data' => 'Some value',
-			)
-		);
-		$expires = $result['Session']['expires'];
-		unset($result['Session']['expires']);
-		$this->assertEquals($expected, $result);
-
-		$expected = time() + (Configure::read('Session.timeout') * 60);
-		$this->assertWithinMargin($expires, $expected, 1);
+		$this->storage->write('foo', 'Some value');
+		$this->assertEquals($this->storage->read('foo'), 'Some value');
 	}
 
 /**
@@ -154,13 +143,10 @@ class DatabaseSessionTest extends CakeTestCase {
  */
 	public function testRead() {
 		$this->storage->write('foo', 'Some value');
-
-		$result = $this->storage->read('foo');
-		$expected = 'Some value';
-		$this->assertEquals($expected, $result);
-
-		$result = $this->storage->read('made up value');
-		$this->assertFalse($result);
+		$this->assertEquals($this->storage->read('foo'), 'Some value');
+		$this->storage->write('bar', 0);
+		$this->assertEquals(0, $this->storage->read('bar'));
+		$this->assertSame('', $this->storage->read('made up value'));
 	}
 
 /**
@@ -172,7 +158,7 @@ class DatabaseSessionTest extends CakeTestCase {
 		$this->storage->write('foo', 'Some value');
 
 		$this->assertTrue($this->storage->destroy('foo'), 'Destroy failed');
-		$this->assertFalse($this->storage->read('foo'), 'Value still present.');
+		$this->assertSame($this->storage->read('foo'), '');
 	}
 
 /**
@@ -189,6 +175,58 @@ class DatabaseSessionTest extends CakeTestCase {
 
 		sleep(1);
 		$storage->gc();
-		$this->assertFalse($storage->read('foo'));
+		$this->assertSame($storage->read('foo'), '');
+	}
+
+/**
+ * testConcurrentInsert
+ *
+ * @return void
+ */
+	public function testConcurrentInsert() {
+		$this->skipIf(
+			$this->db instanceof Sqlite,
+			'Sqlite does not throw exceptions when attempting to insert a duplicate primary key'
+		);
+
+		ClassRegistry::removeObject('Session');
+
+		$mockedModel = $this->getMockForModel(
+			'SessionTestModel',
+			array('exists'),
+			array('alias' => 'MockedSessionTestModel', 'table' => 'sessions')
+		);
+		Configure::write('Session.handler.model', 'MockedSessionTestModel');
+
+		$counter = 0;
+		// First save
+		$mockedModel->expects($this->at($counter++))
+			->method('exists')
+			->will($this->returnValue(false));
+
+		// Second save
+		$mockedModel->expects($this->at($counter++))
+			->method('exists')
+			->will($this->returnValue(false));
+
+		// Second save retry
+		$mockedModel->expects($this->at($counter++))
+			->method('exists')
+			->will($this->returnValue(true));
+
+		// Datasource exists check
+		$mockedModel->expects($this->at($counter++))
+			->method('exists')
+			->will($this->returnValue(true));
+
+		$this->storage = new DatabaseSession();
+
+		$this->storage->write('foo', 'Some value');
+		$return = $this->storage->read('foo');
+		$this->assertSame('Some value', $return);
+
+		$this->storage->write('foo', 'Some other value');
+		$return = $this->storage->read('foo');
+		$this->assertSame('Some other value', $return);
 	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php b/web/api/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
index 445c7bab9..ed2316d6b 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * Tests cross database HABTM. Requires $test and $test2 to both be set in DATABASE_CONFIG
  * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
  * or one connection will step on the other.
@@ -42,14 +40,14 @@ class ModelCrossSchemaHabtmTest extends BaseModelTest {
 /**
  * Don't drop tables if they exist
  *
- * @var boolean
+ * @var bool
  */
 	public $dropTables = false;
 
 /**
  * Don't auto load fixtures
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/web/api/lib/Cake/Test/Case/Model/ModelIntegrationTest.php
index ca25e0359..65ab2ad3a 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelIntegrationTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -39,7 +39,7 @@ class DboMock extends DboSource {
 /**
  * Returns true to fake a database connection
  *
- * @return boolean true
+ * @return bool true
  */
 	public function connect() {
 		return true;
@@ -226,7 +226,8 @@ class ModelIntegrationTest extends BaseModelTest {
 			'scope' => '1 = 1',
 			'type' => 'nested',
 			'__parentChange' => false,
-			'recursive' => -1
+			'recursive' => -1,
+			'level' => null
 		);
 		$this->assertEquals($expected, $TestModel->Behaviors->Tree->settings['Apple']);
 
@@ -239,6 +240,32 @@ class ModelIntegrationTest extends BaseModelTest {
 		$this->assertFalse(isset($TestModel->Behaviors->Tree));
 	}
 
+/**
+ * testTreeWithContainable method
+ *
+ * @return void
+ */
+	public function testTreeWithContainable() {
+		$this->loadFixtures('Ad', 'Campaign');
+		$TestModel = new Ad();
+		$TestModel->Behaviors->load('Tree');
+		$TestModel->Behaviors->load('Containable');
+
+		$node = $TestModel->findById(2);
+		$node['Ad']['parent_id'] = 1;
+		$TestModel->save($node);
+
+		$result = $TestModel->getParentNode(array('id' => 2, 'contain' => 'Campaign'));
+		$this->assertTrue(array_key_exists('Campaign', $result));
+
+		$result = $TestModel->children(array('id' => 1, 'contain' => 'Campaign'));
+		$this->assertTrue(array_key_exists('Campaign', $result[0]));
+
+		$result = $TestModel->getPath(array('id' => 2, 'contain' => 'Campaign'));
+		$this->assertTrue(array_key_exists('Campaign', $result[0]));
+		$this->assertTrue(array_key_exists('Campaign', $result[1]));
+	}
+
 /**
  * testFindWithJoinsOption method
  *
@@ -1307,7 +1334,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$Article->useTable = false;
 		$Article->id = 1;
 		$result = $Article->exists();
-		$this->assertTrue($result);
+		$this->assertFalse($result);
 	}
 
 /**
@@ -1967,7 +1994,7 @@ class ModelIntegrationTest extends BaseModelTest {
 					'afterFind' => 'Successfully added by AfterFind'
 				)
 			));
-		$this->assertEquals(self::date(), $result['Something']['updated']);
+		$this->assertEquals(static::date(), $result['Something']['updated']);
 		unset($result['Something']['updated']);
 		$this->assertEquals($expected, $result);
 	}
@@ -2471,4 +2498,17 @@ class ModelIntegrationTest extends BaseModelTest {
 		$model->expects($this->never())->method('getDataSource');
 		$this->assertEmpty($model->schema());
 	}
+
+/**
+ * Tests that calling getColumnType() on a model that is not supposed to use a table
+ * does not trigger any calls on any datasource
+ *
+ * @return void
+ */
+	public function testGetColumnTypeNoDB() {
+		$model = $this->getMock('Example', array('getDataSource'));
+		$model->expects($this->never())->method('getDataSource');
+		$result = $model->getColumnType('filefield');
+		$this->assertEquals('string', $result);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php b/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
index 294ce636f..dd8f92b58 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -86,6 +86,112 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertTrue(in_array(false, $doomed));
 	}
 
+/**
+ * Test IN operator
+ *
+ * @return void
+ */
+	public function testInOperator() {
+		$this->loadFixtures('Product');
+		$Product = new Product();
+		$expected = array(
+			array(
+				'Product' => array(
+					'id' => 1,
+					'name' => "Park's Great Hits",
+					'type' => 'Music',
+					'price' => 19
+				)
+			)
+		);
+
+		$result = $Product->find('all', array('conditions' => array('Product.id IN' => array(1))));
+		$this->assertEquals($expected, $result);
+
+		$expected = array(
+			array(
+				'Product' => array(
+					'id' => 2,
+					'name' => "Silly Puddy",
+					'type' => 'Toy',
+					'price' => 3
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 3,
+					'name' => "Playstation",
+					'type' => 'Toy',
+					'price' => 89
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 4,
+					'name' => "Men's T-Shirt",
+					'type' => 'Clothing',
+					'price' => 32
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 5,
+					'name' => "Blouse",
+					'type' => 'Clothing',
+					'price' => 34
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 6,
+					'name' => "Electronica 2002",
+					'type' => 'Music',
+					'price' => 4
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 7,
+					'name' => "Country Tunes",
+					'type' => 'Music',
+					'price' => 21
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 8,
+					'name' => "Watermelon",
+					'type' => 'Food',
+					'price' => 9
+				)
+			)
+		);
+		$result = $Product->find('all', array('conditions' => array('Product.id NOT IN' => array(1))));
+		$this->assertEquals($expected, $result);
+
+		$expected = array(
+			array(
+				'Product' => array(
+					'id' => 1,
+					'name' => "Park's Great Hits",
+					'type' => 'Music',
+					'price' => 19
+				)
+			),
+			array(
+				'Product' => array(
+					'id' => 2,
+					'name' => "Silly Puddy",
+					'type' => 'Toy',
+					'price' => 3
+				)
+			),
+		);
+
+		$result = $Product->find('all', array('conditions' => array('Product.id IN' => array(1, 2))));
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * testGroupBy method
  *
@@ -6309,9 +6415,7 @@ class ModelReadTest extends BaseModelTest {
 			'joins' => array(),
 			'limit' => null,
 			'offset' => null,
-			'order' => array(
-				0 => null
-			),
+			'order' => array(),
 			'page' => 1,
 			'group' => null,
 			'callbacks' => true,
@@ -6550,12 +6654,43 @@ class ModelReadTest extends BaseModelTest {
 		}
 	}
 
+/**
+ * Test that find() with array conditions works when there is only one element.
+ *
+ * @return void
+ */
+	public function testFindAllArrayConditions() {
+		$this->loadFixtures('User');
+		$TestModel = new User();
+		$TestModel->cacheQueries = false;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id' => array(3)),
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			))
+		);
+		$this->assertEquals($expected, $result);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.user' => array('larry')),
+		));
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * test find('list') method
  *
  * @return void
  */
-	public function testGenerateFindList() {
+	public function testFindList() {
 		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User', 'Comment');
 
 		$TestModel = new Article();
@@ -6825,6 +6960,32 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test that find(list) works with array conditions that have only one element.
+ *
+ * @return void
+ */
+	public function testFindListArrayCondition() {
+		$this->loadFixtures('User');
+		$TestModel = new User();
+		$TestModel->cacheQueries = false;
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('id', 'user'),
+			'conditions' => array('User.id' => array(3)),
+		));
+		$expected = array(
+			3 => 'larry'
+		);
+		$this->assertEquals($expected, $result);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('id', 'user'),
+			'conditions' => array('User.user' => array('larry')),
+		));
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * testFindField method
  *
@@ -6986,7 +7147,7 @@ class ModelReadTest extends BaseModelTest {
  * @return void
  */
 	public function testFindMagic() {
-		$this->loadFixtures('User');
+		$this->loadFixtures('User', 'Comment', 'Article');
 		$TestModel = new User();
 
 		$result = $TestModel->findByUser('mariano');
@@ -7009,6 +7170,113 @@ class ModelReadTest extends BaseModelTest {
 			'updated' => '2007-03-17 01:18:31'
 		));
 		$this->assertEquals($expected, $result);
+
+		$Comment = new Comment();
+		$Comment->recursive = -1;
+		$results = $Comment->findAllByUserId(1);
+		$expected = array(
+			array(
+				'Comment' => array(
+					'id' => 3,
+					'article_id' => 1,
+					'user_id' => 1,
+					'comment' => 'Third Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:49:23',
+					'updated' => '2007-03-18 10:51:31'
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => 4,
+					'article_id' => 1,
+					'user_id' => 1,
+					'comment' => 'Fourth Comment for First Article',
+					'published' => 'N',
+					'created' => '2007-03-18 10:51:23',
+					'updated' => '2007-03-18 10:53:31'
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => 5,
+					'article_id' => 2,
+					'user_id' => 1,
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				)
+			)
+		);
+		$this->assertEquals($expected, $results);
+
+		$results = $Comment->findAllByUserIdAndPublished(1, 'Y');
+		$expected = array(
+			array(
+				'Comment' => array(
+					'id' => 3,
+					'article_id' => 1,
+					'user_id' => 1,
+					'comment' => 'Third Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:49:23',
+					'updated' => '2007-03-18 10:51:31'
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => 5,
+					'article_id' => 2,
+					'user_id' => 1,
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				)
+			)
+		);
+		$this->assertEquals($expected, $results);
+
+		$Article = new CustomArticle();
+		$Article->recursive = -1;
+		$results = $Article->findListByUserId(1);
+		$expected = array(
+			1 => 'First Article',
+			3 => 'Third Article'
+		);
+		$this->assertEquals($expected, $results);
+
+		$results = $Article->findPublishedByUserId(1);
+		$expected = array(
+			array(
+				'CustomArticle' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'CustomArticle' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEquals($expected, $results);
+
+		$results = $Article->findUnPublishedByUserId(1);
+		$expected = array();
+		$this->assertEquals($expected, $results);
 	}
 
 /**
@@ -7779,6 +8047,38 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertEquals(4, $result);
 	}
 
+/**
+ * Test virtualfields that contain subqueries get correctly
+ * quoted allowing reserved words to be used.
+ *
+ * @return void
+ */
+	public function testVirtualFieldSubqueryReservedWords() {
+		$this->loadFixtures('User');
+		$user = ClassRegistry::init('User');
+		$user->cacheMethods = false;
+		$ds = $user->getDataSource();
+
+		$sub = $ds->buildStatement(
+			array(
+				'fields' => array('Table.user'),
+				'table' => $ds->fullTableName($user),
+				'alias' => 'Table',
+				'limit' => 1,
+				'conditions' => array(
+					"Table.id > 1"
+				)
+			),
+			$user
+		);
+		$user->virtualFields = array(
+			'sub_test' => $sub
+		);
+
+		$result = $user->find('first');
+		$this->assertNotEmpty($result);
+	}
+
 /**
  * testVirtualFieldsOrder()
  *
@@ -7990,8 +8290,8 @@ class ModelReadTest extends BaseModelTest {
 
 /**
  * test after find callback on related model
- * 
- * @return void 
+ *
+ * @return void
  */
 	public function testRelatedAfterFindCallback() {
 		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelTestBase.php b/web/api/lib/Cake/Test/Case/Model/ModelTestBase.php
index 06658542b..84b7050a7 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelTestBase.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelTestBase.php
@@ -31,14 +31,14 @@ abstract class BaseModelTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
 /**
  * Whether backup global state for each test method or not
  *
- * @var boolean
+ * @var bool
  */
 	public $backupGlobals = false;
 
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php b/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
index 8a3d266fd..1636f7a21 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -210,8 +210,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$TestModel->validate = array(
 			'user_id' => 'numeric',
-			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
-			'body' => 'notEmpty'
+			'title' => array('allowEmpty' => false, 'rule' => 'notBlank'),
+			'body' => 'notBlank'
 		);
 
 		$data = array('TestValidate' => array(
@@ -380,7 +380,7 @@ class ModelValidationTest extends BaseModelTest {
 			),
 			'title' => array(
 				'allowEmpty' => false,
-				'rule' => 'notEmpty'
+				'rule' => 'notBlank'
 		));
 
 		$data = array('TestValidate' => array(
@@ -427,7 +427,7 @@ class ModelValidationTest extends BaseModelTest {
 			),
 			'title' => array(
 				'allowEmpty' => false,
-				'rule' => 'notEmpty'
+				'rule' => 'notBlank'
 		));
 
 		$data = array('TestValidate' => array(
@@ -554,6 +554,44 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test that validates() still performs correctly when useTable = false on the model.
+ *
+ * @return void
+ */
+	public function testValidatesWithNoTable() {
+		$TestModel = new TheVoid();
+		$TestModel->validate = array(
+			'title' => array(
+				'notEmpty' => array(
+					'rule' => array('notBlank'),
+					'required' => true,
+				),
+				'tooShort' => array(
+					'rule' => array('minLength', 10),
+				),
+			),
+		);
+		$data = array(
+			'TheVoid' => array(
+				'title' => 'too short',
+			),
+		);
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array(
+			'TheVoid' => array(
+				'id' => '1',
+				'title' => 'A good title',
+			),
+		);
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+	}
+
 /**
  * test that validates() checks all the 'with' associations as well for validation
  * as this can cause partial/wrong data insertion.
@@ -577,7 +615,7 @@ class ModelValidationTest extends BaseModelTest {
 		$Something = new Something();
 		$JoinThing = $Something->JoinThing;
 
-		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+		$JoinThing->validate = array('doomed' => array('rule' => 'notBlank'));
 
 		$expectedError = array('doomed' => array('This field cannot be left blank'));
 
@@ -620,10 +658,10 @@ class ModelValidationTest extends BaseModelTest {
 		$TestModel = new ValidationTest1();
 		$TestModel->validate = array(
 			'title' => array(
-				'rule' => 'notEmpty',
+				'rule' => 'notBlank',
 			),
 			'name' => array(
-				'rule' => 'notEmpty',
+				'rule' => 'notBlank',
 		));
 		$TestModel->Behaviors->attach('ValidationRule', array('fields' => array('name')));
 
@@ -659,7 +697,7 @@ class ModelValidationTest extends BaseModelTest {
 		$Something = new Something();
 		$JoinThing = $Something->JoinThing;
 
-		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+		$JoinThing->validate = array('doomed' => array('rule' => 'notBlank'));
 		$expectedError = array('doomed' => array('This field cannot be left blank'));
 
 		$Something->create();
@@ -767,7 +805,7 @@ class ModelValidationTest extends BaseModelTest {
 					'last' => false
 				),
 				'between' => array(
-					'rule' => array('between', 5, 15),
+					'rule' => array('lengthBetween', 5, 15),
 					'message' => array('You may enter up to %s chars (minimum is %s chars)', 14, 6)
 				)
 			)
@@ -850,8 +888,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'on' => 'create'
 				)
 			)
@@ -868,8 +906,8 @@ class ModelValidationTest extends BaseModelTest {
 		unset($data['Article']['id']);
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'on' => 'update'
 				)
 			)
@@ -903,8 +941,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'create'
 				)
 			)
@@ -921,8 +959,8 @@ class ModelValidationTest extends BaseModelTest {
 		unset($data['Article']['id']);
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'update'
 				)
 			)
@@ -956,8 +994,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'create',
 					'on' => 'create'
 				)
@@ -969,8 +1007,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'update',
 					'on' => 'create'
 				)
@@ -982,8 +1020,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'create',
 					'on' => 'update'
 				)
@@ -995,8 +1033,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'update',
 					'on' => 'update'
 				)
@@ -1008,8 +1046,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'create',
 					'on' => 'create'
 				)
@@ -1023,8 +1061,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'update',
 					'on' => 'create'
 				)
@@ -1036,8 +1074,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'create',
 					'on' => 'update'
 				)
@@ -1049,8 +1087,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$Article->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => 'update',
 					'on' => 'update'
 				)
@@ -1072,8 +1110,8 @@ class ModelValidationTest extends BaseModelTest {
 		$TestModel = new Article();
 		$TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC');
 		$TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty';
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->Attachment->validate['attachment'] = 'notBlank';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 
 		$data = array(
 			'Article' => array('id' => 2),
@@ -1400,8 +1438,8 @@ class ModelValidationTest extends BaseModelTest {
 		$TestModel = new Article();
 		$TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC');
 		$TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty';
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->Attachment->validate['attachment'] = 'notBlank';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 
 		$data = array(
 			'Article' => array('id' => 2, 'body' => ''),
@@ -1550,7 +1588,7 @@ class ModelValidationTest extends BaseModelTest {
 	public function testValidateAssociated() {
 		$this->loadFixtures('Comment', 'Attachment', 'Article', 'User');
 		$TestModel = new Comment();
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+		$TestModel->Attachment->validate = array('attachment' => 'notBlank');
 
 		$data = array(
 			'Comment' => array(
@@ -1577,7 +1615,7 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertTrue($result);
 		$this->assertEmpty($TestModel->validationErrors);
 
-		$TestModel->validate = array('comment' => 'notEmpty');
+		$TestModel->validate = array('comment' => 'notBlank');
 		$record = array(
 			'Comment' => array(
 				'user_id' => 1,
@@ -1608,7 +1646,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+		$TestModel->Comment->validate = array('comment' => 'notBlank');
 		$data = array(
 			'Article' => array('id' => 2),
 			'Comment' => array(
@@ -1653,8 +1691,8 @@ class ModelValidationTest extends BaseModelTest {
 
 		$model = new Comment();
 		$model->deleteAll(true);
-		$model->validate = array('comment' => 'notEmpty');
-		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->validate = array('comment' => 'notBlank');
+		$model->Attachment->validate = array('attachment' => 'notBlank');
 		$model->Attachment->bindModel(array('belongsTo' => array('Comment')));
 		$expected = array(
 			'comment' => array('This field cannot be left blank'),
@@ -1682,7 +1720,7 @@ class ModelValidationTest extends BaseModelTest {
  */
 	public function testValidateMany() {
 		$TestModel = new Article();
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 			0 => array('title' => ''),
 			1 => array('title' => 'title 1'),
@@ -1803,13 +1841,13 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertEquals('title', $titleValidator->field);
 		$this->assertCount(1, $titleValidator->getRules());
 		$rule = current($titleValidator->getRules());
-		$this->assertEquals('notEmpty', $rule->rule);
+		$this->assertEquals('notBlank', $rule->rule);
 
 		$titleValidator = $Validator['body'];
 		$this->assertEquals('body', $titleValidator->field);
 		$this->assertCount(1, $titleValidator->getRules());
 		$rule = current($titleValidator->getRules());
-		$this->assertEquals('notEmpty', $rule->rule);
+		$this->assertEquals('notBlank', $rule->rule);
 
 		$titleValidator = $Validator['user_id'];
 		$this->assertEquals('user_id', $titleValidator->field);
@@ -1844,7 +1882,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$set = array(
 			'numeric' => array('rule' => 'numeric', 'allowEmpty' => false),
-			'range' => array('rule' => array('between', 1, 5), 'allowEmpty' => false),
+			'between' => array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false),
 		);
 		$Validator['other'] = $set;
 		$rules = $Validator['other'];
@@ -1853,7 +1891,7 @@ class ModelValidationTest extends BaseModelTest {
 		$validators = $rules->getRules();
 		$this->assertCount(2, $validators);
 		$this->assertEquals('numeric', $validators['numeric']->rule);
-		$this->assertEquals(array('between', 1, 5), $validators['range']->rule);
+		$this->assertEquals(array('lengthBetween', 1, 5), $validators['between']->rule);
 
 		$Validator['new'] = new CakeValidationSet('new', $set, array());
 		$rules = $Validator['new'];
@@ -1862,7 +1900,7 @@ class ModelValidationTest extends BaseModelTest {
 		$validators = $rules->getRules();
 		$this->assertCount(2, $validators);
 		$this->assertEquals('numeric', $validators['numeric']->rule);
-		$this->assertEquals(array('between', 1, 5), $validators['range']->rule);
+		$this->assertEquals(array('lengthBetween', 1, 5), $validators['between']->rule);
 	}
 
 /**
@@ -1917,7 +1955,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$set = array(
 			'numeric' => array('rule' => 'numeric', 'allowEmpty' => false),
-			'range' => array('rule' => array('between', 1, 5), 'allowEmpty' => false),
+			'range' => array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false),
 		);
 		$Validator['other'] = $set;
 		$this->assertCount(4, $Validator);
@@ -1938,14 +1976,14 @@ class ModelValidationTest extends BaseModelTest {
 		$Validator = $TestModel->validator();
 
 		$Validator->add('other', 'numeric', array('rule' => 'numeric', 'allowEmpty' => false));
-		$Validator->add('other', 'range', array('rule' => array('between', 1, 5), 'allowEmpty' => false));
+		$Validator->add('other', 'between', array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false));
 		$rules = $Validator['other'];
 		$this->assertEquals('other', $rules->field);
 
 		$validators = $rules->getRules();
 		$this->assertCount(2, $validators);
 		$this->assertEquals('numeric', $validators['numeric']->rule);
-		$this->assertEquals(array('between', 1, 5), $validators['range']->rule);
+		$this->assertEquals(array('lengthBetween', 1, 5), $validators['between']->rule);
 	}
 
 /**
@@ -1962,13 +2000,13 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertFalse(isset($Validator['title']));
 
 		$Validator->add('other', 'numeric', array('rule' => 'numeric', 'allowEmpty' => false));
-		$Validator->add('other', 'range', array('rule' => array('between', 1, 5), 'allowEmpty' => false));
+		$Validator->add('other', 'between', array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false));
 		$this->assertTrue(isset($Validator['other']));
 
 		$Validator->remove('other', 'numeric');
 		$this->assertTrue(isset($Validator['other']));
 		$this->assertFalse(isset($Validator['other']['numeric']));
-		$this->assertTrue(isset($Validator['other']['range']));
+		$this->assertTrue(isset($Validator['other']['between']));
 	}
 
 /**
@@ -1996,8 +2034,8 @@ class ModelValidationTest extends BaseModelTest {
 		$model = new CustomArticle();
 		$model->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => true,
 					'allowEmpty' => false
 				)
@@ -2050,8 +2088,8 @@ class ModelValidationTest extends BaseModelTest {
 		$model = new CustomArticle();
 		$model->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => true
 				)
 			)
@@ -2126,7 +2164,7 @@ class ModelValidationTest extends BaseModelTest {
 
 		$set = array(
 			'numeric' => array('rule' => 'numeric', 'allowEmpty' => false),
-			'range' => array('rule' => array('between', 1, 5), 'allowEmpty' => false),
+			'between' => array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false),
 		);
 
 		$Validator->add('other', $set);
@@ -2136,11 +2174,11 @@ class ModelValidationTest extends BaseModelTest {
 		$validators = $rules->getRules();
 		$this->assertCount(2, $validators);
 		$this->assertEquals('numeric', $validators['numeric']->rule);
-		$this->assertEquals(array('between', 1, 5), $validators['range']->rule);
+		$this->assertEquals(array('lengthBetween', 1, 5), $validators['between']->rule);
 
 		$set = new CakeValidationSet('other', array(
 			'a' => array('rule' => 'numeric', 'allowEmpty' => false),
-			'b' => array('rule' => array('between', 1, 5), 'allowEmpty' => false),
+			'b' => array('rule' => array('lengthBetween', 1, 5), 'allowEmpty' => false),
 		));
 
 		$Validator->add('other', $set);
@@ -2186,10 +2224,15 @@ class ModelValidationTest extends BaseModelTest {
  * Test that type hint exception is thrown
  *
  * @expectedException PHPUnit_Framework_Error
+ * @throws PHPUnit_Framework_Error
  * @return void
  */
 	public function testValidatorTypehintException() {
-		new ModelValidator('asdasds');
+		try {
+			new ModelValidator('asdasds');
+		} catch (Throwable $t) {
+			throw new PHPUnit_Framework_Error($t);
+		}
 	}
 
 /**
@@ -2203,8 +2246,8 @@ class ModelValidationTest extends BaseModelTest {
 		$model = new CustomArticle();
 		$model->validate = array(
 			'title' => array(
-				'notempty' => array(
-					'rule' => 'notEmpty',
+				'notBlank' => array(
+					'rule' => 'notBlank',
 					'required' => true
 				)
 			)
@@ -2294,7 +2337,7 @@ class ModelValidationTest extends BaseModelTest {
 		$this->loadFixtures('Comment', 'Article', 'User', 'Attachment');
 		$Attachment = ClassRegistry::init('Attachment');
 		$Attachment->Comment->validator()->add('comment', array(
-			array('rule' => 'notEmpty')
+			array('rule' => 'notBlank')
 		));
 		$Attachment->Comment->User->bindModel(array(
 			'hasMany' => array(
@@ -2353,7 +2396,7 @@ class ModelValidationTest extends BaseModelTest {
 		$this->loadFixtures('Comment', 'Article', 'User');
 		$Article = ClassRegistry::init('Article');
 		$Article->Comment->validator()->add('comment', array(
-			array('rule' => 'notEmpty')
+			array('rule' => 'notBlank')
 		));
 
 		$data = array(
@@ -2405,6 +2448,77 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test the isUnique method when used as a validator for multiple fields.
+ *
+ * @return void
+ */
+	public function testIsUniqueValidator() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+		$Article->validate = array(
+			'user_id' => array(
+				'duplicate' => array(
+					'rule' => array('isUnique', array('user_id', 'title'), false)
+				)
+			)
+		);
+		$data = array(
+			'user_id' => 1,
+			'title' => 'First Article',
+		);
+		$Article->create($data);
+		$this->assertFalse($Article->validates(), 'Contains a dupe');
+
+		$data = array(
+			'user_id' => 1,
+			'title' => 'Unique Article',
+		);
+		$Article->create($data);
+		$this->assertTrue($Article->validates(), 'Should pass');
+
+		$Article->validate = array(
+			'user_id' => array(
+				'duplicate' => array(
+					'rule' => array('isUnique', array('user_id', 'title'))
+				)
+			)
+		);
+		$data = array(
+			'user_id' => 1,
+			'title' => 'Unique Article',
+		);
+		$Article->create($data);
+		$this->assertFalse($Article->validates(), 'Should fail, conditions are combined with or');
+	}
+
+/**
+ * Test backward compatibility of the isUnique method when used as a validator for a single field.
+ *
+ * @return void
+ */
+	public function testBackwardCompatIsUniqueValidator() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+		$Article->validate = array(
+			'title' => array(
+				'duplicate' => array(
+					'rule' => 'isUnique',
+					'message' => 'Title must be unique',
+				),
+				'minLength' => array(
+					'rule' => array('minLength', 1),
+					'message' => 'Title cannot be empty',
+				),
+			)
+		);
+		$data = array(
+			'title' => 'First Article',
+		);
+		$data = $Article->create($data);
+		$this->assertFalse($Article->validates(), 'Contains a dupe');
+	}
+
 }
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelWriteTest.php b/web/api/lib/Cake/Test/Case/Model/ModelWriteTest.php
index 6acfd3c51..70ca570e9 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelWriteTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -36,6 +36,8 @@ class TestAuthor extends Author {
 
 	protected $_dataSourceObject;
 
+	public $dataForAfterSave;
+
 /**
  * Helper method to set a datasource object
  *
@@ -74,6 +76,8 @@ class TestPost extends Post {
 
 	protected $_dataSourceObject;
 
+	public $dataForAfterSave;
+
 /**
  * Helper method to set a datasource object
  *
@@ -383,6 +387,66 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEquals($whitelist, $model->whitelist);
 	}
 
+/**
+ * Test that save() with a fieldList continues to write
+ * updated in all cases.
+ *
+ * @return void
+ */
+	public function testSaveUpdatedWithFieldList() {
+		$this->loadFixtures('Post', 'Author');
+		$model = ClassRegistry::init('Post');
+		$original = $model->find('first', array(
+			'conditions' => array('Post.id' => 1)
+		));
+		$data = array(
+			'Post' => array(
+				'id' => 1,
+				'title' => 'New title',
+				'updated' => '1999-01-01 00:00:00',
+			)
+		);
+		$model->save($data, array(
+			'fieldList' => array('title')
+		));
+		$new = $model->find('first', array(
+			'conditions' => array('Post.id' => 1)
+		));
+		$this->assertGreaterThan($original['Post']['updated'], $new['Post']['updated']);
+	}
+
+/**
+ * Test save() resets the whitelist after afterSave
+ *
+ * @return void
+ */
+	public function testSaveResetWhitelistOnSuccess() {
+		$this->loadFixtures('Post');
+
+		$callback = array($this, 'callbackForWhitelistReset');
+		$model = ClassRegistry::init('Post');
+		$model->whitelist = array('author_id', 'title', 'body');
+		$model->getEventManager()->attach($callback, 'Model.afterSave');
+		$data = array(
+			'title' => 'New post',
+			'body' => 'Post body',
+			'author_id' => 1
+		);
+		$result = $model->save($data);
+		$this->assertNotEmpty($result);
+	}
+
+/**
+ * Callback for testing whitelist in afterSave
+ *
+ * @param Model $model The model having save called.
+ * @return void
+ */
+	public function callbackForWhitelistReset($event) {
+		$expected = array('author_id', 'title', 'body', 'updated', 'created');
+		$this->assertEquals($expected, $event->subject()->whitelist);
+	}
+
 /**
  * testSaveWithCounterCache method
  *
@@ -702,6 +766,258 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertFalse($result);
 	}
 
+/**
+ * testSaveAtomic method
+ *
+ * @return void
+ */
+	public function testSaveAtomic() {
+		$this->loadFixtures('Article');
+		$TestModel = new Article();
+
+		// Create record with 'atomic' = false
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '1',
+				'title' => 'Fourth Article',
+				'body' => 'Fourth Article Body',
+				'published' => 'Y'
+			)
+		);
+		$TestModel->create();
+		$result = $TestModel->save($data, array('atomic' => false));
+		$this->assertTrue((bool)$result);
+
+		// Check record we created
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '1',
+				'title' => 'Fourth Article',
+				'body' => 'Fourth Article Body',
+				'published' => 'Y'
+			)
+		);
+		$this->assertEquals($expected, $result);
+
+		// Create record with 'atomic' = true
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '4',
+				'title' => 'Fifth Article',
+				'body' => 'Fifth Article Body',
+				'published' => 'Y'
+			)
+		);
+		$TestModel->create();
+		$result = $TestModel->save($data, array('atomic' => true));
+		$this->assertTrue((bool)$result);
+
+		// Check record we created
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array(
+			'Article' => array(
+				'id' => '5',
+				'user_id' => '4',
+				'title' => 'Fifth Article',
+				'body' => 'Fifth Article Body',
+				'published' => 'Y'
+			)
+		);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test save with transaction and ensure there is no missing rollback.
+ *
+ * @return void
+ */
+	public function testSaveTransactionNoRollback() {
+		$this->loadFixtures('Post', 'Article');
+
+		$db = $this->getMock('DboSource', array('begin', 'connect', 'rollback', 'describe'));
+
+		$db->expects($this->once())
+			->method('describe')
+			->will($this->returnValue(array()));
+		$db->expects($this->once())
+			->method('begin')
+			->will($this->returnValue(true));
+		$db->expects($this->once())
+			->method('rollback');
+
+		$Post = new TestPost();
+		$Post->setDataSourceObject($db);
+
+		$callback = array($this, 'callbackForTestSaveTransaction');
+		$Post->getEventManager()->attach($callback, 'Model.beforeSave');
+
+		$data = array(
+			'Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fourth Post'
+			)
+		);
+		$Post->save($data, array('atomic' => true));
+	}
+
+/**
+ * test callback used in testSaveTransaction method
+ *
+ * @return bool false to stop event propagation
+ */
+	public function callbackForTestSaveTransaction($event) {
+		$TestModel = new Article();
+
+		// Create record. Do not use same model as in testSaveTransaction
+		// to avoid infinite loop.
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '1',
+				'title' => 'Fourth Article',
+				'body' => 'Fourth Article Body',
+				'published' => 'Y'
+			)
+		);
+		$TestModel->create();
+		$result = $TestModel->save($data);
+		$this->assertTrue((bool)$result);
+
+		// force transaction to be rolled back in Post model
+		$event->stopPropagation();
+		return false;
+	}
+
+/**
+ * testSaveTransaction method
+ *
+ * @return void
+ */
+	public function testSaveTransaction() {
+		$this->loadFixtures('Post', 'Article');
+		$PostModel = new Post();
+
+		// Check if Database supports transactions
+
+		$PostModel->validate = array('title' => 'notBlank');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => '')
+		);
+		$this->assertFalse($PostModel->saveAll($data));
+
+		$result = $PostModel->find('all', array('recursive' => -1));
+		$expectedPosts = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => 1,
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => 3,
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => 1,
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+
+		$this->skipIf(count($result) !== 3, 'Database does not support transactions.');
+
+		$this->assertEquals($expectedPosts, $result);
+
+		// Database supports transactions --> continue tests
+
+		$data = array(
+			'Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fourth Post'
+			)
+		);
+
+		$callback = array($this, 'callbackForTestSaveTransaction');
+		$PostModel->getEventManager()->attach($callback, 'Model.beforeSave');
+
+		$PostModel->create();
+		$result = $PostModel->save($data, array('atomic' => true));
+		$this->assertFalse($result);
+
+		$result = $PostModel->find('all', array('recursive' => -1));
+		$this->assertEquals($expectedPosts, $result);
+
+		// Check record we created in callbackForTestSaveTransaction method.
+		// record should not exist due to rollback
+
+		$ArticleModel = new Article();
+		$result = $ArticleModel->find('all', array('recursive' => -1));
+		$expectedArticles = array(
+			array(
+				'Article' => array(
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'id' => '1'
+				)
+			),
+			array(
+				'Article' => array(
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'id' => '2'
+				)
+			),
+			array(
+				'Article' => array(
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+					'id' => '3'
+				)
+			)
+		);
+		$this->assertEquals($expectedArticles, $result);
+	}
+
 /**
  * testSaveField method
  *
@@ -1672,8 +1988,8 @@ class ModelWriteTest extends BaseModelTest {
 				'title' => 'New Article With Tags and fieldList',
 				'body' => '',
 				'published' => 'N',
-				'created' => '',
-				'updated' => ''
+				'created' => static::date(),
+				'updated' => static::date(),
 			),
 			'Tag' => array(
 				0 => array(
@@ -1720,6 +2036,47 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEquals($expected, Hash::extract($result, 'JoinC.{n}.JoinAsJoinC.other'));
 	}
 
+/**
+ * test that saving HABTM with an empty array will clear existing HABTM if
+ * unique is true
+ *
+ * @return void
+ */
+	public function testSaveHabtmEmptyData() {
+		$this->loadFixtures('Node', 'Dependency');
+		$Node = new Node();
+
+		$data = array(
+			'Node' => array('name' => 'New First')
+		);
+		$Node->id = 1;
+		$Node->save($data);
+
+		$node = $Node->find('first', array(
+			'conditions' => array('Node.id' => 1),
+			'contain' => array('ParentNode')
+		));
+
+		$result = Hash::extract($node, 'ParentNode.{n}.id');
+		$expected = array(2);
+		$this->assertEquals($expected, $result);
+
+		$data = array(
+			'ParentNode' => array()
+		);
+		$Node->id = 1;
+		$Node->save($data);
+
+		$node = $Node->find('first', array(
+			'conditions' => array('Node.id' => 1),
+			'contain' => array('ParentNode')
+		));
+
+		$result = Hash::extract($node, 'ParentNode.{n}.id');
+		$expected = array();
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * testSaveHabtmNoPrimaryData method
  *
@@ -1773,7 +2130,7 @@ class ModelWriteTest extends BaseModelTest {
 				'body' => 'Second Article Body',
 				'published' => 'Y',
 				'created' => '2007-03-18 10:41:23',
-				'updated' => self::date()
+				'updated' => static::date()
 			),
 			'Tag' => array(
 				array(
@@ -1824,7 +2181,9 @@ class ModelWriteTest extends BaseModelTest {
 
 		$data = array('Item' => array('Item' => array(1, 2)));
 		$TestModel->id = 2;
-		$TestModel->save($data);
+		$result = $TestModel->save($data);
+		$this->assertTrue((bool)$result);
+
 		$result = $TestModel->findById(2);
 		$result['Item'] = Hash::sort($result['Item'], '{n}.id', 'asc');
 		$expected = array(
@@ -2454,18 +2813,9 @@ class ModelWriteTest extends BaseModelTest {
 
 		$TestModel = new TheVoid();
 		$this->assertFalse($TestModel->exists());
-	}
 
-/**
- * testRecordExistsMissingTable method
- *
- * @expectedException PDOException
- * @return void
- */
-	public function testRecordExistsMissingTable() {
-		$TestModel = new TheVoid();
 		$TestModel->id = 5;
-		$TestModel->exists();
+		$this->assertFalse($TestModel->exists());
 	}
 
 /**
@@ -2483,7 +2833,7 @@ class ModelWriteTest extends BaseModelTest {
 				'user' => 'some user',
 				'password' => 'some password'
 		)));
-		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
+		$this->assertTrue(is_int($TestModel->id) || ((int)$TestModel->id === 5));
 		$id = $TestModel->id;
 
 		$TestModel->save(array(
@@ -2711,23 +3061,23 @@ class ModelWriteTest extends BaseModelTest {
 			'JoinA' => array(
 				'id' => '1',
 				'name' => 'New name for Join A 1',
-				'updated' => self::date()
+				'updated' => static::date()
 			),
 			'JoinB' => array(
 				array(
 					'id' => 1,
 					'join_b_id' => 2,
 					'other' => 'New data for Join A 1 Join B 2',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 			)),
 			'JoinC' => array(
 				array(
 					'id' => 1,
 					'join_c_id' => 2,
 					'other' => 'New data for Join A 1 Join C 2',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 		)));
 
 		$TestModel->set($data);
@@ -2740,7 +3090,7 @@ class ModelWriteTest extends BaseModelTest {
 				'name' => 'New name for Join A 1',
 				'body' => 'Join A 1 Body',
 				'created' => '2008-01-03 10:54:23',
-				'updated' => self::date()
+				'updated' => static::date()
 			),
 			'JoinB' => array(
 				0 => array(
@@ -2753,8 +3103,8 @@ class ModelWriteTest extends BaseModelTest {
 						'join_a_id' => 1,
 						'join_b_id' => 2,
 						'other' => 'New data for Join A 1 Join B 2',
-						'created' => self::date(),
-						'updated' => self::date()
+						'created' => static::date(),
+						'updated' => static::date()
 			))),
 			'JoinC' => array(
 				0 => array(
@@ -2767,8 +3117,8 @@ class ModelWriteTest extends BaseModelTest {
 						'join_a_id' => 1,
 						'join_c_id' => 2,
 						'other' => 'New data for Join A 1 Join C 2',
-						'created' => self::date(),
-						'updated' => self::date()
+						'created' => static::date(),
+						'updated' => static::date()
 		))));
 
 		$this->assertEquals($expected, $result);
@@ -2812,10 +3162,10 @@ class ModelWriteTest extends BaseModelTest {
 				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
 				'test' => 'working'
 		));
-		$this->assertEquals(self::date(), $result[3]['Post']['created']);
-		$this->assertEquals(self::date(), $result[3]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Author']['created']);
-		$this->assertEquals(self::date(), $result[3]['Author']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['created']);
+		$this->assertEquals(static::date(), $result[3]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Author']['created']);
+		$this->assertEquals(static::date(), $result[3]['Author']['updated']);
 		unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
 		unset($result[3]['Author']['created'], $result[3]['Author']['updated']);
 		$this->assertEquals($expected, $result[3]);
@@ -2860,10 +3210,10 @@ class ModelWriteTest extends BaseModelTest {
 					'body' => 'Second multi-record post',
 					'published' => 'N'
 		)));
-		$this->assertEquals(self::date(), $result[0]['Post']['created']);
-		$this->assertEquals(self::date(), $result[0]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[1]['Post']['created']);
-		$this->assertEquals(self::date(), $result[1]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[0]['Post']['created']);
+		$this->assertEquals(static::date(), $result[0]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[1]['Post']['created']);
+		$this->assertEquals(static::date(), $result[1]['Post']['updated']);
 		unset($result[0]['Post']['created'], $result[0]['Post']['updated']);
 		unset($result[1]['Post']['created'], $result[1]['Post']['updated']);
 		$this->assertEquals($expected, $result);
@@ -2889,8 +3239,8 @@ class ModelWriteTest extends BaseModelTest {
 			'comment' => 'New comment with attachment',
 			'published' => 'Y'
 		);
-		$this->assertEquals(self::date(), $result[6]['Comment']['created']);
-		$this->assertEquals(self::date(), $result[6]['Comment']['updated']);
+		$this->assertEquals(static::date(), $result[6]['Comment']['created']);
+		$this->assertEquals(static::date(), $result[6]['Comment']['updated']);
 		unset($result[6]['Comment']['created'], $result[6]['Comment']['updated']);
 		$this->assertEquals($expected, $result[6]['Comment']);
 
@@ -2899,8 +3249,8 @@ class ModelWriteTest extends BaseModelTest {
 			'comment_id' => '7',
 			'attachment' => 'some_file.tgz'
 		);
-		$this->assertEquals(self::date(), $result[6]['Attachment']['created']);
-		$this->assertEquals(self::date(), $result[6]['Attachment']['updated']);
+		$this->assertEquals(static::date(), $result[6]['Attachment']['created']);
+		$this->assertEquals(static::date(), $result[6]['Attachment']['updated']);
 		unset($result[6]['Attachment']['created'], $result[6]['Attachment']['updated']);
 		$this->assertEquals($expected, $result[6]['Attachment']);
 	}
@@ -3082,8 +3432,8 @@ class ModelWriteTest extends BaseModelTest {
 		$model->Attachment->deleteAll(true);
 		$this->assertEquals(array(), $model->Attachment->find('all'));
 
-		$model->validate = array('comment' => 'notEmpty');
-		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->validate = array('comment' => 'notBlank');
+		$model->Attachment->validate = array('attachment' => 'notBlank');
 		$model->Attachment->bindModel(array('belongsTo' => array('Comment')));
 
 		$result = $model->saveAll(
@@ -3165,7 +3515,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertSame($result, array('Article' => true, 'Comment' => array(true, true)));
 
 		$TestModel->validate = array(
-			'title' => 'notEmpty',
+			'title' => 'notBlank',
 			'author_id' => 'numeric'
 		);
 		$result = $TestModel->saveAll(array(
@@ -3370,7 +3720,7 @@ class ModelWriteTest extends BaseModelTest {
 				)
 			)
 		);
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 		$result = $TestModel->saveAll($data, array('deep' => true));
 		$this->assertFalse($result);
 
@@ -3413,8 +3763,8 @@ class ModelWriteTest extends BaseModelTest {
 		$TestModel = new Article();
 		$TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC');
 		$TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty';
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->Attachment->validate['attachment'] = 'notBlank';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 
 		$result = $TestModel->saveAll(
 			array(
@@ -3824,7 +4174,7 @@ class ModelWriteTest extends BaseModelTest {
 				)
 			)
 		);
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 		$result = $TestModel->saveAll($data, array('deep' => false));
 		$this->assertFalse($result);
 
@@ -3864,8 +4214,8 @@ class ModelWriteTest extends BaseModelTest {
 		$TestModel = new Article();
 		$TestModel->hasMany['Comment']['order'] = array('Comment.created' => 'ASC');
 		$TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->Attachment->validate['attachment'] = 'notEmpty';
-		$TestModel->Comment->validate['comment'] = 'notEmpty';
+		$TestModel->Comment->Attachment->validate['attachment'] = 'notBlank';
+		$TestModel->Comment->validate['comment'] = 'notBlank';
 
 		$result = $TestModel->saveAll(
 			array(
@@ -4085,7 +4435,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Article', 'Comment');
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+		$TestModel->Comment->validate = array('comment' => 'notBlank');
 
 		$result = $TestModel->saveAll(array(
 			'Article' => array('id' => 2),
@@ -4124,25 +4474,57 @@ class ModelWriteTest extends BaseModelTest {
 	public function testSaveAllManyRowsTransactionNoRollback() {
 		$this->loadFixtures('Post');
 
-		$db = $this->getMock('DboSource', array('begin', 'connect', 'rollback', 'describe'));
+		$Post = new TestPost();
+		$Post->validate = array(
+			'title' => array('rule' => array('notBlank'))
+		);
 
-		$db->expects($this->once())
-			->method('describe')
-			->will($this->returnValue(array()));
+		// If validation error occurs, rollback() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
 		$db->expects($this->once())->method('rollback');
 
-		$Post = new TestPost();
 		$Post->setDataSourceObject($db);
 
-		$Post->validate = array(
-			'title' => array('rule' => array('notEmpty'))
-		);
-
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => '')
 		);
 		$Post->saveAll($data, array('atomic' => true, 'validate' => true));
+
+		// If exception thrown, rollback() should be called too.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post', 'body' => $db->expression('PDO_EXCEPTION()'))
+		);
+
+		try {
+			$Post->saveAll($data, array('atomic' => true, 'validate' => true));
+			$this->fail('No exception thrown');
+		} catch (PDOException $e) {
+		}
+
+		// Otherwise, commit() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post')
+		);
+		$Post->saveAll($data, array('atomic' => true, 'validate' => true));
 	}
 
 /**
@@ -4151,28 +4533,22 @@ class ModelWriteTest extends BaseModelTest {
  * @return void
  */
 	public function testSaveAllAssociatedTransactionNoRollback() {
-		$testDb = ConnectionManager::getDataSource('test');
-
-		$db = $this->getMock('DboSource', array('connect', 'rollback', 'describe', 'create', 'update', 'begin'));
-		$db->columns = $testDb->columns;
-
-		$db->expects($this->once())->method('rollback');
-		$db->expects($this->any())->method('describe')
-			->will($this->returnValue(array(
-				'id' => array('type' => 'integer', 'length' => 11),
-				'title' => array('type' => 'string'),
-				'body' => array('type' => 'text'),
-				'published' => array('type' => 'string')
-			)));
+		$this->loadFixtures('Post', 'Author');
 
 		$Post = new TestPost();
+		$Post->Author->validate = array(
+			'user' => array('rule' => array('notBlank'))
+		);
+
+		// If validation error occurs, rollback() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
 		$Post->setDataSourceObject($db);
 		$Post->Author->setDataSourceObject($db);
 
-		$Post->Author->validate = array(
-			'user' => array('rule' => array('notEmpty'))
-		);
-
 		$data = array(
 			'Post' => array(
 				'title' => 'New post',
@@ -4185,6 +4561,55 @@ class ModelWriteTest extends BaseModelTest {
 			)
 		);
 		$Post->saveAll($data, array('validate' => true));
+
+		// If exception thrown, rollback() should be called too.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+		$Post->Author->setDataSourceObject($db);
+
+		$data = array(
+			'Post' => array(
+				'title' => 'New post',
+				'body' => $db->expression('PDO_EXCEPTION()'),
+				'published' => 'Y'
+			),
+			'Author' => array(
+				'user' => 'New user',
+				'password' => "sekret"
+			)
+		);
+
+		try {
+			$Post->saveAll($data, array('validate' => true));
+			$this->fail('No exception thrown');
+		} catch (PDOException $e) {
+		}
+
+		// Otherwise, commit() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+		$Post->Author->setDataSourceObject($db);
+
+		$data = array(
+			'Post' => array(
+				'title' => 'New post',
+				'body' => 'Content',
+				'published' => 'Y'
+			),
+			'Author' => array(
+				'user' => 'New user',
+				'password' => "sekret"
+			)
+		);
+		$Post->saveAll($data, array('validate' => true));
 	}
 
 /**
@@ -4212,7 +4637,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
 		$TestModel = new Post();
 
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => 'New Fifth Post'),
@@ -4259,8 +4684,8 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'New Fourth Post',
 					'body' => null,
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 			));
 
 			$expected[] = array(
@@ -4270,8 +4695,8 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'New Fifth Post',
 					'body' => null,
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 			));
 
 			$this->assertEquals($expected, $result);
@@ -4327,8 +4752,8 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'New Fourth Post',
 					'body' => 'Third Post Body',
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 			));
 
 			$expected[] = array(
@@ -4338,13 +4763,13 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'Third Post',
 					'body' => 'Third Post Body',
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 			));
 		}
 		$this->assertEquals($expected, $result);
 
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => 'New Fifth Post'),
@@ -4464,15 +4889,15 @@ class ModelWriteTest extends BaseModelTest {
 					'body' => 'Fourth post body',
 					'published' => 'N'
 		)));
-		$this->assertEquals(self::date(), $result[0]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[1]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Post']['created']);
-		$this->assertEquals(self::date(), $result[3]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[0]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[1]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['created']);
+		$this->assertEquals(static::date(), $result[3]['Post']['updated']);
 		unset($result[0]['Post']['updated'], $result[1]['Post']['updated']);
 		unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
 		$this->assertEquals($expected, $result);
 
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric');
 		$data = array(
 			array(
 				'id' => '1',
@@ -4498,7 +4923,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$this->assertEquals($errors, $TestModel->validationErrors);
 
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric');
 		$data = array(
 			array(
 				'id' => '1',
@@ -4558,10 +4983,10 @@ class ModelWriteTest extends BaseModelTest {
 			)
 		);
 
-		$this->assertEquals(self::date(), $result[0]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[1]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Post']['created']);
+		$this->assertEquals(static::date(), $result[0]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[1]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['created']);
 		unset(
 			$result[0]['Post']['updated'], $result[1]['Post']['updated'],
 			$result[3]['Post']['updated'], $result[3]['Post']['created']
@@ -4600,7 +5025,7 @@ class ModelWriteTest extends BaseModelTest {
 	public function testSaveAllValidationOnly() {
 		$this->loadFixtures('Comment', 'Attachment');
 		$TestModel = new Comment();
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+		$TestModel->Attachment->validate = array('attachment' => 'notBlank');
 
 		$data = array(
 			'Comment' => array(
@@ -4615,7 +5040,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertFalse($result);
 
 		$TestModel = new Article();
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$result = $TestModel->saveAll(
 			array(
 				0 => array('title' => ''),
@@ -4655,7 +5080,7 @@ class ModelWriteTest extends BaseModelTest {
 		$model = new Article();
 		$model->deleteAll(true);
 
-		$model->Comment->validate = array('comment' => 'notEmpty');
+		$model->Comment->validate = array('comment' => 'notBlank');
 		$result = $model->saveAll(array(
 			'Article' => array(
 				'title' => 'Post with Author',
@@ -4792,7 +5217,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Article', 'Comment', 'Attachment');
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+		$TestModel->Comment->validate = array('comment' => 'notBlank');
 
 		$result = $TestModel->saveAll(
 			array(
@@ -4942,10 +5367,10 @@ class ModelWriteTest extends BaseModelTest {
 				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
 				'test' => 'working'
 		));
-		$this->assertEquals(self::date(), $result[3]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Post']['created']);
-		$this->assertEquals(self::date(), $result[3]['Author']['created']);
-		$this->assertEquals(self::date(), $result[3]['Author']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['created']);
+		$this->assertEquals(static::date(), $result[3]['Author']['created']);
+		$this->assertEquals(static::date(), $result[3]['Author']['updated']);
 		unset(
 			$result[3]['Post']['updated'], $result[3]['Post']['created'],
 			$result[3]['Author']['updated'], $result[3]['Author']['created']
@@ -4974,8 +5399,8 @@ class ModelWriteTest extends BaseModelTest {
 			'comment' => 'New comment with attachment',
 			'published' => 'Y'
 		);
-		$this->assertEquals(self::date(), $result[6]['Comment']['updated']);
-		$this->assertEquals(self::date(), $result[6]['Comment']['created']);
+		$this->assertEquals(static::date(), $result[6]['Comment']['updated']);
+		$this->assertEquals(static::date(), $result[6]['Comment']['created']);
 		unset($result[6]['Comment']['updated'], $result[6]['Comment']['created']);
 		$this->assertEquals($expected, $result[6]['Comment']);
 
@@ -4984,8 +5409,8 @@ class ModelWriteTest extends BaseModelTest {
 			'comment_id' => '7',
 			'attachment' => 'some_file.tgz'
 		);
-		$this->assertEquals(self::date(), $result[6]['Attachment']['updated']);
-		$this->assertEquals(self::date(), $result[6]['Attachment']['created']);
+		$this->assertEquals(static::date(), $result[6]['Attachment']['updated']);
+		$this->assertEquals(static::date(), $result[6]['Attachment']['created']);
 		unset($result[6]['Attachment']['updated'], $result[6]['Attachment']['created']);
 		$this->assertEquals($expected, $result[6]['Attachment']);
 	}
@@ -5000,7 +5425,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Comment', 'Article', 'User');
 		$Article = ClassRegistry::init('Article');
 		$Article->Comment->validator()->add('comment', array(
-			array('rule' => 'notEmpty')
+			array('rule' => 'notBlank')
 		));
 
 		$data = array(
@@ -5085,10 +5510,10 @@ class ModelWriteTest extends BaseModelTest {
 				)
 			)
 		);
-		$this->assertEquals(self::date(), $result[0]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[0]['Post']['created']);
-		$this->assertEquals(self::date(), $result[1]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[1]['Post']['created']);
+		$this->assertEquals(static::date(), $result[0]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[0]['Post']['created']);
+		$this->assertEquals(static::date(), $result[1]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[1]['Post']['created']);
 		unset($result[0]['Post']['updated'], $result[0]['Post']['created']);
 		unset($result[1]['Post']['updated'], $result[1]['Post']['created']);
 		$this->assertEquals($expected, $result);
@@ -5288,8 +5713,8 @@ class ModelWriteTest extends BaseModelTest {
 		$model->Attachment->deleteAll(true);
 		$this->assertEquals(array(), $model->Attachment->find('all'));
 
-		$model->validate = array('comment' => 'notEmpty');
-		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->validate = array('comment' => 'notBlank');
+		$model->Attachment->validate = array('attachment' => 'notBlank');
 		$model->Attachment->bindModel(array('belongsTo' => array('Comment')));
 
 		$result = $model->saveAssociated(
@@ -5383,7 +5808,7 @@ class ModelWriteTest extends BaseModelTest {
 		), array('atomic' => false));
 		$this->assertSame($result, array(true, true, true));
 
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric');
 		$result = $TestModel->saveMany(array(
 			array(
 				'id' => '1',
@@ -5486,7 +5911,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Article', 'Comment');
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->validate = $TestModel->Comment->validate = array('user_id' => array('notEmpty' => array('rule' => 'notEmpty', 'required' => true)));
+		$TestModel->validate = $TestModel->Comment->validate = array('user_id' => array('notBlank' => array('rule' => 'notBlank', 'required' => true)));
 
 		//empty hasMany data is ignored in save
 		$result = $TestModel->saveAssociated(array(
@@ -5518,7 +5943,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Article', 'Comment');
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+		$TestModel->Comment->validate = array('comment' => 'notBlank');
 
 		$result = $TestModel->saveAssociated(array(
 			'Article' => array('id' => 2),
@@ -5557,25 +5982,57 @@ class ModelWriteTest extends BaseModelTest {
 	public function testSaveManyTransactionNoRollback() {
 		$this->loadFixtures('Post');
 
-		$db = $this->getMock('DboSource', array('begin', 'connect', 'rollback', 'describe'));
+		$Post = new TestPost();
+		$Post->validate = array(
+			'title' => array('rule' => array('notBlank'))
+		);
 
-		$db->expects($this->once())
-			->method('describe')
-			->will($this->returnValue(array()));
+		// If validation error occurs, rollback() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
 		$db->expects($this->once())->method('rollback');
 
-		$Post = new TestPost();
 		$Post->setDataSourceObject($db);
 
-		$Post->validate = array(
-			'title' => array('rule' => array('notEmpty'))
-		);
-
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => '')
 		);
 		$Post->saveMany($data, array('validate' => true));
+
+		// If exception thrown, rollback() should be called too.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post', 'body' => $db->expression('PDO_EXCEPTION()'))
+		);
+
+		try {
+			$Post->saveMany($data, array('validate' => true));
+			$this->fail('No exception thrown');
+		} catch (PDOException $e) {
+		}
+
+		// Otherwise, commit() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post')
+		);
+		$Post->saveMany($data, array('validate' => true));
 	}
 
 /**
@@ -5584,28 +6041,22 @@ class ModelWriteTest extends BaseModelTest {
  * @return void
  */
 	public function testSaveAssociatedTransactionNoRollback() {
-		$testDb = ConnectionManager::getDataSource('test');
-
-		$db = $this->getMock('DboSource', array('connect', 'rollback', 'describe', 'create', 'begin'));
-		$db->columns = $testDb->columns;
-
-		$db->expects($this->once())->method('rollback');
-		$db->expects($this->any())->method('describe')
-			->will($this->returnValue(array(
-				'id' => array('type' => 'integer', 'length' => 11),
-				'title' => array('type' => 'string'),
-				'body' => array('type' => 'text'),
-				'published' => array('type' => 'string')
-			)));
+		$this->loadFixtures('Post', 'Author');
 
 		$Post = new TestPost();
+		$Post->Author->validate = array(
+			'user' => array('rule' => array('notBlank'))
+		);
+
+		// If validation error occurs, rollback() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
 		$Post->setDataSourceObject($db);
 		$Post->Author->setDataSourceObject($db);
 
-		$Post->Author->validate = array(
-			'user' => array('rule' => array('notEmpty'))
-		);
-
 		$data = array(
 			'Post' => array(
 				'title' => 'New post',
@@ -5618,6 +6069,55 @@ class ModelWriteTest extends BaseModelTest {
 			)
 		);
 		$Post->saveAssociated($data, array('validate' => true, 'atomic' => true));
+
+		// If exception thrown, commit() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->once())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+		$Post->Author->setDataSourceObject($db);
+
+		$data = array(
+			'Post' => array(
+				'title' => 'New post',
+				'body' => $db->expression('PDO_EXCEPTION()'),
+				'published' => 'Y'
+			),
+			'Author' => array(
+				'user' => 'New user',
+				'password' => "sekret"
+			)
+		);
+
+		try {
+			$Post->saveAssociated($data, array('validate' => true, 'atomic' => true));
+			$this->fail('No exception thrown');
+		} catch (PDOException $e) {
+		}
+
+		// Otherwise, commit() should be called.
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->once())->method('begin')->will($this->returnValue(true));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+
+		$Post->setDataSourceObject($db);
+		$Post->Author->setDataSourceObject($db);
+
+		$data = array(
+			'Post' => array(
+				'title' => 'New post',
+				'body' => 'Content',
+				'published' => 'Y'
+			),
+			'Author' => array(
+				'user' => 'New user',
+				'password' => "sekret"
+			)
+		);
+		$Post->saveAssociated($data, array('validate' => true, 'atomic' => true));
 	}
 
 /**
@@ -5645,7 +6145,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
 		$TestModel = new Post();
 
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => 'New Fifth Post'),
@@ -5703,10 +6203,10 @@ class ModelWriteTest extends BaseModelTest {
 					'published' => 'N',
 			));
 
-			$this->assertEquals(self::date(), $result[3]['Post']['created']);
-			$this->assertEquals(self::date(), $result[3]['Post']['updated']);
-			$this->assertEquals(self::date(), $result[4]['Post']['created']);
-			$this->assertEquals(self::date(), $result[4]['Post']['updated']);
+			$this->assertEquals(static::date(), $result[3]['Post']['created']);
+			$this->assertEquals(static::date(), $result[3]['Post']['updated']);
+			$this->assertEquals(static::date(), $result[4]['Post']['created']);
+			$this->assertEquals(static::date(), $result[4]['Post']['updated']);
 			unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
 			unset($result[4]['Post']['created'], $result[4]['Post']['updated']);
 			$this->assertEquals($expected, $result);
@@ -5772,16 +6272,16 @@ class ModelWriteTest extends BaseModelTest {
 					'body' => 'Third Post Body',
 					'published' => 'N'
 			));
-			$this->assertEquals(self::date(), $result[3]['Post']['created']);
-			$this->assertEquals(self::date(), $result[3]['Post']['updated']);
-			$this->assertEquals(self::date(), $result[4]['Post']['created']);
-			$this->assertEquals(self::date(), $result[4]['Post']['updated']);
+			$this->assertEquals(static::date(), $result[3]['Post']['created']);
+			$this->assertEquals(static::date(), $result[3]['Post']['updated']);
+			$this->assertEquals(static::date(), $result[4]['Post']['created']);
+			$this->assertEquals(static::date(), $result[4]['Post']['updated']);
 			unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
 			unset($result[4]['Post']['created'], $result[4]['Post']['updated']);
 		}
 		$this->assertEquals($expected, $result);
 
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 			array('author_id' => 1, 'title' => 'New Fourth Post'),
 			array('author_id' => 1, 'title' => 'New Fifth Post'),
@@ -5906,15 +6406,15 @@ class ModelWriteTest extends BaseModelTest {
 			)
 		);
 
-		$this->assertEquals(self::date(), $result[0]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[1]['Post']['updated']);
-		$this->assertEquals(self::date(), $result[3]['Post']['created']);
-		$this->assertEquals(self::date(), $result[3]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[0]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[1]['Post']['updated']);
+		$this->assertEquals(static::date(), $result[3]['Post']['created']);
+		$this->assertEquals(static::date(), $result[3]['Post']['updated']);
 		unset($result[0]['Post']['updated'], $result[1]['Post']['updated']);
 		unset($result[3]['Post']['created'], $result[3]['Post']['updated']);
 		$this->assertEquals($expected, $result);
 
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric');
 		$data = array(
 			array(
 				'id' => '1',
@@ -5940,7 +6440,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$this->assertEquals($errors, $TestModel->validationErrors);
 
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$TestModel->validate = array('title' => 'notBlank', 'author_id' => 'numeric');
 		$data = array(
 			array(
 				'id' => '1',
@@ -6028,7 +6528,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	public function testValidateMany() {
 		$TestModel = new Article();
-		$TestModel->validate = array('title' => 'notEmpty');
+		$TestModel->validate = array('title' => 'notBlank');
 		$data = array(
 				0 => array('title' => ''),
 				1 => array('title' => 'title 1'),
@@ -6064,7 +6564,7 @@ class ModelWriteTest extends BaseModelTest {
 		$model = new Article();
 		$model->deleteAll(true);
 
-		$model->Comment->validate = array('comment' => 'notEmpty');
+		$model->Comment->validate = array('comment' => 'notBlank');
 		$result = $model->saveAssociated(array(
 			'Article' => array(
 				'title' => 'Post with Author',
@@ -6199,7 +6699,7 @@ class ModelWriteTest extends BaseModelTest {
 	public function testValidateAssociated() {
 		$this->loadFixtures('Attachment', 'Article', 'Comment');
 		$TestModel = new Comment();
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+		$TestModel->Attachment->validate = array('attachment' => 'notBlank');
 
 		$data = array(
 			'Comment' => array(
@@ -6215,7 +6715,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+		$TestModel->Comment->validate = array('comment' => 'notBlank');
 
 		$data = array(
 			'Article' => array('id' => 2),
@@ -6371,6 +6871,11 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEquals(array(6, 4, 5, 2), $result);
 	}
 
+/**
+ * testToggleBoolFields method
+ *
+ * @return void
+ */
 	public function testToggleBoolFields() {
 		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
 		$Post = new CounterCachePost();
@@ -6661,15 +7166,15 @@ class ModelWriteTest extends BaseModelTest {
 				'title' => 'Post without body',
 				'body' => null,
 				'published' => 'N',
-				'created' => self::date(),
-				'updated' => self::date(),
+				'created' => static::date(),
+				'updated' => static::date(),
 			),
 			'Author' => array(
 				'id' => '5',
 				'user' => 'bob',
 				'password' => null,
-				'created' => self::date(),
-				'updated' => self::date(),
+				'created' => static::date(),
+				'updated' => static::date(),
 				'test' => 'working',
 			),
 		);
@@ -6724,15 +7229,15 @@ class ModelWriteTest extends BaseModelTest {
 				'title' => 'Post title',
 				'body' => 'Post body',
 				'published' => 'N',
-				'created' => self::date(),
-				'updated' => self::date()
+				'created' => static::date(),
+				'updated' => static::date()
 			),
 			'Author' => array(
 				'id' => '6',
 				'user' => 'jack',
 				'password' => 'foobar',
-				'created' => self::date(),
-				'updated' => self::date(),
+				'created' => static::date(),
+				'updated' => static::date(),
 				'test' => 'working'
 			),
 		);
@@ -6766,8 +7271,8 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'Multi-record post 1',
 					'body' => '',
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 				)
 			),
 			array(
@@ -6777,8 +7282,8 @@ class ModelWriteTest extends BaseModelTest {
 					'title' => 'Multi-record post 2',
 					'body' => '',
 					'published' => 'N',
-					'created' => self::date(),
-					'updated' => self::date()
+					'created' => static::date(),
+					'updated' => static::date()
 				)
 			)
 		);
@@ -6845,8 +7350,8 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('Attachment', 'Comment', 'Article', 'User');
 		$TestModel = new Comment();
 
-		$TestModel->validate = array('comment' => 'notEmpty');
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+		$TestModel->validate = array('comment' => 'notBlank');
+		$TestModel->Attachment->validate = array('attachment' => 'notBlank');
 
 		$record = array(
 			'Comment' => array(
@@ -6881,7 +7386,7 @@ class ModelWriteTest extends BaseModelTest {
 		$this->loadFixtures('ArticleFeatured', 'Featured');
 		$Article = new ArticleFeatured();
 		$Article->belongsTo = $Article->hasMany = array();
-		$Article->Featured->validate = array('end_date' => 'notEmpty');
+		$Article->Featured->validate = array('end_date' => 'notBlank');
 
 		$record = array(
 			'ArticleFeatured' => array(
@@ -7198,6 +7703,218 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertEquals(2, count($result['Attachment']));
 	}
 
+/**
+ * Test that boolean fields don't cause saveMany to fail
+ *
+ * @return void
+ */
+	public function testSaveManyBooleanFields() {
+		$this->loadFixtures('Item', 'Syfile', 'Image');
+		$data = array(
+			array(
+				'Item' => array(
+					'name' => 'testing',
+					'syfile_id' => 1,
+					'published' => false
+				)
+			),
+			array(
+				'Item' => array(
+					'name' => 'testing 2',
+					'syfile_id' => 1,
+					'published' => true
+				)
+			),
+		);
+		$item = ClassRegistry::init('Item');
+		$result = $item->saveMany($data, array('atomic' => false));
+
+		$this->assertCount(2, $result, '2 records should have been saved.');
+		$this->assertTrue($result[0], 'Both should have succeded');
+		$this->assertTrue($result[1], 'Both should have succeded');
+	}
+
+/**
+ * testSaveManyDeepHasManyValidationFailure method
+ *
+ * @return void
+ */
+	public function testSaveManyDeepHasManyValidationFailure() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel = new Article();
+		$TestModel->Comment->validate = array(
+			'comment' => array(
+				'notBlank' => array(
+					'rule' => array('notBlank'),
+				)
+			)
+		);
+
+		$result = $TestModel->saveMany(array(
+			array(
+				'user_id' => 1,
+				'title' => 'New Article',
+				'body' => 'This article contains a invalid comment',
+				'Comment' => array(
+					array(
+						'user_id' => 1,
+						'comment' => ''
+					)
+				)
+			)
+		), array('deep' => true));
+		$this->assertFalse($result);
+		$this->assertEquals(array(
+			array(
+				'Comment' => array(
+					array('comment' => array('notBlank'))
+				)
+			)
+		), $TestModel->validationErrors);
+	}
+
+/**
+ * testSaveAssociatedDeepHasOneHasManyValidateTrueValidationFailure method
+ *
+ * @return void
+ */
+	public function testSaveAssociatedDeepHasOneHasManyValidateTrueValidationFailure() {
+		$this->loadFixtures('User', 'Article', 'Comment');
+		$TestModel = new UserHasOneArticle();
+		$TestModel->Article->Comment->validate = array(
+			'comment' => array(
+				'notBlank' => array(
+					'rule' => array('notBlank'),
+				)
+			)
+		);
+
+		$result = $TestModel->saveAssociated(array(
+			'User' => array(
+				'user' => 'hiromi',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			),
+			'Article' => array(
+				'title' => 'Article with User',
+				'body' => 'This article will be saved with an user and contains a invalid comment',
+				'Comment' => array(
+					array(
+						'user_id' => 1,
+						'comment' => ''
+					)
+				)
+			)
+		), array('deep' => true, 'validate' => true));
+		$this->assertFalse($result);
+		$this->assertEquals(array(
+			'Article' => array(
+				'Comment' => array(
+					array('comment' => array('notBlank'))
+				)
+			)
+		), $TestModel->validationErrors);
+	}
+
+/**
+ * testSaveAssociatedDeepBelongsToHasManyValidateTrueValidationFailure method
+ *
+ * @return void
+ */
+	public function testSaveAssociatedDeepBelongsToHasManyValidateTrueValidationFailure() {
+		$this->loadFixtures('ArticlesTag', 'Article', 'Comment');
+		$TestModel = new ArticlesTagBelongsToArticle();
+		$TestModel->Article->Comment->validate = array(
+			'comment' => array(
+				'notBlank' => array(
+					'rule' => array('notBlank'),
+				)
+			)
+		);
+
+		$result = $TestModel->saveAssociated(array(
+			'ArticlesTagBelongsToArticle' => array(
+				'tag_id' => 1,
+			),
+			'Article' => array(
+				'title' => 'Article with User',
+				'body' => 'This article will be saved with an user and contains a invalid comment',
+				'Comment' => array(
+					array(
+						'user_id' => 1,
+						'comment' => ''
+					)
+				)
+			)
+		), array('deep' => true, 'validate' => true));
+		$this->assertFalse($result);
+		$this->assertEquals(array(
+			'Article' => array(
+				'Comment' => array(
+					array('comment' => array('notBlank'))
+				)
+			)
+		), $TestModel->validationErrors);
+	}
+
+/**
+ * Test that boolean fields don't cause saveAssociated to fail
+ *
+ * @return void
+ */
+	public function testSaveAssociatedHasOneBooleanFields() {
+		$this->loadFixtures('Item', 'Syfile', 'Image');
+		$data = array(
+			'Syfile' => array(
+				'image_id' => 1,
+				'name' => 'Some file',
+			),
+			'Item' => array(
+				'name' => 'testing',
+				'published' => false
+			),
+		);
+		$syfile = ClassRegistry::init('Syfile');
+		$syfile->bindModel(array('hasOne' => array('Item')), false);
+		$result = $syfile->saveAssociated($data, array('atomic' => false));
+
+		$this->assertCount(2, $result, '2 records should have been saved.');
+		$this->assertTrue($result['Syfile'], 'Both should have succeded');
+		$this->assertTrue($result['Item'], 'Both should have succeded');
+	}
+
+/**
+ * Test that boolean fields don't cause saveAssociated to fail
+ *
+ * @return void
+ */
+	public function testSaveAssociatedBelongsToBooleanFields() {
+		$this->loadFixtures('Item', 'Syfile', 'Image');
+		$data = array(
+			'Syfile' => array(
+				'image_id' => 1,
+				'name' => 'Some file',
+			),
+			'Item' => array(
+				'name' => 'testing',
+				'syfile_id' => 2,
+				'published' => false
+			),
+		);
+		$item = ClassRegistry::init('Item');
+		$item->bindModel(array(
+			'belongsTo' => array(
+				'Item' => array(
+					'foreignKey' => 'image_id'
+				)
+			)
+		), false);
+		$result = $item->saveAssociated($data, array('atomic' => false));
+
+		$this->assertCount(2, $result, '2 records should have been saved.');
+		$this->assertTrue($result['Syfile'], 'Both should have succeded');
+		$this->assertTrue($result['Item'], 'Both should have succeded');
+	}
+
 /**
  * testUpdateAllBoolean
  *
@@ -7261,4 +7978,252 @@ class ModelWriteTest extends BaseModelTest {
 		$this->assertFalse(isset($model->data['Bid']['name']));
 		$this->assertFalse(isset($model->data['Bid']['message_id']));
 	}
+
+/**
+ * Test that Model::save() doesn't generate a query with WHERE 1 = 1 on race condition.
+ *
+ * @link https://github.com/cakephp/cakephp/issues/3857
+ * @return void
+ */
+	public function testSafeUpdateMode() {
+		$this->loadFixtures('User');
+
+		$User = ClassRegistry::init('User');
+		$this->assertFalse($User->__safeUpdateMode);
+
+		$User->getEventManager()->attach(array($this, 'deleteMe'), 'Model.beforeSave');
+
+		$User->id = 1;
+		$User->set(array('user' => 'nobody'));
+		$User->save();
+
+		$users = $User->find('list', array('fields' => 'User.user'));
+
+		$expected = array(
+			2 => 'nate',
+			3 => 'larry',
+			4 => 'garrett',
+		);
+		$this->assertEquals($expected, $users);
+		$this->assertFalse($User->__safeUpdateMode);
+
+		$User->id = 2;
+		$User->set(array('user' => $User->getDataSource()->expression('PDO_EXCEPTION()')));
+		try {
+			$User->save(null, false);
+			$this->fail('No exception thrown');
+		} catch (PDOException $e) {
+			$this->assertFalse($User->__safeUpdateMode);
+		}
+	}
+
+/**
+ * Emulates race condition
+ *
+ * @param CakeEvent $event containing the Model
+ * @return void
+ */
+	public function deleteMe($event) {
+		$Model = $event->subject;
+		$Model->getDataSource()->delete($Model, array($Model->alias . '.' . $Model->primaryKey => $Model->id));
+	}
+
+/**
+ * Creates a convenient mock DboSource
+ *
+ * We cannot call several methods via mock DboSource, such as DboSource::value()
+ * because mock DboSource has no $_connection.
+ * This method helps us to avoid this problem.
+ *
+ * @param array $methods Configurable method names.
+ * @return DboSource
+ */
+	protected function _getMockDboSource($methods = array()) {
+		$testDb = ConnectionManager::getDataSource('test');
+
+		$passthrough = array_diff(array('value', 'begin', 'rollback', 'commit', 'describe', 'lastInsertId', 'execute'), $methods);
+
+		$methods = array_merge($methods, $passthrough);
+		if (!in_array('connect', $methods)) {
+			$methods[] = 'connect'; // This will be called by DboSource::__construct().
+		}
+
+		$db = $this->getMock('DboSource', $methods);
+		$db->columns = $testDb->columns;
+		$db->startQuote = $testDb->startQuote;
+		$db->endQuote = $testDb->endQuote;
+
+		foreach ($passthrough as $method) {
+			$db->expects($this->any())
+				->method($method)
+				->will($this->returnCallback(array($testDb, $method)));
+		}
+
+		return $db;
+	}
+
+/**
+ * Test that transactions behave correctly on nested saveMany calls.
+ *
+ * @return void
+ */
+	public function testTransactionOnNestedSaveMany() {
+		$this->loadFixtures('Post');
+		$Post = new TestPost();
+		$Post->getEventManager()->attach(array($this, 'nestedSaveMany'), 'Model.afterSave');
+
+		// begin -> [ begin -> commit ] -> commit
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->exactly(2))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->exactly(2))->method('commit');
+		$db->expects($this->never())->method('rollback');
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'Outer Post'),
+		);
+		$Post->dataForAfterSave = array(
+			array('author_id' => 1, 'title' => 'Inner Post'),
+		);
+		$this->assertTrue($Post->saveMany($data));
+
+		// begin -> [  begin(false) ] -> commit
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->at(0))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->at(1))->method('begin')->will($this->returnValue(false));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+		$Post->setDataSourceObject($db);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'Outer Post'),
+		);
+		$Post->dataForAfterSave = array(
+			array('author_id' => 1, 'title' => 'Inner Post'),
+		);
+		$this->assertTrue($Post->saveMany($data));
+
+		// begin -> [ begin -> rollback ] -> rollback
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->exactly(2))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->exactly(2))->method('rollback');
+		$Post->setDataSourceObject($db);
+		$data = array(
+			array('author_id' => 1, 'title' => 'Outer Post'),
+		);
+		$Post->dataForAfterSave = array(
+			array('author_id' => 1, 'title' => 'Inner Post', 'body' => $db->expression('PDO_EXCEPTION()')),
+		);
+
+		try {
+			$Post->saveMany($data);
+			$this->fail('No exception thrown');
+		} catch(Exception $e) {
+		}
+	}
+
+/**
+ * Test that transaction behaves correctly on nested saveAssociated calls.
+ *
+ * @return void
+ */
+	public function testTransactionOnNestedSaveAssociated() {
+		$this->loadFixtures('Author', 'Post');
+
+		$Author = new TestAuthor();
+		$Author->getEventManager()->attach(array($this, 'nestedSaveAssociated'), 'Model.afterSave');
+
+		// begin -> [ begin -> commit ] -> commit
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->exactly(2))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->exactly(2))->method('commit');
+		$db->expects($this->never())->method('rollback');
+		$Author->setDataSourceObject($db);
+		$Author->Post->setDataSourceObject($db);
+
+		$data = array(
+			'Author' => array('user' => 'outer'),
+			'Post' => array(
+				array('title' => 'Outer Post'),
+			)
+		);
+		$Author->dataForAfterSave = array(
+			'Author' => array('user' => 'inner'),
+			'Post' => array(
+				array('title' => 'Inner Post'),
+			)
+		);
+		$this->assertTrue($Author->saveAssociated($data));
+
+		// begin -> [  begin(false) ] -> commit
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->at(0))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->at(1))->method('begin')->will($this->returnValue(false));
+		$db->expects($this->once())->method('commit');
+		$db->expects($this->never())->method('rollback');
+		$Author->setDataSourceObject($db);
+		$Author->Post->setDataSourceObject($db);
+		$data = array(
+			'Author' => array('user' => 'outer'),
+			'Post' => array(
+				array('title' => 'Outer Post'),
+			)
+		);
+		$Author->dataForAfterSave = array(
+			'Author' => array('user' => 'inner'),
+			'Post' => array(
+				array('title' => 'Inner Post'),
+			)
+		);
+		$this->assertTrue($Author->saveAssociated($data));
+
+		// begin -> [ begin -> rollback ] -> rollback
+		$db = $this->_getMockDboSource(array('begin', 'commit', 'rollback'));
+		$db->expects($this->exactly(2))->method('begin')->will($this->returnValue(true));
+		$db->expects($this->never())->method('commit');
+		$db->expects($this->exactly(2))->method('rollback');
+		$Author->setDataSourceObject($db);
+		$Author->Post->setDataSourceObject($db);
+		$data = array(
+			'Author' => array('user' => 'outer'),
+			'Post' => array(
+				array('title' => 'Outer Post'),
+			)
+		);
+		$Author->dataForAfterSave = array(
+			'Author' => array('user' => 'inner', 'password' => $db->expression('PDO_EXCEPTION()')),
+			'Post' => array(
+				array('title' => 'Inner Post'),
+			)
+		);
+
+		try {
+			$Author->saveAssociated($data);
+			$this->fail('No exception thrown');
+		} catch(Exception $e) {
+		}
+	}
+
+/**
+ * A callback for testing nested saveMany.
+ *
+ * @param CakeEvent $event containing the Model
+ * @return void
+ */
+	public function nestedSaveMany($event) {
+		$Model = $event->subject;
+		$Model->saveMany($Model->dataForAfterSave, array('callbacks' => false));
+	}
+
+/**
+ * A callback for testing nested saveAssociated.
+ *
+ * @param CakeEvent $event containing the Model
+ * @return void
+ */
+	public function nestedSaveAssociated($event) {
+		$Model = $event->subject;
+		$Model->saveAssociated($Model->dataForAfterSave, array('callbacks' => false));
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php b/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
index 269e4ce24..5b1a9caff 100644
--- a/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationRuleTest.php
@@ -28,7 +28,7 @@ class CakeValidationRuleTest extends CakeTestCase {
 /**
  * Auxiliary method to test custom validators
  *
- * @return boolean
+ * @return bool
  */
 	public function myTestRule() {
 		return false;
@@ -37,7 +37,7 @@ class CakeValidationRuleTest extends CakeTestCase {
 /**
  * Auxiliary method to test custom validators
  *
- * @return boolean
+ * @return bool
  */
 	public function myTestRule2() {
 		return true;
@@ -58,7 +58,7 @@ class CakeValidationRuleTest extends CakeTestCase {
  * @return void
  */
 	public function testIsValid() {
-		$def = array('rule' => 'notEmpty', 'message' => 'Can not be empty');
+		$def = array('rule' => 'notBlank', 'message' => 'Can not be empty');
 		$data = array(
 			'fieldName' => ''
 		);
@@ -122,19 +122,19 @@ class CakeValidationRuleTest extends CakeTestCase {
  * @return void
  */
 	public function testIsRequired() {
-		$def = array('rule' => 'notEmpty', 'required' => true);
+		$def = array('rule' => 'notBlank', 'required' => true);
 		$Rule = new CakeValidationRule($def);
 		$this->assertTrue($Rule->isRequired());
 
-		$def = array('rule' => 'notEmpty', 'required' => false);
+		$def = array('rule' => 'notBlank', 'required' => false);
 		$Rule = new CakeValidationRule($def);
 		$this->assertFalse($Rule->isRequired());
 
-		$def = array('rule' => 'notEmpty', 'required' => 'create');
+		$def = array('rule' => 'notBlank', 'required' => 'create');
 		$Rule = new CakeValidationRule($def);
 		$this->assertTrue($Rule->isRequired());
 
-		$def = array('rule' => 'notEmpty', 'required' => 'update');
+		$def = array('rule' => 'notBlank', 'required' => 'update');
 		$Rule = new CakeValidationRule($def);
 		$this->assertFalse($Rule->isRequired());
 
@@ -156,14 +156,14 @@ class CakeValidationRuleTest extends CakeTestCase {
 		$Rule = new CakeValidationRule($def);
 		$this->assertFalse($Rule->isEmptyAllowed());
 
-		$def = array('rule' => 'notEmpty', 'allowEmpty' => false, 'on' => 'update');
+		$def = array('rule' => 'notBlank', 'allowEmpty' => false, 'on' => 'update');
 		$Rule = new CakeValidationRule($def);
 		$this->assertTrue($Rule->isEmptyAllowed());
 
 		$Rule->isUpdate(true);
 		$this->assertFalse($Rule->isEmptyAllowed());
 
-		$def = array('rule' => 'notEmpty', 'allowEmpty' => false, 'on' => 'create');
+		$def = array('rule' => 'notBlank', 'allowEmpty' => false, 'on' => 'create');
 		$Rule = new CakeValidationRule($def);
 		$this->assertFalse($Rule->isEmptyAllowed());
 
diff --git a/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php b/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php
index ecd9e444e..ee2b178a8 100644
--- a/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Validator/CakeValidationSetTest.php
@@ -41,7 +41,7 @@ class CakeValidationSetTest extends CakeTestCase {
  * @return void
  */
 	public function testValidate() {
-		$Field = new CakeValidationSet('title', 'notEmpty');
+		$Field = new CakeValidationSet('title', 'notBlank');
 		$data = array(
 			'title' => '',
 			'body' => 'a body'
@@ -51,20 +51,20 @@ class CakeValidationSetTest extends CakeTestCase {
 		$expected = array('This field cannot be left blank');
 		$this->assertEquals($expected, $result);
 
-		$Field = new CakeValidationSet('body', 'notEmpty');
+		$Field = new CakeValidationSet('body', 'notBlank');
 
 		$result = $Field->validate($data);
 		$this->assertEmpty($result);
 
 		$Field = new CakeValidationSet('nothere', array(
-			'notEmpty' => array(
-				'rule' => 'notEmpty',
+			'notBlank' => array(
+				'rule' => 'notBlank',
 				'required' => true
 			)
 		));
 
 		$result = $Field->validate($data);
-		$expected = array('notEmpty');
+		$expected = array('notBlank');
 		$this->assertEquals($expected, $result);
 
 		$Field = new CakeValidationSet('body', array(
@@ -83,11 +83,11 @@ class CakeValidationSetTest extends CakeTestCase {
  * @return void
  */
 	public function testGetRule() {
-		$rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty'));
+		$rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty'));
 		$Field = new CakeValidationSet('title', $rules);
-		$result = $Field->getRule('notEmpty');
+		$result = $Field->getRule('notBlank');
 		$this->assertInstanceOf('CakeValidationRule', $result);
-		$this->assertEquals('notEmpty', $result->rule);
+		$this->assertEquals('notBlank', $result->rule);
 		$this->assertEquals(null, $result->required);
 		$this->assertEquals(false, $result->allowEmpty);
 		$this->assertEquals(null, $result->on);
@@ -101,12 +101,12 @@ class CakeValidationSetTest extends CakeTestCase {
  * @return void
  */
 	public function testGetRules() {
-		$rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty'));
+		$rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty'));
 		$Field = new CakeValidationSet('title', $rules);
 
 		$result = $Field->getRules();
-		$this->assertEquals(array('notEmpty'), array_keys($result));
-		$this->assertInstanceOf('CakeValidationRule', $result['notEmpty']);
+		$this->assertEquals(array('notBlank'), array_keys($result));
+		$this->assertInstanceOf('CakeValidationRule', $result['notBlank']);
 	}
 
 /**
@@ -115,23 +115,23 @@ class CakeValidationSetTest extends CakeTestCase {
  * @return void
  */
 	public function testSetRule() {
-		$rules = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty'));
+		$rules = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty'));
 		$Field = new CakeValidationSet('title', $rules);
-		$Rule = new CakeValidationRule($rules['notEmpty']);
+		$Rule = new CakeValidationRule($rules['notBlank']);
 
-		$this->assertEquals($Rule, $Field->getRule('notEmpty'));
+		$this->assertEquals($Rule, $Field->getRule('notBlank'));
 
 		$rules = array('validEmail' => array('rule' => 'email', 'message' => 'Invalid email'));
 		$Rule = new CakeValidationRule($rules['validEmail']);
 		$Field->setRule('validEmail', $Rule);
 		$result = $Field->getRules();
-		$this->assertEquals(array('notEmpty', 'validEmail'), array_keys($result));
+		$this->assertEquals(array('notBlank', 'validEmail'), array_keys($result));
 
 		$rules = array('validEmail' => array('rule' => 'email', 'message' => 'Other message'));
 		$Rule = new CakeValidationRule($rules['validEmail']);
 		$Field->setRule('validEmail', $Rule);
 		$result = $Field->getRules();
-		$this->assertEquals(array('notEmpty', 'validEmail'), array_keys($result));
+		$this->assertEquals(array('notBlank', 'validEmail'), array_keys($result));
 		$result = $Field->getRule('validEmail');
 		$this->assertInstanceOf('CakeValidationRule', $result);
 		$this->assertEquals('email', $result->rule);
@@ -148,9 +148,9 @@ class CakeValidationSetTest extends CakeTestCase {
  * @return void
  */
 	public function testSetRules() {
-		$rule = array('notEmpty' => array('rule' => 'notEmpty', 'message' => 'Can not be empty'));
+		$rule = array('notBlank' => array('rule' => 'notBlank', 'message' => 'Can not be empty'));
 		$Field = new CakeValidationSet('title', $rule);
-		$RuleEmpty = new CakeValidationRule($rule['notEmpty']);
+		$RuleEmpty = new CakeValidationRule($rule['notBlank']);
 
 		$rule = array('validEmail' => array('rule' => 'email', 'message' => 'Invalid email'));
 		$RuleEmail = new CakeValidationRule($rule['validEmail']);
@@ -165,15 +165,15 @@ class CakeValidationSetTest extends CakeTestCase {
 		$this->assertEquals(array('validEmail'), array_keys($result));
 		$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
 
-		$rules = array('notEmpty' => $RuleEmpty);
+		$rules = array('notBlank' => $RuleEmpty);
 		$Field->setRules($rules, true);
 		$result = $Field->getRules();
-		$this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result));
+		$this->assertEquals(array('validEmail', 'notBlank'), array_keys($result));
 
-		$rules = array('notEmpty' => array('rule' => 'notEmpty'));
+		$rules = array('notBlank' => array('rule' => 'notBlank'));
 		$Field->setRules($rules, true);
 		$result = $Field->getRules();
-		$this->assertEquals(array('validEmail', 'notEmpty'), array_keys($result));
+		$this->assertEquals(array('validEmail', 'notBlank'), array_keys($result));
 		$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
 		$this->assertTrue(array_pop($result) instanceof CakeValidationRule);
 	}
@@ -185,14 +185,14 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testArrayAccessGet() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
 
-		$rule = $Set['notEmpty'];
+		$rule = $Set['notBlank'];
 		$this->assertInstanceOf('CakeValidationRule', $rule);
-		$this->assertEquals('notEmpty', $rule->rule);
+		$this->assertEquals('notBlank', $rule->rule);
 
 		$rule = $Set['numeric'];
 		$this->assertInstanceOf('CakeValidationRule', $rule);
@@ -210,12 +210,12 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testArrayAccessExists() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
 
-		$this->assertTrue(isset($Set['notEmpty']));
+		$this->assertTrue(isset($Set['notBlank']));
 		$this->assertTrue(isset($Set['numeric']));
 		$this->assertTrue(isset($Set['other']));
 		$this->assertFalse(isset($Set['fail']));
@@ -228,7 +228,7 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testArrayAccessSet() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 		));
 
 		$this->assertFalse(isset($Set['other']));
@@ -251,19 +251,19 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testArrayAccessUnset() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
 
-		unset($Set['notEmpty']);
-		$this->assertFalse(isset($Set['notEmpty']));
+		unset($Set['notBlank']);
+		$this->assertFalse(isset($Set['notBlank']));
 
 		unset($Set['numeric']);
-		$this->assertFalse(isset($Set['notEmpty']));
+		$this->assertFalse(isset($Set['notBlank']));
 
 		unset($Set['other']);
-		$this->assertFalse(isset($Set['notEmpty']));
+		$this->assertFalse(isset($Set['notBlank']));
 	}
 
 /**
@@ -273,7 +273,7 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testIterator() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
@@ -281,7 +281,7 @@ class CakeValidationSetTest extends CakeTestCase {
 		$i = 0;
 		foreach ($Set as $name => $rule) {
 			if ($i === 0) {
-				$this->assertEquals('notEmpty', $name);
+				$this->assertEquals('notBlank', $name);
 			}
 			if ($i === 1) {
 				$this->assertEquals('numeric', $name);
@@ -302,7 +302,7 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testCount() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
@@ -319,13 +319,13 @@ class CakeValidationSetTest extends CakeTestCase {
  */
 	public function testRemoveRule() {
 		$Set = new CakeValidationSet('title', array(
-			'notEmpty' => array('rule' => 'notEmpty', 'required' => true),
+			'notBlank' => array('rule' => 'notBlank', 'required' => true),
 			'numeric' => array('rule' => 'numeric'),
 			'other' => array('rule' => array('other', 1)),
 		));
 
-		$Set->removeRule('notEmpty');
-		$this->assertFalse(isset($Set['notEmpty']));
+		$Set->removeRule('notBlank');
+		$this->assertFalse(isset($Set['notBlank']));
 
 		$Set->removeRule('numeric');
 		$this->assertFalse(isset($Set['numeric']));
diff --git a/web/api/lib/Cake/Test/Case/Model/models.php b/web/api/lib/Cake/Test/Case/Model/models.php
index fe7bdc12b..ea8d36426 100644
--- a/web/api/lib/Cake/Test/Case/Model/models.php
+++ b/web/api/lib/Cake/Test/Case/Model/models.php
@@ -66,7 +66,7 @@ class Test extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -103,7 +103,7 @@ class TestAlias extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -139,7 +139,7 @@ class TestValidate extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -208,12 +208,12 @@ class User extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('user' => 'notEmpty', 'password' => 'notEmpty');
+	public $validate = array('user' => 'notBlank', 'password' => 'notBlank');
 
 /**
  * beforeFind() callback used to run ContainableBehaviorTest::testLazyLoad()
  *
- * @return boolean
+ * @return bool
  * @throws Exception
  */
 	public function beforeFind($queryData) {
@@ -269,14 +269,14 @@ class Article extends CakeTestModel {
  */
 	public $validate = array(
 		'user_id' => 'numeric',
-		'title' => array('required' => false, 'rule' => 'notEmpty'),
-		'body' => array('required' => false, 'rule' => 'notEmpty'),
+		'title' => array('required' => false, 'rule' => 'notBlank'),
+		'body' => array('required' => false, 'rule' => 'notBlank'),
 	);
 
 /**
  * beforeSaveReturn property
  *
- * @var boolean
+ * @var bool
  */
 	public $beforeSaveReturn = true;
 
@@ -424,7 +424,7 @@ class ArticleFeatured extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('user_id' => 'numeric', 'title' => 'notEmpty', 'body' => 'notEmpty');
+	public $validate = array('user_id' => 'numeric', 'title' => 'notBlank', 'body' => 'notBlank');
 
 }
 
@@ -548,7 +548,7 @@ class ModifiedComment extends CakeTestModel {
 /**
  * Property used to toggle filtering of results
  *
- * @var boolean
+ * @var bool
  */
 	public $remove = false;
 
@@ -732,8 +732,14 @@ class ModifiedAttachment extends CakeTestModel {
  * @return void
  */
 	public function afterFind($results, $primary = false) {
-		if (isset($results['id'])) {
-			$results['callback'] = 'Fired';
+		if ($this->useConsistentAfterFind) {
+			if (isset($results[0][$this->alias]['id'])) {
+				$results[0][$this->alias]['callback'] = 'Fired';
+			}
+		} else {
+			if (isset($results['id'])) {
+				$results['callback'] = 'Fired';
+			}
 		}
 		return $results;
 	}
@@ -796,7 +802,7 @@ class Apple extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('name' => 'notEmpty');
+	public $validate = array('name' => 'notBlank');
 
 /**
  * hasOne property
@@ -931,7 +937,7 @@ class Post extends CakeTestModel {
 
 /**
  * @param array $queryData
- * @return boolean true
+ * @return bool true
  */
 	public function beforeFind($queryData) {
 		if (isset($queryData['connection'])) {
@@ -942,8 +948,8 @@ class Post extends CakeTestModel {
 
 /**
  * @param array $results
- * @param boolean $primary
- * @return array $results
+ * @param bool $primary
+ * @return array results
  */
 	public function afterFind($results, $primary = false) {
 		$this->useDbConfig = 'test';
@@ -1191,7 +1197,7 @@ class NodeAfterFind extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('name' => 'notEmpty');
+	public $validate = array('name' => 'notBlank');
 
 /**
  * useTable property
@@ -1281,7 +1287,7 @@ class NodeNoAfterFind extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('name' => 'notEmpty');
+	public $validate = array('name' => 'notBlank');
 
 /**
  * useTable property
@@ -2050,28 +2056,28 @@ class CallbackPostTestModel extends CakeTestModel {
 /**
  * variable to control return of beforeValidate
  *
- * @var boolean
+ * @var bool
  */
 	public $beforeValidateReturn = true;
 
 /**
  * variable to control return of beforeSave
  *
- * @var boolean
+ * @var bool
  */
 	public $beforeSaveReturn = true;
 
 /**
  * variable to control return of beforeDelete
  *
- * @var boolean
+ * @var bool
  */
 	public $beforeDeleteReturn = true;
 
 /**
  * beforeSave callback
  *
- * @return boolean
+ * @return bool
  */
 	public function beforeSave($options = array()) {
 		return $this->beforeSaveReturn;
@@ -2081,7 +2087,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeValidate callback
  *
  * @param array $options Options passed from Model::save().
- * @return boolean True if validate operation should continue, false to abort
+ * @return bool True if validate operation should continue, false to abort
  * @see Model::save()
  */
 	public function beforeValidate($options = array()) {
@@ -2091,7 +2097,7 @@ class CallbackPostTestModel extends CakeTestModel {
 /**
  * beforeDelete callback
  *
- * @return boolean
+ * @return bool
  */
 	public function beforeDelete($cascade = true) {
 		return $this->beforeDeleteReturn;
@@ -2146,7 +2152,7 @@ class TheVoid extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 }
@@ -2168,7 +2174,7 @@ class ValidationTest1 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -2185,10 +2191,10 @@ class ValidationTest1 extends CakeTestModel {
  * @var array
  */
 	public $validate = array(
-		'title' => 'notEmpty',
+		'title' => 'notBlank',
 		'published' => 'customValidationMethod',
 		'body' => array(
-			'notEmpty',
+			'notBlank',
 			'/^.{5,}$/s' => 'no matchy',
 			'/^[0-9A-Za-z \\.]{1,}$/s'
 		)
@@ -2254,7 +2260,7 @@ class ValidationTest2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -2264,10 +2270,10 @@ class ValidationTest2 extends CakeTestModel {
  * @var array
  */
 	public $validate = array(
-		'title' => 'notEmpty',
+		'title' => 'notBlank',
 		'published' => 'customValidationMethod',
 		'body' => array(
-			'notEmpty',
+			'notBlank',
 			'/^.{5,}$/s' => 'no matchy',
 			'/^[0-9A-Za-z \\.]{1,}$/s'
 		)
@@ -2388,7 +2394,7 @@ class Story extends CakeTestModel {
  *
  * @var array
  */
-	public $validate = array('title' => 'notEmpty');
+	public $validate = array('title' => 'notBlank');
 }
 
 /**
@@ -2584,12 +2590,12 @@ class NumberTree extends CakeTestModel {
 /**
  * initialize method
  *
- * @param integer $levelLimit
- * @param integer $childLimit
+ * @param int $levelLimit
+ * @param int $childLimit
  * @param mixed $currentLevel
  * @param mixed $parent_id
  * @param string $prefix
- * @param boolean $hierarchal
+ * @param bool $hierarchal
  * @return void
  */
 	public function initialize($levelLimit = 3, $childLimit = 3, $currentLevel = null, $parentId = null, $prefix = '1', $hierarchal = true) {
@@ -2773,7 +2779,7 @@ class AfterTree extends NumberTree {
 	public $actsAs = array('Tree');
 
 /**
- * @param boolean $created
+ * @param bool $created
  * @param array $options
  * @return void
  */
@@ -3125,7 +3131,7 @@ class TranslatedItem extends CakeTestModel {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -3162,7 +3168,7 @@ class TranslatedItem2 extends CakeTestModel {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -3206,7 +3212,7 @@ class TranslatedItemWithTable extends CakeTestModel {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -3280,7 +3286,7 @@ class TranslatedArticle extends CakeTestModel {
 /**
  * cacheQueries property
  *
- * @var boolean
+ * @var bool
  */
 	public $cacheQueries = false;
 
@@ -3582,7 +3588,7 @@ class TestModel extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -3657,7 +3663,7 @@ class TestModel2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 }
@@ -3679,7 +3685,7 @@ class TestModel3 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 }
@@ -3708,7 +3714,7 @@ class TestModel4 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -3792,7 +3798,7 @@ class TestModel4TestModel7 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -3837,7 +3843,7 @@ class TestModel5 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -3905,7 +3911,7 @@ class TestModel6 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -3965,7 +3971,7 @@ class TestModel7 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4012,7 +4018,7 @@ class TestModel8 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4073,7 +4079,7 @@ class TestModel9 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4134,7 +4140,7 @@ class Level extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4193,7 +4199,7 @@ class Group extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4253,7 +4259,7 @@ class User2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4325,7 +4331,7 @@ class Category2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4408,7 +4414,7 @@ class Article2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4480,7 +4486,7 @@ class CategoryFeatured2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4528,7 +4534,7 @@ class Featured2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4593,7 +4599,7 @@ class Comment2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4640,7 +4646,7 @@ class ArticleFeatured2 extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4713,7 +4719,7 @@ class MysqlTestModel extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -4775,7 +4781,6 @@ class MysqlTestModel extends Model {
 
 /**
  * Test model for datasource prefixes
- *
  */
 class PrefixTestModel extends CakeTestModel {
 }
@@ -5029,7 +5034,7 @@ class CustomArticle extends AppModel {
  * Alters title data
  *
  * @param array $options Options passed from Model::save().
- * @return boolean True if validate operation should continue, false to abort
+ * @return bool True if validate operation should continue, false to abort
  * @see Model::save()
  */
 	public function beforeValidate($options = array()) {
@@ -5042,3 +5047,81 @@ class CustomArticle extends AppModel {
 	}
 
 }
+
+/**
+ * Example class
+ *
+ * @package       Cake.Test.Case.Model
+ */
+class Example extends AppModel {
+
+/**
+ * useTable property
+ *
+ * @var string
+ */
+	public $useTable = false;
+
+/**
+ * schema property
+ *
+ * @var array
+ */
+	protected $_schema = array(
+		'filefield' => array(
+			'type' => 'string',
+			'length' => 254,
+			'default' => null,
+			'null' => true,
+			'comment' => null
+		),
+	);
+
+}
+
+/**
+ * UserHasOneArticle class
+ *
+ * @package       Cake.Test.Case.Model
+ */
+class UserHasOneArticle extends AppModel {
+
+/**
+ * useTable property
+ *
+ * @var string
+ */
+	public $useTable = 'users';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ */
+	public $hasOne = array('Article');
+
+}
+
+
+/**
+ * ArticlesTagBelongsToArticle class
+ *
+ * @package       Cake.Test.Case.Model
+ */
+class ArticlesTagBelongsToArticle extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string
+ */
+	public $useTable = 'articles_tags';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ */
+	public $belongsTo = array('Article');
+
+}
diff --git a/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php b/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
index 2dc28941c..7d1d0706c 100644
--- a/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -31,7 +31,7 @@ class TestCakeRequest extends CakeRequest {
  * reConstruct method
  *
  * @param string $url
- * @param boolean $parseEnvironment
+ * @param bool $parseEnvironment
  * @return void
  */
 	public function reConstruct($url = 'some/path', $parseEnvironment = true) {
@@ -89,6 +89,50 @@ class CakeRequestTest extends CakeTestCase {
 		Configure::write('App', $this->_app);
 	}
 
+/**
+ * Test the header detector.
+ *
+ * @return void
+ */
+	public function testHeaderDetector() {
+		$request = new CakeRequest('some/path');
+		$request->addDetector('host', array('header' => array('host' => 'cakephp.org')));
+
+		$_SERVER['HTTP_HOST'] = 'cakephp.org';
+		$this->assertTrue($request->is('host'));
+
+		$_SERVER['HTTP_HOST'] = 'php.net';
+		$this->assertFalse($request->is('host'));
+	}
+
+/**
+ * Test the accept header detector.
+ *
+ * @return void
+ */
+	public function testExtensionDetector() {
+		$request = new CakeRequest('some/path');
+		$request->params['ext'] = 'json';
+		$this->assertTrue($request->is('json'));
+
+		$request->params['ext'] = 'xml';
+		$this->assertFalse($request->is('json'));
+	}
+
+/**
+ * Test the accept header detector.
+ *
+ * @return void
+ */
+	public function testAcceptHeaderDetector() {
+		$request = new CakeRequest('some/path');
+		$_SERVER['HTTP_ACCEPT'] = 'application/json, text/plain, */*';
+		$this->assertTrue($request->is('json'));
+
+		$_SERVER['HTTP_ACCEPT'] = 'text/plain, */*';
+		$this->assertFalse($request->is('json'));
+	}
+
 /**
  * Test that the autoparse = false constructor works.
  *
@@ -274,12 +318,6 @@ class CakeRequestTest extends CakeTestCase {
 		$request->reConstruct();
 		$this->assertEquals($data, $request->data);
 
-		$data = array(
-			'data' => array(
-				'Article' => array('title' => 'Testing'),
-			),
-			'action' => 'update'
-		);
 		$request = $this->getMock('TestCakeRequest', array('_readInput'));
 		$request->expects($this->at(0))->method('_readInput')
 			->will($this->returnValue('data[Article][title]=Testing&action=update'));
@@ -749,6 +787,24 @@ class CakeRequestTest extends CakeTestCase {
 		$this->assertFalse($request->is('delete'));
 	}
 
+/**
+ * Test is() with json and xml.
+ *
+ * @return void
+ */
+	public function testIsJsonAndXml() {
+		$request = new CakeRequest('some/path');
+
+		$_SERVER['HTTP_ACCEPT'] = 'application/json, text/plain, */*';
+		$this->assertTrue($request->is(array('json')));
+
+		$_SERVER['HTTP_ACCEPT'] = 'application/xml, text/plain, */*';
+		$this->assertTrue($request->is(array('xml')));
+
+		$_SERVER['HTTP_ACCEPT'] = 'text/xml, */*';
+		$this->assertTrue($request->is(array('xml')));
+	}
+
 /**
  * Test is() with multiple types.
  *
@@ -1057,7 +1113,7 @@ class CakeRequestTest extends CakeTestCase {
  * Helper function for testing callbacks.
  *
  * @param $request
- * @return boolean
+ * @return bool
  */
 	public function detectCallback($request) {
 		return (bool)$request->return;
@@ -1069,12 +1125,14 @@ class CakeRequestTest extends CakeTestCase {
  * @return void
  */
 	public function testHeader() {
+		$_SERVER['HTTP_X_THING'] = '';
 		$_SERVER['HTTP_HOST'] = 'localhost';
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-ca) AppleWebKit/534.8+ (KHTML, like Gecko) Version/5.0 Safari/533.16';
 		$request = new CakeRequest('/', false);
 
 		$this->assertEquals($_SERVER['HTTP_HOST'], $request->header('host'));
 		$this->assertEquals($_SERVER['HTTP_USER_AGENT'], $request->header('User-Agent'));
+		$this->assertSame('', $request->header('X-thing'));
 	}
 
 /**
@@ -1359,6 +1417,24 @@ class CakeRequestTest extends CakeTestCase {
 		$this->assertEquals('/cakephp/bananas/eat/tasty_banana', $request->here);
 	}
 
+/**
+ * Test that even if mod_rewrite is on, and the url contains index.php
+ * and there are numerous //s that the base/webroot is calculated correctly.
+ *
+ * @return void
+ */
+	public function testBaseUrlWithModRewriteAndExtraSlashes() {
+		$_SERVER['REQUEST_URI'] = '/cakephp/webroot///index.php/bananas/eat';
+		$_SERVER['PHP_SELF'] = '/cakephp/webroot///index.php/bananas/eat';
+		$_SERVER['PATH_INFO'] = '/bananas/eat';
+		$request = new CakeRequest();
+
+		$this->assertEquals('/cakephp', $request->base);
+		$this->assertEquals('/cakephp/', $request->webroot);
+		$this->assertEquals('bananas/eat', $request->url);
+		$this->assertEquals('/cakephp/bananas/eat', $request->here);
+	}
+
 /**
  * Test base, webroot, and URL parsing when there is no URL rewriting
  *
@@ -1995,26 +2071,6 @@ class CakeRequestTest extends CakeTestCase {
 		$this->assertNull($result);
 	}
 
-/**
- * Test using param()
- *
- * @return void
- */
-	public function testReadingParams() {
-		$request = new CakeRequest();
-		$request->addParams(array(
-			'controller' => 'posts',
-			'admin' => true,
-			'truthy' => 1,
-			'zero' => '0',
-		));
-		$this->assertFalse($request->param('not_set'));
-		$this->assertTrue($request->param('admin'));
-		$this->assertEquals(1, $request->param('truthy'));
-		$this->assertEquals('posts', $request->param('controller'));
-		$this->assertEquals('0', $request->param('zero'));
-	}
-
 /**
  * Test the data() method reading
  *
@@ -2077,6 +2133,100 @@ class CakeRequestTest extends CakeTestCase {
 		$this->assertSame('', $request->data['Post']['empty']);
 	}
 
+/**
+ * Test reading params
+ *
+ * @dataProvider paramReadingDataProvider
+ */
+	public function testParamReading($toRead, $expected) {
+		$request = new CakeRequest('/');
+		$request->addParams(array(
+			'action' => 'index',
+			'foo' => 'bar',
+			'baz' => array(
+				'a' => array(
+					'b' => 'c',
+				),
+			),
+			'admin' => true,
+			'truthy' => 1,
+			'zero' => '0',
+		));
+		$this->assertEquals($expected, $request->param($toRead));
+	}
+
+/**
+ * Data provider for testing reading values with CakeRequest::param()
+ *
+ * @return array
+ */
+	public function paramReadingDataProvider() {
+		return array(
+			array(
+				'action',
+				'index',
+			),
+			array(
+				'baz',
+				array(
+					'a' => array(
+						'b' => 'c',
+					),
+				),
+			),
+			array(
+				'baz.a.b',
+				'c',
+			),
+			array(
+				'does_not_exist',
+				false,
+			),
+			array(
+				'admin',
+				true,
+			),
+			array(
+				'truthy',
+				1,
+			),
+			array(
+				'zero',
+				'0',
+			),
+		);
+	}
+
+/**
+ * test writing request params with param()
+ *
+ * @return void
+ */
+	public function testParamWriting() {
+		$request = new CakeRequest('/');
+		$request->addParams(array(
+			'action' => 'index',
+		));
+
+		$this->assertInstanceOf('CakeRequest', $request->param('some', 'thing'), 'Method has not returned $this');
+
+		$request->param('Post.null', null);
+		$this->assertNull($request->params['Post']['null']);
+
+		$request->param('Post.false', false);
+		$this->assertFalse($request->params['Post']['false']);
+
+		$request->param('Post.zero', 0);
+		$this->assertSame(0, $request->params['Post']['zero']);
+
+		$request->param('Post.empty', '');
+		$this->assertSame('', $request->params['Post']['empty']);
+
+		$this->assertSame('index', $request->action);
+		$request->param('action', 'edit');
+		$this->assertSame('edit', $request->action);
+	}
+
 /**
  * Test accept language
  *
@@ -2105,7 +2255,7 @@ class CakeRequestTest extends CakeTestCase {
 
 		// Checking if requested
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx,en_ca';
-		$result = CakeRequest::acceptLanguage();
+		CakeRequest::acceptLanguage();
 
 		$result = CakeRequest::acceptLanguage('en-ca');
 		$this->assertTrue($result);
@@ -2144,6 +2294,36 @@ class CakeRequestTest extends CakeTestCase {
 		$this->assertEquals('/posts/base_path/1/name:value?test=value', $result);
 	}
 
+/**
+ * Test the here() with space in URL
+ *
+ * @return void
+ */
+	public function testHereWithSpaceInUrl() {
+		Configure::write('App.base', '');
+		$_GET = array('/admin/settings/settings/prefix/Access_Control' => '');
+		$request = new CakeRequest('/admin/settings/settings/prefix/Access%20Control');
+
+		$result = $request->here();
+		$this->assertEquals('/admin/settings/settings/prefix/Access%20Control', $result);
+	}
+
+/**
+ * Test the input() method.
+ *
+ * @return void
+ */
+	public function testSetInput() {
+		$request = new CakeRequest('/');
+
+		$request->setInput('I came from setInput');
+		$result = $request->input();
+		$this->assertEquals('I came from setInput', $result);
+
+		$result = $request->input();
+		$this->assertEquals('I came from setInput', $result);
+	}
+
 /**
  * Test the input() method.
  *
@@ -2264,6 +2444,24 @@ XML;
 		$request->allowMethod('POST');
 	}
 
+/**
+ * Tests that overriding the method to GET will clean all request
+ * data, to better simulate a GET request.
+ *
+ * @return void
+ */
+	public function testMethodOverrideEmptyData() {
+		$_POST = array('_method' => 'GET', 'foo' => 'bar');
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$request = new CakeRequest('/posts/edit/1');
+		$this->assertEmpty($request->data);
+
+		$_POST = array('foo' => 'bar');
+		$_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'GET';
+		$request = new CakeRequest('/posts/edit/1');
+		$this->assertEmpty($request->data);
+	}
+
 /**
  * loadEnvironment method
  *
diff --git a/web/api/lib/Cake/Test/Case/Network/CakeResponseTest.php b/web/api/lib/Cake/Test/Case/Network/CakeResponseTest.php
index c3c0181b0..cbbe1c7c6 100644
--- a/web/api/lib/Cake/Test/Case/Network/CakeResponseTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -373,7 +373,7 @@ class CakeResponseTest extends CakeTestCase {
  * @return void
  */
 	public function testCompress() {
-		if (php_sapi_name() !== 'cli') {
+		if (PHP_SAPI !== 'cli') {
 			$this->markTestSkipped('The response compression can only be tested in cli.');
 		}
 
@@ -404,7 +404,7 @@ class CakeResponseTest extends CakeTestCase {
 	public function testHttpCodes() {
 		$response = new CakeResponse();
 		$result = $response->httpCodes();
-		$this->assertEquals(40, count($result));
+		$this->assertEquals(41, count($result));
 
 		$result = $response->httpCodes(100);
 		$expected = array(100 => 'Continue');
@@ -417,7 +417,7 @@ class CakeResponseTest extends CakeTestCase {
 
 		$result = $response->httpCodes($codes);
 		$this->assertTrue($result);
-		$this->assertEquals(42, count($response->httpCodes()));
+		$this->assertEquals(43, count($response->httpCodes()));
 
 		$result = $response->httpCodes(381);
 		$expected = array(381 => 'Unicorn Moved');
@@ -426,7 +426,7 @@ class CakeResponseTest extends CakeTestCase {
 		$codes = array(404 => 'Sorry Bro');
 		$result = $response->httpCodes($codes);
 		$this->assertTrue($result);
-		$this->assertEquals(42, count($response->httpCodes()));
+		$this->assertEquals(43, count($response->httpCodes()));
 
 		$result = $response->httpCodes(404);
 		$expected = array(404 => 'Sorry Bro');
@@ -491,7 +491,7 @@ class CakeResponseTest extends CakeTestCase {
 		if (!extension_loaded("zlib")) {
 			$this->markTestSkipped('Skipping further tests for outputCompressed as zlib extension is not loaded');
 		}
-		if (php_sapi_name() !== 'cli') {
+		if (PHP_SAPI !== 'cli') {
 			$this->markTestSkipped('Testing outputCompressed method with compression enabled done only in cli');
 		}
 
@@ -566,7 +566,7 @@ class CakeResponseTest extends CakeTestCase {
 		$response->send();
 
 		ob_start();
-		$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
+		$this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
 		$goofyOutput = 'I am goofily sending output in the controller';
 		echo $goofyOutput;
 		$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
@@ -751,7 +751,7 @@ class CakeResponseTest extends CakeTestCase {
 		$response = new CakeResponse;
 		$response->sharable(true, 3600);
 		$headers = $response->header();
-		$this->assertEquals('public, s-maxage=3600', $headers['Cache-Control']);
+		$this->assertEquals('public, max-age=3600', $headers['Cache-Control']);
 
 		$response = new CakeResponse;
 		$response->sharable(false, 3600);
@@ -1088,9 +1088,9 @@ class CakeResponseTest extends CakeTestCase {
  * @param string|array $domains
  * @param string|array $methods
  * @param string|array $headers
- * @param string|boolean $expectedOrigin
- * @param string|boolean $expectedMethods
- * @param string|boolean $expectedHeaders
+ * @param string|bool $expectedOrigin
+ * @param string|bool $expectedMethods
+ * @param string|bool $expectedHeaders
  * @return void
  */
 	public function testCors($request, $origin, $domains, $methods, $headers, $expectedOrigin, $expectedMethods = false, $expectedHeaders = false) {
@@ -1166,6 +1166,43 @@ class CakeResponseTest extends CakeTestCase {
 		$response->file('/some/missing/folder/file.jpg');
 	}
 
+/**
+ * test file with ../
+ *
+ * @expectedException NotFoundException
+ * @expectedExceptionMessage The requested file contains `..` and will not be read.
+ * @return void
+ */
+	public function testFileWithForwardSlashPathTraversal() {
+		$response = new CakeResponse();
+		$response->file('my/../cat.gif');
+	}
+
+/**
+ * test file with ..\
+ *
+ * @expectedException NotFoundException
+ * @expectedExceptionMessage The requested file contains `..` and will not be read.
+ * @return void
+ */
+	public function testFileWithBackwardSlashPathTraversal() {
+		$response = new CakeResponse();
+		$response->file('my\..\cat.gif');
+	}
+
+/**
+ * Although unlikely, a file may contain dots in its filename.
+ * This should be allowed, as long as the dots doesn't specify a path (../ or ..\)
+ *
+ * @expectedException NotFoundException
+ * @execptedExceptionMessageRegExp #The requested file .+my/Some..cat.gif was not found or not readable#
+ * @return void
+ */
+	public function testFileWithDotsInFilename() {
+		$response = new CakeResponse();
+		$response->file('my/Some..cat.gif');
+	}
+
 /**
  * testFile method
  *
@@ -1188,6 +1225,10 @@ class CakeResponseTest extends CakeTestCase {
 			->will($this->returnArgument(0));
 
 		$response->expects($this->at(1))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(2))
 			->method('header')
 			->with('Content-Length', 38);
 
@@ -1204,7 +1245,7 @@ class CakeResponseTest extends CakeTestCase {
 		$result = $response->send();
 		$output = ob_get_clean();
 		$this->assertEquals("/* this is the test asset css file */\n", $output);
-		$this->assertTrue($result !== false);
+		$this->assertNotSame(false, $result);
 	}
 
 /**
@@ -1238,11 +1279,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(2))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(4))
 			->method('header')
@@ -1261,7 +1302,7 @@ class CakeResponseTest extends CakeTestCase {
 		$result = $response->send();
 		$output = ob_get_clean();
 		$this->assertEquals("some_key = some_value\nbool_key = 1\n", $output);
-		$this->assertTrue($result !== false);
+		$this->assertNotSame(false, $result);
 		if ($currentUserAgent !== null) {
 			$_SERVER['HTTP_USER_AGENT'] = $currentUserAgent;
 		}
@@ -1303,11 +1344,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(4))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(5))
 			->method('header')
@@ -1325,7 +1366,7 @@ class CakeResponseTest extends CakeTestCase {
 		$result = $response->send();
 		$output = ob_get_clean();
 		$this->assertEquals("some_key = some_value\nbool_key = 1\n", $output);
-		$this->assertTrue($result !== false);
+		$this->assertNotSame(false, $result);
 		if ($currentUserAgent !== null) {
 			$_SERVER['HTTP_USER_AGENT'] = $currentUserAgent;
 		}
@@ -1367,11 +1408,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(4))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(5))
 			->method('header')
@@ -1391,7 +1432,7 @@ class CakeResponseTest extends CakeTestCase {
 		$result = $response->send();
 		$output = ob_get_clean();
 		$this->assertEquals("some_key = some_value\nbool_key = 1\n", $output);
-		$this->assertTrue($result !== false);
+		$this->assertNotSame(false, $result);
 		if ($currentUserAgent !== null) {
 			$_SERVER['HTTP_USER_AGENT'] = $currentUserAgent;
 		}
@@ -1421,6 +1462,10 @@ class CakeResponseTest extends CakeTestCase {
 			->with('ini')
 			->will($this->returnValue(false));
 
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
 		$response->expects($this->never())
 			->method('download');
 
@@ -1573,11 +1618,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(2))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(4))
 			->method('header')
@@ -1628,11 +1673,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(2))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(4))
 			->method('header')
@@ -1657,7 +1702,7 @@ class CakeResponseTest extends CakeTestCase {
 		$output = ob_get_clean();
 		$this->assertEquals(206, $response->statusCode());
 		$this->assertEquals("is the test asset ", $output);
-		$this->assertTrue($result !== false);
+		$this->assertNotSame(false, $result);
 	}
 
 /**
@@ -1683,11 +1728,11 @@ class CakeResponseTest extends CakeTestCase {
 
 		$response->expects($this->at(2))
 			->method('header')
-			->with('Accept-Ranges', 'bytes');
+			->with('Content-Transfer-Encoding', 'binary');
 
 		$response->expects($this->at(3))
 			->method('header')
-			->with('Content-Transfer-Encoding', 'binary');
+			->with('Accept-Ranges', 'bytes');
 
 		$response->expects($this->at(4))
 			->method('header')
@@ -1701,7 +1746,137 @@ class CakeResponseTest extends CakeTestCase {
 		);
 
 		$this->assertEquals(416, $response->statusCode());
+		$response->send();
+	}
+
+/**
+ * testFileRangeOffsetsNoDownload method
+ *
+ * @dataProvider rangeProvider
+ * @return void
+ */
+	public function testFileRangeOffsetsNoDownload($range, $length, $offsetResponse) {
+		$_SERVER['HTTP_RANGE'] = $range;
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'_sendHeader',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(2))
+			->method('header')
+			->with(array(
+				'Content-Length' => $length,
+				'Content-Range' => $offsetResponse,
+			));
+
+		$response->expects($this->any())
+			->method('_isActive')
+			->will($this->returnValue(true));
+
+		$response->file(
+			CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css',
+			array('download' => false)
+		);
+
+		ob_start();
+		$response->send();
+		ob_get_clean();
+	}
+
+/**
+ * testFileRangeNoDownload method
+ *
+ * @return void
+ */
+	public function testFileRangeNoDownload() {
+		$_SERVER['HTTP_RANGE'] = 'bytes=8-25';
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'_sendHeader',
+			'_setContentType',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->exactly(1))
+			->method('type')
+			->with('css')
+			->will($this->returnArgument(0));
+
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(2))
+			->method('header')
+			->with(array(
+				'Content-Length' => 18,
+				'Content-Range' => 'bytes 8-25/38',
+			));
+
+		$response->expects($this->once())->method('_clearBuffer');
+
+		$response->expects($this->any())
+			->method('_isActive')
+			->will($this->returnValue(true));
+
+		$response->file(
+			CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css',
+			array('download' => false)
+		);
+
+		ob_start();
 		$result = $response->send();
+		$output = ob_get_clean();
+		$this->assertEquals(206, $response->statusCode());
+		$this->assertEquals("is the test asset ", $output);
+		$this->assertNotSame(false, $result);
+	}
+
+/**
+ * testFileRangeInvalidNoDownload method
+ *
+ * @return void
+ */
+	public function testFileRangeInvalidNoDownload() {
+		$_SERVER['HTTP_RANGE'] = 'bytes=30-2';
+		$response = $this->getMock('CakeResponse', array(
+			'header',
+			'type',
+			'_sendHeader',
+			'_setContentType',
+			'_isActive',
+			'_clearBuffer',
+			'_flushBuffer'
+		));
+
+		$response->expects($this->at(1))
+			->method('header')
+			->with('Accept-Ranges', 'bytes');
+
+		$response->expects($this->at(2))
+			->method('header')
+			->with(array(
+				'Content-Range' => 'bytes 0-37/38',
+			));
+
+		$response->file(
+			CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css',
+			array('download' => false)
+		);
+
+		$this->assertEquals(416, $response->statusCode());
+		$response->send();
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Network/CakeSocketTest.php b/web/api/lib/Cake/Test/Case/Network/CakeSocketTest.php
index c6bb2035f..e93882d06 100644
--- a/web/api/lib/Cake/Test/Case/Network/CakeSocketTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/CakeSocketTest.php
@@ -56,7 +56,7 @@ class CakeSocketTest extends CakeTestCase {
 		$this->assertSame($config, array(
 			'persistent'	=> false,
 			'host'			=> 'localhost',
-			'protocol'		=> getprotobyname('tcp'),
+			'protocol'		=> 'tcp',
 			'port'			=> 80,
 			'timeout'		=> 30
 		));
@@ -71,7 +71,7 @@ class CakeSocketTest extends CakeTestCase {
 
 		$config['host'] = 'www.cakephp.org';
 		$config['port'] = 23;
-		$config['protocol'] = 17;
+		$config['protocol'] = 'udp';
 
 		$this->assertSame($this->Socket->config, $config);
 	}
@@ -265,6 +265,24 @@ class CakeSocketTest extends CakeTestCase {
 		$this->Socket->enableCrypto('tls', 'client');
 	}
 
+/**
+ * Test that protocol in the host doesn't cause cert errors.
+ *
+ * @return void
+ */
+	public function testConnectProtocolInHost() {
+		$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
+		$configSslTls = array('host' => 'ssl://smtp.gmail.com', 'port' => 465, 'timeout' => 5);
+		$socket = new CakeSocket($configSslTls);
+		try {
+			$socket->connect();
+			$this->assertEquals('smtp.gmail.com', $socket->config['host']);
+			$this->assertEquals('ssl', $socket->config['protocol']);
+		} catch (SocketException $e) {
+			$this->markTestSkipped('Cannot test network, skipping.');
+		}
+	}
+
 /**
  * _connectSocketToSslTls
  *
@@ -367,7 +385,37 @@ class CakeSocketTest extends CakeTestCase {
 		$this->Socket = new CakeSocket($config);
 		$this->Socket->connect();
 		$result = $this->Socket->context();
-		$this->assertEquals($config['context'], $result);
+		$this->assertSame($config['context']['ssl']['capture_peer'], $result['ssl']['capture_peer']);
 	}
 
+/**
+ * test configuring the context from the flat keys.
+ *
+ * @return void
+ */
+	public function testConfigContext() {
+		$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
+		$config = array(
+			'host' => 'smtp.gmail.com',
+			'port' => 465,
+			'timeout' => 5,
+			'ssl_verify_peer' => true,
+			'ssl_allow_self_signed' => false,
+			'ssl_verify_depth' => 5,
+			'ssl_verify_host' => true,
+		);
+		$this->Socket = new CakeSocket($config);
+
+		$this->Socket->connect();
+		$result = $this->Socket->context();
+
+		$this->assertTrue($result['ssl']['verify_peer']);
+		$this->assertFalse($result['ssl']['allow_self_signed']);
+		$this->assertEquals(5, $result['ssl']['verify_depth']);
+		$this->assertEquals('smtp.gmail.com', $result['ssl']['CN_match']);
+		$this->assertArrayNotHasKey('ssl_verify_peer', $this->Socket->config);
+		$this->assertArrayNotHasKey('ssl_allow_self_signed', $this->Socket->config);
+		$this->assertArrayNotHasKey('ssl_verify_host', $this->Socket->config);
+		$this->assertArrayNotHasKey('ssl_verify_depth', $this->Socket->config);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
index 9cb3ca321..d27f2f709 100644
--- a/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -17,10 +17,10 @@
  */
 
 App::uses('CakeEmail', 'Network/Email');
+App::uses('File', 'Utility');
 
 /**
  * Help to test CakeEmail
- *
  */
 class TestCakeEmail extends CakeEmail {
 
@@ -35,7 +35,6 @@ class TestCakeEmail extends CakeEmail {
 
 /**
  * Config
- *
  */
 	protected $_config = array();
 
@@ -88,10 +87,18 @@ class TestCakeEmail extends CakeEmail {
 
 /**
  * EmailConfig class
- *
  */
 class TestEmailConfig {
 
+/**
+ * default config
+ *
+ * @var array
+ */
+	public $default = array(
+		'subject' => 'Default Subject',
+	);
+
 /**
  * test config
  *
@@ -125,7 +132,6 @@ class TestEmailConfig {
 /**
  * ExtendTransport class
  * test class to ensure the class has send() method
- *
  */
 class ExtendTransport {
 
@@ -145,6 +151,14 @@ class CakeEmailTest extends CakeTestCase {
  */
 	public function setUp() {
 		parent::setUp();
+
+		$this->_configFileExists = true;
+		$emailConfig = new File(APP . 'Config' . DS . 'email.php');
+		if (!$emailConfig->exists()) {
+			$this->_configFileExists = false;
+			$emailConfig->create();
+		}
+
 		$this->CakeEmail = new TestCakeEmail();
 
 		App::build(array(
@@ -160,6 +174,19 @@ class CakeEmailTest extends CakeTestCase {
 	public function tearDown() {
 		parent::tearDown();
 		App::build();
+
+		if (!$this->_configFileExists) {
+			unlink(APP . 'Config' . DS . 'email.php');
+		}
+	}
+
+/**
+ * Test if the EmailConfig::$default configuration is read when present
+ *
+ * @return void
+ */
+	public function testDefaultConfig() {
+		$this->assertEquals('Default Subject', $this->CakeEmail->subject());
 	}
 
 /**
@@ -168,25 +195,25 @@ class CakeEmailTest extends CakeTestCase {
  * @return void
  */
 	public function testFrom() {
-		$this->assertSame($this->CakeEmail->from(), array());
+		$this->assertSame(array(), $this->CakeEmail->from());
 
 		$this->CakeEmail->from('cake@cakephp.org');
 		$expected = array('cake@cakephp.org' => 'cake@cakephp.org');
-		$this->assertSame($this->CakeEmail->from(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->from());
 
 		$this->CakeEmail->from(array('cake@cakephp.org'));
-		$this->assertSame($this->CakeEmail->from(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->from());
 
 		$this->CakeEmail->from('cake@cakephp.org', 'CakePHP');
 		$expected = array('cake@cakephp.org' => 'CakePHP');
-		$this->assertSame($this->CakeEmail->from(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->from());
 
 		$result = $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP'));
-		$this->assertSame($this->CakeEmail->from(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->from());
 		$this->assertSame($this->CakeEmail, $result);
 
 		$this->setExpectedException('SocketException');
-		$result = $this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address'));
+		$this->CakeEmail->from(array('cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address'));
 	}
 
 /**
@@ -215,20 +242,20 @@ class CakeEmailTest extends CakeTestCase {
  */
 	public function testSender() {
 		$this->CakeEmail->reset();
-		$this->assertSame($this->CakeEmail->sender(), array());
+		$this->assertSame(array(), $this->CakeEmail->sender());
 
 		$this->CakeEmail->sender('cake@cakephp.org', 'Name');
 		$expected = array('cake@cakephp.org' => 'Name');
-		$this->assertSame($this->CakeEmail->sender(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->sender());
 
 		$headers = $this->CakeEmail->getHeaders(array('from' => true, 'sender' => true));
 		$this->assertFalse($headers['From']);
-		$this->assertSame($headers['Sender'], 'Name <cake@cakephp.org>');
+		$this->assertSame('Name <cake@cakephp.org>', $headers['Sender']);
 
 		$this->CakeEmail->from('cake@cakephp.org', 'CakePHP');
 		$headers = $this->CakeEmail->getHeaders(array('from' => true, 'sender' => true));
-		$this->assertSame($headers['From'], 'CakePHP <cake@cakephp.org>');
-		$this->assertSame($headers['Sender'], '');
+		$this->assertSame('CakePHP <cake@cakephp.org>', $headers['From']);
+		$this->assertSame('', $headers['Sender']);
 	}
 
 /**
@@ -237,47 +264,52 @@ class CakeEmailTest extends CakeTestCase {
  * @return void
  */
 	public function testTo() {
-		$this->assertSame($this->CakeEmail->to(), array());
+		$this->assertSame(array(), $this->CakeEmail->to());
 
 		$result = $this->CakeEmail->to('cake@cakephp.org');
 		$expected = array('cake@cakephp.org' => 'cake@cakephp.org');
-		$this->assertSame($this->CakeEmail->to(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->to());
 		$this->assertSame($this->CakeEmail, $result);
 
 		$this->CakeEmail->to('cake@cakephp.org', 'CakePHP');
 		$expected = array('cake@cakephp.org' => 'CakePHP');
-		$this->assertSame($this->CakeEmail->to(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->to());
 
 		$list = array(
-			'cake@cakephp.org' => 'Cake PHP',
+			'root@localhost' => 'root',
+			'bjørn@hammeröath.com' => 'Bjorn',
+			'cake.php@cakephp.org' => 'Cake PHP',
 			'cake-php@googlegroups.com' => 'Cake Groups',
 			'root@cakephp.org'
 		);
 		$this->CakeEmail->to($list);
 		$expected = array(
-			'cake@cakephp.org' => 'Cake PHP',
+			'root@localhost' => 'root',
+			'bjørn@hammeröath.com' => 'Bjorn',
+			'cake.php@cakephp.org' => 'Cake PHP',
 			'cake-php@googlegroups.com' => 'Cake Groups',
 			'root@cakephp.org' => 'root@cakephp.org'
 		);
-		$this->assertSame($this->CakeEmail->to(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->to());
 
 		$this->CakeEmail->addTo('jrbasso@cakephp.org');
 		$this->CakeEmail->addTo('mark_story@cakephp.org', 'Mark Story');
+		$this->CakeEmail->addTo('foobar@ætdcadsl.dk');
 		$result = $this->CakeEmail->addTo(array('phpnut@cakephp.org' => 'PhpNut', 'jose_zap@cakephp.org'));
 		$expected = array(
-			'cake@cakephp.org' => 'Cake PHP',
+			'root@localhost' => 'root',
+			'bjørn@hammeröath.com' => 'Bjorn',
+			'cake.php@cakephp.org' => 'Cake PHP',
 			'cake-php@googlegroups.com' => 'Cake Groups',
 			'root@cakephp.org' => 'root@cakephp.org',
 			'jrbasso@cakephp.org' => 'jrbasso@cakephp.org',
 			'mark_story@cakephp.org' => 'Mark Story',
+			'foobar@ætdcadsl.dk' => 'foobar@ætdcadsl.dk',
 			'phpnut@cakephp.org' => 'PhpNut',
 			'jose_zap@cakephp.org' => 'jose_zap@cakephp.org'
 		);
-		$this->assertSame($this->CakeEmail->to(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->to());
 		$this->assertSame($this->CakeEmail, $result);
-
-		$this->setExpectedException('SocketException');
-		$this->CakeEmail->to(array('cake@localhost', 'CakePHP'));
 	}
 
 /**
@@ -291,8 +323,6 @@ class CakeEmailTest extends CakeTestCase {
 			array(''),
 			array('string'),
 			array('<tag>'),
-			array('some@one-whereis'),
-			array('wrong@key' => 'Name'),
 			array(array('ok@cakephp.org', 1.0, '', 'string'))
 		);
 	}
@@ -326,7 +356,6 @@ class CakeEmailTest extends CakeTestCase {
  */
 	public function testEmailPattern() {
 		$regex = '/.+@.+\..+/i';
-		$this->assertNull($this->CakeEmail->emailPattern());
 		$this->assertSame($regex, $this->CakeEmail->emailPattern($regex)->emailPattern());
 	}
 
@@ -384,6 +413,25 @@ class CakeEmailTest extends CakeTestCase {
 		), $this->CakeEmail->to());
 	}
 
+/**
+ * Tests that it is possible to unset the email pattern and make use of filter_var() instead.
+ *
+ * @return void
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage Invalid email: "fail.@example.com"
+ */
+	public function testUnsetEmailPattern() {
+		$email = new CakeEmail();
+		$this->assertSame(CakeEmail::EMAIL_PATTERN, $email->emailPattern());
+
+		$email->emailPattern(null);
+		$this->assertNull($email->emailPattern());
+
+		$email->to('pass@example.com');
+		$email->to('fail.@example.com');
+	}
+
 /**
  * testFormatAddress method
  *
@@ -499,10 +547,10 @@ class CakeEmailTest extends CakeTestCase {
 		$result = $this->CakeEmail->messageId('<my-email@localhost>');
 		$this->assertSame($this->CakeEmail, $result);
 		$result = $this->CakeEmail->getHeaders();
-		$this->assertSame($result['Message-ID'], '<my-email@localhost>');
+		$this->assertSame('<my-email@localhost>', $result['Message-ID']);
 
 		$result = $this->CakeEmail->messageId();
-		$this->assertSame($result, '<my-email@localhost>');
+		$this->assertSame('<my-email@localhost>', $result);
 	}
 
 /**
@@ -558,16 +606,16 @@ class CakeEmailTest extends CakeTestCase {
  */
 	public function testSubject() {
 		$this->CakeEmail->subject('You have a new message.');
-		$this->assertSame($this->CakeEmail->subject(), 'You have a new message.');
+		$this->assertSame('You have a new message.', $this->CakeEmail->subject());
 
 		$this->CakeEmail->subject('You have a new message, I think.');
 		$this->assertSame($this->CakeEmail->subject(), 'You have a new message, I think.');
 		$this->CakeEmail->subject(1);
-		$this->assertSame($this->CakeEmail->subject(), '1');
+		$this->assertSame('1', $this->CakeEmail->subject());
 
 		$this->CakeEmail->subject('هذه رسالة بعنوان طويل مرسل للمستلم');
 		$expected = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
-		$this->assertSame($this->CakeEmail->subject(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->subject());
 	}
 
 /**
@@ -582,13 +630,13 @@ class CakeEmailTest extends CakeTestCase {
 		$this->CakeEmail->headerCharset = 'ISO-2022-JP';
 		$this->CakeEmail->subject('日本語のSubjectにも対応するよ');
 		$expected = '=?ISO-2022-JP?B?GyRCRnxLXDhsJE4bKEJTdWJqZWN0GyRCJEskYkJQMX4kOSRrJGgbKEI=?=';
-		$this->assertSame($this->CakeEmail->subject(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->subject());
 
 		$this->CakeEmail->subject('長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？');
 		$expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" .
 			" =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" .
 			" =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?=";
-		$this->assertSame($this->CakeEmail->subject(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->subject());
 	}
 
 /**
@@ -607,7 +655,7 @@ class CakeEmailTest extends CakeTestCase {
 			'Content-Type' => 'text/plain; charset=UTF-8',
 			'Content-Transfer-Encoding' => '8bit'
 		);
-		$this->assertSame($this->CakeEmail->getHeaders(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders());
 
 		$this->CakeEmail->addHeaders(array('X-Something' => 'very nice', 'X-Other' => 'cool'));
 		$expected = array(
@@ -619,10 +667,10 @@ class CakeEmailTest extends CakeTestCase {
 			'Content-Type' => 'text/plain; charset=UTF-8',
 			'Content-Transfer-Encoding' => '8bit'
 		);
-		$this->assertSame($this->CakeEmail->getHeaders(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders());
 
 		$this->CakeEmail->from('cake@cakephp.org');
-		$this->assertSame($this->CakeEmail->getHeaders(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders());
 
 		$expected = array(
 			'From' => 'cake@cakephp.org',
@@ -634,11 +682,11 @@ class CakeEmailTest extends CakeTestCase {
 			'Content-Type' => 'text/plain; charset=UTF-8',
 			'Content-Transfer-Encoding' => '8bit'
 		);
-		$this->assertSame($this->CakeEmail->getHeaders(array('from' => true)), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders(array('from' => true)));
 
 		$this->CakeEmail->from('cake@cakephp.org', 'CakePHP');
 		$expected['From'] = 'CakePHP <cake@cakephp.org>';
-		$this->assertSame($this->CakeEmail->getHeaders(array('from' => true)), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders(array('from' => true)));
 
 		$this->CakeEmail->to(array('cake@cakephp.org', 'php@cakephp.org' => 'CakePHP'));
 		$expected = array(
@@ -652,7 +700,7 @@ class CakeEmailTest extends CakeTestCase {
 			'Content-Type' => 'text/plain; charset=UTF-8',
 			'Content-Transfer-Encoding' => '8bit'
 		);
-		$this->assertSame($this->CakeEmail->getHeaders(array('from' => true, 'to' => true)), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders(array('from' => true, 'to' => true)));
 
 		$this->CakeEmail->charset = 'ISO-2022-JP';
 		$expected = array(
@@ -666,7 +714,7 @@ class CakeEmailTest extends CakeTestCase {
 			'Content-Type' => 'text/plain; charset=ISO-2022-JP',
 			'Content-Transfer-Encoding' => '7bit'
 		);
-		$this->assertSame($this->CakeEmail->getHeaders(array('from' => true, 'to' => true)), $expected);
+		$this->assertSame($expected, $this->CakeEmail->getHeaders(array('from' => true, 'to' => true)));
 
 		$result = $this->CakeEmail->setHeaders(array());
 		$this->assertInstanceOf('CakeEmail', $result);
@@ -717,19 +765,19 @@ class CakeEmailTest extends CakeTestCase {
 	public function testTemplate() {
 		$this->CakeEmail->template('template', 'layout');
 		$expected = array('template' => 'template', 'layout' => 'layout');
-		$this->assertSame($this->CakeEmail->template(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->template());
 
 		$this->CakeEmail->template('new_template');
 		$expected = array('template' => 'new_template', 'layout' => 'layout');
-		$this->assertSame($this->CakeEmail->template(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->template());
 
 		$this->CakeEmail->template('template', null);
 		$expected = array('template' => 'template', 'layout' => null);
-		$this->assertSame($this->CakeEmail->template(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->template());
 
 		$this->CakeEmail->template(null, null);
 		$expected = array('template' => null, 'layout' => null);
-		$this->assertSame($this->CakeEmail->template(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->template());
 	}
 
 /**
@@ -738,7 +786,7 @@ class CakeEmailTest extends CakeTestCase {
  * @return void
  */
 	public function testTheme() {
-		$this->assertSame(null, $this->CakeEmail->theme());
+		$this->assertNull($this->CakeEmail->theme());
 
 		$this->CakeEmail->theme('default');
 		$expected = 'default';
@@ -751,16 +799,16 @@ class CakeEmailTest extends CakeTestCase {
  * @return void
  */
 	public function testViewVars() {
-		$this->assertSame($this->CakeEmail->viewVars(), array());
+		$this->assertSame(array(), $this->CakeEmail->viewVars());
 
 		$this->CakeEmail->viewVars(array('value' => 12345));
-		$this->assertSame($this->CakeEmail->viewVars(), array('value' => 12345));
+		$this->assertSame(array('value' => 12345), $this->CakeEmail->viewVars());
 
 		$this->CakeEmail->viewVars(array('name' => 'CakePHP'));
-		$this->assertSame($this->CakeEmail->viewVars(), array('value' => 12345, 'name' => 'CakePHP'));
+		$this->assertSame(array('value' => 12345, 'name' => 'CakePHP'), $this->CakeEmail->viewVars());
 
 		$this->CakeEmail->viewVars(array('value' => 4567));
-		$this->assertSame($this->CakeEmail->viewVars(), array('value' => 4567, 'name' => 'CakePHP'));
+		$this->assertSame(array('value' => 4567, 'name' => 'CakePHP'), $this->CakeEmail->viewVars());
 	}
 
 /**
@@ -776,10 +824,10 @@ class CakeEmailTest extends CakeTestCase {
 				'mimetype' => 'application/octet-stream'
 			)
 		);
-		$this->assertSame($this->CakeEmail->attachments(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->attachments());
 
 		$this->CakeEmail->attachments(array());
-		$this->assertSame($this->CakeEmail->attachments(), array());
+		$this->assertSame(array(), $this->CakeEmail->attachments());
 
 		$this->CakeEmail->attachments(array(
 			array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain')
@@ -793,7 +841,7 @@ class CakeEmailTest extends CakeTestCase {
 			'other.txt' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'application/octet-stream'),
 			'license' => array('file' => CAKE . 'LICENSE.txt', 'mimetype' => 'application/octet-stream')
 		);
-		$this->assertSame($this->CakeEmail->attachments(), $expected);
+		$this->assertSame($expected, $this->CakeEmail->attachments());
 
 		$this->setExpectedException('SocketException');
 		$this->CakeEmail->attachments(array(array('nofile' => CAKE . 'basics.php', 'mimetype' => 'text/plain')));
@@ -807,14 +855,14 @@ class CakeEmailTest extends CakeTestCase {
 	public function testTransport() {
 		$result = $this->CakeEmail->transport('Debug');
 		$this->assertSame($this->CakeEmail, $result);
-		$this->assertSame($this->CakeEmail->transport(), 'Debug');
+		$this->assertSame('Debug', $this->CakeEmail->transport());
 
 		$result = $this->CakeEmail->transportClass();
 		$this->assertInstanceOf('DebugTransport', $result);
 
 		$this->setExpectedException('SocketException');
 		$this->CakeEmail->transport('Invalid');
-		$result = $this->CakeEmail->transportClass();
+		$this->CakeEmail->transportClass();
 	}
 
 /**
@@ -838,17 +886,18 @@ class CakeEmailTest extends CakeTestCase {
 
 		$config = array('test' => 'ok', 'test2' => true);
 		$this->CakeEmail->config($config);
-		$this->assertSame($transportClass->config(), $config);
-		$this->assertSame($this->CakeEmail->config(), $config);
+		$this->assertSame($config, $transportClass->config());
+		$expected = $config + array('subject' => 'Default Subject');
+		$this->assertSame($expected, $this->CakeEmail->config());
 
 		$this->CakeEmail->config(array());
-		$this->assertSame($transportClass->config(), $config);
+		$this->assertSame($config, $transportClass->config());
 
-		$config = array('test' => 'test@example.com');
+		$config = array('test' => 'test@example.com', 'subject' => 'my test subject');
 		$this->CakeEmail->config($config);
-		$expected = array('test' => 'test@example.com', 'test2' => true);
+		$expected = array('test' => 'test@example.com', 'subject' => 'my test subject', 'test2' => true);
 		$this->assertSame($expected, $this->CakeEmail->config());
-		$this->assertSame($expected, $transportClass->config());
+		$this->assertSame(array('test' => 'test@example.com', 'test2' => true), $transportClass->config());
 	}
 
 /**
@@ -897,12 +946,13 @@ class CakeEmailTest extends CakeTestCase {
 			'username' => null,
 			'password' => null,
 			'client' => null,
-			'tls' => false
+			'tls' => false,
+			'ssl_allow_self_signed' => false
 		);
 		$this->assertEquals($expected, $this->CakeEmail->transportClass()->config());
 
 		$this->CakeEmail->config(array('log' => true));
-		$result = $this->CakeEmail->transportClass()->config();
+		$this->CakeEmail->transportClass()->config();
 		$expected += array('log' => true);
 		$this->assertEquals($expected, $this->CakeEmail->transportClass()->config());
 
@@ -957,7 +1007,7 @@ class CakeEmailTest extends CakeTestCase {
 
 		$result = $this->CakeEmail->send("Other body");
 		$expected = "Other body\r\n\r\n";
-		$this->assertSame($result['message'], $expected);
+		$this->assertSame($expected, $result['message']);
 		$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
 		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
 
@@ -969,7 +1019,7 @@ class CakeEmailTest extends CakeTestCase {
 		$this->CakeEmail->config(array('empty'));
 		$result = $this->CakeEmail->send(array('Sending content', 'As array'));
 		$expected = "Sending content\r\nAs array\r\n\r\n\r\n";
-		$this->assertSame($result['message'], $expected);
+		$this->assertSame($expected, $result['message']);
 	}
 
 /**
@@ -1167,6 +1217,48 @@ class CakeEmailTest extends CakeTestCase {
 		$this->assertContains('--' . $boundary . '--', $result['message']);
 	}
 
+/**
+ * Test setting inline attachments and HTML only messages.
+ *
+ * @return void
+ */
+	public function testSendWithInlineAttachmentsHtmlOnly() {
+		$this->CakeEmail->transport('debug');
+		$this->CakeEmail->from('cake@cakephp.org');
+		$this->CakeEmail->to('cake@cakephp.org');
+		$this->CakeEmail->subject('My title');
+		$this->CakeEmail->emailFormat('html');
+		$this->CakeEmail->attachments(array(
+			'cake.png' => array(
+				'file' => CAKE . 'VERSION.txt',
+				'contentId' => 'abc123'
+			)
+		));
+		$result = $this->CakeEmail->send('Hello');
+
+		$boundary = $this->CakeEmail->getBoundary();
+		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
+		$expected = "--$boundary\r\n" .
+			"Content-Type: multipart/related; boundary=\"rel-$boundary\"\r\n" .
+			"\r\n" .
+			"--rel-$boundary\r\n" .
+			"Content-Type: text/html; charset=UTF-8\r\n" .
+			"Content-Transfer-Encoding: 8bit\r\n" .
+			"\r\n" .
+			"Hello" .
+			"\r\n" .
+			"\r\n" .
+			"\r\n" .
+			"--rel-$boundary\r\n" .
+			"Content-Type: application/octet-stream\r\n" .
+			"Content-Transfer-Encoding: base64\r\n" .
+			"Content-ID: <abc123>\r\n" .
+			"Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n";
+		$this->assertContains($expected, $result['message']);
+		$this->assertContains('--rel-' . $boundary . '--', $result['message']);
+		$this->assertContains('--' . $boundary . '--', $result['message']);
+	}
+
 /**
  * Test disabling content-disposition.
  *
@@ -1301,6 +1393,52 @@ class CakeEmailTest extends CakeTestCase {
 		$this->assertNotContains('This email was sent using the CakePHP Framework', $result['message']);
 	}
 
+/**
+ * testSendRender both method
+ *
+ * @return void
+ */
+	public function testSendRenderBoth() {
+		$this->CakeEmail->reset();
+		$this->CakeEmail->transport('debug');
+
+		$this->CakeEmail->from('cake@cakephp.org');
+		$this->CakeEmail->to(array('you@cakephp.org' => 'You'));
+		$this->CakeEmail->subject('My title');
+		$this->CakeEmail->config(array('empty'));
+		$this->CakeEmail->template('default', 'default');
+		$this->CakeEmail->emailFormat('both');
+		$result = $this->CakeEmail->send();
+
+		$this->assertContains('Message-ID: ', $result['headers']);
+		$this->assertContains('To: ', $result['headers']);
+
+		$boundary = $this->CakeEmail->getBoundary();
+		$this->assertContains('Content-Type: multipart/alternative; boundary="' . $boundary . '"', $result['headers']);
+
+		$expected = "--$boundary\r\n" .
+			"Content-Type: text/plain; charset=UTF-8\r\n" .
+			"Content-Transfer-Encoding: 8bit\r\n" .
+			"\r\n" .
+			"\r\n" .
+			"\r\n" .
+			"This email was sent using the CakePHP Framework, http://cakephp.org." .
+			"\r\n" .
+			"\r\n" .
+			"--$boundary\r\n" .
+			"Content-Type: text/html; charset=UTF-8\r\n" .
+			"Content-Transfer-Encoding: 8bit\r\n" .
+			"\r\n" .
+			"<!DOCTYPE html";
+		$this->assertStringStartsWith($expected, $result['message']);
+
+		$expected = "</html>\r\n" .
+			"\r\n" .
+			"\r\n" .
+			"--$boundary--\r\n";
+		$this->assertStringEndsWith($expected, $result['message']);
+	}
+
 /**
  * testSendRender method for ISO-2022-JP
  *
@@ -1461,7 +1599,7 @@ class CakeEmailTest extends CakeTestCase {
 			$server .= ':' . env('SERVER_PORT');
 		}
 
-		$expected = '<img src="http://' . $server . '/img/image.gif" alt="cool image" width="100" height="100" />';
+		$expected = '<img src="http://' . $server . '/img/image.gif" alt="cool image" width="100" height="100"/>';
 		$result = $this->CakeEmail->send();
 		$this->assertContains($expected, $result['message']);
 	}
@@ -1542,8 +1680,6 @@ class CakeEmailTest extends CakeTestCase {
 		$this->assertFalse(empty($boundary));
 		$this->assertContains('--' . $boundary, $message);
 		$this->assertContains('--' . $boundary . '--', $message);
-		$this->assertContains('--alt-' . $boundary, $message);
-		$this->assertContains('--alt-' . $boundary . '--', $message);
 
 		$this->CakeEmail->attachments(array('fake.php' => __FILE__));
 		$this->CakeEmail->send();
@@ -1669,12 +1805,12 @@ class CakeEmailTest extends CakeTestCase {
 		$this->CakeEmail->to('cake@cakephp.org');
 		$this->CakeEmail->theme('TestTheme');
 		$this->CakeEmail->emailPattern('/.+@.+\..+/i');
-		$this->assertSame($this->CakeEmail->to(), array('cake@cakephp.org' => 'cake@cakephp.org'));
+		$this->assertSame(array('cake@cakephp.org' => 'cake@cakephp.org'), $this->CakeEmail->to());
 
 		$this->CakeEmail->reset();
-		$this->assertSame($this->CakeEmail->to(), array());
-		$this->assertSame(null, $this->CakeEmail->theme());
-		$this->assertSame(null, $this->CakeEmail->emailPattern());
+		$this->assertSame(array(), $this->CakeEmail->to());
+		$this->assertNull($this->CakeEmail->theme());
+		$this->assertSame(CakeEmail::EMAIL_PATTERN, $this->CakeEmail->emailPattern());
 	}
 
 /**
@@ -1686,8 +1822,8 @@ class CakeEmailTest extends CakeTestCase {
 		$this->CakeEmail->charset = 'ISO-2022-JP';
 		$this->CakeEmail->reset();
 
-		$this->assertSame($this->CakeEmail->charset, 'utf-8', $this->CakeEmail->charset);
-		$this->assertSame($this->CakeEmail->headerCharset, null, $this->CakeEmail->headerCharset);
+		$this->assertSame('utf-8', $this->CakeEmail->charset, $this->CakeEmail->charset);
+		$this->assertNull($this->CakeEmail->headerCharset, $this->CakeEmail->headerCharset);
 	}
 
 /**
@@ -1807,6 +1943,26 @@ class CakeEmailTest extends CakeTestCase {
 		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
 	}
 
+/**
+ * testConfigArrayWithLayoutWithoutTemplate method
+ *
+ * @return void
+ */
+	public function testConfigArrayWithLayoutWithoutTemplate() {
+		$configs = array(
+			'from' => array('some@example.com' => 'My website'),
+			'to' => 'test@example.com',
+			'subject' => 'Test mail subject',
+			'transport' => 'Debug',
+			'layout' => 'custom'
+		);
+		$this->CakeEmail = new CakeEmail($configs);
+
+		$result = $this->CakeEmail->template();
+		$this->assertEquals('', $result['template']);
+		$this->assertEquals($configs['layout'], $result['layout']);
+	}
+
 /**
  * testConstructWithConfigString method
  *
@@ -1869,7 +2025,7 @@ class CakeEmailTest extends CakeTestCase {
 		$this->assertEquals('html', $result);
 
 		$this->setExpectedException('SocketException');
-		$result = $this->CakeEmail->emailFormat('invalid');
+		$this->CakeEmail->emailFormat('invalid');
 	}
 
 /**
@@ -1985,12 +2141,12 @@ class CakeEmailTest extends CakeTestCase {
 	}
 
 	protected function _checkContentTransferEncoding($message, $charset) {
-		$boundary = '--alt-' . $this->CakeEmail->getBoundary();
+		$boundary = '--' . $this->CakeEmail->getBoundary();
 		$result['text'] = false;
 		$result['html'] = false;
 		$length = count($message);
 		for ($i = 0; $i < $length; ++$i) {
-			if ($message[$i] == $boundary) {
+			if ($message[$i] === $boundary) {
 				$flag = false;
 				$type = '';
 				while (!preg_match('/^$/', $message[$i])) {
@@ -2129,10 +2285,10 @@ class CakeEmailTest extends CakeTestCase {
 	protected function _getEmailByOldStyleCharset($charset, $headerCharset) {
 		$email = new CakeEmail(array('transport' => 'Debug'));
 
-		if (! empty($charset)) {
+		if (!empty($charset)) {
 			$email->charset = $charset;
 		}
-		if (! empty($headerCharset)) {
+		if (!empty($headerCharset)) {
 			$email->headerCharset = $headerCharset;
 		}
 
@@ -2153,10 +2309,10 @@ class CakeEmailTest extends CakeTestCase {
 	protected function _getEmailByNewStyleCharset($charset, $headerCharset) {
 		$email = new CakeEmail(array('transport' => 'Debug'));
 
-		if (! empty($charset)) {
+		if (!empty($charset)) {
 			$email->charset($charset);
 		}
-		if (! empty($headerCharset)) {
+		if (!empty($headerCharset)) {
 			$email->headerCharset($headerCharset);
 		}
 
@@ -2226,7 +2382,6 @@ class CakeEmailTest extends CakeTestCase {
         style="font-weight: bold">The tag is across multiple lines</th>
 </table>
 HTML;
-		$length = strlen($str);
 		$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST + 1);
 
 		$this->CakeEmail->reset();
@@ -2289,6 +2444,44 @@ HTML;
 		$this->assertEquals($expected, $result['message']);
 	}
 
+/**
+ * testZeroOnlyLinesNotBeingEmptied()
+ *
+ * @return void
+ */
+	public function testZeroOnlyLinesNotBeingEmptied() {
+		$message = "Lorem\r\n0\r\n0\r\nipsum";
+
+		$this->CakeEmail->reset();
+		$this->CakeEmail->transport('Debug');
+		$this->CakeEmail->from('cake@cakephp.org');
+		$this->CakeEmail->to('cake@cakephp.org');
+		$this->CakeEmail->subject('Wordwrap Test');
+		$this->CakeEmail->config(array('empty'));
+		$result = $this->CakeEmail->send($message);
+		$expected = "{$message}\r\n\r\n";
+		$this->assertEquals($expected, $result['message']);
+	}
+
+/**
+ * Test that really long lines don't cause errors.
+ *
+ * @return void
+ */
+	public function testReallyLongLine() {
+		$this->CakeEmail->reset();
+		$this->CakeEmail->config(array('empty'));
+		$this->CakeEmail->transport('Debug');
+		$this->CakeEmail->from('cake@cakephp.org');
+		$this->CakeEmail->to('cake@cakephp.org');
+		$this->CakeEmail->subject('Wordwrap Test');
+		$this->CakeEmail->emailFormat('html');
+		$this->CakeEmail->template('long_line', null);
+		$result = $this->CakeEmail->send();
+		$this->assertContains('<a>', $result['message'], 'First bits are included');
+		$this->assertContains('x', $result['message'], 'Last byte are included');
+	}
+
 /**
  * CakeEmailTest::assertLineLengths()
  *
diff --git a/web/api/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php b/web/api/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
index ca5653b49..9c6061c36 100644
--- a/web/api/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
@@ -22,7 +22,6 @@ App::uses('DebugTransport', 'Network/Email');
 
 /**
  * Test case
- *
  */
 class DebugTransportTest extends CakeTestCase {
 
diff --git a/web/api/lib/Cake/Test/Case/Network/Email/MailTransportTest.php b/web/api/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
index bccc95439..dde5eaa90 100644
--- a/web/api/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Email/MailTransportTest.php
@@ -22,7 +22,6 @@ App::uses('MailTransport', 'Network/Email');
 
 /**
  * Test case
- *
  */
 class MailTransportTest extends CakeTestCase {
 
diff --git a/web/api/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php b/web/api/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
index 1eecd8893..478de6b98 100644
--- a/web/api/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
@@ -22,14 +22,13 @@ App::uses('SmtpTransport', 'Network/Email');
 
 /**
  * Help to test SmtpTransport
- *
  */
 class SmtpTestTransport extends SmtpTransport {
 
 /**
  * Helper to change the socket
  *
- * @param object $socket
+ * @param CakeSocket $socket A socket.
  * @return void
  */
 	public function setSocket(CakeSocket $socket) {
@@ -39,7 +38,7 @@ class SmtpTestTransport extends SmtpTransport {
 /**
  * Helper to change the CakeEmail
  *
- * @param object $cakeEmail
+ * @param object $cakeEmail An email object.
  * @return void
  */
 	public function setCakeEmail($cakeEmail) {
@@ -57,8 +56,8 @@ class SmtpTestTransport extends SmtpTransport {
 /**
  * Magic function to call protected methods
  *
- * @param string $method
- * @param string $args
+ * @param string $method The method to call.
+ * @param string $args The arguments.
  * @return mixed
  */
 	public function __call($method, $args) {
@@ -70,7 +69,6 @@ class SmtpTestTransport extends SmtpTransport {
 
 /**
  * Test case
- *
  */
 class SmtpTransportTest extends CakeTestCase {
 
@@ -130,6 +128,7 @@ class SmtpTransportTest extends CakeTestCase {
  * testConnectEhloTlsOnNonTlsServer method
  *
  * @expectedException SocketException
+ * @expectedExceptionMessage SMTP server did not accept the connection or trying to connect to non TLS SMTP server using TLS.
  * @return void
  */
 	public function testConnectEhloTlsOnNonTlsServer() {
@@ -150,6 +149,7 @@ class SmtpTransportTest extends CakeTestCase {
  * testConnectEhloNoTlsOnRequiredTlsServer method
  *
  * @expectedException SocketException
+ * @expectedExceptionMessage SMTP authentication method not allowed, check if SMTP server requires TLS.
  * @return void
  */
 	public function testConnectEhloNoTlsOnRequiredTlsServer() {
@@ -189,6 +189,7 @@ class SmtpTransportTest extends CakeTestCase {
  * testConnectFail method
  *
  * @expectedException SocketException
+ * @expectedExceptionMessage SMTP server did not accept the connection.
  * @return void
  */
 	public function testConnectFail() {
@@ -223,6 +224,90 @@ class SmtpTransportTest extends CakeTestCase {
 		$this->SmtpTransport->auth();
 	}
 
+/**
+ * testAuthNotRecognized method
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage AUTH command not recognized or not implemented, SMTP server may not require authentication.
+ * @return void
+ */
+	public function testAuthNotRecognized() {
+		$this->socket->expects($this->at(0))->method('write')->with("AUTH LOGIN\r\n");
+		$this->socket->expects($this->at(1))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(2))->method('read')->will($this->returnValue("500 5.3.3 Unrecognized command\r\n"));
+		$this->SmtpTransport->config(array('username' => 'mark', 'password' => 'story'));
+		$this->SmtpTransport->auth();
+	}
+
+/**
+ * testAuthNotImplemented method
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage AUTH command not recognized or not implemented, SMTP server may not require authentication.
+ * @return void
+ */
+	public function testAuthNotImplemented() {
+		$this->socket->expects($this->at(0))->method('write')->with("AUTH LOGIN\r\n");
+		$this->socket->expects($this->at(1))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(2))->method('read')->will($this->returnValue("502 5.3.3 Command not implemented\r\n"));
+		$this->SmtpTransport->config(array('username' => 'mark', 'password' => 'story'));
+		$this->SmtpTransport->auth();
+	}
+
+/**
+ * testAuthBadSequence method
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage SMTP Error: 503 5.5.1 Already authenticated
+ * @return void
+ */
+	public function testAuthBadSequence() {
+		$this->socket->expects($this->at(0))->method('write')->with("AUTH LOGIN\r\n");
+		$this->socket->expects($this->at(1))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(2))->method('read')->will($this->returnValue("503 5.5.1 Already authenticated\r\n"));
+		$this->SmtpTransport->config(array('username' => 'mark', 'password' => 'story'));
+		$this->SmtpTransport->auth();
+	}
+
+/**
+ * testAuthBadUsername method
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage SMTP server did not accept the username.
+ * @return void
+ */
+	public function testAuthBadUsername() {
+		$this->socket->expects($this->at(0))->method('write')->with("AUTH LOGIN\r\n");
+		$this->socket->expects($this->at(1))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(2))->method('read')->will($this->returnValue("334 Login\r\n"));
+		$this->socket->expects($this->at(3))->method('write')->with("bWFyaw==\r\n");
+		$this->socket->expects($this->at(4))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(5))->method('read')->will($this->returnValue("535 5.7.8 Authentication failed\r\n"));
+		$this->SmtpTransport->config(array('username' => 'mark', 'password' => 'story'));
+		$this->SmtpTransport->auth();
+	}
+
+/**
+ * testAuthBadPassword method
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage SMTP server did not accept the password.
+ * @return void
+ */
+	public function testAuthBadPassword() {
+		$this->socket->expects($this->at(0))->method('write')->with("AUTH LOGIN\r\n");
+		$this->socket->expects($this->at(1))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(2))->method('read')->will($this->returnValue("334 Login\r\n"));
+		$this->socket->expects($this->at(3))->method('write')->with("bWFyaw==\r\n");
+		$this->socket->expects($this->at(4))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(5))->method('read')->will($this->returnValue("334 Pass\r\n"));
+		$this->socket->expects($this->at(6))->method('write')->with("c3Rvcnk=\r\n");
+		$this->socket->expects($this->at(7))->method('read')->will($this->returnValue(false));
+		$this->socket->expects($this->at(8))->method('read')->will($this->returnValue("535 5.7.8 Authentication failed\r\n"));
+		$this->SmtpTransport->config(array('username' => 'mark', 'password' => 'story'));
+		$this->SmtpTransport->auth();
+	}
+
 /**
  * testAuthNoAuth method
  *
diff --git a/web/api/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php b/web/api/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
index f7b4d6109..7ae8349b3 100644
--- a/web/api/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
@@ -19,6 +19,25 @@
 App::uses('HttpSocket', 'Network/Http');
 App::uses('BasicAuthentication', 'Network/Http');
 
+/**
+ * class TestSslHttpSocket
+ *
+ * @package       Cake.Test.Case.Network.Http
+ */
+class TestSslHttpSocket extends HttpSocket {
+
+/**
+ * testSetProxy method
+ *
+ * @return void
+ */
+	public function testSetProxy($proxy = null) {
+		$this->_proxy = $proxy;
+		$this->_setProxy();
+	}
+
+}
+
 /**
  * BasicMethodTest class
  *
@@ -60,4 +79,26 @@ class BasicAuthenticationTest extends CakeTestCase {
 		$this->assertEquals('Basic bWFyazpzZWNyZXQ=', $http->request['header']['Proxy-Authorization']);
 	}
 
+/**
+ * testProxyAuthenticationSsl method
+ *
+ * @return void
+ */
+	public function testProxyAuthenticationSsl() {
+		$http = new TestSslHttpSocket();
+		$http->request['uri']['scheme'] = 'https';
+		$proxy = array(
+			'host' => 'localhost',
+			'port' => 3128,
+			'method' => 'Basic',
+			'user' => 'mark',
+			'pass' => 'secret'
+		);
+
+		$http->testSetProxy($proxy);
+
+		$this->assertEquals('Basic bWFyazpzZWNyZXQ=', $http->config['proxyauth']);
+		$this->assertFalse(isset($http->request['header']['Proxy-Authorization']));
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php b/web/api/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
index 96ddd398a..3610427c5 100644
--- a/web/api/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
@@ -61,7 +61,7 @@ class DigestAuthenticationTest extends CakeTestCase {
 /**
  * Socket property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $HttpSocket = null;
 
diff --git a/web/api/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php b/web/api/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
index 033f12da6..502340094 100644
--- a/web/api/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
@@ -15,7 +15,6 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-
 App::uses('HttpResponse', 'Network/Http');
 
 /**
@@ -39,7 +38,7 @@ class TestHttpResponse extends HttpResponse {
  * Convenience method for testing protected method
  *
  * @param string $body A string containing the body to decode
- * @param boolean|string $encoding Can be false in case no encoding is being used, or a string representing the encoding
+ * @param bool|string $encoding Can be false in case no encoding is being used, or a string representing the encoding
  * @return mixed Array or false
  */
 	public function decodeBody($body, $encoding = 'chunked') {
@@ -69,7 +68,7 @@ class TestHttpResponse extends HttpResponse {
 /**
  * Convenience method for testing protected method
  *
- * @param boolean $hex true to get them as HEX values, false otherwise
+ * @param bool $hex true to get them as HEX values, false otherwise
  * @return array Escape chars
  */
 	public function tokenEscapeChars($hex = true, $chars = null) {
@@ -453,12 +452,13 @@ class HttpResponseTest extends CakeTestCase {
 /**
  * testDecodeChunkedBodyError method
  *
- * @expectedException SocketException
  * @return void
  */
 	public function testDecodeChunkedBodyError() {
 		$encoded = "19\r\nThis is a chunked message\r\nE\r\n\nThat is cool\n\r\n";
-		$this->HttpResponse->decodeChunkedBody($encoded);
+		$result = $this->HttpResponse->decodeChunkedBody($encoded);
+		$expected = "This is a chunked message\nThat is cool\n";
+		$this->assertEquals($expected, $result['body']);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
index cc86d7ba3..559980494 100644
--- a/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
@@ -29,8 +29,8 @@ class TestAuthentication {
 /**
  * authentication method
  *
- * @param HttpSocket $http
- * @param array $authInfo
+ * @param HttpSocket $http A HTTP socket.
+ * @param array &$authInfo Some auth info.
  * @return void
  */
 	public static function authentication(HttpSocket $http, &$authInfo) {
@@ -40,8 +40,8 @@ class TestAuthentication {
 /**
  * proxyAuthentication method
  *
- * @param HttpSocket $http
- * @param array $proxyInfo
+ * @param HttpSocket $http A HTTP socket.
+ * @param array &$proxyInfo Some proxy info.
  * @return void
  */
 	public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) {
@@ -52,7 +52,6 @@ class TestAuthentication {
 
 /**
  * CustomResponse
- *
  */
 class CustomResponse {
 
@@ -66,6 +65,7 @@ class CustomResponse {
 /**
  * Constructor
  *
+ * @param string $message A message.
  */
 	public function __construct($message) {
 		$this->first10 = substr($message, 0, 10);
@@ -75,7 +75,6 @@ class CustomResponse {
 
 /**
  * TestHttpSocket
- *
  */
 class TestHttpSocket extends HttpSocket {
 
@@ -93,7 +92,7 @@ class TestHttpSocket extends HttpSocket {
  * Convenience method for testing protected method
  *
  * @param string|array $uri URI to parse
- * @param boolean|array $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
+ * @param bool|array $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
  * @return array Parsed URI
  */
 	public function parseUri($uri = null, $base = array()) {
@@ -135,17 +134,16 @@ class TestHttpSocket extends HttpSocket {
  * Convenience method for testing protected method
  *
  * @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
- * @param string $versionToken The version token to use, defaults to HTTP/1.1
  * @return string Request line
  */
-	public function buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
-		return parent::_buildRequestLine($request, $versionToken);
+	public function buildRequestLine($request = array()) {
+		return parent::_buildRequestLine($request);
 	}
 
 /**
  * Convenience method for testing protected method
  *
- * @param boolean $hex true to get them as HEX values, false otherwise
+ * @param bool $hex true to get them as HEX values, false otherwise
  * @return array Escape chars
  */
 	public function tokenEscapeChars($hex = true, $chars = null) {
@@ -174,14 +172,14 @@ class HttpSocketTest extends CakeTestCase {
 /**
  * Socket property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $Socket = null;
 
 /**
  * RequestSocket property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $RequestSocket = null;
 
@@ -217,7 +215,6 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->expects($this->never())->method('connect');
 		$this->Socket->__construct(array('host' => 'foo-bar'));
 		$baseConfig['host'] = 'foo-bar';
-		$baseConfig['protocol'] = getprotobyname($baseConfig['protocol']);
 		$this->assertEquals($this->Socket->config, $baseConfig);
 
 		$this->Socket->reset();
@@ -226,7 +223,6 @@ class HttpSocketTest extends CakeTestCase {
 		$baseConfig['host'] = $baseConfig['request']['uri']['host'] = 'www.cakephp.org';
 		$baseConfig['port'] = $baseConfig['request']['uri']['port'] = 23;
 		$baseConfig['request']['uri']['scheme'] = 'http';
-		$baseConfig['protocol'] = getprotobyname($baseConfig['protocol']);
 		$this->assertEquals($this->Socket->config, $baseConfig);
 
 		$this->Socket->reset();
@@ -309,21 +305,15 @@ class HttpSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testRequest() {
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->returnValue(false));
+
 		$this->Socket->reset();
 
 		$response = $this->Socket->request(true);
 		$this->assertFalse($response);
 
-		$context = array(
-			'ssl' => array(
-				'verify_peer' => true,
-				'allow_self_signed' => false,
-				'verify_depth' => 5,
-				'CN_match' => 'www.cakephp.org',
-				'cafile' => CAKE . 'Config' . DS . 'cacert.pem'
-			)
-		);
-
 		$tests = array(
 			array(
 				'request' => 'http://www.cakephp.org/?foo=bar',
@@ -334,7 +324,10 @@ class HttpSocketTest extends CakeTestCase {
 						'protocol' => 'tcp',
 						'port' => 80,
 						'timeout' => 30,
-						'context' => $context,
+						'ssl_verify_peer' => true,
+						'ssl_allow_self_signed' => false,
+						'ssl_verify_depth' => 5,
+						'ssl_verify_host' => true,
 						'request' => array(
 							'uri' => array(
 								'scheme' => 'http',
@@ -495,6 +488,9 @@ class HttpSocketTest extends CakeTestCase {
 					)
 				)
 			),
+			'reset10' => array(
+				'config.protocol' => 'ssl'
+			),
 			array(
 				'request' => array(
 					'method' => 'POST',
@@ -523,8 +519,12 @@ class HttpSocketTest extends CakeTestCase {
 					)
 				)
 			),
+			'reset11' => array(
+				'config.protocol' => 'ssl'
+			),
 			array(
 				'request' => array(
+					'version' => '1.0',
 					'method' => 'POST',
 					'uri' => 'https://www.cakephp.org/posts/add',
 					'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'),
@@ -532,6 +532,8 @@ class HttpSocketTest extends CakeTestCase {
 				),
 				'expectation' => array(
 					'request' => array(
+						'version' => '1.0',
+						'line' => "POST /posts/add HTTP/1.0\r\n",
 						'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\nCookie: foo=bar\r\n",
 						'cookies' => array(
 							'foo' => array('value' => 'bar'),
@@ -565,7 +567,7 @@ class HttpSocketTest extends CakeTestCase {
 
 		$this->Socket->reset();
 		$request = array('method' => 'POST', 'uri' => 'http://www.cakephp.org/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'));
-		$response = $this->Socket->request($request);
+		$this->Socket->request($request);
 		$this->assertEquals("name=HttpSocket-is-released&date=today", $this->Socket->request['body']);
 	}
 
@@ -575,6 +577,10 @@ class HttpSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testGetWithSchemeAndPort() {
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->returnValue(false));
+
 		$this->Socket->reset();
 		$request = array(
 			'uri' => array(
@@ -595,6 +601,10 @@ class HttpSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testRequestWithStringQuery() {
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->returnValue(false));
+
 		$this->Socket->reset();
 		$request = array(
 			'uri' => array(
@@ -628,14 +638,18 @@ class HttpSocketTest extends CakeTestCase {
  */
 	public function testRequest2() {
 		$this->Socket->reset();
+
 		$request = array('uri' => 'htpp://www.cakephp.org/');
 		$number = mt_rand(0, 9999999);
 		$this->Socket->expects($this->any())->method('connect')->will($this->returnValue(true));
 		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is " . $number . "</h1>";
 		$this->Socket->expects($this->at(0))->method('write')
 			->with("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n");
-		$this->Socket->expects($this->at(0))->method('read')->will($this->returnValue(false));
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse, false));
+
 		$response = (string)$this->Socket->request($request);
 		$this->assertEquals($response, "<h1>Hello, your lucky number is " . $number . "</h1>");
 	}
@@ -648,7 +662,11 @@ class HttpSocketTest extends CakeTestCase {
 	public function testRequest3() {
 		$request = array('uri' => 'htpp://www.cakephp.org/');
 		$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a cookie test!</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse, false));
+
 		$this->Socket->connected = true;
 		$this->Socket->request($request);
 		$result = $this->Socket->response['cookies'];
@@ -697,9 +715,10 @@ class HttpSocketTest extends CakeTestCase {
  */
 	public function testRequestWithResource() {
 		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a test!</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
-		$this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false));
-		$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse, false, $serverResponse, false));
 		$this->Socket->connected = true;
 
 		$f = fopen(TMP . 'download.txt', 'w');
@@ -730,8 +749,10 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->config['request']['cookies'] = array();
 
 		$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a test!</h1>";
+
 		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
 		$this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false));
+
 		$expected = array('www.cakephp.org' => array('foo' => array('value' => 'bar')));
 		$this->Socket->request('http://www.cakephp.org/');
 		$this->assertEquals($expected, $this->Socket->config['request']['cookies']);
@@ -767,8 +788,9 @@ class HttpSocketTest extends CakeTestCase {
 	public function testRequestCustomResponse() {
 		$this->Socket->connected = true;
 		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a test!</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
-		$this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false));
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse, false));
 
 		$this->Socket->responseClass = 'CustomResponse';
 		$response = $this->Socket->request('http://www.cakephp.org/');
@@ -786,7 +808,7 @@ class HttpSocketTest extends CakeTestCase {
 			'uri' => 'http://localhost/oneuri',
 			'redirect' => 1
 		);
-		$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://i.cmpnet.com%2Ftechonline%2Fpdf%2Fa.pdf=\r\n\r\n";
+		$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://i.cmpnet.com%2Ftechonline%2Fpdf%2Fa+b.pdf=\r\n\r\n";
 		$serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>You have been redirected</h1>";
 
 		$this->Socket->expects($this->at(1))
@@ -797,12 +819,14 @@ class HttpSocketTest extends CakeTestCase {
 			->method('write')
 			->with($this->logicalAnd(
 				$this->stringContains('Host: i.cmpnet.com'),
-				$this->stringContains('GET /techonline/pdf/a.pdf')
+				$this->stringContains('GET /techonline/pdf/a+b.pdf')
 			));
 
 		$this->Socket->expects($this->at(4))
 			->method('read')
 			->will($this->returnValue($serverResponse2));
+		$this->Socket->expects($this->any())
+			->method('read')->will($this->returnValue(false));
 
 		$response = $this->Socket->request($request);
 		$this->assertEquals('<h1>You have been redirected</h1>', $response->body());
@@ -820,8 +844,10 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n";
 		$serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>You have been redirected</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1));
-		$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false));
 
 		$response = $this->Socket->request($request);
 		$this->assertEquals('<h1>You have been redirected</h1>', $response->body());
@@ -839,8 +865,10 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n";
 		$serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>You have been redirected</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1));
-		$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false));
 
 		$this->Socket->request($request);
 		$this->assertEquals(1, $this->Socket->request['redirect']);
@@ -858,8 +886,10 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/oneruri\r\n\r\n";
 		$serverResponse2 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1));
-		$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse1, false, $serverResponse2, false));
 
 		$response = $this->Socket->request($request);
 		$this->assertEquals(0, $this->Socket->request['redirect']);
@@ -1045,12 +1075,63 @@ class HttpSocketTest extends CakeTestCase {
 		));
 	}
 
+/**
+ * Test the head method
+ *
+ * @return void
+ */
+	public function testHead() {
+		$this->RequestSocket->reset();
+		$this->RequestSocket->expects($this->at(0))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'http://www.google.com/'));
+
+		$this->RequestSocket->expects($this->at(1))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'http://www.google.com/?foo=bar'));
+
+		$this->RequestSocket->expects($this->at(2))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'http://www.google.com/?foo=bar'));
+
+		$this->RequestSocket->expects($this->at(3))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'http://www.google.com/?foo=23&foobar=42'));
+
+		$this->RequestSocket->expects($this->at(4))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'http://www.google.com/', 'version' => '1.0'));
+
+		$this->RequestSocket->expects($this->at(5))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'https://secure.example.com/test.php?one=two'));
+
+		$this->RequestSocket->expects($this->at(6))
+			->method('request')
+			->with(array('method' => 'HEAD', 'uri' => 'https://example.com/oauth/access?clientid=123&redirect_uri=http%3A%2F%2Fexample.com&code=456'));
+
+		$this->RequestSocket->head('http://www.google.com/');
+		$this->RequestSocket->head('http://www.google.com/', array('foo' => 'bar'));
+		$this->RequestSocket->head('http://www.google.com/', 'foo=bar');
+		$this->RequestSocket->head('http://www.google.com/?foo=bar', array('foobar' => '42', 'foo' => '23'));
+		$this->RequestSocket->head('http://www.google.com/', null, array('version' => '1.0'));
+		$this->RequestSocket->head('https://secure.example.com/test.php', array('one' => 'two'));
+		$this->RequestSocket->head('https://example.com/oauth/access', array(
+			'clientid' => '123',
+			'redirect_uri' => 'http://example.com',
+			'code' => 456
+		));
+	}
+
 /**
  * Test authentication
  *
  * @return void
  */
 	public function testAuth() {
+		$this->Socket->expects($this->any())
+			->method('read')->will($this->returnValue(false));
+
 		$this->Socket->get('http://mark:secret@example.com/test');
 		$this->assertTrue(strpos($this->Socket->request['header'], 'Authorization: Basic bWFyazpzZWNyZXQ=') !== false);
 
@@ -1074,6 +1155,16 @@ class HttpSocketTest extends CakeTestCase {
 		));
 		$this->assertEquals($this->Socket->request['auth'], array('Basic' => array('user' => 'joel', 'pass' => 'hunter2')));
 		$this->assertTrue(strpos($this->Socket->request['header'], 'Authorization: Basic am9lbDpodW50ZXIy') !== false);
+
+		$this->Socket->configAuth('Basic', 'mark', 'password');
+		$this->Socket->request(array(
+			'method' => 'GET',
+			'uri' => 'http://example.com/test',
+			'header' => array(
+				'Authorization' => 'OtherAuth Hi.There'
+			)
+		));
+		$this->assertPattern('/Authorization: OtherAuth Hi\.There/m', $this->Socket->request['header']);
 	}
 
 /**
@@ -1082,6 +1173,9 @@ class HttpSocketTest extends CakeTestCase {
  * @return void
  */
 	public function testConsecutiveGetResetsAuthCredentials() {
+		$this->Socket->expects($this->any())
+			->method('read')->will($this->returnValue(false));
+
 		$this->Socket->get('http://mark:secret@example.com/test');
 		$this->assertEquals('mark', $this->Socket->request['uri']['user']);
 		$this->assertEquals('secret', $this->Socket->request['uri']['pass']);
@@ -1090,6 +1184,15 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->get('/test2');
 		$this->assertTrue(strpos($this->Socket->request['header'], 'Authorization: Basic bWFyazpzZWNyZXQ=') !== false);
 
+		$this->Socket->request(array(
+			'method' => 'GET',
+			'uri' => 'http://example.com/test',
+			'header' => array(
+				'Authorization' => 'OtherAuth Hi.There'
+			)
+		));
+		$this->assertPattern('/Authorization: OtherAuth Hi\.There/m', $this->Socket->request['header']);
+
 		$this->Socket->get('/test3');
 		$this->assertTrue(strpos($this->Socket->request['header'], 'Authorization: Basic bWFyazpzZWNyZXQ=') !== false);
 	}
@@ -1226,9 +1329,6 @@ class HttpSocketTest extends CakeTestCase {
 		$r = $this->Socket->buildRequestLine($request);
 		$this->assertEquals("GET /search?q=socket HTTP/1.1\r\n", $r);
 
-		$r = $this->Socket->buildRequestLine($request, 'CAKE-HTTP/0.1');
-		$this->assertEquals("GET /search?q=socket CAKE-HTTP/0.1\r\n", $r);
-
 		$request = array('method' => 'OPTIONS', 'uri' => '*');
 		$r = $this->Socket->buildRequestLine($request);
 		$this->assertEquals("OPTIONS * HTTP/1.1\r\n", $r);
@@ -1240,6 +1340,17 @@ class HttpSocketTest extends CakeTestCase {
 
 		$r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n");
 		$this->assertEquals("GET * HTTP/1.1\r\n", $r);
+
+		$request = array(
+			'version' => '1.0',
+			'method' => 'GET',
+			'uri' => array(
+				'path' => '/search',
+				'query' => array('q' => 'socket')
+			)
+		);
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertEquals("GET /search?q=socket HTTP/1.0\r\n", $r);
 	}
 
 /**
@@ -1718,24 +1829,6 @@ class HttpSocketTest extends CakeTestCase {
 		$this->assertEquals(true, $return);
 	}
 
-/**
- * test configuring the context from the flat keys.
- *
- * @return void
- */
-	public function testConfigContext() {
-		$this->Socket->reset();
-		$this->Socket->request('http://example.com');
-		$this->assertTrue($this->Socket->config['context']['ssl']['verify_peer']);
-		$this->assertFalse($this->Socket->config['context']['ssl']['allow_self_signed']);
-		$this->assertEquals(5, $this->Socket->config['context']['ssl']['verify_depth']);
-		$this->assertEquals('example.com', $this->Socket->config['context']['ssl']['CN_match']);
-		$this->assertArrayNotHasKey('ssl_verify_peer', $this->Socket->config);
-		$this->assertArrayNotHasKey('ssl_allow_self_signed', $this->Socket->config);
-		$this->assertArrayNotHasKey('ssl_verify_host', $this->Socket->config);
-		$this->assertArrayNotHasKey('ssl_verify_depth', $this->Socket->config);
-	}
-
 /**
  * Test that requests fail when peer verification fails.
  *
@@ -1745,7 +1838,7 @@ class HttpSocketTest extends CakeTestCase {
 		$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
 		$socket = new HttpSocket();
 		try {
-			$socket->get('https://typography.com');
+			$socket->get('https://tv.eurosport.com/');
 			$this->markTestSkipped('Found valid certificate, was expecting invalid certificate.');
 		} catch (SocketException $e) {
 			$message = $e->getMessage();
@@ -1762,10 +1855,12 @@ class HttpSocketTest extends CakeTestCase {
  */
 	public function statusProvider() {
 		return array(
-			array('HTTP/1.1 200 '),
-			array('HTTP/1.1 200    '),
-			array('HTTP/1.1 200'),
-			array('HTTP/1.1 200  OK', 'OK'),
+			array('HTTP/1.1 200 ', '200'),
+			array('HTTP/1.1 200    ', '200'),
+			array('HTTP/1.1 200', '200'),
+			array('HTTP/1.1 200  OK', '200', 'OK'),
+			array('HTTP/1.1 404 Not Found', '404', 'Not Found'),
+			array('HTTP/1.1 404    Not Found', '404', 'Not Found'),
 		);
 	}
 
@@ -1775,17 +1870,19 @@ class HttpSocketTest extends CakeTestCase {
  * @dataProvider statusProvider
  * @return void
  */
-	public function testResponseStatusParsing($status, $msg = '') {
+	public function testResponseStatusParsing($status, $code, $msg = '') {
 		$this->Socket->connected = true;
 		$serverResponse = $status . "\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n\r\n<h1>This is a test!</h1>";
-		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
-		$this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false));
+
+		$this->Socket->expects($this->any())
+			->method('read')
+			->will($this->onConsecutiveCalls($serverResponse, false));
 
 		$response = $this->Socket->request('http://www.cakephp.org/');
 		$this->assertInstanceOf('HttpSocketResponse', $response);
 		$expected = array(
 			'http-version' => 'HTTP/1.1',
-			'code' => '200',
+			'code' => $code,
 			'reason-phrase' => $msg
 		);
 		$this->assertEquals($expected, $response['status']);
diff --git a/web/api/lib/Cake/Test/Case/Routing/DispatcherTest.php b/web/api/lib/Cake/Test/Case/Routing/DispatcherTest.php
index e7b61f5d7..324d56a25 100644
--- a/web/api/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/web/api/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -339,7 +339,7 @@ class SomePostsController extends AppController {
 /**
  * autoRender property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoRender = false;
 
@@ -511,7 +511,7 @@ class TestFilterDispatcher extends DispatcherFilter {
  * TestFilterDispatcher::beforeDispatch()
  *
  * @param mixed $event
- * @return CakeResponse|boolean
+ * @return CakeResponse|bool
  */
 	public function beforeDispatch(CakeEvent $event) {
 		$event->stopPropagation();
@@ -589,6 +589,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsWithoutZerosAndEmptyPost method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $request)
  */
 	public function testParseParamsWithoutZerosAndEmptyPost() {
 		$Dispatcher = new Dispatcher();
@@ -607,6 +608,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsReturnsPostedData method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $request)
  */
 	public function testParseParamsReturnsPostedData() {
 		$_POST['testdata'] = "My Posted Content";
@@ -622,6 +624,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsWithSingleZero method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $test)
  */
 	public function testParseParamsWithSingleZero() {
 		$Dispatcher = new Dispatcher();
@@ -640,6 +643,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsWithManySingleZeros method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $test)
  */
 	public function testParseParamsWithManySingleZeros() {
 		$Dispatcher = new Dispatcher();
@@ -659,6 +663,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsWithManyZerosInEachSectionOfUrl method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $test)
  */
 	public function testParseParamsWithManyZerosInEachSectionOfUrl() {
 		$Dispatcher = new Dispatcher();
@@ -678,6 +683,7 @@ class DispatcherTest extends CakeTestCase {
  * testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $test)
  */
 	public function testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl() {
 		$Dispatcher = new Dispatcher();
@@ -697,6 +703,8 @@ class DispatcherTest extends CakeTestCase {
  * testQueryStringOnRoot method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $request)
+ * @triggers DispatcherTest $Dispatcher, array('request' => $request)
  */
 	public function testQueryStringOnRoot() {
 		Router::reload();
@@ -928,6 +936,7 @@ class DispatcherTest extends CakeTestCase {
  * testPluginDispatch method
  *
  * @return void
+ * @triggers DispatcherTest $Dispatcher, array('request' => $url)
  */
 	public function testPluginDispatch() {
 		$_POST = array();
@@ -1328,6 +1337,16 @@ class DispatcherTest extends CakeTestCase {
 		$dispatcher->dispatch($request, $response);
 		$this->assertEquals('Dispatcher.afterDispatch', $request->params['eventName']);
 
+		$dispatcher = new TestDispatcher();
+		Configure::write('Dispatcher.filters', array(
+			'filterTest' => array('callable' => array($dispatcher, 'filterTest'), 'on' => 'before')
+		));
+
+		$request = new CakeRequest('/');
+		$response = $this->getMock('CakeResponse', array('send'));
+		$dispatcher->dispatch($request, $response);
+		$this->assertEquals('Dispatcher.beforeDispatch', $request->params['eventName']);
+
 		// Test that it is possible to skip the route connection process
 		$dispatcher = new TestDispatcher();
 		Configure::write('Dispatcher.filters', array(
@@ -1630,6 +1649,11 @@ class DispatcherTest extends CakeTestCase {
  * testHttpMethodOverrides method
  *
  * @return void
+ * @triggers DispatcherTest $dispatcher, array('request' => $request)
+ * @triggers DispatcherTest $dispatcher, array('request' => $request)
+ * @triggers DispatcherTest $dispatcher, array('request' => $request)
+ * @triggers DispatcherTest $dispatcher, array('request' => $request)
+ * @triggers DispatcherTest $dispatcher, array('request' => $request)
  */
 	public function testHttpMethodOverrides() {
 		Router::reload();
diff --git a/web/api/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/web/api/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
index 35c261cd8..c67cba384 100644
--- a/web/api/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
+++ b/web/api/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
@@ -39,6 +39,12 @@ class AssetDispatcherTest extends CakeTestCase {
  * test that asset filters work for theme and plugin assets
  *
  * @return void
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
  */
 	public function testAssetFilterForThemeAndPlugins() {
 		$filter = new AssetDispatcher();
@@ -83,11 +89,41 @@ class AssetDispatcherTest extends CakeTestCase {
 		$this->assertFalse($event->isStopped());
 	}
 
+/**
+ * AssetDispatcher should not 404 extensions that could be handled
+ * by Routing.
+ *
+ * @return void
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ */
+	public function testNoHandleRoutedExtension() {
+		$filter = new AssetDispatcher();
+		$response = $this->getMock('CakeResponse', array('_sendHeader'));
+		Configure::write('Asset.filter', array(
+			'js' => '',
+			'css' => ''
+		));
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+		), App::RESET);
+		Router::parseExtensions('json');
+		Router::connect('/test_plugin/api/v1/:action', array('controller' => 'api'));
+		CakePlugin::load('TestPlugin');
+
+		$request = new CakeRequest('test_plugin/api/v1/forwarding.json');
+		$event = new CakeEvent('DispatcherTest', $this, compact('request', 'response'));
+		$this->assertNull($filter->beforeDispatch($event));
+		$this->assertFalse($event->isStopped(), 'Events for routed extensions should not be stopped');
+	}
+
 /**
  * Tests that $response->checkNotModified() is called and bypasses
  * file dispatching
  *
  * @return void
+ * @triggers DispatcherTest $this, compact('request', 'response')
+ * @triggers DispatcherTest $this, compact('request', 'response')
  */
 	public function testNotModified() {
 		$filter = new AssetDispatcher();
@@ -129,27 +165,11 @@ class AssetDispatcherTest extends CakeTestCase {
 		$this->assertEquals($time->format('D, j M Y H:i:s') . ' GMT', $response->modified());
 	}
 
-/**
- * Test 404 status code is set on missing asset.
- *
- * @return void
- */
-	public function test404OnMissingFile() {
-		$filter = new AssetDispatcher();
-
-		$response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$request = new CakeRequest('/theme/test_theme/img/nope.gif');
-		$event = new CakeEvent('Dispatcher.beforeRequest', $this, compact('request', 'response'));
-
-		$response = $filter->beforeDispatch($event);
-		$this->assertTrue($event->isStopped());
-		$this->assertEquals(404, $response->statusCode());
-	}
-
 /**
  * Test that no exceptions are thrown for //index.php type URLs.
  *
  * @return void
+ * @triggers Dispatcher.beforeRequest $this, compact('request', 'response')
  */
 	public function test404OnDoubleSlash() {
 		$filter = new AssetDispatcher();
@@ -166,6 +186,7 @@ class AssetDispatcherTest extends CakeTestCase {
  * Test that attempts to traverse directories are prevented.
  *
  * @return void
+ * @triggers Dispatcher.beforeRequest $this, compact('request', 'response')
  */
 	public function test404OnDoubleDot() {
 		App::build(array(
@@ -188,6 +209,7 @@ class AssetDispatcherTest extends CakeTestCase {
  * Test that attempts to traverse directories with urlencoded paths fail.
  *
  * @return void
+ * @triggers Dispatcher.beforeRequest $this, compact('request', 'response')
  */
 	public function test404OnDoubleDotEncoded() {
 		App::build(array(
@@ -206,4 +228,38 @@ class AssetDispatcherTest extends CakeTestCase {
 		$this->assertFalse($event->isStopped());
 	}
 
+/**
+ * Test asset content length is unset
+ *
+ * If content length is unset, then the webserver can figure it out.
+ *
+ * @outputBuffering enabled
+ * @return void
+ */
+	public function testAssetContentLength() {
+		Router::reload();
+		Configure::write('Dispatcher.filters', array('AssetDispatcher'));
+		App::build(array(
+			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+		));
+
+		$url = 'theme/test_theme/css/test_asset.css';
+		$file = 'View/Themed/TestTheme/webroot/css/test_asset.css';
+
+		$request = new CakeRequest($url);
+		$response = $this->getMock('CakeResponse', array('_sendHeader', 'send'));
+		$event = new CakeEvent('Dispatcher.beforeRequest', $this, compact('request', 'response'));
+
+		$filter = new AssetDispatcher();
+		$filter->beforeDispatch($event);
+		$result = ob_get_clean();
+
+		$path = CAKE . 'Test' . DS . 'test_app' . DS . str_replace('/', DS, $file);
+		$file = file_get_contents($path);
+		$this->assertEquals($file, $result);
+
+		$headers = $response->header();
+		$this->assertFalse($headers['Content-Length']);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php b/web/api/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
index 375cf4d59..6a05b378c 100644
--- a/web/api/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
+++ b/web/api/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
@@ -873,6 +873,23 @@ class CakeRouteTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test match() with trailing ** style routes.
+ *
+ * @return void
+ */
+	public function testMatchTrailing() {
+		$route = new CakeRoute('/pages/**', array('controller' => 'pages', 'action' => 'display'));
+		$id = 'test/ spaces/漢字/la†în';
+		$result = $route->match(array(
+			'controller' => 'pages',
+			'action' => 'display',
+			$id
+		));
+		$expected = '/pages/test/%20spaces/%E6%BC%A2%E5%AD%97/la%E2%80%A0%C3%AEn';
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * test restructuring args with pass key
  *
@@ -960,4 +977,34 @@ class CakeRouteTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test for __set_state magic method on CakeRoute
+ *
+ * @return void
+ */
+	public function testSetState() {
+		$route = CakeRoute::__set_state(array(
+			'keys' => array(),
+			'options' => array(),
+			'defaults' => array(
+				'controller' => 'pages',
+				'action' => 'display',
+				'home',
+			),
+			'template' => '/',
+			'_greedy' => false,
+			'_compiledRoute' => null,
+			'_headerMap' => array (
+				'type' => 'content_type',
+				'method' => 'request_method',
+				'server' => 'server_name',
+			),
+		));
+		$this->assertInstanceOf('CakeRoute', $route);
+		$this->assertSame('/', $route->match(array('controller' => 'pages', 'action' => 'display', 'home')));
+		$this->assertFalse($route->match(array('controller' => 'pages', 'action' => 'display', 'about')));
+		$expected = array('controller' => 'pages', 'action' => 'display', 'pass' => array('home'), 'named' => array());
+		$this->assertEquals($expected, $route->parse('/'));
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php b/web/api/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
index fe3b41ab8..4eb654047 100644
--- a/web/api/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
+++ b/web/api/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
@@ -47,14 +47,14 @@ class RedirectRouteTest extends CakeTestCase {
 		$route = new RedirectRoute('/home', array('controller' => 'posts'));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/home');
+		$route->parse('/home');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/posts', true), $header['Location']);
 
 		$route = new RedirectRoute('/home', array('controller' => 'posts', 'action' => 'index'));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/home');
+		$route->parse('/home');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/posts', true), $header['Location']);
 		$this->assertEquals(301, $route->response->statusCode());
@@ -62,14 +62,14 @@ class RedirectRouteTest extends CakeTestCase {
 		$route = new RedirectRoute('/google', 'http://google.com');
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/google');
+		$route->parse('/google');
 		$header = $route->response->header();
 		$this->assertEquals('http://google.com', $header['Location']);
 
 		$route = new RedirectRoute('/posts/*', array('controller' => 'posts', 'action' => 'view'), array('status' => 302));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/posts/2');
+		$route->parse('/posts/2');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/posts/view', true), $header['Location']);
 		$this->assertEquals(302, $route->response->statusCode());
@@ -77,35 +77,35 @@ class RedirectRouteTest extends CakeTestCase {
 		$route = new RedirectRoute('/posts/*', array('controller' => 'posts', 'action' => 'view'), array('persist' => true));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/posts/2');
+		$route->parse('/posts/2');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/posts/view/2', true), $header['Location']);
 
 		$route = new RedirectRoute('/posts/*', '/test', array('persist' => true));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/posts/2');
+		$route->parse('/posts/2');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/test', true), $header['Location']);
 
 		$route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add'), array('persist' => true));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/my_controllers/do_something/passme/named:param');
+		$route->parse('/my_controllers/do_something/passme/named:param');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/tags/add/passme/named:param', true), $header['Location']);
 
 		$route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add'));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/my_controllers/do_something/passme/named:param');
+		$route->parse('/my_controllers/do_something/passme/named:param');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/tags/add', true), $header['Location']);
 
 		$route = new RedirectRoute('/:lang/my_controllers', array('controller' => 'tags', 'action' => 'add'), array('lang' => '(nl|en)', 'persist' => array('lang')));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/nl/my_controllers/');
+		$route->parse('/nl/my_controllers/');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/tags/add/lang:nl', true), $header['Location']);
 
@@ -114,7 +114,7 @@ class RedirectRouteTest extends CakeTestCase {
 		$route = new RedirectRoute('/:lang/my_controllers', array('controller' => 'tags', 'action' => 'add'), array('lang' => '(nl|en)', 'persist' => array('lang')));
 		$route->stop = false;
 		$route->response = $this->getMock('CakeResponse', array('_sendHeader'));
-		$result = $route->parse('/nl/my_controllers/');
+		$route->parse('/nl/my_controllers/');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/nl/preferred_controllers', true), $header['Location']);
 	}
diff --git a/web/api/lib/Cake/Test/Case/Routing/RouterTest.php b/web/api/lib/Cake/Test/Case/Routing/RouterTest.php
index d1a466980..20d493bfe 100644
--- a/web/api/lib/Cake/Test/Case/Routing/RouterTest.php
+++ b/web/api/lib/Cake/Test/Case/Routing/RouterTest.php
@@ -201,7 +201,7 @@ class RouterTest extends CakeTestCase {
 		));
 		CakePlugin::load('TestPlugin');
 		App::uses('TestRoute', 'TestPlugin.Routing/Route');
-		$resources = Router::mapResources('Posts', array(
+		Router::mapResources('Posts', array(
 			'connectOptions' => array(
 				'routeClass' => 'TestPlugin.TestRoute',
 				'foo' => '^(bar)$',
@@ -238,7 +238,7 @@ class RouterTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 		$this->assertEquals(array('test_plugin'), $resources);
 
-		$resources = Router::mapResources('Posts', array('prefix' => 'api'));
+		Router::mapResources('Posts', array('prefix' => 'api'));
 
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 		$result = Router::parse('/api/posts');
@@ -996,6 +996,23 @@ class RouterTest extends CakeTestCase {
 		$this->assertEquals('/admin/other/posts/index', $result);
 	}
 
+/**
+ * Test that URL's fail to parse when they are prefixed with //
+ *
+ * @return void
+ */
+	public function testUrlParseFailureDoubleSlash() {
+		Router::connect('/posts', array('controller' => 'posts', 'action' => 'index'));
+		$result = Router::parse('/posts');
+		$this->assertEquals(
+			array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'index'),
+			$result
+		);
+
+		$result = Router::parse('//posts');
+		$this->assertEquals(array(), $result);
+	}
+
 /**
  * testUrlParsing method
  *
@@ -1562,7 +1579,7 @@ class RouterTest extends CakeTestCase {
 		$request->base = '/';
 		Router::setRequestInfo($request);
 
-		$result = Router::parse('/admin/controller/index/type:whatever');
+		Router::parse('/admin/controller/index/type:whatever');
 		$result = Router::url(array('type' => 'new'));
 		$expected = "/admin/controller/index/type:new";
 		$this->assertEquals($expected, $result);
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
index 3dfc66926..da97150c3 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
@@ -17,9 +17,27 @@
  * @since         CakePHP v 1.2.0.4487
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-
+App::uses('CakePlugin', 'Core');
 App::uses('Controller', 'Controller');
 App::uses('CakeHtmlReporter', 'TestSuite/Reporter');
+App::uses('Model', 'Model');
+
+/**
+ * Secondary Post stub class.
+ */
+class SecondaryPost extends Model {
+
+/**
+ * @var string
+ */
+	public $useTable = 'posts';
+
+/**
+ * @var string
+ */
+	public $useDbConfig = 'secondary';
+
+}
 
 /**
  * CakeTestCaseTest
@@ -309,7 +327,6 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextStartsWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
 
 		$this->assertStringStartsWith("some\nstring", $stringDirty);
 		$this->assertStringStartsNotWith("some\r\nstring\r\nwith", $stringDirty);
@@ -326,8 +343,6 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextStartsNotWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-
 		$this->assertTextStartsNotWith("some\nstring\nwithout", $stringDirty);
 	}
 
@@ -338,8 +353,6 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextEndsWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-
 		$this->assertTextEndsWith("string\nwith\r\ndifferent\rline endings!", $stringDirty);
 		$this->assertTextEndsWith("string\r\nwith\ndifferent\nline endings!", $stringDirty);
 	}
@@ -351,8 +364,6 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextEndsNotWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-
 		$this->assertStringEndsNotWith("different\nline endings", $stringDirty);
 		$this->assertTextEndsNotWith("different\rline endings", $stringDirty);
 	}
@@ -364,11 +375,8 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextContains() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-
 		$this->assertContains("different", $stringDirty);
 		$this->assertNotContains("different\rline", $stringDirty);
-
 		$this->assertTextContains("different\rline", $stringDirty);
 	}
 
@@ -379,8 +387,6 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testAssertTextNotContains() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
-		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-
 		$this->assertTextNotContains("different\rlines", $stringDirty);
 	}
 
@@ -391,12 +397,12 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testGetMockForModel() {
 		App::build(array(
-				'Model' => array(
-					CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS
-				)
+			'Model' => array(
+				CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS
+			)
 		), App::RESET);
 		$Post = $this->getMockForModel('Post');
-
+		$this->assertEquals('test', $Post->useDbConfig);
 		$this->assertInstanceOf('Post', $Post);
 		$this->assertNull($Post->save(array()));
 		$this->assertNull($Post->find('all'));
@@ -408,6 +414,27 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->assertInternalType('array', $Post->find('all'));
 	}
 
+/**
+ * Test getMockForModel on secondary datasources.
+ *
+ * @return void
+ */
+	public function testGetMockForModelSecondaryDatasource() {
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+			'Model/Datasource/Database' => array(
+				CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+			)
+		), App::RESET);
+		CakePlugin::load('TestPlugin');
+		ConnectionManager::create('test_secondary', array(
+			'datasource' => 'Database/TestLocalDriver'
+		));
+		$post = $this->getMockForModel('SecondaryPost', array('save'));
+		$this->assertEquals('test_secondary', $post->useDbConfig);
+		ConnectionManager::drop('test_secondary');
+	}
+
 /**
  * test getMockForModel() with plugin models
  *
@@ -415,16 +442,17 @@ class CakeTestCaseTest extends CakeTestCase {
  */
 	public function testGetMockForModelWithPlugin() {
 		App::build(array(
-				'Plugin' => array(
-					CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
-				)
+			'Plugin' => array(
+				CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
+			)
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
 		$this->getMockForModel('TestPlugin.TestPluginAppModel');
-		$TestPluginComment = $this->getMockForModel('TestPlugin.TestPluginComment');
+		$this->getMockForModel('TestPlugin.TestPluginComment');
 
 		$result = ClassRegistry::init('TestPlugin.TestPluginComment');
 		$this->assertInstanceOf('TestPluginComment', $result);
+		$this->assertEquals('test', $result->useDbConfig);
 
 		$TestPluginComment = $this->getMockForModel('TestPlugin.TestPluginComment', array('save'));
 
@@ -445,7 +473,7 @@ class CakeTestCaseTest extends CakeTestCase {
  * @return void
  */
 	public function testGetMockForModelModel() {
-		$Mock = $this->getMockForModel('Model', array('save'), array('name' => 'Comment'));
+		$Mock = $this->getMockForModel('Model', array('save', 'setDataSource'), array('name' => 'Comment'));
 
 		$result = ClassRegistry::init('Comment');
 		$this->assertInstanceOf('Model', $result);
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
index 3488d6a92..b50e21926 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -471,7 +471,7 @@ class CakeTestFixtureTest extends CakeTestCase {
  * @param string $table
  * @param string $fields
  * @param string $values
- * @return boolean true
+ * @return bool true
  */
 	public function insertCallback($table, $fields, $values) {
 		$this->insertMulti['table'] = $table;
@@ -534,7 +534,7 @@ class CakeTestFixtureTest extends CakeTestCase {
  */
 	public function testInsertInvalid() {
 		$Fixture = new InvalidTestFixture();
-		$return = $Fixture->insert($this->criticDb);
+		$Fixture->insert($this->criticDb);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/web/api/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
index 4eb1d3011..efd8878d8 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -276,7 +276,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * @return void
  */
 	public function testTestAction() {
-		$Controller = $this->Case->generate('TestsApps');
+		$this->Case->generate('TestsApps');
 		$this->Case->testAction('/tests_apps/index');
 		$this->assertInternalType('array', $this->Case->controller->viewVars);
 
@@ -297,6 +297,30 @@ class ControllerTestCaseTest extends CakeTestCase {
 			'Location' => 'http://cakephp.org'
 		);
 		$this->assertEquals($expected, $results);
+		$this->assertSame(302, $Controller->response->statusCode());
+	}
+
+/**
+ * Test array URLs with testAction()
+ *
+ * @return void
+ */
+	public function testTestActionArrayUrls() {
+		$this->Case->generate('TestsApps');
+		$this->Case->testAction(array('controller' => 'tests_apps', 'action' => 'index'));
+		$this->assertInternalType('array', $this->Case->controller->viewVars);
+	}
+
+/**
+ * Test that file responses don't trigger errors.
+ *
+ * @return void
+ */
+	public function testActionWithFile() {
+		$Controller = $this->Case->generate('TestsApps');
+		$this->Case->testAction('/tests_apps/file');
+		$this->assertArrayHasKey('Content-Disposition', $Controller->response->header());
+		$this->assertArrayHasKey('Content-Length', $Controller->response->header());
 	}
 
 /**
@@ -428,7 +452,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 	public function testTestActionGetData() {
 		$this->Case->autoMock = true;
 
-		$result = $this->Case->testAction('/tests_apps_posts/url_var', array(
+		$this->Case->testAction('/tests_apps_posts/url_var', array(
 			'method' => 'get',
 			'data' => array(
 				'some' => 'var',
@@ -450,7 +474,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 		));
 		$this->assertEquals(array('gogo', 'val2'), $result['params']['pass']);
 
-		$result = $this->Case->testAction('/tests_apps_posts/url_var', array(
+		$this->Case->testAction('/tests_apps_posts/url_var', array(
 			'return' => 'vars',
 			'method' => 'get',
 			'data' => array(
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/web/api/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
index a0bcb76e5..6763d2f1f 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
@@ -119,7 +119,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
 		);
 		$result = $this->Coverage->generateDiff('myfile.php', $file, $coverage);
 		$this->assertRegExp('/myfile\.php Code coverage\: \d+\.?\d*\%/', $result);
-		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php"/', $result);
+		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php-' . md5('myfile.php') . '"/', $result);
 		$this->assertRegExp('/<pre>/', $result);
 		foreach ($file as $i => $line) {
 			$this->assertTrue(strpos($line, $result) !== 0, 'Content is missing ' . $i);
@@ -127,7 +127,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
 			if (in_array($i + 1, array(5, 9, 2))) {
 				$class = 'uncovered';
 			}
-			if ($i + 1 == 2) {
+			if ($i + 1 === 2) {
 				$class .= ' dead';
 			}
 			$this->assertTrue(strpos($class, $result) !== 0, 'Class name is wrong ' . $i);
@@ -167,7 +167,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
 
 		$result = $this->Coverage->generateDiff('myfile.php', $file, $coverage);
 		$this->assertRegExp('/myfile\.php Code coverage\: \d+\.?\d*\%/', $result);
-		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php"/', $result);
+		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php-' . md5('myfile.php') . '"/', $result);
 		$this->assertRegExp('/<pre>/', $result);
 		foreach ($file as $i => $line) {
 			$this->assertTrue(strpos($line, $result) !== 0, 'Content is missing ' . $i);
@@ -175,7 +175,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
 			if (in_array($i + 1, array(5, 9, 2))) {
 				$class = 'uncovered';
 			}
-			if ($i + 1 == 2) {
+			if ($i + 1 === 2) {
 				$class .= ' dead';
 			}
 			$this->assertTrue(strpos($class, $result) !== 0, 'Class name is wrong ' . $i);
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php b/web/api/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php
new file mode 100644
index 000000000..270b3f238
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/TestSuite/Stub/ConsoleOutputStubTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("ConsoleOutputStub", "TestSuite/Stub");
+
+/*
+ * ConsoleOutputStub test
+ */
+class ConsoleOutputStubTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+
+		$this->stub = new ConsoleOutputStub();
+	}
+
+/**
+ * Test that stub can be used as an instance of ConsoleOutput
+ *
+ * @return void
+ */
+	public function testCanActAsConsoleOutput() {
+		$this->assertInstanceOf("ConsoleOutput", $this->stub);
+	}
+
+/**
+ * Test write method
+ *
+ * @return void
+ */
+	public function testWrite() {
+		$this->stub->write(array("foo", "bar", "baz"));
+		$this->assertEquals(array("foo", "bar", "baz"), $this->stub->messages());
+	}
+
+/**
+ * Test overwrite method
+ *
+ * @return void
+ */
+	public function testOverwrite() {
+		$this->stub->write(array("foo", "bar", "baz"));
+		$this->stub->overwrite("bat");
+		$this->assertEquals(array("foo", "bar", "baz", "", "bat"), $this->stub->messages());
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/Case/Utility/CakeTextTest.php b/web/api/lib/Cake/Test/Case/Utility/CakeTextTest.php
new file mode 100644
index 000000000..2e085c39a
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/Utility/CakeTextTest.php
@@ -0,0 +1,874 @@
+<?php
+/**
+ * CakeTextTest file
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+ * @package       Cake.Test.Case.Utility
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('CakeText', 'Utility');
+
+/**
+ * CakeText Tests
+ *
+ * @package Cake.Test.Case.Utility
+ * @coversDefaultClass CakeText
+ */
+class CakeTextTest extends CakeTestCase {
+
+/**
+ * Setup object under test
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+		$this->Text = new CakeText();
+	}
+
+/**
+ * Tear down object under test
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		unset($this->Text);
+	}
+
+/**
+ * testUuidGeneration method
+ *
+ * @return void
+ * @covers ::uuid
+ */
+	public function testUuidGeneration() {
+		$result = CakeText::uuid();
+		$pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/";
+		$match = (bool)preg_match($pattern, $result);
+		$this->assertTrue($match);
+	}
+
+/**
+ * testMultipleUuidGeneration method
+ *
+ * @return void
+ * @covers ::uuid
+ */
+	public function testMultipleUuidGeneration() {
+		$check = array();
+		$count = mt_rand(10, 1000);
+		$pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/";
+
+		for ($i = 0; $i < $count; $i++) {
+			$result = CakeText::uuid();
+			$match = (bool)preg_match($pattern, $result);
+			$this->assertTrue($match);
+			$this->assertFalse(in_array($result, $check));
+			$check[] = $result;
+		}
+	}
+
+/**
+ * testInsert method
+ *
+ * @return void
+ * @covers ::insert
+ */
+	public function testInsert() {
+		$string = 'some string';
+		$expected = 'some string';
+		$result = CakeText::insert($string, array());
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = :sum. Cake is :adjective.';
+		$expected = '2 + 2 = 4. Cake is yummy.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = %sum. Cake is %adjective.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = 2sum2. Cake is 9adjective9.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])%s\\1/'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = 12sum21. Cake is 23adjective45.';
+		$expected = '2 + 2 = 4. Cake is 23adjective45.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])([\d])%s\\2\\1/'));
+		$this->assertEquals($expected, $result);
+
+		$string = ':web :web_site';
+		$expected = 'www http';
+		$result = CakeText::insert($string, array('web' => 'www', 'web_site' => 'http'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = <sum. Cake is <adjective>.';
+		$expected = '2 + 2 = <sum. Cake is yummy.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '<', 'after' => '>'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = \:sum. Cake is :adjective.';
+		$expected = '2 + 2 = :sum. Cake is yummy.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = !:sum. Cake is :adjective.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('escape' => '!'));
+		$this->assertEquals($expected, $result);
+
+		$string = '2 + 2 = \%sum. Cake is %adjective.';
+		$expected = '2 + 2 = %sum. Cake is yummy.';
+		$result = CakeText::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%'));
+		$this->assertEquals($expected, $result);
+
+		$string = ':a :b \:a :a';
+		$expected = '1 2 :a 1';
+		$result = CakeText::insert($string, array('a' => 1, 'b' => 2));
+		$this->assertEquals($expected, $result);
+
+		$string = ':a :b :c';
+		$expected = '2 3';
+		$result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = ':a :b :c';
+		$expected = '1 3';
+		$result = CakeText::insert($string, array('a' => 1, 'c' => 3), array('clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = ':a :b :c';
+		$expected = '2 3';
+		$result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = ':a, :b and :c';
+		$expected = '2 and 3';
+		$result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = '":a, :b and :c"';
+		$expected = '"1, 2"';
+		$result = CakeText::insert($string, array('a' => 1, 'b' => 2), array('clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = '"${a}, ${b} and ${c}"';
+		$expected = '"1, 2"';
+		$result = CakeText::insert($string, array('a' => 1, 'b' => 2), array('before' => '${', 'after' => '}', 'clean' => true));
+		$this->assertEquals($expected, $result);
+
+		$string = '<img src=":src" alt=":alt" class="foo :extra bar"/>';
+		$expected = '<img src="foo" class="foo bar"/>';
+		$result = CakeText::insert($string, array('src' => 'foo'), array('clean' => 'html'));
+
+		$this->assertEquals($expected, $result);
+
+		$string = '<img src=":src" class=":no :extra"/>';
+		$expected = '<img src="foo"/>';
+		$result = CakeText::insert($string, array('src' => 'foo'), array('clean' => 'html'));
+		$this->assertEquals($expected, $result);
+
+		$string = '<img src=":src" class=":no :extra"/>';
+		$expected = '<img src="foo" class="bar"/>';
+		$result = CakeText::insert($string, array('src' => 'foo', 'extra' => 'bar'), array('clean' => 'html'));
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert("this is a ? string", "test");
+		$expected = "this is a test string";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert("this is a ? string with a ? ? ?", array('long', 'few?', 'params', 'you know'));
+		$expected = "this is a long string with a few? params you know";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id', 'id' => 1));
+		$expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert('update saved_urls set url = :url where id = :id', array('id' => 1, 'url' => 'http://www.testurl.com/param1:url/param2:id'));
+		$expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert(':me cake. :subject :verb fantastic.', array('me' => 'I :verb', 'subject' => 'cake', 'verb' => 'is'));
+		$expected = "I :verb cake. cake is fantastic.";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert(':I.am: :not.yet: passing.', array('I.am' => 'We are'), array('before' => ':', 'after' => ':', 'clean' => array('replacement' => ' of course', 'method' => 'text')));
+		$expected = "We are of course passing.";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert(
+			':I.am: :not.yet: passing.',
+			array('I.am' => 'We are'),
+			array('before' => ':', 'after' => ':', 'clean' => true)
+		);
+		$expected = "We are passing.";
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::insert('?-pended result', array('Pre'));
+		$expected = "Pre-pended result";
+		$this->assertEquals($expected, $result);
+
+		$string = 'switching :timeout / :timeout_count';
+		$expected = 'switching 5 / 10';
+		$result = CakeText::insert($string, array('timeout' => 5, 'timeout_count' => 10));
+		$this->assertEquals($expected, $result);
+
+		$string = 'switching :timeout / :timeout_count';
+		$expected = 'switching 5 / 10';
+		$result = CakeText::insert($string, array('timeout_count' => 10, 'timeout' => 5));
+		$this->assertEquals($expected, $result);
+
+		$string = 'switching :timeout_count by :timeout';
+		$expected = 'switching 10 by 5';
+		$result = CakeText::insert($string, array('timeout' => 5, 'timeout_count' => 10));
+		$this->assertEquals($expected, $result);
+
+		$string = 'switching :timeout_count by :timeout';
+		$expected = 'switching 10 by 5';
+		$result = CakeText::insert($string, array('timeout_count' => 10, 'timeout' => 5));
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test Clean Insert
+ *
+ * @return void
+ * @covers ::cleanInsert
+ */
+	public function testCleanInsert() {
+		$result = CakeText::cleanInsert(':incomplete', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEquals('', $result);
+
+		$result = CakeText::cleanInsert(':incomplete', array(
+			'clean' => array('method' => 'text', 'replacement' => 'complete'),
+			'before' => ':', 'after' => '')
+		);
+		$this->assertEquals('complete', $result);
+
+		$result = CakeText::cleanInsert(':in.complete', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEquals('', $result);
+
+		$result = CakeText::cleanInsert(':in.complete and', array(
+			'clean' => true, 'before' => ':', 'after' => '')
+		);
+		$this->assertEquals('', $result);
+
+		$result = CakeText::cleanInsert(':in.complete or stuff', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEquals('stuff', $result);
+
+		$result = CakeText::cleanInsert(
+			'<p class=":missing" id=":missing">Text here</p>',
+			array('clean' => 'html', 'before' => ':', 'after' => '')
+		);
+		$this->assertEquals('<p>Text here</p>', $result);
+	}
+
+/**
+ * Tests that non-insertable variables (i.e. arrays) are skipped when used as values in
+ * CakeText::insert().
+ *
+ * @return void
+ * @covers ::insert
+ */
+	public function testAutoIgnoreBadInsertData() {
+		$data = array('foo' => 'alpha', 'bar' => 'beta', 'fale' => array());
+		$result = CakeText::insert('(:foo > :bar || :fale!)', $data, array('clean' => 'text'));
+		$this->assertEquals('(alpha > beta || !)', $result);
+	}
+
+/**
+ * testTokenize method
+ *
+ * @return void
+ * @covers ::tokenize
+ */
+	public function testTokenize() {
+		$result = CakeText::tokenize('A,(short,boring test)');
+		$expected = array('A', '(short,boring test)');
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::tokenize('A,(short,more interesting( test)');
+		$expected = array('A', '(short,more interesting( test)');
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::tokenize('A,(short,very interesting( test))');
+		$expected = array('A', '(short,very interesting( test))');
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::tokenize('"single tag"', ' ', '"', '"');
+		$expected = array('"single tag"');
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::tokenize('tagA "single tag" tagB', ' ', '"', '"');
+		$expected = array('tagA', '"single tag"', 'tagB');
+		$this->assertEquals($expected, $result);
+
+		// Ideographic width space.
+		$result = CakeText::tokenize("tagA\xe3\x80\x80\"single\xe3\x80\x80tag\"\xe3\x80\x80tagB", "\xe3\x80\x80", '"', '"');
+		$expected = array('tagA', '"single　tag"', 'tagB');
+		$this->assertEquals($expected, $result);
+
+		$result = CakeText::tokenize('');
+		$expected = array();
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testReplaceWithQuestionMarkInString method
+ *
+ * @return void
+ * @covers ::insert
+ */
+	public function testReplaceWithQuestionMarkInString() {
+		$string = ':a, :b and :c?';
+		$expected = '2 and 3?';
+		$result = CakeText::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * test that wordWrap() works the same as built-in wordwrap function
+ *
+ * @dataProvider wordWrapProvider
+ * @return void
+ * @covers ::wordWrap
+ * @covers ::_wordWrap
+ */
+	public function testWordWrap($text, $width, $break = "\n", $cut = false) {
+		$result = CakeText::wordWrap($text, $width, $break, $cut);
+		$expected = wordwrap($text, $width, $break, $cut);
+		$this->assertTextEquals($expected, $result, 'Text not wrapped same as built-in function.');
+	}
+
+/**
+ * data provider for testWordWrap method
+ *
+ * @return array
+ */
+	public function wordWrapProvider() {
+		return array(
+			array(
+				'The quick brown fox jumped over the lazy dog.',
+				33
+			),
+			array(
+				'A very long woooooooooooord.',
+				8
+			),
+			array(
+				'A very long woooooooooooord. Right.',
+				8
+			),
+		);
+	}
+
+/**
+ * test that wordWrap() properly handle unicode strings.
+ *
+ * @return void
+ * @covers ::wordWrap
+ * @covers ::_wordWrap
+ */
+	public function testWordWrapUnicodeAware() {
+		$text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+		$result = CakeText::wordWrap($text, 33, "\n", true);
+		$expected = <<<TEXT
+Но вим омниюм факёльиси элыктрам,
+мюнырэ лэгыры векж ыт. Выльёт квю
+андо нюмквуам ты кюм. Зыд эю рыбю
+м.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+
+		$text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+		$result = CakeText::wordWrap($text, 33, "\n");
+		$expected = <<<TEXT
+Но вим омниюм факёльиси элыктрам,
+мюнырэ лэгыры векж ыт. Выльёт
+квюандо нюмквуам ты кюм. Зыд эю
+рыбюм.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+	}
+
+/**
+ * test that wordWrap() properly handle newline characters.
+ *
+ * @return void
+ * @covers ::wordWrap
+ * @covers ::_wordWrap
+ */
+	public function testWordWrapNewlineAware() {
+		$text = 'This is a line that is almost the 55 chars long.
+This is a new sentence which is manually newlined, but is so long it needs two lines.';
+		$result = CakeText::wordWrap($text, 55);
+		$expected = <<<TEXT
+This is a line that is almost the 55 chars long.
+This is a new sentence which is manually newlined, but
+is so long it needs two lines.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+	}
+
+/**
+ * test wrap method.
+ *
+ * @return void
+ * @covers ::wrap
+ * @covers ::wordWrap
+ * @covers ::_wordWrap
+ */
+	public function testWrap() {
+		$text = 'This is the song that never ends. This is the song that never ends. This is the song that never ends.';
+		$result = CakeText::wrap($text, 33);
+		$expected = <<<TEXT
+This is the song that never ends.
+This is the song that never ends.
+This is the song that never ends.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+
+		$result = CakeText::wrap($text, array('width' => 20, 'wordWrap' => false));
+		$expected = 'This is the song th' . "\n" .
+			'at never ends. This' . "\n" .
+			' is the song that n' . "\n" .
+			'ever ends. This is ' . "\n" .
+			'the song that never' . "\n" .
+			' ends.';
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+
+		$text = 'Но вим омниюм факёльиси элыктрам, мюнырэ лэгыры векж ыт. Выльёт квюандо нюмквуам ты кюм. Зыд эю рыбюм.';
+		$result = CakeText::wrap($text, 33);
+		$expected = <<<TEXT
+Но вим омниюм факёльиси элыктрам,
+мюнырэ лэгыры векж ыт. Выльёт
+квюандо нюмквуам ты кюм. Зыд эю
+рыбюм.
+TEXT;
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
+	}
+
+/**
+ * test wrap() indenting
+ *
+ * @return void
+ * @covers ::wrap
+ * @covers ::wordWrap
+ * @covers ::_wordWrap
+ */
+	public function testWrapIndent() {
+		$text = 'This is the song that never ends. This is the song that never ends. This is the song that never ends.';
+		$result = CakeText::wrap($text, array('width' => 33, 'indent' => "\t", 'indentAt' => 1));
+		$expected = <<<TEXT
+This is the song that never ends.
+	This is the song that never ends.
+	This is the song that never ends.
+TEXT;
+		$this->assertTextEquals($expected, $result);
+	}
+
+/**
+ * testTruncate method
+ *
+ * @return void
+ * @covers ::truncate
+ */
+	public function testTruncate() {
+		$text1 = 'The quick brown fox jumps over the lazy dog';
+		$text2 = 'Heiz&ouml;lr&uuml;cksto&szlig;abd&auml;mpfung';
+		$text3 = '<b>&copy; 2005-2007, Cake Software Foundation, Inc.</b><br />written by Alexander Wegener';
+		$text4 = '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the following image tag should be conform <img src="mypic.jpg" alt="Me, myself and I" /></b><br />Great, or?';
+		$text5 = '0<b>1<i>2<span class="myclass">3</span>4<u>5</u>6</i>7</b>8<b>9</b>0';
+		$text6 = '<p><strong>Extra dates have been announced for this year\'s tour.</strong></p><p>Tickets for the new shows in</p>';
+		$text7 = 'El moño está en el lugar correcto. Eso fue lo que dijo la niña, ¿habrá dicho la verdad?';
+		$text8 = 'Vive la R' . chr(195) . chr(169) . 'publique de France';
+		$text9 = 'НОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыь';
+		$text10 = 'http://example.com/something/foo:bar';
+
+		$elipsis = "\xe2\x80\xa6";
+		$this->assertSame($this->Text->truncate($text1, 15), 'The quick br...');
+		$this->assertSame($this->Text->truncate($text1, 15, array('exact' => false)), 'The quick...');
+		$this->assertSame($this->Text->truncate($text1, 100), 'The quick brown fox jumps over the lazy dog');
+		$this->assertSame($this->Text->truncate($text2, 10), 'Heiz&ou...');
+		$this->assertSame($this->Text->truncate($text2, 10, array('exact' => false)), '...');
+		$this->assertSame($this->Text->truncate($text3, 20), '<b>&copy; 2005-20...');
+		$this->assertSame($this->Text->truncate($text4, 15), '<img src="my...');
+		$this->assertSame($this->Text->truncate($text5, 6, array('ellipsis' => '')), '0<b>1<');
+		$this->assertSame($this->Text->truncate($text1, 15, array('html' => true)), 'The quick brow' . $elipsis);
+		$this->assertSame($this->Text->truncate($text1, 15, array('exact' => false, 'html' => true)), 'The quick' . $elipsis);
+		$this->assertSame($this->Text->truncate($text2, 10, array('html' => true)), 'Heiz&ouml;lr&uuml;c' . $elipsis);
+		$this->assertSame($this->Text->truncate($text2, 10, array('exact' => false, 'html' => true)), $elipsis);
+		$this->assertSame($this->Text->truncate($text3, 20, array('html' => true)), '<b>&copy; 2005-2007, Cake S' . $elipsis . '</b>');
+		$this->assertSame($this->Text->truncate($text4, 15, array('html' => true)), '<img src="mypic.jpg"> This image ta' . $elipsis);
+		$this->assertSame($this->Text->truncate($text4, 45, array('html' => true)), '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the' . $elipsis . '</b>');
+		$this->assertSame($this->Text->truncate($text4, 90, array('html' => true)), '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the following image tag should be conform <img src="mypic.jpg" alt="Me, myself and I" /></b><br />Great,' . $elipsis);
+		$this->assertSame($this->Text->truncate($text5, 6, array('ellipsis' => '', 'html' => true)), '0<b>1<i>2<span class="myclass">3</span>4<u>5</u></i></b>');
+		$this->assertSame($this->Text->truncate($text5, 20, array('ellipsis' => '', 'html' => true)), $text5);
+		$this->assertSame($this->Text->truncate($text6, 57, array('exact' => false, 'html' => true)), "<p><strong>Extra dates have been announced for this year's" . $elipsis . "</strong></p>");
+		$this->assertSame($this->Text->truncate($text7, 255), $text7);
+		$this->assertSame($this->Text->truncate($text7, 15), 'El moño está...');
+		$this->assertSame($this->Text->truncate($text8, 15), 'Vive la R' . chr(195) . chr(169) . 'pu...');
+		$this->assertSame($this->Text->truncate($text9, 10), 'НОПРСТУ...');
+		$this->assertSame($this->Text->truncate($text10, 30), 'http://example.com/somethin...');
+
+		$text = '<p><span style="font-size: medium;"><a>Iamatestwithnospacesandhtml</a></span></p>';
+		$result = $this->Text->truncate($text, 10, array(
+			'ellipsis' => '...',
+			'exact' => false,
+			'html' => true
+		));
+		$expected = '<p><span style="font-size: medium;"><a>...</a></span></p>';
+		$this->assertEquals($expected, $result);
+
+		$text = '<p><span style="font-size: medium;">El biógrafo de Steve Jobs, Walter
+Isaacson, explica porqué Jobs le pidió que le hiciera su biografía en
+este artículo de El País.</span></p>
+<p><span style="font-size: medium;"><span style="font-size:
+large;">Por qué Steve era distinto.</span></span></p>
+<p><span style="font-size: medium;"><a href="http://www.elpais.com/
+articulo/primer/plano/Steve/era/distinto/elpepueconeg/
+20111009elpneglse_4/Tes">http://www.elpais.com/articulo/primer/plano/
+Steve/era/distinto/elpepueconeg/20111009elpneglse_4/Tes</a></span></p>
+<p><span style="font-size: medium;">Ya se ha publicado la biografía de
+Steve Jobs escrita por Walter Isaacson  "<strong>Steve Jobs by Walter
+Isaacson</strong>", aquí os dejamos la dirección de amazon donde
+podeís adquirirla.</span></p>
+<p><span style="font-size: medium;"><a>http://www.amazon.com/Steve-
+Jobs-Walter-Isaacson/dp/1451648537</a></span></p>';
+		$result = $this->Text->truncate($text, 500, array(
+			'ellipsis' => '... ',
+			'exact' => false,
+			'html' => true
+		));
+		$expected = '<p><span style="font-size: medium;">El biógrafo de Steve Jobs, Walter
+Isaacson, explica porqué Jobs le pidió que le hiciera su biografía en
+este artículo de El País.</span></p>
+<p><span style="font-size: medium;"><span style="font-size:
+large;">Por qué Steve era distinto.</span></span></p>
+<p><span style="font-size: medium;"><a href="http://www.elpais.com/
+articulo/primer/plano/Steve/era/distinto/elpepueconeg/
+20111009elpneglse_4/Tes">http://www.elpais.com/articulo/primer/plano/
+Steve/era/distinto/elpepueconeg/20111009elpneglse_4/Tes</a></span></p>
+<p><span style="font-size: medium;">Ya se ha publicado la biografía de
+Steve Jobs escrita por Walter Isaacson  "<strong>Steve Jobs by Walter
+Isaacson</strong>", aquí os dejamos la dirección de amazon donde
+podeís adquirirla.</span></p>
+<p><span style="font-size: medium;"><a>... </a></span></p>';
+		$this->assertEquals($expected, $result);
+
+		// test deprecated `ending` (`ellipsis` taking precedence if both are defined)
+		$result = $this->Text->truncate($text1, 31, array(
+			'ending' => '.',
+			'exact' => false,
+		));
+		$expected = 'The quick brown fox jumps.';
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Text->truncate($text1, 31, array(
+			'ellipsis' => '..',
+			'ending' => '.',
+			'exact' => false,
+		));
+		$expected = 'The quick brown fox jumps..';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testTruncate method with non utf8 sites
+ *
+ * @return void
+ * @covers ::truncate
+ */
+	public function testTruncateLegacy() {
+		Configure::write('App.encoding', 'ISO-8859-1');
+		$text = '<b>&copy; 2005-2007, Cake Software Foundation, Inc.</b><br />written by Alexander Wegener';
+		$result = $this->Text->truncate($text, 31, array(
+			'html' => true,
+			'exact' => false,
+		));
+		$expected = '<b>&copy; 2005-2007, Cake Software...</b>';
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Text->truncate($text, 31, array(
+			'html' => true,
+			'exact' => true,
+		));
+		$expected = '<b>&copy; 2005-2007, Cake Software F...</b>';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testTail method
+ *
+ * @return void
+ * @covers ::tail
+ */
+	public function testTail() {
+		$text1 = 'The quick brown fox jumps over the lazy dog';
+		$text2 = 'Heiz&ouml;lr&uuml;cksto&szlig;abd&auml;mpfung';
+		$text3 = 'El moño está en el lugar correcto. Eso fue lo que dijo la niña, ¿habrá dicho la verdad?';
+		$text4 = 'Vive la R' . chr(195) . chr(169) . 'publique de France';
+		$text5 = 'НОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыь';
+
+		$result = $this->Text->tail($text1, 13);
+		$this->assertEquals('...e lazy dog', $result);
+
+		$result = $this->Text->tail($text1, 13, array('exact' => false));
+		$this->assertEquals('...lazy dog', $result);
+
+		$result = $this->Text->tail($text1, 100);
+		$this->assertEquals('The quick brown fox jumps over the lazy dog', $result);
+
+		$result = $this->Text->tail($text2, 10);
+		$this->assertEquals('...;mpfung', $result);
+
+		$result = $this->Text->tail($text2, 10, array('exact' => false));
+		$this->assertEquals('...', $result);
+
+		$result = $this->Text->tail($text3, 255);
+		$this->assertEquals($text3, $result);
+
+		$result = $this->Text->tail($text3, 21);
+		$this->assertEquals('...á dicho la verdad?', $result);
+
+		$result = $this->Text->tail($text4, 25);
+		$this->assertEquals('...a R' . chr(195) . chr(169) . 'publique de France', $result);
+
+		$result = $this->Text->tail($text5, 10);
+		$this->assertEquals('...цчшщъыь', $result);
+
+		$result = $this->Text->tail($text5, 6, array('ellipsis' => ''));
+		$this->assertEquals('чшщъыь', $result);
+	}
+
+/**
+ * testHighlight method
+ *
+ * @return void
+ * @covers ::highlight
+ */
+	public function testHighlight() {
+		$text = 'This is a test text';
+		$phrases = array('This', 'text');
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$expected = '<b>This</b> is a test <b>text</b>';
+		$this->assertEquals($expected, $result);
+
+		$phrases = array('is', 'text');
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>', 'regex' => "|\b%s\b|iu"));
+		$expected = 'This <b>is</b> a test <b>text</b>';
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text';
+		$phrases = null;
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$this->assertEquals($text, $result);
+
+		$text = 'This is a (test) text';
+		$phrases = '(test';
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$this->assertEquals('This is a <b>(test</b>) text', $result);
+
+		$text = 'Ich saß in einem Café am Übergang';
+		$expected = 'Ich <b>saß</b> in einem <b>Café</b> am <b>Übergang</b>';
+		$phrases = array('saß', 'café', 'übergang');
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testHighlightHtml method
+ *
+ * @return void
+ * @covers ::highlight
+ */
+	public function testHighlightHtml() {
+		$text1 = '<p>strongbow isn&rsquo;t real cider</p>';
+		$text2 = '<p>strongbow <strong>isn&rsquo;t</strong> real cider</p>';
+		$text3 = '<img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$text4 = 'What a strong mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$options = array('format' => '<b>\1</b>', 'html' => true);
+
+		$expected = '<p><b>strong</b>bow isn&rsquo;t real cider</p>';
+		$this->assertEquals($expected, $this->Text->highlight($text1, 'strong', $options));
+
+		$expected = '<p><b>strong</b>bow <strong>isn&rsquo;t</strong> real cider</p>';
+		$this->assertEquals($expected, $this->Text->highlight($text2, 'strong', $options));
+
+		$this->assertEquals($this->Text->highlight($text3, 'strong', $options), $text3);
+
+		$this->assertEquals($this->Text->highlight($text3, array('strong', 'what'), $options), $text3);
+
+		$expected = '<b>What</b> a <b>strong</b> mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$this->assertEquals($expected, $this->Text->highlight($text4, array('strong', 'what'), $options));
+	}
+
+/**
+ * testHighlightMulti method
+ *
+ * @return void
+ * @covers ::highlight
+ */
+	public function testHighlightMulti() {
+		$text = 'This is a test text';
+		$phrases = array('This', 'text');
+		$result = $this->Text->highlight($text, $phrases, array('format' => array('<b>\1</b>', '<em>\1</em>')));
+		$expected = '<b>This</b> is a test <em>text</em>';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testStripLinks method
+ *
+ * @return void
+ * @covers ::stripLinks
+ */
+	public function testStripLinks() {
+		$text = 'This is a test text';
+		$expected = 'This is a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a <a href="#">test</a> text';
+		$expected = 'This is a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This <strong>is</strong> a <a href="#">test</a> <a href="#">text</a>';
+		$expected = 'This <strong>is</strong> a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This <strong>is</strong> a <a href="#">test</a> and <abbr>some</abbr> other <a href="#">text</a>';
+		$expected = 'This <strong>is</strong> a test and <abbr>some</abbr> other text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testHighlightCaseInsensitivity method
+ *
+ * @return void
+ * @covers ::highlight
+ */
+	public function testHighlightCaseInsensitivity() {
+		$text = 'This is a Test text';
+		$expected = 'This is a <b>Test</b> text';
+
+		$result = $this->Text->highlight($text, 'test', array('format' => '<b>\1</b>'));
+		$this->assertEquals($expected, $result);
+
+		$result = $this->Text->highlight($text, array('test'), array('format' => '<b>\1</b>'));
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testExcerpt method
+ *
+ * @return void
+ * @covers ::excerpt
+ */
+	public function testExcerpt() {
+		$text = 'This is a phrase with test text to play with';
+
+		$expected = '...ase with test text to ...';
+		$result = $this->Text->excerpt($text, 'test', 9, '...');
+		$this->assertEquals($expected, $result);
+
+		$expected = 'This is a...';
+		$result = $this->Text->excerpt($text, 'not_found', 9, '...');
+		$this->assertEquals($expected, $result);
+
+		$expected = 'This is a phras...';
+		$result = $this->Text->excerpt($text, null, 9, '...');
+		$this->assertEquals($expected, $result);
+
+		$expected = $text;
+		$result = $this->Text->excerpt($text, null, 200, '...');
+		$this->assertEquals($expected, $result);
+
+		$expected = '...a phrase w...';
+		$result = $this->Text->excerpt($text, 'phrase', 2, '...');
+		$this->assertEquals($expected, $result);
+
+		$phrase = 'This is a phrase with test text';
+		$expected = $text;
+		$result = $this->Text->excerpt($text, $phrase, 13, '...');
+		$this->assertEquals($expected, $result);
+
+		$text = 'aaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaa';
+		$phrase = 'bbbbbbbb';
+		$result = $this->Text->excerpt($text, $phrase, 10);
+		$expected = '...aaaaaaaaaabbbbbbbbaaaaaaaaaa...';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testExcerptCaseInsensitivity method
+ *
+ * @return void
+ * @covers ::excerpt
+ */
+	public function testExcerptCaseInsensitivity() {
+		$text = 'This is a phrase with test text to play with';
+
+		$expected = '...ase with test text to ...';
+		$result = $this->Text->excerpt($text, 'TEST', 9, '...');
+		$this->assertEquals($expected, $result);
+
+		$expected = 'This is a...';
+		$result = $this->Text->excerpt($text, 'NOT_FOUND', 9, '...');
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testListGeneration method
+ *
+ * @return void
+ * @covers ::toList
+ */
+	public function testListGeneration() {
+		$result = $this->Text->toList(array());
+		$this->assertEquals('', $result);
+
+		$result = $this->Text->toList(array('One'));
+		$this->assertEquals('One', $result);
+
+		$result = $this->Text->toList(array('Larry', 'Curly', 'Moe'));
+		$this->assertEquals('Larry, Curly and Moe', $result);
+
+		$result = $this->Text->toList(array('Dusty', 'Lucky', 'Ned'), 'y');
+		$this->assertEquals('Dusty, Lucky y Ned', $result);
+
+		$result = $this->Text->toList(array(1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'y');
+		$this->assertEquals('Dusty, Lucky y Ned', $result);
+
+		$result = $this->Text->toList(array(1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'and', ' + ');
+		$this->assertEquals('Dusty + Lucky and Ned', $result);
+
+		$result = $this->Text->toList(array('name1' => 'Dusty', 'name2' => 'Lucky'));
+		$this->assertEquals('Dusty and Lucky', $result);
+
+		$result = $this->Text->toList(array('test_0' => 'banana', 'test_1' => 'apple', 'test_2' => 'lemon'));
+		$this->assertEquals('banana, apple and lemon', $result);
+	}
+
+}
diff --git a/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
index e0a4182c4..2620f7897 100644
--- a/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -72,13 +72,13 @@ class CakeTimeTest extends CakeTestCase {
  */
 	public function testToQuarter() {
 		$result = $this->Time->toQuarter('2007-12-25');
-		$this->assertEquals(4, $result);
+		$this->assertSame(4, $result);
 
 		$result = $this->Time->toQuarter('2007-9-25');
-		$this->assertEquals(3, $result);
+		$this->assertSame(3, $result);
 
 		$result = $this->Time->toQuarter('2007-3-25');
-		$this->assertEquals(1, $result);
+		$this->assertSame(1, $result);
 
 		$result = $this->Time->toQuarter('2007-3-25', true);
 		$this->assertEquals(array('2007-01-01', '2007-03-31'), $result);
@@ -108,9 +108,9 @@ class CakeTimeTest extends CakeTestCase {
 			array('-2 days -3 hours', '2 days, 3 hours ago'),
 			array('-1 week', '1 week ago'),
 			array('-2 weeks -2 days', '2 weeks, 2 days ago'),
-			array('+1 week', '1 week'),
-			array('+1 week 1 day', '1 week, 1 day'),
-			array('+2 weeks 2 day', '2 weeks, 2 days'),
+			array('+1 week', 'in 1 week'),
+			array('+1 week 1 day', 'in 1 week, 1 day'),
+			array('+2 weeks 2 day', 'in 2 weeks, 2 days'),
 			array('2007-9-24', 'on 24/9/07'),
 			array('now', 'just now'),
 		);
@@ -136,37 +136,37 @@ class CakeTimeTest extends CakeTestCase {
 		return array(
 			array(
 				'+4 months +2 weeks +3 days',
-				'4 months, 2 weeks, 3 days',
+				'in 4 months, 2 weeks, 3 days',
 				'8 years'
 			),
 			array(
 				'+4 months +2 weeks +1 day',
-				'4 months, 2 weeks, 1 day',
+				'in 4 months, 2 weeks, 1 day',
 				'8 years'
 			),
 			array(
 				'+3 months +2 weeks',
-				'3 months, 2 weeks',
+				'in 3 months, 2 weeks',
 				'8 years'
 			),
 			array(
 				'+3 months +2 weeks +1 day',
-				'3 months, 2 weeks, 1 day',
+				'in 3 months, 2 weeks, 1 day',
 				'8 years'
 			),
 			array(
 				'+1 months +1 week +1 day',
-				'1 month, 1 week, 1 day',
+				'in 1 month, 1 week, 1 day',
 				'8 years'
 			),
 			array(
 				'+2 months +2 days',
-				'2 months, 2 days',
+				'in 2 months, 2 days',
 				'on ' . date('j/n/y', strtotime('+2 months +2 days'))
 			),
 			array(
 				'+2 months +12 days',
-				'2 months, 1 week, 5 days',
+				'in 2 months, 1 week, 5 days',
 				'3 months'
 			),
 		);
@@ -198,6 +198,13 @@ class CakeTimeTest extends CakeTestCase {
 		$expected = 'at least 8 years ago';
 		$this->assertEquals($expected, $result);
 
+		$result = $this->Time->timeAgoInWords(
+			strtotime('+8 years +4 months +2 weeks +3 days'),
+			array('relativeStringFuture' => 'not in the next %s', 'accuracy' => array('year' => 'year'), 'end' => '+10 years')
+		);
+		$expected = 'not in the next 8 years';
+		$this->assertEquals($expected, $result);
+
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+4 months +2 weeks +3 days'),
 			array('absoluteString' => 'exactly on %s', 'accuracy' => array('year' => 'year'), 'end' => '+2 months')
@@ -216,35 +223,35 @@ class CakeTimeTest extends CakeTestCase {
 			strtotime('+8 years +4 months +2 weeks +3 days'),
 			array('accuracy' => array('year' => 'year'), 'end' => '+10 years')
 		);
-		$expected = '8 years';
+		$expected = 'in 8 years';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+8 years +4 months +2 weeks +3 days'),
 			array('accuracy' => array('year' => 'month'), 'end' => '+10 years')
 		);
-		$expected = '8 years, 4 months';
+		$expected = 'in 8 years, 4 months';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+8 years +4 months +2 weeks +3 days'),
 			array('accuracy' => array('year' => 'week'), 'end' => '+10 years')
 		);
-		$expected = '8 years, 4 months, 2 weeks';
+		$expected = 'in 8 years, 4 months, 2 weeks';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+8 years +4 months +2 weeks +3 days'),
 			array('accuracy' => array('year' => 'day'), 'end' => '+10 years')
 		);
-		$expected = '8 years, 4 months, 2 weeks, 3 days';
+		$expected = 'in 8 years, 4 months, 2 weeks, 3 days';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+1 years +5 weeks'),
 			array('accuracy' => array('year' => 'year'), 'end' => '+10 years')
 		);
-		$expected = '1 year';
+		$expected = 'in 1 year';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
@@ -263,7 +270,7 @@ class CakeTimeTest extends CakeTestCase {
 	}
 
 /**
- * Test the format option of timeAgoInWords()
+ * Test the format option of timeAgoInWords() with date() and strftime compatible strings
  *
  * @return void
  */
@@ -271,20 +278,32 @@ class CakeTimeTest extends CakeTestCase {
 		$result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d');
 		$this->assertEquals('on 2007-09-25', $result);
 
-		$result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d');
-		$this->assertEquals('on 2007-09-25', $result);
+		$result = $this->Time->timeAgoInWords('2007-9-25', '%x');
+		$this->assertEquals('on ' . strftime('%x', strtotime('2007-9-25')), $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+2 weeks +2 days'),
 			'Y-m-d'
 		);
-		$this->assertRegExp('/^2 weeks, [1|2] day(s)?$/', $result);
+		$this->assertRegExp('/^in 2 weeks, [1|2] day(s)?$/', $result);
+
+		$result = $this->Time->timeAgoInWords(
+			strtotime('+2 weeks +2 days'),
+			'%x'
+		);
+		$this->assertRegExp('/^in 2 weeks, [1|2] day(s)?$/', $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('+2 months +2 days'),
 			array('end' => '1 month', 'format' => 'Y-m-d')
 		);
 		$this->assertEquals('on ' . date('Y-m-d', strtotime('+2 months +2 days')), $result);
+
+		$result = $this->Time->timeAgoInWords(
+			strtotime('+2 months +2 days'),
+			array('end' => '1 month', 'format' => '%x')
+		);
+		$this->assertEquals('on ' . strftime('%x', strtotime('+2 months +2 days')), $result);
 	}
 
 /**
@@ -597,6 +616,12 @@ class CakeTimeTest extends CakeTestCase {
 		$result = $this->Time->format('Y-m-d', null, 'never');
 		$this->assertEquals('never', $result);
 
+		$result = $this->Time->format('Y-m-d', '');
+		$this->assertSame('', $result);
+
+		$result = $this->Time->format('Y-m-d', false);
+		$this->assertSame('', $result);
+
 		$result = $this->Time->format('2012-01-13', '%d-%m-%Y', 'invalid');
 		$this->assertEquals('13-01-2012', $result);
 
@@ -1050,12 +1075,12 @@ class CakeTimeTest extends CakeTestCase {
 	}
 
 /**
- * test convert %e on windows.
+ * test convert %e on Windows.
  *
  * @return void
  */
 	public function testConvertPercentE() {
-		$this->skipIf(DIRECTORY_SEPARATOR !== '\\', 'Cannot run windows tests on non-windows OS.');
+		$this->skipIf(DIRECTORY_SEPARATOR !== '\\', 'Cannot run Windows tests on non-Windows OS.');
 
 		$time = strtotime('Thu Jan 14 11:43:39 2010');
 		$result = $this->Time->convertSpecifiers('%e', $time);
@@ -1141,6 +1166,19 @@ class CakeTimeTest extends CakeTestCase {
 		$this->assertTrue(isset($return['Asia']['Asia/Bangkok']));
 		$this->assertFalse(isset($return['Pacific']));
 
+		$return = CakeTime::listTimezones(null, null, array('abbr' => true));
+		$this->assertTrue(isset($return['Asia']['Asia/Jakarta']));
+		$this->assertEquals('Jakarta - WIB', $return['Asia']['Asia/Jakarta']);
+		$this->assertEquals('Regina - CST', $return['America']['America/Regina']);
+
+		$return = CakeTime::listTimezones(null, null, array(
+			'abbr' => true,
+			'before' => ' (',
+			'after' => ')',
+		));
+		$this->assertEquals('Jayapura (WIT)', $return['Asia']['Asia/Jayapura']);
+		$this->assertEquals('Regina (CST)', $return['America']['America/Regina']);
+
 		$return = CakeTime::listTimezones('#^(America|Pacific)/#', null, false);
 		$this->assertTrue(isset($return['America/Argentina/Buenos_Aires']));
 		$this->assertTrue(isset($return['Pacific/Tahiti']));
diff --git a/web/api/lib/Cake/Test/Case/Utility/ClassRegistryTest.php b/web/api/lib/Cake/Test/Case/Utility/ClassRegistryTest.php
index 595efc5b2..09e54959f 100644
--- a/web/api/lib/Cake/Test/Case/Utility/ClassRegistryTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/ClassRegistryTest.php
@@ -28,7 +28,7 @@ class ClassRegisterModel extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 }
diff --git a/web/api/lib/Cake/Test/Case/Utility/DebuggerTest.php b/web/api/lib/Cake/Test/Case/Utility/DebuggerTest.php
index 63cc39e41..4179a7636 100644
--- a/web/api/lib/Cake/Test/Case/Utility/DebuggerTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -187,7 +187,7 @@ class DebuggerTest extends CakeTestCase {
 			'error' => array(),
 			'code' => array(), '8', '/code',
 			'file' => array(), 'preg:/[^<]+/', '/file',
-			'line' => array(), '' . (intval(__LINE__) - 7), '/line',
+			'line' => array(), '' . ((int)__LINE__ - 7), '/line',
 			'preg:/Undefined variable:\s+foo/',
 			'/error'
 		);
@@ -246,7 +246,7 @@ class DebuggerTest extends CakeTestCase {
 			'<error',
 			'<code', '8', '/code',
 			'<file', 'preg:/[^<]+/', '/file',
-			'<line', '' . (intval(__LINE__) - 7), '/line',
+			'<line', '' . ((int)__LINE__ - 7), '/line',
 			'preg:/Undefined variable:\s+foo/',
 			'/error'
 		);
@@ -362,6 +362,7 @@ TEXT;
 	)
 	[protected] _scripts => array()
 	[protected] _paths => array()
+	[protected] _pathsForPlugin => array()
 	[protected] _parents => array()
 	[protected] _current => null
 	[protected] _currentType => ''
@@ -515,8 +516,8 @@ TEXT;
 		Debugger::dump($var);
 		$result = ob_get_clean();
 
-		$open = php_sapi_name() == 'cli' ? "\n" : '<pre>';
-		$close = php_sapi_name() == 'cli' ? "\n" : '</pre>';
+		$open = PHP_SAPI === 'cli' ? "\n" : '<pre>';
+		$close = PHP_SAPI === 'cli' ? "\n" : '</pre>';
 		$expected = <<<TEXT
 {$open}array(
 	'People' => array(
@@ -539,8 +540,8 @@ TEXT;
 		Debugger::dump($var, 1);
 		$result = ob_get_clean();
 
-		$open = php_sapi_name() == 'cli' ? "\n" : '<pre>';
-		$close = php_sapi_name() == 'cli' ? "\n" : '</pre>';
+		$open = PHP_SAPI === 'cli' ? "\n" : '<pre>';
+		$close = PHP_SAPI === 'cli' ? "\n" : '</pre>';
 		$expected = <<<TEXT
 {$open}array(
 	'People' => array(
diff --git a/web/api/lib/Cake/Test/Case/Utility/FileTest.php b/web/api/lib/Cake/Test/Case/Utility/FileTest.php
index 6a478f35d..573a7922f 100644
--- a/web/api/lib/Cake/Test/Case/Utility/FileTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/FileTest.php
@@ -23,13 +23,14 @@ App::uses('Folder', 'Utility');
  * FileTest class
  *
  * @package       Cake.Test.Case.Utility
+ * @coversDefaultClass File
  */
 class FileTest extends CakeTestCase {
 
 /**
  * File property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $File = null;
 
@@ -62,6 +63,15 @@ class FileTest extends CakeTestCase {
  * testBasic method
  *
  * @return void
+ * @covers ::__construct
+ * @covers ::info
+ * @covers ::ext
+ * @covers ::name
+ * @covers ::md5
+ * @covers ::size
+ * @covers ::owner
+ * @covers ::group
+ * @covers ::Folder
  */
 	public function testBasic() {
 		$file = CAKE . DS . 'LICENSE.txt';
@@ -81,8 +91,7 @@ class FileTest extends CakeTestCase {
 			'filesize' => filesize($file),
 			'mime' => 'text/plain'
 		);
-		if (
-			!function_exists('finfo_open') &&
+		if (!function_exists('finfo_open') &&
 			(!function_exists('mime_content_type') ||
 			function_exists('mime_content_type') &&
 			mime_content_type($this->File->pwd()) === false)
@@ -127,6 +136,7 @@ class FileTest extends CakeTestCase {
  * testPermission method
  *
  * @return void
+ * @covers ::perms
  */
 	public function testPermission() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.');
@@ -173,6 +183,7 @@ class FileTest extends CakeTestCase {
  * testRead method
  *
  * @return void
+ * @covers ::read
  */
 	public function testRead() {
 		$file = __FILE__;
@@ -204,6 +215,7 @@ class FileTest extends CakeTestCase {
  * testOffset method
  *
  * @return void
+ * @covers ::offset
  */
 	public function testOffset() {
 		$this->File->close();
@@ -236,6 +248,7 @@ class FileTest extends CakeTestCase {
  * testOpen method
  *
  * @return void
+ * @covers ::open
  */
 	public function testOpen() {
 		$this->File->handle = null;
@@ -260,6 +273,7 @@ class FileTest extends CakeTestCase {
  * testClose method
  *
  * @return void
+ * @covers ::close
  */
 	public function testClose() {
 		$this->File->handle = null;
@@ -277,6 +291,9 @@ class FileTest extends CakeTestCase {
  * testCreate method
  *
  * @return void
+ * @covers ::create
+ * @covers ::exists
+ * @covers ::clearStatCache
  */
 	public function testCreate() {
 		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
@@ -284,10 +301,29 @@ class FileTest extends CakeTestCase {
 		$this->assertTrue($File->exists());
 	}
 
+/**
+ * Tests the exists() method.
+ *
+ * @return void
+ */
+	public function testExists() {
+		$tmpFile = TMP . 'tests/cakephp.file.test.tmp';
+		$file = new File($tmpFile, true, 0777);
+		$this->assertTrue($file->exists(), 'absolute path should exist');
+
+		$file = new File('file://' . $tmpFile, false);
+		$this->assertTrue($file->exists(), 'file:// should exist.');
+
+		$file = new File('/something/bad', false);
+		$this->assertFalse($file->exists(), 'missing file should not exist.');
+	}
+
 /**
  * testOpeningNonExistentFileCreatesIt method
  *
  * @return void
+ * @covers ::open
+ * @covers ::create
  */
 	public function testOpeningNonExistentFileCreatesIt() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -301,6 +337,7 @@ class FileTest extends CakeTestCase {
  * testPrepare method
  *
  * @return void
+ * @covers ::prepare
  */
 	public function testPrepare() {
 		$string = "some\nvery\ncool\r\nteststring here\n\n\nfor\r\r\n\n\r\n\nhere";
@@ -321,6 +358,7 @@ class FileTest extends CakeTestCase {
  * testReadable method
  *
  * @return void
+ * @covers ::readable
  */
 	public function testReadable() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -334,6 +372,7 @@ class FileTest extends CakeTestCase {
  * testWritable method
  *
  * @return void
+ * @covers ::writable
  */
 	public function testWritable() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -347,6 +386,7 @@ class FileTest extends CakeTestCase {
  * testExecutable method
  *
  * @return void
+ * @covers ::executable
  */
 	public function testExecutable() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -360,6 +400,7 @@ class FileTest extends CakeTestCase {
  * testLastAccess method
  *
  * @return void
+ * @covers ::lastAccess
  */
 	public function testLastAccess() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -374,6 +415,7 @@ class FileTest extends CakeTestCase {
  * testLastChange method
  *
  * @return void
+ * @covers ::lastChange
  */
 	public function testLastChange() {
 		$someFile = new File(TMP . 'some_file.txt', false);
@@ -392,6 +434,7 @@ class FileTest extends CakeTestCase {
  * testWrite method
  *
  * @return void
+ * @covers ::write
  */
 	public function testWrite() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -422,6 +465,7 @@ class FileTest extends CakeTestCase {
  * testAppend method
  *
  * @return void
+ * @covers ::append
  */
 	public function testAppend() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -458,6 +502,7 @@ class FileTest extends CakeTestCase {
  * testDelete method
  *
  * @return void
+ * @covers ::delete
  */
 	public function testDelete() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -483,6 +528,7 @@ class FileTest extends CakeTestCase {
  * active filehandles open.
  *
  * @return void
+ * @covers ::delete
  */
 	public function testDeleteAfterRead() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -500,6 +546,7 @@ class FileTest extends CakeTestCase {
  * testCopy method
  *
  * @return void
+ * @covers ::copy
  */
 	public function testCopy() {
 		$dest = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
@@ -528,6 +575,7 @@ class FileTest extends CakeTestCase {
  * Test mime()
  *
  * @return void
+ * @covers ::mime
  */
 	public function testMime() {
 		$this->skipIf(!function_exists('finfo_open') && !function_exists('mime_content_type'), 'Not able to read mime type');
@@ -543,7 +591,7 @@ class FileTest extends CakeTestCase {
 /**
  * getTmpFile method
  *
- * @param boolean $paintSkip
+ * @param bool $paintSkip
  * @return void
  */
 	protected function _getTmpFile($paintSkip = true) {
@@ -567,6 +615,7 @@ class FileTest extends CakeTestCase {
  * testReplaceText method
  *
  * @return void
+ * @covers ::replaceText
  */
 	public function testReplaceText() {
 		$TestFile = new File(dirname(__FILE__) . '/../../test_app/Vendor/welcome.php');
@@ -598,4 +647,17 @@ class FileTest extends CakeTestCase {
 
 		$TmpFile->delete();
 	}
+
+/**
+ * Tests that no path is being set for passed file paths that
+ * do not exist.
+ *
+ * @return void
+ * @covers ::pwd
+ */
+	public function testNoPartialPathBeingSetForNonExistentPath() {
+		$tmpFile = new File('/non/existent/file');
+		$this->assertNull($tmpFile->pwd());
+		$this->assertNull($tmpFile->path);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Utility/FolderTest.php b/web/api/lib/Cake/Test/Case/Utility/FolderTest.php
index c1f0e6cb8..552922818 100644
--- a/web/api/lib/Cake/Test/Case/Utility/FolderTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/FolderTest.php
@@ -41,7 +41,7 @@ class FolderTest extends CakeTestCase {
 
 		foreach (scandir(TMP) as $file) {
 			if (is_dir(TMP . $file) && !in_array($file, array('.', '..'))) {
-				self::$_tmp[] = $file;
+				static::$_tmp[] = $file;
 			}
 		}
 	}
@@ -62,7 +62,7 @@ class FolderTest extends CakeTestCase {
  * @return void
  */
 	public function tearDown() {
-		$exclude = array_merge(self::$_tmp, array('.', '..'));
+		$exclude = array_merge(static::$_tmp, array('.', '..'));
 		foreach (scandir(TMP) as $dir) {
 			if (is_dir(TMP . $dir) && !in_array($dir, $exclude)) {
 				$iterator = new RecursiveDirectoryIterator(TMP . $dir);
@@ -170,13 +170,29 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue($Folder->delete());
 	}
 
+/**
+ * Test that relative paths to create() are added to cwd.
+ *
+ * @return void
+ */
+	public function testCreateRelative() {
+		$folder = new Folder(TMP);
+		$path = TMP . 'tests' . DS . 'relative-test';
+		$result = $folder->create('tests' . DS . 'relative-test');
+		$this->assertTrue($result, 'should create');
+
+		$this->assertTrue(is_dir($path), 'Folder was not made');
+		$folder = new Folder($path);
+		$folder->delete();
+	}
+
 /**
  * test recursive directory create failure.
  *
  * @return void
  */
 	public function testRecursiveCreateFailure() {
-		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
+		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on Windows.');
 
 		$path = TMP . 'tests' . DS . 'one';
 		mkdir($path);
@@ -548,6 +564,8 @@ class FolderTest extends CakeTestCase {
 		$this->assertFalse(Folder::isAbsolute('0:\\path\\to\\file'));
 		$this->assertFalse(Folder::isAbsolute('\\path/to/file'));
 		$this->assertFalse(Folder::isAbsolute('\\path\\to\\file'));
+		$this->assertFalse(Folder::isAbsolute('notRegisteredStreamWrapper://example'));
+		$this->assertFalse(Folder::isAbsolute('://example'));
 
 		$this->assertTrue(Folder::isAbsolute('/usr/local'));
 		$this->assertTrue(Folder::isAbsolute('//path/to/file'));
@@ -555,6 +573,7 @@ class FolderTest extends CakeTestCase {
 		$this->assertTrue(Folder::isAbsolute('C:\\path\\to\\file'));
 		$this->assertTrue(Folder::isAbsolute('d:\\path\\to\\file'));
 		$this->assertTrue(Folder::isAbsolute('\\\\vmware-host\\Shared Folders\\file'));
+		$this->assertTrue(Folder::isAbsolute('http://www.example.com'));
 	}
 
 /**
@@ -973,6 +992,28 @@ class FolderTest extends CakeTestCase {
 		$Folder->delete();
 	}
 
+/**
+ * Test that SKIP mode skips files too.
+ *
+ * @return void
+ */
+	public function testCopyWithSkipFileSkipped() {
+		$path = TMP . 'folder_test';
+		$folderOne = $path . DS . 'folder1';
+		$folderTwo = $path . DS . 'folder2';
+
+		new Folder($path, true);
+		new Folder($folderOne, true);
+		new Folder($folderTwo, true);
+		file_put_contents($folderOne . DS . 'fileA.txt', 'Folder One File');
+		file_put_contents($folderTwo . DS . 'fileA.txt', 'Folder Two File');
+
+		$Folder = new Folder($folderOne);
+		$result = $Folder->copy(array('to' => $folderTwo, 'scheme' => Folder::SKIP));
+		$this->assertTrue($result);
+		$this->assertEquals('Folder Two File', file_get_contents($folderTwo . DS . 'fileA.txt'));
+	}
+
 /**
  * testCopyWithOverwrite
  *
@@ -985,7 +1026,7 @@ class FolderTest extends CakeTestCase {
 		extract($this->_setupFilesystem());
 
 		$Folder = new Folder($folderOne);
-		$result = $Folder->copy(array('to' => $folderThree, 'scheme' => Folder::OVERWRITE));
+		$Folder->copy(array('to' => $folderThree, 'scheme' => Folder::OVERWRITE));
 
 		$this->assertTrue(file_exists($folderThree . DS . 'file1.php'));
 		$this->assertTrue(file_exists($folderThree . DS . 'folderA' . DS . 'fileA.php'));
diff --git a/web/api/lib/Cake/Test/Case/Utility/HashTest.php b/web/api/lib/Cake/Test/Case/Utility/HashTest.php
index 260568fde..cb97f60e2 100644
--- a/web/api/lib/Cake/Test/Case/Utility/HashTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/HashTest.php
@@ -23,6 +23,11 @@ App::uses('Hash', 'Utility');
  */
 class HashTest extends CakeTestCase {
 
+/**
+ * Data provider
+ *
+ * @return array
+ */
 	public static function articleData() {
 		return array(
 			array(
@@ -136,6 +141,11 @@ class HashTest extends CakeTestCase {
 		);
 	}
 
+/**
+ * Data provider
+ *
+ * @return array
+ */
 	public static function userData() {
 		return array(
 			array(
@@ -188,7 +198,7 @@ class HashTest extends CakeTestCase {
 		$result = Hash::get($data, '1');
 		$this->assertEquals('def', $result);
 
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::get(array(), '1.Article.title');
 		$this->assertNull($result);
@@ -219,6 +229,29 @@ class HashTest extends CakeTestCase {
 		$this->assertEquals($data[1]['Article'], $result);
 	}
 
+/**
+ * Test get() with an invalid path
+ *
+ * @expectedException InvalidArgumentException
+ * @return void
+ */
+	public function testGetInvalidPath() {
+		Hash::get(array('one' => 'two'), true);
+	}
+
+/**
+ * Test testGetNullPath()
+ *
+ * @return void
+ */
+	public function testGetNullPath() {
+		$result = Hash::get(array('one' => 'two'), null, '-');
+		$this->assertEquals('-', $result);
+
+		$result = Hash::get(array('one' => 'two'), '', '-');
+		$this->assertEquals('-', $result);
+	}
+
 /**
  * Test dimensions.
  *
@@ -255,42 +288,37 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testMaxDimensions() {
+		$data = array();
+		$result = Hash::maxDimensions($data);
+		$this->assertEquals(0, $result);
+
+		$data = array('a', 'b');
+		$result = Hash::maxDimensions($data);
+		$this->assertEquals(1, $result);
+
 		$data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1'));
 		$result = Hash::maxDimensions($data);
 		$this->assertEquals($result, 2);
 
-		$data = array('1' => array('1.1' => '1.1.1'), '2', '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$data = array(
+			'1' => array('1.1' => '1.1.1'),
+			'2',
+			'3' => array('3.1' => array('3.1.1' => '3.1.1.1'))
+		);
 		$result = Hash::maxDimensions($data);
 		$this->assertEquals($result, 3);
 
 		$data = array(
-			'1' => array('1.1' => '1.1.1'),
-			array('2' => array('2.1' => array('2.1.1' => '2.1.1.1'))),
-			'3' => array('3.1' => array('3.1.1' => '3.1.1.1'))
-		);
-		$result = Hash::maxDimensions($data);
-		$this->assertEquals($result, 4);
-
-		$data = array(
-			'1' => array('1.1' => '1.1.1'),
-			array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1')))),
-			'3' => array('3.1' => array('3.1.1' => '3.1.1.1'))
-		);
-		$result = Hash::maxDimensions($data);
-		$this->assertEquals($result, 5);
-
-		$data = array(
-			'1' => array('1.1' => '1.1.1'),
-			array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))),
-			'3' => array('3.1' => array('3.1.1' => '3.1.1.1'))
-		);
-		$result = Hash::maxDimensions($data);
-		$this->assertEquals($result, 5);
-
-		$data = array(
-			'1' => array('1.1' => '1.1.1'),
-			array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))),
-			'3' => array('3.1' => array('3.1.1' => '3.1.1.1'))
+			'1' => array(
+				'1.1' => '1.1.1',
+				'1.2' => array(
+					'1.2.1' => array(
+						'1.2.1.1',
+						array('1.2.2.1')
+					)
+				)
+			),
+			'2' => array('2.1' => '2.1.1')
 		);
 		$result = Hash::maxDimensions($data);
 		$this->assertEquals($result, 5);
@@ -680,7 +708,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractBasic() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '');
 		$this->assertEquals($data, $result);
@@ -701,7 +729,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractNumericKey() {
-		$data = self::articleData();
+		$data = static::articleData();
 		$result = Hash::extract($data, '{n}.Article.title');
 		$expected = array(
 			'First Article', 'Second Article',
@@ -780,7 +808,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractStringKey() {
-		$data = self::articleData();
+		$data = static::articleData();
 		$result = Hash::extract($data, '{n}.{s}.user');
 		$expected = array(
 			'mariano',
@@ -795,13 +823,39 @@ class HashTest extends CakeTestCase {
 		$this->assertEquals(array('foo'), $result);
 	}
 
+/**
+ * Test wildcard matcher
+ *
+ * @return void
+ */
+	public function testExtractWildcard() {
+		$data = array(
+			'02000009C5560001' => array('name' => 'Mr. Alphanumeric'),
+			'2300000918020101' => array('name' => 'Mr. Numeric'),
+			'390000096AB30001' => array('name' => 'Mrs. Alphanumeric'),
+			'stuff' => array('name' => 'Ms. Word'),
+			123 => array('name' => 'Mr. Number'),
+			true => array('name' => 'Ms. Bool'),
+		);
+		$result = Hash::extract($data, '{*}.name');
+		$expected = array(
+			'Mr. Alphanumeric',
+			'Mr. Numeric',
+			'Mrs. Alphanumeric',
+			'Ms. Word',
+			'Mr. Number',
+			'Ms. Bool',
+		);
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * Test the attribute presense selector.
  *
  * @return void
  */
 	public function testExtractAttributePresence() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '{n}.Article[published]');
 		$expected = array($data[1]['Article']);
@@ -818,7 +872,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractAttributeEquality() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '{n}.Article[id=3]');
 		$expected = array($data[2]['Article']);
@@ -858,10 +912,19 @@ class HashTest extends CakeTestCase {
 				'active' => false
 			),
 		);
+		$result = Hash::extract($users, '{n}[active=0]');
+		$this->assertCount(1, $result);
+		$this->assertEquals($users[2], $result[0]);
+
 		$result = Hash::extract($users, '{n}[active=false]');
 		$this->assertCount(1, $result);
 		$this->assertEquals($users[2], $result[0]);
 
+		$result = Hash::extract($users, '{n}[active=1]');
+		$this->assertCount(2, $result);
+		$this->assertEquals($users[0], $result[0]);
+		$this->assertEquals($users[1], $result[1]);
+
 		$result = Hash::extract($users, '{n}[active=true]');
 		$this->assertCount(2, $result);
 		$this->assertEquals($users[0], $result[0]);
@@ -894,7 +957,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractAttributeComparison() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '{n}.Comment.{n}[user_id > 2]');
 		$expected = array($data[0]['Comment'][1]);
@@ -923,7 +986,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractAttributeMultiple() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '{n}.Comment.{n}[user_id > 2][id=1]');
 		$this->assertEmpty($result);
@@ -940,7 +1003,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testExtractAttributePattern() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::extract($data, '{n}.Article[title=/^First/]');
 		$expected = array($data[0]['Article']);
@@ -1021,7 +1084,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testSort() {
-		$result = Hash::sort(array(), '{n}.name', 'asc');
+		$result = Hash::sort(array(), '{n}.name');
 		$this->assertEquals(array(), $result);
 
 		$a = array(
@@ -1044,7 +1107,7 @@ class HashTest extends CakeTestCase {
 				'Friend' => array(array('name' => 'Nate'))
 			)
 		);
-		$a = Hash::sort($a, '{n}.Friend.{n}.name', 'asc');
+		$a = Hash::sort($a, '{n}.Friend.{n}.name');
 		$this->assertEquals($a, $b);
 
 		$b = array(
@@ -1238,6 +1301,43 @@ class HashTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test natural sorting ignoring case.
+ *
+ * @return void
+ */
+	public function testSortNaturalIgnoreCase() {
+		if (version_compare(PHP_VERSION, '5.4.0', '<')) {
+			$this->markTestSkipped('SORT_NATURAL is available since PHP 5.4.');
+		}
+		$items = array(
+			array('Item' => array('image' => 'img1.jpg')),
+			array('Item' => array('image' => 'img99.jpg')),
+			array('Item' => array('image' => 'Img12.jpg')),
+			array('Item' => array('image' => 'Img10.jpg')),
+			array('Item' => array('image' => 'img2.jpg')),
+		);
+		$result = Hash::sort($items, '{n}.Item.image', 'desc', array('type' => 'natural', 'ignoreCase' => true));
+		$expected = array(
+			array('Item' => array('image' => 'img99.jpg')),
+			array('Item' => array('image' => 'Img12.jpg')),
+			array('Item' => array('image' => 'Img10.jpg')),
+			array('Item' => array('image' => 'img2.jpg')),
+			array('Item' => array('image' => 'img1.jpg')),
+		);
+		$this->assertEquals($expected, $result);
+
+		$result = Hash::sort($items, '{n}.Item.image', 'asc', array('type' => 'natural', 'ignoreCase' => true));
+		$expected = array(
+			array('Item' => array('image' => 'img1.jpg')),
+			array('Item' => array('image' => 'img2.jpg')),
+			array('Item' => array('image' => 'Img10.jpg')),
+			array('Item' => array('image' => 'Img12.jpg')),
+			array('Item' => array('image' => 'img99.jpg')),
+		);
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * Test that sort() with 'natural' type will fallback to 'regular' as SORT_NATURAL is introduced in PHP 5.4
  *
@@ -1292,7 +1392,7 @@ class HashTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testSortString() {
+	public function testSortStringKeys() {
 		$toSort = array(
 			'four' => array('number' => 4, 'some' => 'foursome'),
 			'six' => array('number' => 6, 'some' => 'sixsome'),
@@ -1324,6 +1424,50 @@ class HashTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test sorting with string ignoring case.
+ *
+ * @return void
+ */
+	public function testSortStringIgnoreCase() {
+		$toSort = array(
+			array('Item' => array('name' => 'bar')),
+			array('Item' => array('name' => 'Baby')),
+			array('Item' => array('name' => 'Baz')),
+			array('Item' => array('name' => 'bat')),
+		);
+		$sorted = Hash::sort($toSort, '{n}.Item.name', 'asc', array('type' => 'string', 'ignoreCase' => true));
+		$expected = array(
+			array('Item' => array('name' => 'Baby')),
+			array('Item' => array('name' => 'bar')),
+			array('Item' => array('name' => 'bat')),
+			array('Item' => array('name' => 'Baz')),
+		);
+		$this->assertEquals($expected, $sorted);
+	}
+
+/**
+ * test regular sorting ignoring case.
+ *
+ * @return void
+ */
+	public function testSortRegularIgnoreCase() {
+		$toSort = array(
+			array('Item' => array('name' => 'bar')),
+			array('Item' => array('name' => 'Baby')),
+			array('Item' => array('name' => 'Baz')),
+			array('Item' => array('name' => 'bat')),
+		);
+		$sorted = Hash::sort($toSort, '{n}.Item.name', 'asc', array('type' => 'regular', 'ignoreCase' => true));
+		$expected = array(
+			array('Item' => array('name' => 'Baby')),
+			array('Item' => array('name' => 'bar')),
+			array('Item' => array('name' => 'bat')),
+			array('Item' => array('name' => 'Baz')),
+		);
+		$this->assertEquals($expected, $sorted);
+	}
+
 /**
  * Test insert()
  *
@@ -1348,6 +1492,13 @@ class HashTest extends CakeTestCase {
 			'pages' => array('name' => array()),
 		);
 		$this->assertEquals($expected, $result);
+
+		$a = array(
+			'foo' => array('bar' => 'baz')
+		);
+		$result = Hash::insert($a, 'some.0123.path', array('foo' => array('bar' => 'baz')));
+		$expected = array('foo' => array('bar' => 'baz'));
+		$this->assertEquals($expected, Hash::get($result, 'some.0123.path'));
 	}
 
 /**
@@ -1356,7 +1507,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testInsertMulti() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::insert($data, '{n}.Article.insert', 'value');
 		$this->assertEquals('value', $result[0]['Article']['insert']);
@@ -1462,6 +1613,18 @@ class HashTest extends CakeTestCase {
 			)
 		);
 		$this->assertEquals($expected, $result);
+
+		$array = array(
+			0 => 'foo',
+			1 => array(
+				0 => 'baz'
+			)
+		);
+		$expected = $array;
+		$result = Hash::remove($array, '{n}.part');
+		$this->assertEquals($expected, $result);
+		$result = Hash::remove($array, '{n}.{n}.part');
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -1470,7 +1633,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testRemoveMulti() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::remove($data, '{n}.Article.title');
 		$this->assertFalse(isset($result[0]['Article']['title']));
@@ -1537,7 +1700,7 @@ class HashTest extends CakeTestCase {
 		$result = Hash::combine(array(), '{n}.User.id', '{n}.User.Data');
 		$this->assertTrue(empty($result));
 
-		$a = self::userData();
+		$a = static::userData();
 
 		$result = Hash::combine($a, '{n}.User.id');
 		$expected = array(2 => null, 14 => null, 25 => null);
@@ -1596,7 +1759,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testCombineWithGroupPath() {
-		$a = self::userData();
+		$a = static::userData();
 
 		$result = Hash::combine($a, '{n}.User.id', '{n}.User.Data', '{n}.User.group_id');
 		$expected = array(
@@ -1653,7 +1816,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testCombineWithFormatting() {
-		$a = self::userData();
+		$a = static::userData();
 
 		$result = Hash::combine(
 			$a,
@@ -1719,7 +1882,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testFormat() {
-		$data = self::userData();
+		$data = static::userData();
 
 		$result = Hash::format(
 			$data,
@@ -1779,15 +1942,20 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testMap() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::map($data, '{n}.Article.id', array($this, 'mapCallback'));
 		$expected = array(2, 4, 6, 8, 10);
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * testApply
+ *
+ * @return void
+ */
 	public function testApply() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::apply($data, '{n}.Article.id', 'array_sum');
 		$this->assertEquals(15, $result);
@@ -1799,7 +1967,7 @@ class HashTest extends CakeTestCase {
  * @return void
  */
 	public function testReduce() {
-		$data = self::articleData();
+		$data = static::articleData();
 
 		$result = Hash::reduce($data, '{n}.Article.id', array($this, 'reduceCallback'));
 		$this->assertEquals(15, $result);
@@ -1808,8 +1976,8 @@ class HashTest extends CakeTestCase {
 /**
  * testing method for map callbacks.
  *
- * @param mixed $value
- * @return mixed.
+ * @param mixed $value Value
+ * @return mixed
  */
 	public function mapCallback($value) {
 		return $value * 2;
@@ -1818,9 +1986,9 @@ class HashTest extends CakeTestCase {
 /**
  * testing method for reduce callbacks.
  *
- * @param mixed $one
- * @param mixed $two
- * @return mixed.
+ * @param mixed $one First param
+ * @param mixed $two Second param
+ * @return mixed
  */
 	public function reduceCallback($one, $two) {
 		return $one + $two;
@@ -2242,6 +2410,25 @@ class HashTest extends CakeTestCase {
 		$this->assertEquals($input, $result);
 	}
 
+/**
+ * Tests that nest() throws an InvalidArgumentException when providing an invalid input.
+ *
+ * @expectedException InvalidArgumentException
+ * @return void
+ */
+	public function testNestInvalid() {
+		$input = array(
+			array(
+				'ParentCategory' => array(
+					'id' => '1',
+					'name' => 'Lorem ipsum dolor sit amet',
+					'parent_id' => '1'
+				)
+			)
+		);
+		Hash::nest($input);
+	}
+
 /**
  * testMergeDiff method
  *
diff --git a/web/api/lib/Cake/Test/Case/Utility/InflectorTest.php b/web/api/lib/Cake/Test/Case/Utility/InflectorTest.php
index 1d269348b..9df596e78 100644
--- a/web/api/lib/Cake/Test/Case/Utility/InflectorTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/InflectorTest.php
@@ -30,6 +30,57 @@ App::uses('Inflector', 'Utility');
  */
 class InflectorTest extends CakeTestCase {
 
+/**
+ * A list of chars to test transliteration.
+ *
+ * @var array
+ */
+	public static $maps = array (
+		'de' => array ( /* German */
+			'Ä' => 'Ae', 'Ö' => 'Oe', 'Ü' => 'Ue', 'ä' => 'ae', 'ö' => 'oe', 'ü' => 'ue', 'ß' => 'ss',
+			'ẞ' => 'SS'
+		),
+		'latin' => array (
+			'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Å' => 'A', 'Ă' => 'A', 'Æ' => 'AE', 'Ç' =>
+			'C', 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I',
+			'Ï' => 'I', 'Ð' => 'D', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ő' => 'O', 'Ø' => 'O',
+			'Ș' => 'S', 'Ț' => 'T', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ű' => 'U',
+			'Ý' => 'Y', 'Þ' => 'TH', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a',
+			'å' => 'a', 'ă' => 'a', 'æ' => 'ae', 'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+			'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ð' => 'd', 'ñ' => 'n', 'ò' => 'o', 'ó' =>
+			'o', 'ô' => 'o', 'õ' => 'o', 'ő' => 'o', 'ø' => 'o', 'ș' => 's', 'ț' => 't', 'ù' => 'u', 'ú' => 'u',
+			'û' => 'u', 'ű' => 'u', 'ý' => 'y', 'þ' => 'th', 'ÿ' => 'y'
+		),
+		'tr' => array ( /* Turkish */
+			'ş' => 's', 'Ş' => 'S', 'ı' => 'i', 'İ' => 'I', 'ç' => 'c', 'Ç' => 'C', 'ğ' => 'g', 'Ğ' => 'G'
+		),
+		'uk' => array ( /* Ukrainian */
+			'Є' => 'Ye', 'І' => 'I', 'Ї' => 'Yi', 'Ґ' => 'G', 'є' => 'ye', 'і' => 'i', 'ї' => 'yi', 'ґ' => 'g'
+		),
+		'cs' => array ( /* Czech */
+			'č' => 'c', 'ď' => 'd', 'ě' => 'e', 'ň' => 'n', 'ř' => 'r', 'š' => 's', 'ť' => 't', 'ů' => 'u',
+			'ž' => 'z', 'Č' => 'C', 'Ď' => 'D', 'Ě' => 'E', 'Ň' => 'N', 'Ř' => 'R', 'Š' => 'S', 'Ť' => 'T',
+			'Ů' => 'U', 'Ž' => 'Z'
+		),
+		'pl' => array ( /* Polish */
+			'ą' => 'a', 'ć' => 'c', 'ę' => 'e', 'ł' => 'l', 'ń' => 'n', 'ó' => 'o', 'ś' => 's', 'ź' => 'z',
+			'ż' => 'z', 'Ą' => 'A', 'Ć' => 'C', 'Ł' => 'L', 'Ń' => 'N', 'Ó' => 'O', 'Ś' => 'S',
+			'Ź' => 'Z', 'Ż' => 'Z'
+		),
+		'ro' => array ( /* Romanian */
+			'ă' => 'a', 'â' => 'a', 'î' => 'i', 'ș' => 's', 'ț' => 't', 'Ţ' => 'T', 'ţ' => 't'
+		),
+		'lv' => array ( /* Latvian */
+			'ā' => 'a', 'č' => 'c', 'ē' => 'e', 'ģ' => 'g', 'ī' => 'i', 'ķ' => 'k', 'ļ' => 'l', 'ņ' => 'n',
+			'š' => 's', 'ū' => 'u', 'ž' => 'z', 'Ā' => 'A', 'Č' => 'C', 'Ē' => 'E', 'Ģ' => 'G', 'Ī' => 'I',
+			'Ķ' => 'K', 'Ļ' => 'L', 'Ņ' => 'N', 'Š' => 'S', 'Ū' => 'U', 'Ž' => 'Z'
+		),
+		'lt' => array ( /* Lithuanian */
+			'ą' => 'a', 'č' => 'c', 'ę' => 'e', 'ė' => 'e', 'į' => 'i', 'š' => 's', 'ų' => 'u', 'ū' => 'u', 'ž' => 'z',
+			'Ą' => 'A', 'Č' => 'C', 'Ę' => 'E', 'Ė' => 'E', 'Į' => 'I', 'Š' => 'S', 'Ų' => 'U', 'Ū' => 'U', 'Ž' => 'Z'
+		)
+	);
+
 /**
  * tearDown
  *
@@ -72,11 +123,12 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::singularize('fungi'), 'fungus');
 		$this->assertEquals(Inflector::singularize('nuclei'), 'nucleus');
 		$this->assertEquals(Inflector::singularize('octopuses'), 'octopus');
+		$this->assertEquals(Inflector::singularize('octopuses'), 'octopus');
 		$this->assertEquals(Inflector::singularize('radii'), 'radius');
 		$this->assertEquals(Inflector::singularize('stimuli'), 'stimulus');
 		$this->assertEquals(Inflector::singularize('syllabi'), 'syllabus');
 		$this->assertEquals(Inflector::singularize('termini'), 'terminus');
-		$this->assertEquals(Inflector::singularize('viri'), 'virus');
+		$this->assertEquals(Inflector::singularize('viruses'), 'virus');
 		$this->assertEquals(Inflector::singularize('people'), 'person');
 		$this->assertEquals(Inflector::singularize('gloves'), 'glove');
 		$this->assertEquals(Inflector::singularize('doves'), 'dove');
@@ -125,15 +177,45 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::singularize('curves'), 'curve');
 		$this->assertEquals(Inflector::singularize('body_curves'), 'body_curve');
 		$this->assertEquals(Inflector::singularize('metadata'), 'metadata');
+		$this->assertEquals(Inflector::singularize('files_metadata'), 'files_metadata');
+		$this->assertEquals(Inflector::singularize('sieves'), 'sieve');
+		$this->assertEquals(Inflector::singularize('blue_octopuses'), 'blue_octopus');
 		$this->assertEquals(Inflector::singularize(''), '');
 	}
 
+/**
+ * Test that overlapping irregulars don't collide.
+ *
+ * @return void
+ */
+	public function testSingularizeMultiWordIrregular() {
+		Inflector::rules('singular', array(
+			'irregular' => array(
+				'preguntas_frecuentes' => 'pregunta_frecuente',
+				'categorias_preguntas_frecuentes' => 'categoria_pregunta_frecuente',
+			)
+		));
+		$this->assertEquals('pregunta_frecuente', Inflector::singularize('preguntas_frecuentes'));
+		$this->assertEquals(
+			'categoria_pregunta_frecuente',
+			Inflector::singularize('categorias_preguntas_frecuentes')
+		);
+		$this->assertEquals(
+			'faq_categoria_pregunta_frecuente',
+			Inflector::singularize('faq_categorias_preguntas_frecuentes')
+		);
+	}
+
 /**
  * testInflectingPlurals method
  *
  * @return void
  */
 	public function testInflectingPlurals() {
+		$this->assertEquals(Inflector::pluralize('axman'), 'axmen');
+		$this->assertEquals(Inflector::pluralize('man'), 'men');
+		$this->assertEquals(Inflector::pluralize('woman'), 'women');
+		$this->assertEquals(Inflector::pluralize('human'), 'humans');
 		$this->assertEquals(Inflector::pluralize('categoria'), 'categorias');
 		$this->assertEquals(Inflector::pluralize('house'), 'houses');
 		$this->assertEquals(Inflector::pluralize('powerhouse'), 'powerhouses');
@@ -164,7 +246,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::pluralize('stimulus'), 'stimuli');
 		$this->assertEquals(Inflector::pluralize('syllabus'), 'syllabi');
 		$this->assertEquals(Inflector::pluralize('terminus'), 'termini');
-		$this->assertEquals(Inflector::pluralize('virus'), 'viri');
+		$this->assertEquals(Inflector::pluralize('virus'), 'viruses');
 		$this->assertEquals(Inflector::pluralize('person'), 'people');
 		$this->assertEquals(Inflector::pluralize('people'), 'people');
 		$this->assertEquals(Inflector::pluralize('glove'), 'gloves');
@@ -190,9 +272,68 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals(Inflector::pluralize('curve'), 'curves');
 		$this->assertEquals(Inflector::pluralize('body_curve'), 'body_curves');
 		$this->assertEquals(Inflector::pluralize('metadata'), 'metadata');
+		$this->assertEquals(Inflector::pluralize('files_metadata'), 'files_metadata');
+		$this->assertEquals(Inflector::pluralize('stadia'), 'stadia');
+		$this->assertEquals(Inflector::pluralize('sieve'), 'sieves');
+		$this->assertEquals(Inflector::pluralize('blue_octopus'), 'blue_octopuses');
 		$this->assertEquals(Inflector::pluralize(''), '');
 	}
 
+/**
+ * Test that overlapping irregulars don't collide.
+ *
+ * @return void
+ */
+	public function testPluralizeMultiWordIrregular() {
+		Inflector::rules('plural', array(
+			'irregular' => array(
+				'mytable1' => 'mytables1',
+				'mytable2' => 'mytables2',
+				'mytable1_mytable2' => 'mytables1_mytables2',
+				'pregunta_frecuente' => 'preguntas_frecuentes',
+				'categoria_pregunta_frecuente' => 'categorias_preguntas_frecuentes',
+			)
+		));
+		$this->assertEquals('preguntas_frecuentes', Inflector::pluralize('pregunta_frecuente'));
+		$this->assertEquals(
+			'categorias_preguntas_frecuentes',
+			Inflector::pluralize('categoria_pregunta_frecuente')
+		);
+		$this->assertEquals(
+			'faq_categorias_preguntas_frecuentes',
+			Inflector::pluralize('faq_categoria_pregunta_frecuente')
+		);
+		$this->assertEquals('mytables1', Inflector::pluralize('mytable1'));
+		$this->assertEquals('mytables2', Inflector::pluralize('mytable2'));
+		$this->assertEquals('mytables1_mytables2', Inflector::pluralize('mytable1_mytable2'));
+		$this->assertEquals('mytables1_mytables2', Inflector::tableize('Mytable1Mytable2'));
+	}
+
+/**
+ * testInflectingMultiWordIrregulars
+ *
+ * @return void
+ */
+	public function testInflectingMultiWordIrregulars() {
+		// unset the default rules in order to avoid them possibly matching
+		// the words in case the irregular regex won't match, the tests
+		// should fail in that case
+		Inflector::rules('plural', array(
+			'rules' => array(),
+		));
+		Inflector::rules('singular', array(
+			'rules' => array(),
+		));
+
+		$this->assertEquals(Inflector::singularize('wisdom teeth'), 'wisdom tooth');
+		$this->assertEquals(Inflector::singularize('wisdom-teeth'), 'wisdom-tooth');
+		$this->assertEquals(Inflector::singularize('wisdom_teeth'), 'wisdom_tooth');
+
+		$this->assertEquals(Inflector::pluralize('sweet potato'), 'sweet potatoes');
+		$this->assertEquals(Inflector::pluralize('sweet-potato'), 'sweet-potatoes');
+		$this->assertEquals(Inflector::pluralize('sweet_potato'), 'sweet_potatoes');
+	}
+
 /**
  * testInflectorSlug method
  *
@@ -259,6 +400,20 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEquals('non_breaking_space', $result);
 	}
 
+/**
+ * Test slug() with a complete list of special chars.
+ *
+ * @return void
+ */
+	public function testInflectorSlugCharList() {
+		foreach (static::$maps as $language => $list) {
+			foreach ($list as $from => $to) {
+				$result = Inflector::slug($from);
+				$this->assertEquals($to, $result, $from . ' (' . $language . ') should be ' . $to . ' - but is ' . $result);
+			}
+		}
+	}
+
 /**
  * testInflectorSlugWithMap method
  *
@@ -297,12 +452,14 @@ class InflectorTest extends CakeTestCase {
 		$this->assertSame(Inflector::underscore('testThing'), 'test_thing');
 		$this->assertSame(Inflector::underscore('TestThingExtra'), 'test_thing_extra');
 		$this->assertSame(Inflector::underscore('testThingExtra'), 'test_thing_extra');
+		$this->assertSame(Inflector::underscore('testThingExtrå'), 'test_thing_extrå');
 
 		// Identical checks test the cache code path.
 		$this->assertSame(Inflector::underscore('TestThing'), 'test_thing');
 		$this->assertSame(Inflector::underscore('testThing'), 'test_thing');
 		$this->assertSame(Inflector::underscore('TestThingExtra'), 'test_thing_extra');
 		$this->assertSame(Inflector::underscore('testThingExtra'), 'test_thing_extra');
+		$this->assertSame(Inflector::underscore('testThingExtrå'), 'test_thing_extrå');
 
 		// Test stupid values
 		$this->assertSame(Inflector::underscore(''), '');
@@ -310,6 +467,19 @@ class InflectorTest extends CakeTestCase {
 		$this->assertSame(Inflector::underscore(false), '');
 	}
 
+/**
+ * Test camelize()
+ *
+ * @return void
+ */
+	public function testCamelize() {
+		$this->assertSame('BlogArticles', Inflector::camelize('blog_articles'));
+		$this->assertSame('BlogArticles', Inflector::camelize('blog articles'));
+		$this->assertSame('MyPlugin.MyClass', Inflector::camelize('MyPlugin.MyClass'));
+		$this->assertSame('MyPlugin.MyClass', Inflector::camelize('my_plugin.MyClass'));
+		$this->assertSame('MyPlugin.myClass', Inflector::camelize('MyPlugin.my_class'));
+	}
+
 /**
  * testVariableNaming method
  *
@@ -340,10 +510,10 @@ class InflectorTest extends CakeTestCase {
  * @return void
  */
 	public function testTableNaming() {
-		$this->assertEquals(Inflector::tableize('ArtistsGenre'), 'artists_genres');
-		$this->assertEquals(Inflector::tableize('FileSystem'), 'file_systems');
-		$this->assertEquals(Inflector::tableize('News'), 'news');
-		$this->assertEquals(Inflector::tableize('Bureau'), 'bureaus');
+		$this->assertEquals('artists_genres', Inflector::tableize('ArtistsGenre'));
+		$this->assertEquals('file_systems', Inflector::tableize('FileSystem'));
+		$this->assertEquals('news', Inflector::tableize('News'));
+		$this->assertEquals('bureaus', Inflector::tableize('Bureau'));
 	}
 
 /**
@@ -352,9 +522,12 @@ class InflectorTest extends CakeTestCase {
  * @return void
  */
 	public function testHumanization() {
-		$this->assertEquals(Inflector::humanize('posts'), 'Posts');
-		$this->assertEquals(Inflector::humanize('posts_tags'), 'Posts Tags');
-		$this->assertEquals(Inflector::humanize('file_systems'), 'File Systems');
+		$this->assertEquals('Posts', Inflector::humanize('posts'));
+		$this->assertEquals('Posts Tags', Inflector::humanize('posts_tags'));
+		$this->assertEquals('File Systems', Inflector::humanize('file_systems'));
+		$this->assertEquals('FiLe SysTems', Inflector::humanize('FiLe_SysTems'));
+		$this->assertEquals('Hello Wörld', Inflector::humanize('hello_wörld'));
+		$this->assertEquals('福岡 City', Inflector::humanize('福岡_city'));
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php b/web/api/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
index 5d4d0f30b..7d2eade79 100644
--- a/web/api/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
@@ -27,8 +27,8 @@ class GenericObject {
 /**
  * Constructor
  *
- * @param GenericObjectCollection $collection
- * @param array $settings
+ * @param GenericObjectCollection $collection A collection.
+ * @param array $settings Settings.
  */
 	public function __construct(GenericObjectCollection $collection, $settings = array()) {
 		$this->_Collection = $collection;
@@ -535,6 +535,7 @@ class ObjectCollectionTest extends CakeTestCase {
  * tests that passing an instance of CakeEvent to trigger will prepend the subject to the list of arguments
  *
  * @return void
+ * @triggers callback $subjectClass, array('first argument')
  */
 	public function testDispatchEventWithSubject() {
 		$this->_makeMockClasses();
@@ -560,6 +561,7 @@ class ObjectCollectionTest extends CakeTestCase {
  * will NOT prepend the subject to the list of arguments
  *
  * @return void
+ * @triggers callback $subjectClass, array('first argument')
  */
 	public function testDispatchEventNoSubject() {
 		$this->_makeMockClasses();
@@ -581,4 +583,33 @@ class ObjectCollectionTest extends CakeTestCase {
 		$this->assertTrue($this->Objects->trigger($event));
 	}
 
+/**
+ * test that the various methods ignore plugin prefixes
+ *
+ * plugin prefixes should be removed consistently as load() will
+ * remove them. Furthermore the __get() method does not support
+ * names with '.' in them.
+ *
+ * @return void
+ */
+	public function testPluginPrefixes() {
+		$this->Objects->load('TestPlugin.First');
+		$this->assertTrue($this->Objects->loaded('First'));
+		$this->assertTrue($this->Objects->loaded('TestPlugin.First'));
+
+		$this->assertTrue($this->Objects->enabled('First'));
+		$this->assertTrue($this->Objects->enabled('TestPlugin.First'));
+
+		$this->assertNull($this->Objects->disable('TestPlugin.First'));
+		$this->assertFalse($this->Objects->enabled('First'));
+		$this->assertFalse($this->Objects->enabled('TestPlugin.First'));
+
+		$this->assertNull($this->Objects->enable('TestPlugin.First'));
+		$this->assertTrue($this->Objects->enabled('First'));
+		$this->assertTrue($this->Objects->enabled('TestPlugin.First'));
+		$this->Objects->setPriority('TestPlugin.First', 1000);
+
+		$result = $this->Objects->prioritize();
+		$this->assertEquals(1000, $result['First'][0]);
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Utility/SanitizeTest.php b/web/api/lib/Cake/Test/Case/Utility/SanitizeTest.php
index 9cda8d3af..b6112c124 100644
--- a/web/api/lib/Cake/Test/Case/Utility/SanitizeTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/SanitizeTest.php
@@ -58,7 +58,7 @@ class SanitizeTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -154,7 +154,7 @@ class SanitizeTest extends CakeTestCase {
 		$string = '';
 		$expected = '';
 		$result = Sanitize::clean($string, array('connection' => 'test'));
-		$this->assertEquals($expected, $string);
+		$this->assertEquals($expected, $result);
 
 		$data = array(
 			'Grant' => array(
diff --git a/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php b/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
index d0f6a11af..90ea96c86 100644
--- a/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
@@ -25,7 +25,7 @@ class SecurityTest extends CakeTestCase {
 /**
  * sut property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $sut = null;
 
@@ -114,10 +114,10 @@ class SecurityTest extends CakeTestCase {
 		$key = 'someKey';
 		$hash = 'someHash';
 
-		$this->assertSame(strlen(Security::hash($key, null, false)), 40);
-		$this->assertSame(strlen(Security::hash($key, 'sha1', false)), 40);
-		$this->assertSame(strlen(Security::hash($key, null, true)), 40);
-		$this->assertSame(strlen(Security::hash($key, 'sha1', true)), 40);
+		$this->assertSame(40, strlen(Security::hash($key, null, false)));
+		$this->assertSame(40, strlen(Security::hash($key, 'sha1', false)));
+		$this->assertSame(40, strlen(Security::hash($key, null, true)));
+		$this->assertSame(40, strlen(Security::hash($key, 'sha1', true)));
 
 		$result = Security::hash($key, null, $hash);
 		$this->assertSame($result, 'e38fcb877dccb6a94729a81523851c931a46efb1');
@@ -127,25 +127,25 @@ class SecurityTest extends CakeTestCase {
 
 		$hashType = 'sha1';
 		Security::setHash($hashType);
-		$this->assertSame(Security::$hashType, $hashType);
-		$this->assertSame(strlen(Security::hash($key, null, true)), 40);
-		$this->assertSame(strlen(Security::hash($key, null, false)), 40);
+		$this->assertSame($hashType, Security::$hashType);
+		$this->assertSame(40, strlen(Security::hash($key, null, true)));
+		$this->assertSame(40, strlen(Security::hash($key, null, false)));
 
-		$this->assertSame(strlen(Security::hash($key, 'md5', false)), 32);
-		$this->assertSame(strlen(Security::hash($key, 'md5', true)), 32);
+		$this->assertSame(32, strlen(Security::hash($key, 'md5', false)));
+		$this->assertSame(32, strlen(Security::hash($key, 'md5', true)));
 
 		$hashType = 'md5';
 		Security::setHash($hashType);
-		$this->assertSame(Security::$hashType, $hashType);
-		$this->assertSame(strlen(Security::hash($key, null, false)), 32);
-		$this->assertSame(strlen(Security::hash($key, null, true)), 32);
+		$this->assertSame($hashType, Security::$hashType);
+		$this->assertSame(32, strlen(Security::hash($key, null, false)));
+		$this->assertSame(32, strlen(Security::hash($key, null, true)));
 
 		if (!function_exists('hash') && !function_exists('mhash')) {
-			$this->assertSame(strlen(Security::hash($key, 'sha256', false)), 32);
-			$this->assertSame(strlen(Security::hash($key, 'sha256', true)), 32);
+			$this->assertSame(32, strlen(Security::hash($key, 'sha256', false)));
+			$this->assertSame(32, strlen(Security::hash($key, 'sha256', true)));
 		} else {
-			$this->assertSame(strlen(Security::hash($key, 'sha256', false)), 64);
-			$this->assertSame(strlen(Security::hash($key, 'sha256', true)), 64);
+			$this->assertSame(64, strlen(Security::hash($key, 'sha256', false)));
+			$this->assertSame(64, strlen(Security::hash($key, 'sha256', true)));
 		}
 
 		Security::setHash($_hashType);
@@ -167,8 +167,8 @@ class SecurityTest extends CakeTestCase {
 		$hashType = 'blowfish';
 		Security::setHash($hashType);
 
-		$this->assertSame(Security::$hashType, $hashType);
-		$this->assertSame(strlen(Security::hash($key, null, false)), 60);
+		$this->assertSame($hashType, Security::$hashType);
+		$this->assertSame(60, strlen(Security::hash($key, null, false)));
 
 		$password = $submittedPassword = $key;
 		$storedPassword = Security::hash($password);
@@ -324,7 +324,7 @@ class SecurityTest extends CakeTestCase {
 	public function testDecryptKeyFailure() {
 		$txt = 'The quick brown fox';
 		$key = 'This key is longer than 32 bytes long.';
-		$result = Security::encrypt($txt, $key);
+		Security::encrypt($txt, $key);
 
 		$key = 'Not the same key. This one will fail';
 		$this->assertFalse(Security::decrypt($txt, $key), 'Modified key will fail.');
diff --git a/web/api/lib/Cake/Test/Case/Utility/SetTest.php b/web/api/lib/Cake/Test/Case/Utility/SetTest.php
index f55afd106..6097191db 100644
--- a/web/api/lib/Cake/Test/Case/Utility/SetTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/SetTest.php
@@ -2763,7 +2763,6 @@ class SetTest extends CakeTestCase {
 /**
  * testSetApply method
  * @return void
- *
  */
 	public function testApply() {
 		$data = array(
diff --git a/web/api/lib/Cake/Test/Case/Utility/ValidationTest.php b/web/api/lib/Cake/Test/Case/Utility/ValidationTest.php
index 245217d2a..8b326f166 100644
--- a/web/api/lib/Cake/Test/Case/Utility/ValidationTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/ValidationTest.php
@@ -28,8 +28,8 @@ class CustomValidator {
 /**
  * Makes sure that a given $email address is valid and unique
  *
- * @param string $email
- * @return boolean
+ * @param string $check Email to check.
+ * @return bool
  */
 	public static function customValidate($check) {
 		return (bool)preg_match('/^[0-9]{3}$/', $check);
@@ -124,37 +124,37 @@ class ValidationTest extends CakeTestCase {
 	}
 
 /**
- * testNotEmpty method
+ * Test notBlank method
  *
  * @return void
  */
-	public function testNotEmpty() {
-		$this->assertTrue(Validation::notEmpty('abcdefg'));
-		$this->assertTrue(Validation::notEmpty('fasdf '));
-		$this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
-		$this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
-		$this->assertTrue(Validation::notEmpty('José'));
-		$this->assertTrue(Validation::notEmpty('é'));
-		$this->assertTrue(Validation::notEmpty('π'));
-		$this->assertFalse(Validation::notEmpty("\t "));
-		$this->assertFalse(Validation::notEmpty(""));
+	public function testNotBlank() {
+		$this->assertTrue(Validation::notBlank('abcdefg'));
+		$this->assertTrue(Validation::notBlank('fasdf '));
+		$this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla'));
+		$this->assertTrue(Validation::notBlank('abçďĕʑʘπй'));
+		$this->assertTrue(Validation::notBlank('José'));
+		$this->assertTrue(Validation::notBlank('é'));
+		$this->assertTrue(Validation::notBlank('π'));
+		$this->assertFalse(Validation::notBlank("\t "));
+		$this->assertFalse(Validation::notBlank(""));
 	}
 
 /**
- * testNotEmptyISO88591Encoding method
+ * Test notBlank method with ISO88591 encoding
  *
  * @return void
  */
-	public function testNotEmptyISO88591AppEncoding() {
+	public function testNotBlankISO88591AppEncoding() {
 		Configure::write('App.encoding', 'ISO-8859-1');
-		$this->assertTrue(Validation::notEmpty('abcdefg'));
-		$this->assertTrue(Validation::notEmpty('fasdf '));
-		$this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
-		$this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
-		$this->assertTrue(Validation::notEmpty('José'));
-		$this->assertTrue(Validation::notEmpty(utf8_decode('José')));
-		$this->assertFalse(Validation::notEmpty("\t "));
-		$this->assertFalse(Validation::notEmpty(""));
+		$this->assertTrue(Validation::notBlank('abcdefg'));
+		$this->assertTrue(Validation::notBlank('fasdf '));
+		$this->assertTrue(Validation::notBlank('fooo' . chr(243) . 'blabla'));
+		$this->assertTrue(Validation::notBlank('abçďĕʑʘπй'));
+		$this->assertTrue(Validation::notBlank('José'));
+		$this->assertTrue(Validation::notBlank(utf8_decode('José')));
+		$this->assertFalse(Validation::notBlank("\t "));
+		$this->assertFalse(Validation::notBlank(""));
 	}
 
 /**
@@ -184,36 +184,17 @@ class ValidationTest extends CakeTestCase {
 	}
 
 /**
- * testAlphaNumericPassedAsArray method
+ * testLengthBetween method
  *
  * @return void
  */
-	public function testAlphaNumericPassedAsArray() {
-		$this->assertTrue(Validation::alphaNumeric(array('check' => 'frferrf')));
-		$this->assertTrue(Validation::alphaNumeric(array('check' => '12234')));
-		$this->assertTrue(Validation::alphaNumeric(array('check' => '1w2e2r3t4y')));
-		$this->assertTrue(Validation::alphaNumeric(array('check' => '0')));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => '12 234')));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => 'dfd 234')));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => "\n")));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => "\t")));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => "\r")));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => ' ')));
-		$this->assertFalse(Validation::alphaNumeric(array('check' => '')));
-	}
+	public function testLengthBetween() {
+		$this->assertTrue(Validation::lengthBetween('abcdefg', 1, 7));
+		$this->assertTrue(Validation::lengthBetween('', 0, 7));
+		$this->assertTrue(Validation::lengthBetween('אกあアꀀ豈', 1, 7));
 
-/**
- * testBetween method
- *
- * @return void
- */
-	public function testBetween() {
-		$this->assertTrue(Validation::between('abcdefg', 1, 7));
-		$this->assertTrue(Validation::between('', 0, 7));
-		$this->assertTrue(Validation::between('אกあアꀀ豈', 1, 7));
-
-		$this->assertFalse(Validation::between('abcdefg', 1, 6));
-		$this->assertFalse(Validation::between('ÆΔΩЖÇ', 1, 3));
+		$this->assertFalse(Validation::lengthBetween('abcdefg', 1, 6));
+		$this->assertFalse(Validation::lengthBetween('ÆΔΩЖÇ', 1, 3));
 	}
 
 /**
@@ -231,21 +212,6 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::blank('Blank'));
 	}
 
-/**
- * testBlankAsArray method
- *
- * @return void
- */
-	public function testBlankAsArray() {
-		$this->assertTrue(Validation::blank(array('check' => '')));
-		$this->assertTrue(Validation::blank(array('check' => ' ')));
-		$this->assertTrue(Validation::blank(array('check' => "\n")));
-		$this->assertTrue(Validation::blank(array('check' => "\t")));
-		$this->assertTrue(Validation::blank(array('check' => "\r")));
-		$this->assertFalse(Validation::blank(array('check' => '    Blank')));
-		$this->assertFalse(Validation::blank(array('check' => 'Blank')));
-	}
-
 /**
  * testcc method
  *
@@ -930,42 +896,25 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::comparison(7, '==', 6));
 		$this->assertFalse(Validation::comparison(7, 'not equal', 7));
 		$this->assertFalse(Validation::comparison(7, '!=', 7));
+
+		$this->assertTrue(Validation::comparison('6.5', '!=', 6));
+		$this->assertTrue(Validation::comparison('6.5', '<', 7));
 	}
 
 /**
- * testComparisonAsArray method
+ * Test comparison casting values before comparisons.
  *
  * @return void
  */
-	public function testComparisonAsArray() {
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'is greater', 'check2' => 6)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>', 'check2' => 6)));
-		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'is less', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 6)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6)));
-		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '==', 'check2' => 7)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 6)));
-		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'is greater', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'is less', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '==', 'check2' => 6)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
-		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
+	public function testComparisonTypeChecks() {
+		$this->assertFalse(Validation::comparison('\x028', '>=', 1), 'hexish encoding fails');
+		$this->assertFalse(Validation::comparison('0b010', '>=', 1), 'binary string data fails');
+		$this->assertFalse(Validation::comparison('0x01', '>=', 1), 'hex string data fails');
+		$this->assertFalse(Validation::comparison('0x1', '>=', 1), 'hex string data fails');
+
+		$this->assertFalse(Validation::comparison('\x028', '>=', 1.5), 'hexish encoding fails');
+		$this->assertFalse(Validation::comparison('0b010', '>=', 1.5), 'binary string data fails');
+		$this->assertFalse(Validation::comparison('0x02', '>=', 1.5), 'hex string data fails');
 	}
 
 /**
@@ -980,17 +929,6 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::custom('missing regex'));
 	}
 
-/**
- * testCustomAsArray method
- *
- * @return void
- */
-	public function testCustomAsArray() {
-		$this->assertTrue(Validation::custom(array('check' => '12345', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
-		$this->assertFalse(Validation::custom(array('check' => 'Text', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
-		$this->assertFalse(Validation::custom(array('check' => '123.45', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
-	}
-
 /**
  * testDateDdmmyyyy method
  *
@@ -1462,10 +1400,11 @@ class ValidationTest extends CakeTestCase {
 		$this->assertTrue(Validation::date('2008', array('y')));
 		$this->assertTrue(Validation::date('2013', array('y')));
 		$this->assertTrue(Validation::date('2104', array('y')));
+		$this->assertTrue(Validation::date('1899', array('y')));
 		$this->assertFalse(Validation::date('20009', array('y')));
 		$this->assertFalse(Validation::date(' 2012', array('y')));
 		$this->assertFalse(Validation::date('3000', array('y')));
-		$this->assertFalse(Validation::date('1899', array('y')));
+		$this->assertFalse(Validation::date('1799', array('y')));
 	}
 
 /**
@@ -1662,7 +1601,7 @@ class ValidationTest extends CakeTestCase {
 	public function testDecimalLocaleSet() {
 		$this->skipIf(DS === '\\', 'The locale is not supported in Windows and affects other tests.');
 		$restore = setlocale(LC_NUMERIC, 0);
-		$this->skipIf(setlocale(LC_NUMERIC, 'de_DE') === false, "The German locale isn't available.");
+		$this->skipIf(setlocale(LC_NUMERIC, 'da_DK') === false, "The Danish locale isn't available.");
 
 		$this->assertTrue(Validation::decimal(1.54), '1.54 should be considered a valid float');
 		$this->assertTrue(Validation::decimal('1.54'), '"1.54" should be considered a valid float');
@@ -1766,7 +1705,6 @@ class ValidationTest extends CakeTestCase {
 
 		$this->assertTrue(Validation::email('abc.efg@cakephp.org', true));
 		$this->assertFalse(Validation::email('abc.efg@caphpkeinvalid.com', true));
-		$this->assertFalse(Validation::email('abc@example.abcd', true));
 	}
 
 /**
@@ -1979,6 +1917,10 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::inList(2, array('1', '2x', '3')));
 		$this->assertFalse(Validation::inList('One', array('one', 'two')));
 
+		// No hexadecimal for numbers.
+		$this->assertFalse(Validation::inList('0x7B', array('ABC', '123')));
+		$this->assertFalse(Validation::inList('0x7B', array('ABC', 123)));
+
 		// case insensitive
 		$this->assertTrue(Validation::inList('one', array('One', 'Two'), true));
 		$this->assertTrue(Validation::inList('Two', array('one', 'two'), true));
@@ -2000,6 +1942,22 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::range('word'));
 	}
 
+/**
+ * Test range type checks
+ *
+ * @return void
+ */
+	public function testRangeTypeChecks() {
+		$this->assertFalse(Validation::range('\x028', 1, 5), 'hexish encoding fails');
+		$this->assertFalse(Validation::range('0b010', 1, 5), 'binary string data fails');
+		$this->assertFalse(Validation::range('0x01', 1, 5), 'hex string data fails');
+		$this->assertFalse(Validation::range('0x1', 1, 5), 'hex string data fails');
+
+		$this->assertFalse(Validation::range('\x028', 1, 5), 'hexish encoding fails');
+		$this->assertFalse(Validation::range('0b010', 1, 5), 'binary string data fails');
+		$this->assertFalse(Validation::range('0x02', 1, 5), 'hex string data fails');
+	}
+
 /**
  * testExtension method
  *
@@ -2081,8 +2039,9 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::multiple(''));
 		$this->assertFalse(Validation::multiple(null));
 		$this->assertFalse(Validation::multiple(array()));
-		$this->assertFalse(Validation::multiple(array(0)));
-		$this->assertFalse(Validation::multiple(array('0')));
+		$this->assertTrue(Validation::multiple(array(0)));
+		$this->assertTrue(Validation::multiple(array('0')));
+		$this->assertFalse(Validation::multiple(array('')));
 
 		$this->assertTrue(Validation::multiple(array(0, 3, 4, 5), array('in' => range(0, 10))));
 		$this->assertFalse(Validation::multiple(array(0, 15, 20, 5), array('in' => range(0, 10))));
@@ -2090,8 +2049,9 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::multiple(array('boo', 'foo', 'bar'), array('in' => array('foo', 'bar', 'baz'))));
 		$this->assertFalse(Validation::multiple(array('foo', '1bar'), array('in' => range(0, 10))));
 
-		$this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('max' => 3)));
-		$this->assertFalse(Validation::multiple(array(0, 5, 10, 11, 55), array('max' => 3)));
+		$this->assertFalse(Validation::multiple(array(1, 5, 10, 11), array('max' => 3)));
+		$this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('max' => 4)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 10, 11, 55), array('max' => 4)));
 		$this->assertTrue(Validation::multiple(array('foo', 'bar', 'baz'), array('max' => 3)));
 		$this->assertFalse(Validation::multiple(array('foo', 'bar', 'baz', 'squirrel'), array('max' => 3)));
 
@@ -2106,8 +2066,8 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5)));
 		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5)));
 
-		$this->assertFalse(Validation::multiple(array(0, 5, 9), array('in' => range(0, 10), 'max' => 5, 'min' => 3)));
-		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
+		$this->assertFalse(Validation::multiple(array(-1, 5, 9), array('in' => range(0, 10), 'max' => 5, 'min' => 3)));
+		$this->assertFalse(Validation::multiple(array(-1, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
 		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
 
 		$this->assertFalse(Validation::multiple(array('2x', '3x'), array('in' => array(1, 2, 3, 4, 5))));
@@ -2413,6 +2373,12 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::uploadError(2));
 		$this->assertFalse(Validation::uploadError(array('error' => 2)));
 		$this->assertFalse(Validation::uploadError(array('error' => '2')));
+
+		$this->assertFalse(Validation::uploadError(UPLOAD_ERR_NO_FILE));
+		$this->assertFalse(Validation::uploadError(UPLOAD_ERR_FORM_SIZE, true));
+		$this->assertFalse(Validation::uploadError(UPLOAD_ERR_INI_SIZE, true));
+		$this->assertFalse(Validation::uploadError(UPLOAD_ERR_NO_TMP_DIR, true));
+		$this->assertTrue(Validation::uploadError(UPLOAD_ERR_NO_FILE, true));
 	}
 
 /**
@@ -2433,4 +2399,110 @@ class ValidationTest extends CakeTestCase {
 		$this->assertFalse(Validation::fileSize(array('tmp_name' => $image), '>', '1KB'));
 	}
 
+/**
+ * Test uploaded file validation.
+ *
+ * @return void
+ */
+	public function testUploadedFileErrorCode() {
+		$this->assertFalse(Validation::uploadedFile('derp'));
+		$invalid = array(
+			'name' => 'testing'
+		);
+		$this->assertFalse(Validation::uploadedFile($invalid));
+		$file = array(
+			'name' => 'cake.power.gif',
+			'tmp_name' => CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot/img/cake.power.gif',
+			'error' => UPLOAD_ERR_OK,
+			'type' => 'image/gif',
+			'size' => 201
+		);
+		$this->assertTrue(Validation::uploadedFile($file));
+		$file['error'] = UPLOAD_ERR_NO_FILE;
+		$this->assertFalse(Validation::uploadedFile($file), 'Error upload should fail.');
+	}
+
+/**
+ * Test uploaded file validation.
+ *
+ * @return void
+ */
+	public function testUploadedFileMimeType() {
+		$file = array(
+			'name' => 'cake.power.gif',
+			'tmp_name' => CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot/img/cake.power.gif',
+			'error' => UPLOAD_ERR_OK,
+			'type' => 'text/plain',
+			'size' => 201
+		);
+		$options = array(
+			'types' => array('text/plain')
+		);
+		$this->assertFalse(Validation::uploadedFile($file, $options), 'Incorrect mimetype.');
+		$options = array(
+			'types' => array('image/gif', 'image/png')
+		);
+		$this->assertTrue(Validation::uploadedFile($file, $options));
+	}
+
+/**
+ * Test uploaded file validation.
+ *
+ * @return void
+ */
+	public function testUploadedFileSize() {
+		$file = array(
+			'name' => 'cake.power.gif',
+			'tmp_name' => CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot/img/cake.power.gif',
+			'error' => UPLOAD_ERR_OK,
+			'type' => 'text/plain',
+			'size' => 201
+		);
+		$options = array(
+			'minSize' => 500
+		);
+		$this->assertFalse(Validation::uploadedFile($file, $options), 'Too small');
+		$options = array(
+			'maxSize' => 100
+		);
+		$this->assertFalse(Validation::uploadedFile($file, $options), 'Too big');
+		$options = array(
+			'minSize' => 100,
+		);
+		$this->assertTrue(Validation::uploadedFile($file, $options));
+		$options = array(
+			'maxSize' => 500,
+		);
+		$this->assertTrue(Validation::uploadedFile($file, $options));
+		$options = array(
+			'minSize' => 100,
+			'maxSize' => 500
+		);
+		$this->assertTrue(Validation::uploadedFile($file, $options));
+	}
+
+/**
+ * Test uploaded file validation.
+ *
+ * @return void
+ */
+	public function testUploadedFileNoFile() {
+		$file = array(
+			'name' => '',
+			'tmp_name' => CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot/img/cake.power.gif',
+			'error' => UPLOAD_ERR_NO_FILE,
+			'type' => '',
+			'size' => 0
+		);
+		$options = array(
+			'optional' => true,
+			'minSize' => 500,
+			'types' => array('image/gif', 'image/png')
+		);
+		$this->assertTrue(Validation::uploadedFile($file, $options), 'No file should be ok.');
+		$options = array(
+			'optional' => false
+		);
+		$this->assertFalse(Validation::uploadedFile($file, $options), 'File is required.');
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Utility/XmlTest.php b/web/api/lib/Cake/Test/Case/Utility/XmlTest.php
index 767e125e1..5cb62d0f8 100644
--- a/web/api/lib/Cake/Test/Case/Utility/XmlTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -82,7 +82,7 @@ class XmlTest extends CakeTestCase {
 /**
  * autoFixtures property
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -167,6 +167,28 @@ class XmlTest extends CakeTestCase {
 		$this->assertNotRegExp('/encoding/', $obj->saveXML());
 	}
 
+/**
+ * Test that the readFile option disables local file parsing.
+ *
+ * @expectedException XmlException
+ * @return void
+ */
+	public function testBuildFromFileWhenDisabled() {
+		$xml = CAKE . 'Test' . DS . 'Fixture' . DS . 'sample.xml';
+		Xml::build($xml, array('readFile' => false));
+	}
+
+/**
+ * Test that the readFile option disables local file parsing.
+ *
+ * @expectedException XmlException
+ * @return void
+ */
+	public function testBuildFromUrlWhenDisabled() {
+		$xml = 'http://www.google.com';
+		Xml::build($xml, array('readFile' => false));
+	}
+
 /**
  * data provider function for testBuildInvalidData
  *
@@ -200,7 +222,7 @@ class XmlTest extends CakeTestCase {
  */
 	public function testBuildInvalidDataSimpleXml() {
 		$input = '<derp';
-		$xml = Xml::build($input, array('return' => 'simplexml'));
+		Xml::build($input, array('return' => 'simplexml'));
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
new file mode 100644
index 000000000..b3d1d7440
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * FlashHelperTest file
+ *
+ * Series of tests for flash helper.
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+ * @package       Cake.Test.Case.View.Helper
+ * @since         CakePHP(tm) v 2.7.0-dev
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('FlashHelper', 'View/Helper');
+App::uses('View', 'View');
+App::uses('CakePlugin', 'Core');
+
+/**
+ * FlashHelperTest class
+ *
+ * @package		Cake.Test.Case.View.Helper
+ */
+class FlashHelperTest extends CakeTestCase {
+
+/**
+ * setupBeforeClass method
+ *
+ * @return void
+ */
+	public static function setupBeforeClass() {
+		App::build(array(
+			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+		));
+	}
+
+/**
+ * setUp method
+ *
+ * @return void
+ */
+	public function setUp() {
+		parent::setUp();
+		$controller = null;
+		$this->View = new View($controller);
+		$this->Flash = new FlashHelper($this->View);
+
+		if (!CakeSession::started()) {
+			CakeSession::start();
+		}
+		CakeSession::write(array(
+			'Message' => array(
+				'flash' => array(
+					'key' => 'flash',
+					'message' => 'This is a calling',
+					'element' => 'Flash/default',
+					'params' => array()
+				),
+				'notification' => array(
+					'key' => 'notification',
+					'message' => 'Broadcast message testing',
+					'element' => 'flash_helper',
+					'params' => array(
+						'title' => 'Notice!',
+						'name' => 'Alert!'
+					)
+				),
+				'classy' => array(
+					'key' => 'classy',
+					'message' => 'Recorded',
+					'element' => 'flash_classy',
+					'params' => array()
+				)
+			)
+		));
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		unset($this->View, $this->Flash);
+		CakeSession::destroy();
+	}
+
+/**
+ * testFlash method
+ *
+ * @return void
+ */
+	public function testFlash() {
+		$result = $this->Flash->render();
+		$expected = '<div class="message">This is a calling</div>';
+		$this->assertContains($expected, $result);
+
+		$expected = '<div id="classy-message">Recorded</div>';
+		$result = $this->Flash->render('classy');
+		$this->assertContains($expected, $result);
+
+		$result = $this->Flash->render('notification');
+		$expected = "<div id=\"notificationLayout\">\n\t<h1>Alert!</h1>\n\t<h3>Notice!</h3>\n\t<p>Broadcast message testing</p>\n</div>";
+		$this->assertContains($expected, $result);
+
+		$this->assertNull($this->Flash->render('non-existent'));
+	}
+
+/**
+ * testFlashThrowsException
+ *
+ * @expectedException UnexpectedValueException
+ */
+	public function testFlashThrowsException() {
+		CakeSession::write('Message.foo', 'bar');
+		$this->Flash->render('foo');
+	}
+
+/**
+ * test setting the element from the attrs.
+ *
+ * @return void
+ */
+	public function testFlashElementInAttrs() {
+		$result = $this->Flash->render('notification', array(
+			'element' => 'flash_helper',
+			'params' => array('title' => 'Alert!', 'name' => 'Notice!')
+		));
+
+		$expected = "<div id=\"notificationLayout\">\n\t<h1>Notice!</h1>\n\t<h3>Alert!</h3>\n\t<p>Broadcast message testing</p>\n</div>";
+
+		$this->assertContains($expected, $result);
+	}
+
+/**
+ * test using elements in plugins.
+ *
+ * @return void
+ */
+	public function testFlashWithPluginElement() {
+		App::build(array(
+			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+		));
+		CakePlugin::load('TestPlugin');
+
+		$result = $this->Flash->render('flash', array('element' => 'TestPlugin.plugin_element'));
+		$expected = 'this is the plugin element';
+		$this->assertContains($expected, $result);
+	}
+}
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
old mode 100755
new mode 100644
index a5ff2df54..79fd6118d
--- a/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -36,7 +36,7 @@ class ContactTestController extends Controller {
 /**
  * uses property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $uses = null;
 }
@@ -51,7 +51,7 @@ class Contact extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -81,15 +81,15 @@ class Contact extends CakeTestModel {
 		'non_existing' => array(),
 		'idontexist' => array(),
 		'imrequired' => array('rule' => array('between', 5, 30), 'allowEmpty' => false),
-		'imrequiredonupdate' => array('notEmpty' => array('rule' => 'alphaNumeric', 'on' => 'update')),
+		'imrequiredonupdate' => array('notBlank' => array('rule' => 'alphaNumeric', 'on' => 'update')),
 		'imrequiredoncreate' => array('required' => array('rule' => 'alphaNumeric', 'on' => 'create')),
 		'imrequiredonboth' => array(
 			'required' => array('rule' => 'alphaNumeric'),
 		),
-		'string_required' => 'notEmpty',
+		'string_required' => 'notBlank',
 		'imalsorequired' => array('rule' => 'alphaNumeric', 'allowEmpty' => false),
-		'imrequiredtoo' => array('rule' => 'notEmpty'),
-		'required_one' => array('required' => array('rule' => array('notEmpty'))),
+		'imrequiredtoo' => array('rule' => 'notBlank'),
+		'required_one' => array('required' => array('rule' => array('notBlank'))),
 		'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric', 'allowEmpty' => true),
 		'imalsonotrequired' => array(
 			'alpha' => array('rule' => 'alphaNumeric', 'allowEmpty' => true),
@@ -142,7 +142,7 @@ class ContactTagsContact extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -207,7 +207,7 @@ class ContactTag extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -234,7 +234,7 @@ class UserForm extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -274,7 +274,7 @@ class OpenidUrl extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -329,7 +329,7 @@ class ValidateUser extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -353,6 +353,7 @@ class ValidateUser extends CakeTestModel {
 		'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
 		'balance' => array('type' => 'float', 'null' => false, 'length' => '5,2'),
 		'cost_decimal' => array('type' => 'decimal', 'null' => false, 'length' => '6,3'),
+		'null_decimal' => array('type' => 'decimal', 'null' => false, 'length' => null),
 		'ratio' => array('type' => 'decimal', 'null' => false, 'length' => '10,6'),
 		'population' => array('type' => 'decimal', 'null' => false, 'length' => '15,0'),
 		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
@@ -381,7 +382,7 @@ class ValidateProfile extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -440,7 +441,7 @@ class ValidateItem extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -489,7 +490,7 @@ class TestMail extends CakeTestModel {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -513,7 +514,7 @@ class FormHelperTest extends CakeTestCase {
 /**
  * Do not load the fixtures by default
  *
- * @var boolean
+ * @var bool
  */
 	public $autoFixtures = false;
 
@@ -763,6 +764,31 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Tests correct generation of decimal fields as text inputs
+ *
+ * @return void
+ */
+	public function testTextFieldGenerationForDecimalAsText() {
+		$this->Form->create('ValidateUser');
+		$result = $this->Form->input('cost_decimal', array(
+			'type' => 'text'
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ValidateUserCostDecimal'),
+			'Cost Decimal',
+			'/label',
+			array('input' => array(
+				'type' => 'text',
+				'name' => 'data[ValidateUser][cost_decimal]',
+				'id' => 'ValidateUserCostDecimal',
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Tests correct generation of number fields for integer fields
  *
@@ -1009,7 +1035,7 @@ class FormHelperTest extends CakeTestCase {
 
 		$result = $this->Form->secure($this->Form->fields);
 
-		$hash = 'c9118120e680a7201b543f562e5301006ccfcbe2%3AAddresses.0.id%7CAddresses.1.id';
+		$hash = 'a3b9b2ba1cb688838f92818a5970e17dd7943a78%3AAddresses.0.id%7CAddresses.1.id';
 
 		$expected = array(
 			'div' => array('style' => 'display:none;'),
@@ -1074,7 +1100,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->Form->input('Addresses.1.phone');
 
 		$result = $this->Form->secure($this->Form->fields);
-		$hash = '629b6536dcece48aa41a117045628ce602ccbbb2%3AAddresses.0.id%7CAddresses.1.id';
+		$hash = '5c9cadf9da008cc444d3960b481391a425a5d979%3AAddresses.0.id%7CAddresses.1.id';
 
 		$expected = array(
 			'div' => array('style' => 'display:none;'),
@@ -1124,7 +1150,7 @@ class FormHelperTest extends CakeTestCase {
 
 		$result = $this->Form->secure($expected);
 
-		$hash = '2981c38990f3f6ba935e6561dc77277966fabd6d%3AAddresses.id';
+		$hash = '40289bd07811587887ff56585a8526ff9da59d7a%3AAddresses.id';
 		$expected = array(
 			'div' => array('style' => 'display:none;'),
 			array('input' => array(
@@ -1247,7 +1273,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertEquals($expected, $result);
 
-		$hash = 'bd7c4a654e5361f9a433a43f488ff9a1065d0aaf%3AUserForm.hidden%7CUserForm.stuff';
+		$hash = '6014b4e1c4f39eb62389712111dbe6435bec66cb%3AUserForm.hidden%7CUserForm.stuff';
 
 		$result = $this->Form->secure($this->Form->fields);
 		$expected = array(
@@ -1265,6 +1291,30 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test that a hidden field followed by a visible field
+ * undoes the hidden field locking.
+ *
+ * @return void
+ */
+	public function testSecuredInputDuplicate() {
+		$this->Form->request['_Token'] = array('key' => 'testKey');
+		$this->assertEquals(array(), $this->Form->fields);
+
+		$this->Form->input('text_val', array(
+			'type' => 'hidden',
+			'value' => 'some text',
+		));
+		$expected = array('text_val' => 'some text');
+		$this->assertEquals($expected, $this->Form->fields);
+
+		$this->Form->input('text_val', array(
+			'type' => 'text',
+		));
+		$expected = array('text_val');
+		$this->assertEquals($expected, $this->Form->fields);
+	}
+
 /**
  * Test secured inputs with custom names.
  *
@@ -1294,7 +1344,7 @@ class FormHelperTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testFormSecuredFileInput() {
+	public function testSecuredFileInput() {
 		$this->Form->request['_Token'] = array('key' => 'testKey');
 		$this->assertEquals(array(), $this->Form->fields);
 
@@ -1311,7 +1361,7 @@ class FormHelperTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testFormSecuredMultipleSelect() {
+	public function testSecuredMultipleSelect() {
 		$this->Form->request['_Token'] = array('key' => 'testKey');
 		$this->assertEquals(array(), $this->Form->fields);
 		$options = array('1' => 'one', '2' => 'two');
@@ -1330,7 +1380,7 @@ class FormHelperTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testFormSecuredRadio() {
+	public function testSecuredRadio() {
 		$this->Form->request['_Token'] = array('key' => 'testKey');
 		$this->assertEquals(array(), $this->Form->fields);
 		$options = array('1' => 'option1', '2' => 'option2');
@@ -1338,6 +1388,18 @@ class FormHelperTest extends CakeTestCase {
 		$this->Form->radio('Test.test', $options);
 		$expected = array('Test.test');
 		$this->assertEquals($expected, $this->Form->fields);
+
+		$this->Form->radio('Test.all', $options, array(
+			'disabled' => array('option1', 'option2')
+		));
+		$expected = array('Test.test', 'Test.all' => '');
+		$this->assertEquals($expected, $this->Form->fields);
+
+		$this->Form->radio('Test.some', $options, array(
+			'disabled' => array('option1')
+		));
+		$expected = array('Test.test', 'Test.all' => '', 'Test.some');
+		$this->assertEquals($expected, $this->Form->fields);
 	}
 
 /**
@@ -1345,7 +1407,7 @@ class FormHelperTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testFormSecuredAndDisabledNotAssoc() {
+	public function testSecuredAndDisabledNotAssoc() {
 		$this->Form->request['_Token'] = array('key' => 'testKey');
 
 		$this->Form->select('Model.select', array(1, 2), array('disabled'));
@@ -1367,14 +1429,16 @@ class FormHelperTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testFormSecuredAndDisabled() {
+	public function testSecuredAndDisabled() {
 		$this->Form->request['_Token'] = array('key' => 'testKey');
 
 		$this->Form->checkbox('Model.checkbox', array('disabled' => true));
 		$this->Form->text('Model.text', array('disabled' => true));
-		$this->Form->password('Model.text', array('disabled' => true));
+		$this->Form->text('Model.text2', array('disabled' => 'disabled'));
+		$this->Form->password('Model.password', array('disabled' => true));
 		$this->Form->textarea('Model.textarea', array('disabled' => true));
 		$this->Form->select('Model.select', array(1, 2), array('disabled' => true));
+		$this->Form->select('Model.select', array(1, 2), array('disabled' => array(1, 2)));
 		$this->Form->radio('Model.radio', array(1, 2), array('disabled' => array(1, 2)));
 		$this->Form->year('Model.year', null, null, array('disabled' => true));
 		$this->Form->month('Model.month', array('disabled' => true));
@@ -1389,6 +1453,83 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertEquals($expected, $this->Form->fields);
 	}
 
+/**
+ * Test that only the path + query elements of a form's URL show up in their hash.
+ *
+ * @return void
+ */
+	public function testSecuredFormUrlIgnoresHost() {
+		$this->Form->request['_Token'] = array('key' => 'testKey');
+
+		$expected = '0ff0c85cd70584d8fd18fa136846d22c66c21e2d%3A';
+		$this->Form->create('Address', array(
+			'url' => array('controller' => 'articles', 'action' => 'view', 1, '?' => array('page' => 1))
+		));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result);
+
+		$this->Form->create('Address', array('url' => 'http://localhost/articles/view/1?page=1'));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result, 'Full URL should only use path and query.');
+
+		$this->Form->create('Address', array('url' => '/articles/view/1?page=1'));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result, 'URL path + query should work.');
+
+		$this->Form->create('Address', array('url' => '/articles/view/1'));
+		$result = $this->Form->secure();
+		$this->assertNotContains($expected, $result, 'URL is different');
+	}
+
+/**
+ * Ensure named parameters work correctly with hash generation.
+ *
+ * @return void
+ */
+	public function testSecuredFormUrlWorksWithNamedParameter() {
+		$this->Form->request['_Token'] = array('key' => 'testKey');
+
+		$expected = 'c890c5f041b1d83d1610dee8f52cd257df7ce618%3A';
+		$this->Form->create('Address', array(
+			'url' => array('controller' => 'articles', 'action' => 'view', 1, 'type' => 'red')
+		));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result);
+	}
+
+/**
+ * Test that URL, HTML and identifier show up in their hashs.
+ *
+ * @return void
+ */
+	public function testSecuredFormUrlHasHtmlAndIdentifier() {
+		$this->Form->request['_Token'] = array('key' => 'testKey');
+
+		$expected = 'ece0693fb1b19ca116133db1832ac29baaf41ce5%3A';
+		$this->Form->create('Address', array(
+			'url' => array(
+				'controller' => 'articles',
+				'action' => 'view',
+				'?' => array(
+					'page' => 1,
+					'limit' => 10,
+					'html' => '<>"',
+				),
+				'#' => 'result',
+			),
+		));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result);
+
+		$this->Form->create('Address', array('url' => 'http://localhost/articles/view?page=1&limit=10&html=%3C%3E%22#result'));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result, 'Full URL should only use path and query.');
+
+		$this->Form->create('Address', array('url' => '/articles/view?page=1&limit=10&html=%3C%3E%22#result'));
+		$result = $this->Form->secure();
+		$this->assertContains($expected, $result, 'URL path + query should work.');
+	}
+
 /**
  * testDisableSecurityUsingForm method
  *
@@ -1639,11 +1780,13 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertFalse(empty($result));
 		$this->assertFalse($this->UserForm->OpenidUrl->validates());
 
-		$result = $this->Form->create('UserForm', array('type' => 'post', 'action' => 'login'));
+		$result = $this->Form->create('UserForm', array('type' => 'post', 'url' => array('action' => 'login')));
 		$encoding = strtolower(Configure::read('App.encoding'));
 		$expected = array(
 			'form' => array(
-				'method' => 'post', 'action' => '/user_forms/login', 'id' => 'UserFormLoginForm',
+				'action' => '/user_forms/login',
+				'id' => 'UserFormLoginForm',
+				'method' => 'post',
 				'accept-charset' => $encoding
 			),
 			'div' => array('style' => 'display:none;'),
@@ -1681,7 +1824,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertFalse($this->ValidateUser->validates());
 		$this->assertFalse($this->ValidateUser->ValidateProfile->validates());
 
-		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
+		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'url' => array('action' => 'add')));
 		$encoding = strtolower(Configure::read('App.encoding'));
 		$expected = array(
 			'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id', 'accept-charset' => $encoding),
@@ -1734,7 +1877,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertFalse($this->ValidateUser->ValidateProfile->validates());
 		$this->assertFalse($this->ValidateUser->ValidateProfile->ValidateItem->validates());
 
-		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
+		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'url' => array('action' => 'add')));
 		$encoding = strtolower(Configure::read('App.encoding'));
 		$expected = array(
 			'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id', 'accept-charset' => $encoding),
@@ -1905,6 +2048,17 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
+		$result = $this->Form->input('ValidateUser.null_decimal');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'Null Decimal',
+			'/label',
+			'input' => array('name', 'type' => 'number', 'step' => 'any', 'id'),
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Form->input('ValidateUser.ratio');
 		$expected = array(
 			'div' => array('class'),
@@ -1969,7 +2123,7 @@ class FormHelperTest extends CakeTestCase {
 			'Email',
 			'/label',
 			array('input' => array(
-				'type' => 'text', 'name' => 'data[Contact][email]',
+				'maxlength' => 255, 'type' => 'text', 'name' => 'data[Contact][email]',
 				'id' => 'ContactEmail'
 			)),
 			'/div'
@@ -1983,7 +2137,7 @@ class FormHelperTest extends CakeTestCase {
 			'Email',
 			'/label',
 			array('input' => array(
-				'type' => 'text', 'name' => 'data[Contact][5][email]',
+				'maxlength' => 255, 'type' => 'text', 'name' => 'data[Contact][5][email]',
 				'id' => 'Contact5Email'
 			)),
 			'/div'
@@ -2401,6 +2555,61 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
 	}
 
+/**
+ * Test interval + value near the hour roll over.
+ *
+ * @return void
+ */
+	public function testTimeValueWithInterval() {
+		$result = $this->Form->input('Model.start_time', array(
+			'type' => 'time',
+			'interval' => 15,
+			'value' => array('hour' => '3', 'min' => '57', 'meridian' => 'pm')
+		));
+		$this->assertContains('<option value="04" selected="selected">4</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+		$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
+
+		$result = $this->Form->input('Model.start_time', array(
+			'type' => 'time',
+			'interval' => 15,
+			'value' => '2012-10-23 15:57:00'
+		));
+		$this->assertContains('<option value="04" selected="selected">4</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+		$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
+
+		$result = $this->Form->input('Model.start_time', array(
+			'timeFormat' => 24,
+			'type' => 'time',
+			'interval' => 15,
+			'value' => '15:57'
+		));
+		$this->assertContains('<option value="16" selected="selected">16</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+
+		$result = $this->Form->input('Model.start_time', array(
+			'timeFormat' => 24,
+			'type' => 'time',
+			'interval' => 15,
+			'value' => '23:57'
+		));
+		$this->assertContains('<option value="00" selected="selected">0</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+
+		$result = $this->Form->input('Model.created', array(
+			'timeFormat' => 24,
+			'type' => 'datetime',
+			'interval' => 15,
+			'value' => '2012-09-30 23:56'
+		));
+		$this->assertContains('<option value="2012" selected="selected">2012</option>', $result);
+		$this->assertContains('<option value="10" selected="selected">October</option>', $result);
+		$this->assertContains('<option value="01" selected="selected">1</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">0</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+	}
+
 /**
  * Test time with selected values around 12:xx:xx
  *
@@ -2438,6 +2647,43 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
 	}
 
+/**
+ * Test time with selected values around 12:xx:xx
+ *
+ * @return void
+ */
+	public function testTimeValueWithIntervalTwelve() {
+		$result = $this->Form->input('Model.start_time', array(
+			'type' => 'time',
+			'timeFormat' => 12,
+			'interval' => 15,
+			'value' => '00:00:00'
+		));
+		$this->assertContains('<option value="12" selected="selected">12</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+		$this->assertContains('<option value="am" selected="selected">am</option>', $result);
+
+		$result = $this->Form->input('Model.start_time', array(
+			'type' => 'time',
+			'timeFormat' => 12,
+			'interval' => 15,
+			'value' => '12:00:00'
+		));
+		$this->assertContains('<option value="12" selected="selected">12</option>', $result);
+		$this->assertContains('<option value="00" selected="selected">00</option>', $result);
+		$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
+
+		$result = $this->Form->input('Model.start_time', array(
+			'type' => 'time',
+			'timeFormat' => 12,
+			'interval' => 15,
+			'value' => '12:15:00'
+		));
+		$this->assertContains('<option value="12" selected="selected">12</option>', $result);
+		$this->assertContains('<option value="15" selected="selected">15</option>', $result);
+		$this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
+	}
+
 /**
  * Test interval & timeFormat = 12
  *
@@ -2618,7 +2864,7 @@ class FormHelperTest extends CakeTestCase {
 			array('label' => array('for' => "ContactMultiple")),
 			'Multiple',
 			'/label',
-			array('input' => array('type' => 'hidden', 'name' => "data[Contact][multiple]", 'value' => '', 'id' => "ContactMultiple")),
+			array('input' => array('type' => 'hidden', 'name' => "data[Contact][multiple]", 'value' => '', 'id' => "ContactMultiple", 'disabled' => 'disabled')),
 			array('div' => array('class' => 'checkbox')),
 			array('input' => array('type' => 'checkbox', 'name' => "data[Contact][multiple][]", 'value' => 1, 'disabled' => 'disabled', 'id' => "ContactMultiple1")),
 			array('label' => array('for' => "ContactMultiple1")),
@@ -3507,9 +3753,9 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$Contact->validationErrors['field'] = array('notEmpty', 'email', 'Something else');
+		$Contact->validationErrors['field'] = array('notBlank', 'email', 'Something else');
 		$result = $this->Form->error('Contact.field', array(
-			'notEmpty' => 'Cannot be empty',
+			'notBlank' => 'Cannot be empty',
 			'email' => 'No good!'
 		));
 		$expected = array(
@@ -3524,13 +3770,13 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 
 		// Testing error messages list options
-		$Contact->validationErrors['field'] = array('notEmpty', 'email');
+		$Contact->validationErrors['field'] = array('notBlank', 'email');
 
 		$result = $this->Form->error('Contact.field', null, array('listOptions' => 'ol'));
 		$expected = array(
 			'div' => array('class' => 'error-message'),
 				'ol' => array(),
-					'<li', 'notEmpty', '/li',
+					'<li', 'notBlank', '/li',
 					'<li', 'email', '/li',
 				'/ol',
 			'/div'
@@ -3541,7 +3787,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array(
 			'div' => array('class' => 'error-message'),
 				'ol' => array(),
-					'<li', 'notEmpty', '/li',
+					'<li', 'notBlank', '/li',
 					'<li', 'email', '/li',
 				'/ol',
 			'/div'
@@ -3559,7 +3805,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array(
 			'div' => array('class' => 'error-message'),
 				'ul' => array('class' => 'ul-class'),
-					array('li' => array('class' => 'li-class')), 'notEmpty', '/li',
+					array('li' => array('class' => 'li-class')), 'notBlank', '/li',
 					array('li' => array('class' => 'li-class')), 'email', '/li',
 				'/ul',
 			'/div'
@@ -3786,6 +4032,25 @@ class FormHelperTest extends CakeTestCase {
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio(
+			'Model.multibyte',
+			array('男性' => '男性')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multibyte]',
+				'id' => 'ModelMultibyte_', 'value' => '',
+			),
+			array('input' => array(
+				'type' => 'radio', 'name' => 'data[Model][multibyte]',
+				'id' => 'ModelMultibyte男性', 'value' => '男性')
+			),
+			array('label' => array('for' => 'ModelMultibyte男性')),
+			'男性',
+			'/label',
+		);
+		$this->assertTags($result, $expected);
 	}
 
 /**
@@ -4297,6 +4562,34 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTextNotContains('"Model1Field"', $result);
 	}
 
+/**
+ * Test that radio() accepts a deep array for options
+ *
+ * @return void
+ */
+	public function testRadioOptionsArray() {
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'radio',
+			'legend' => false,
+			'div' => false,
+			'options' => array(
+				'1' => array('name' => 'Option A', 'title' => 'A Title'),
+				'2' => array('name' => 'Option B', 'data-foo' => 'bar'))
+		));
+		$expected = array(
+			array('input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'id' => 'ModelField_', 'value' => '')),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'id' => 'ModelField1', 'value' => '1', 'title' => 'A Title')),
+			array('label' => array('for' => 'ModelField1')),
+			'Option A',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'id' => 'ModelField2', 'value' => '2', 'data-foo' => 'bar')),
+			array('label' => array('for' => 'ModelField2')),
+			'Option B',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test that radio() accepts an array for label
  *
@@ -4862,7 +5155,7 @@ class FormHelperTest extends CakeTestCase {
  */
 	public function testSelectMultipleWithDisabledElements() {
 		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = array(2, 3);
+		$disabled = array(1);
 		$result = $this->Form->select('Contact.multiple', $options, array('multiple' => 'multiple', 'disabled' => $disabled));
 		$expected = array(
 			'input' => array(
@@ -4871,13 +5164,13 @@ class FormHelperTest extends CakeTestCase {
 			'select' => array(
 				'name' => 'data[Contact][multiple][]', 'multiple' => 'multiple', 'id' => 'ContactMultiple'
 			),
-			array('option' => array('value' => '1')),
+			array('option' => array('value' => '1', 'disabled' => 'disabled')),
 			'One',
 			'/option',
-			array('option' => array('value' => '2', 'disabled' => 'disabled')),
+			array('option' => array('value' => '2')),
 			'Two',
 			'/option',
-			array('option' => array('value' => '3', 'disabled' => 'disabled')),
+			array('option' => array('value' => '3')),
 			'Three',
 			'/option',
 			array('option' => array('value' => '3x')),
@@ -4927,7 +5220,7 @@ class FormHelperTest extends CakeTestCase {
 			'Multiple',
 			'/label',
 			'input' => array(
-				'type' => 'hidden', 'name' => 'data[Contact][multiple]', 'value' => '', 'id' => 'ContactMultiple_'
+				'type' => 'hidden', 'name' => 'data[Contact][multiple]', 'value' => '', 'id' => 'ContactMultiple_', 'disabled' => 'disabled'
 			),
 			'select' => array(
 				'name' => 'data[Contact][multiple][]', 'disabled' => 'disabled', 'multiple' => 'multiple', 'id' => 'ContactMultiple'
@@ -7314,6 +7607,53 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertNotContains('value="' . date('d') . '" selected="selected"', $result);
 	}
 
+/**
+ * testInputDate method
+ *
+ * Test various inputs with type date and different option attributes.
+ *
+ * @return void
+ */
+	public function testInputDateOptions() {
+		$this->Form->create('User');
+
+		$result = $this->Form->input('date',
+			array(
+				'label' => false,
+				'type' => 'day',
+				'class' => 'form-control'
+			)
+		);
+		$this->assertContains('class="form-control"', $result);
+
+		$result = $this->Form->input('date',
+			array(
+				'label' => false,
+				'type' => 'month',
+				'class' => 'form-control'
+			)
+		);
+		$this->assertContains('class="form-control"', $result);
+
+		$result = $this->Form->input('date',
+			array(
+				'label' => false,
+				'type' => 'year',
+				'class' => 'form-control'
+			)
+		);
+		$this->assertContains('class="form-control"', $result);
+
+		$result = $this->Form->input('date',
+			array(
+				'label' => false,
+				'type' => 'hour',
+				'class' => 'form-control'
+			)
+		);
+		$this->assertContains('class="form-control"', $result);
+	}
+
 /**
  * testInputDateMaxYear method
  *
@@ -7387,6 +7727,37 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test textareas maxlength reading from schema.
+ *
+ * @return void
+ */
+	public function testTextAreaMaxLength() {
+		$result = $this->Form->input('UserForm.other', array('type' => 'textarea'));
+		$expected = array(
+			'div' => array('class' => 'input textarea'),
+				'label' => array('for' => 'UserFormOther'),
+					'Other',
+				'/label',
+				'textarea' => array('name' => 'data[UserForm][other]', 'cols' => '30', 'rows' => '6', 'id' => 'UserFormOther'),
+				'/textarea',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('UserForm.stuff', array('type' => 'textarea'));
+		$expected = array(
+			'div' => array('class' => 'input textarea'),
+				'label' => array('for' => 'UserFormStuff'),
+					'Stuff',
+				'/label',
+				'textarea' => array('name' => 'data[UserForm][stuff]', 'maxlength' => 10, 'cols' => '30', 'rows' => '6', 'id' => 'UserFormStuff'),
+				'/textarea',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * testTextAreaWithStupidCharacters method
  *
@@ -7668,6 +8039,40 @@ class FormHelperTest extends CakeTestCase {
 		));
 	}
 
+/**
+ * Test that security hashes for postLink include the url.
+ *
+ * @return void
+ */
+	public function testPostLinkSecurityHash() {
+		$hash = Security::hash(
+			'/posts/delete/1' .
+			serialize(array()) .
+			'' .
+			Configure::read('Security.salt')
+		);
+		$hash .= '%3A';
+		$this->Form->request->params['_Token']['key'] = 'test';
+
+		$result = $this->Form->postLink('Delete', '/posts/delete/1');
+		$this->assertTags($result, array(
+			'form' => array(
+				'method' => 'post', 'action' => '/posts/delete/1',
+				'name', 'id', 'style' => 'display:none;'
+			),
+			array('input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST')),
+			array('input' => array('type' => 'hidden', 'name' => 'data[_Token][key]', 'value' => 'test', 'id')),
+			'div' => array('style' => 'display:none;'),
+			array('input' => array('type' => 'hidden', 'name' => 'data[_Token][fields]', 'value' => $hash, 'id')),
+			array('input' => array('type' => 'hidden', 'name' => 'data[_Token][unlocked]', 'value' => '', 'id')),
+			'/div',
+			'/form',
+			'a' => array('href' => '#', 'onclick' => 'preg:/document\.post_\w+\.submit\(\); event\.returnValue = false; return false;/'),
+			'Delete',
+			'/a'
+		));
+	}
+
 /**
  * Test using postLink with N dimensional data.
  *
@@ -8136,7 +8541,9 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->create('User', array('url' => array('action' => 'login')));
 		$expected = array(
 			'form' => array(
-				'id' => 'UserAddForm', 'method' => 'post', 'action' => '/users/login',
+				'action' => '/users/login',
+				'id' => 'UserLoginForm',
+				'method' => 'post',
 				'accept-charset' => $encoding
 			),
 			'div' => array('style' => 'display:none;'),
@@ -8145,7 +8552,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Form->create('User', array('action' => 'login'));
+		$result = $this->Form->create('User', array('url' => array('action' => 'login')));
 		$expected = array(
 			'form' => array(
 				'id' => 'UserLoginForm', 'method' => 'post', 'action' => '/users/login',
@@ -8159,7 +8566,12 @@ class FormHelperTest extends CakeTestCase {
 
 		$result = $this->Form->create('User', array('url' => '/users/login'));
 		$expected = array(
-			'form' => array('method' => 'post', 'action' => '/users/login', 'accept-charset' => $encoding, 'id' => 'UserAddForm'),
+			'form' => array(
+				'action' => '/users/login',
+				'id' => 'UserAddForm',
+				'method' => 'post',
+				'accept-charset' => $encoding
+			),
 			'div' => array('style' => 'display:none;'),
 			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
 			'/div'
@@ -8167,7 +8579,7 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 
 		$this->Form->request['controller'] = 'pages';
-		$result = $this->Form->create('User', array('action' => 'signup'));
+		$result = $this->Form->create('User', array('url' => array('action' => 'signup')));
 		$expected = array(
 			'form' => array(
 				'id' => 'UserSignupForm', 'method' => 'post', 'action' => '/users/signup',
@@ -8185,7 +8597,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param',
+				'id' => 'ContactIndexForm', 'method' => 'post', 'action' => '/contacts/index/param',
 				'accept-charset' => 'utf-8'
 			),
 			'div' => array('style' => 'display:none;'),
@@ -8195,6 +8607,26 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test create() with no URL (no "action" attribute for <form> tag)
+ *
+ * @return void
+ */
+	public function testCreateNoUrl() {
+		$result = $this->Form->create(false, array('url' => false));
+		$expected = array(
+			'form' => array(
+				'id' => 'addForm',
+				'method' => 'post',
+				'accept-charset' => strtolower(Configure::read('App.encoding'))
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test the onsubmit option for create()
  *
@@ -8207,7 +8639,7 @@ class FormHelperTest extends CakeTestCase {
 		$result = $this->Form->create(array('url' => array('action' => 'index', 'param'), 'default' => false));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm', 'method' => 'post', 'onsubmit' => 'event.returnValue = false; return false;', 'action' => '/contacts/index/param',
+				'id' => 'ContactIndexForm', 'method' => 'post', 'onsubmit' => 'event.returnValue = false; return false;', 'action' => '/contacts/index/param',
 				'accept-charset' => 'utf-8'
 			),
 			'div' => array('style' => 'display:none;'),
@@ -8227,7 +8659,7 @@ class FormHelperTest extends CakeTestCase {
 
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm', 'method' => 'post',
+				'id' => 'ContactIndexForm', 'method' => 'post',
 				'onsubmit' => 'someFunction();event.returnValue = false; return false;',
 				'action' => '/contacts/index/param',
 				'accept-charset' => 'utf-8'
@@ -8285,7 +8717,7 @@ class FormHelperTest extends CakeTestCase {
 		Router::connect('/login', array('controller' => 'users', 'action' => 'login'));
 		$encoding = strtolower(Configure::read('App.encoding'));
 
-		$result = $this->Form->create('User', array('action' => 'login'));
+		$result = $this->Form->create('User', array('url' => array('action' => 'login')));
 		$expected = array(
 			'form' => array(
 				'id' => 'UserLoginForm', 'method' => 'post', 'action' => '/login',
@@ -8357,7 +8789,7 @@ class FormHelperTest extends CakeTestCase {
  */
 	public function testCreateWithAcceptCharset() {
 		$result = $this->Form->create('UserForm', array(
-				'type' => 'post', 'action' => 'login', 'encoding' => 'iso-8859-1'
+				'type' => 'post', 'url' => array('action' => 'login'), 'encoding' => 'iso-8859-1'
 			)
 		);
 		$expected = array(
@@ -8390,7 +8822,7 @@ class FormHelperTest extends CakeTestCase {
 		));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm',
+				'id' => 'ContactActionForm',
 				'method' => 'post',
 				'action' => '/controller/action?param1=value1&amp;param2=value2',
 				'accept-charset' => $encoding
@@ -8411,7 +8843,7 @@ class FormHelperTest extends CakeTestCase {
 		));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm',
+				'id' => 'ContactActionForm',
 				'method' => 'post',
 				'action' => '/controller/action?param1=value1&amp;param2=value2',
 				'accept-charset' => $encoding
@@ -8461,14 +8893,15 @@ class FormHelperTest extends CakeTestCase {
 			'escape' => false,
 			'url' => array(
 				'action' => 'edit',
+				'0',
 				'myparam'
 			)
 		));
 		$expected = array(
 			'form' => array(
-				'id' => 'ContactAddForm',
+				'id' => 'ContactEditForm',
 				'method' => 'post',
-				'action' => '/contacts/edit/myparam',
+				'action' => '/contacts/edit/0/myparam',
 				'accept-charset' => $encoding
 			),
 			'div' => array('style' => 'display:none;'),
@@ -8478,6 +8911,26 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * test that create() works without raising errors with a Mock Model
+ *
+ * @return void
+ */
+	public function testCreateNoErrorsWithMockModel() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$ContactMock = $this->getMockBuilder('Contact')
+			->disableOriginalConstructor()
+			->getMock();
+		ClassRegistry::removeObject('Contact');
+		ClassRegistry::addObject('Contact', $ContactMock);
+		$result = $this->Form->create('Contact', array('type' => 'GET'));
+		$expected = array('form' => array(
+			'id' => 'ContactAddForm', 'method' => 'get', 'action' => '/contacts/add',
+			'accept-charset' => $encoding
+		));
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * test creating a get form, and get form inputs.
  *
@@ -8821,7 +9274,7 @@ class FormHelperTest extends CakeTestCase {
  * @return void
  */
 	public function testFormInputRequiredDetectionModelValidator() {
-		ClassRegistry::getObject('ContactTag')->validator()->add('iwillberequired', 'required', array('rule' => 'notEmpty'));
+		ClassRegistry::getObject('ContactTag')->validator()->add('iwillberequired', 'required', array('rule' => 'notBlank'));
 
 		$this->Form->create('ContactTag');
 		$result = $this->Form->input('ContactTag.iwillberequired');
@@ -9455,6 +9908,7 @@ class FormHelperTest extends CakeTestCase {
 				'textarea' => array(
 					'id' => 'ValidateProfile1ValidateItem2Name',
 					'name' => 'data[ValidateProfile][1][ValidateItem][2][name]',
+					'maxlength' => 255,
 					'cols' => 30,
 					'rows' => 6
 				),
@@ -9571,7 +10025,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array(
 			'div' => array('class' => 'input text'),
 			'input' => array(
-				'type' => 'text', 'name' => 'data[Contact][email]',
+				'maxlength' => 255, 'type' => 'text', 'name' => 'data[Contact][email]',
 				'id' => 'ContactEmail'
 			),
 			'/div'
@@ -9585,7 +10039,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array(
 			'div' => array('class' => 'input text'),
 			array('input' => array(
-				'type' => 'text', 'name' => 'data[Contact][email]',
+				'maxlength' => 255, 'type' => 'text', 'name' => 'data[Contact][email]',
 				'id' => 'ContactEmail'
 			)),
 			'label' => array('for' => 'ContactEmail'),
@@ -9605,7 +10059,7 @@ class FormHelperTest extends CakeTestCase {
 		$expected = array(
 			'div' => array('class' => 'input text'),
 			array('input' => array(
-				'type' => 'text', 'name' => 'data[Contact][email]',
+				'maxlength' => 255, 'type' => 'text', 'name' => 'data[Contact][email]',
 				'id' => 'ContactEmail'
 			)),
 			array('div' => array()),
@@ -9695,7 +10149,6 @@ class FormHelperTest extends CakeTestCase {
 	}
 
 /**
- *
  * @expectedException CakeException
  * @return void
  */
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
index 35edd4841..57ece5171 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -23,6 +23,7 @@ App::uses('HtmlHelper', 'View/Helper');
 App::uses('FormHelper', 'View/Helper');
 App::uses('ClassRegistry', 'Utility');
 App::uses('Folder', 'Utility');
+App::uses('CakePlugin', 'Core');
 
 if (!defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');
@@ -45,7 +46,7 @@ class TheHtmlTestController extends Controller {
 /**
  * uses property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $uses = null;
 }
@@ -695,6 +696,31 @@ class HtmlHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test css() with once option.
+ *
+ * @return void
+ */
+	public function testCssLinkOnce() {
+		Configure::write('Asset.filter.css', false);
+
+		$result = $this->Html->css('screen', array('once' => true));
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*css\/screen\.css/')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->css('screen', array('once' => true));
+		$this->assertEquals('', $result);
+
+		// Default is once=false
+		$result = $this->Html->css('screen');
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*css\/screen\.css/')
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test css link BC usage
  *
@@ -873,6 +899,22 @@ class HtmlHelperTest extends CakeTestCase {
 		CakePlugin::unload('TestPlugin');
 	}
 
+/**
+ * Resource names must be treated differently for css() and script()
+ *
+ * @return void
+ */
+	public function testBufferedCssAndScriptWithIdenticalResourceName() {
+		$this->View->expects($this->at(0))
+			->method('append')
+			->with('css', $this->stringContains('test.min.css'));
+		$this->View->expects($this->at(1))
+			->method('append')
+			->with('script', $this->stringContains('test.min.js'));
+		$this->Html->css('test.min', array('inline' => false));
+		$this->Html->script('test.min', array('inline' => false));
+	}
+
 /**
  * test timestamp enforcement for script tags.
  *
@@ -906,7 +948,7 @@ class HtmlHelperTest extends CakeTestCase {
 	public function testPluginScriptTimestamping() {
 		CakePlugin::load('TestPlugin');
 
-		$pluginPath = App::pluginPath('TestPlugin');
+		$pluginPath = CakePlugin::path('TestPlugin');
 		$pluginJsPath = $pluginPath . 'webroot/js';
 		$this->skipIf(!is_writable($pluginJsPath), $pluginJsPath . ' is not Writable, timestamp testing has been skipped.');
 
@@ -1713,7 +1755,6 @@ class HtmlHelperTest extends CakeTestCase {
 
 		$result = $this->Html->meta('keywords', 'these, are, some, meta, keywords');
 		$this->assertTags($result, array('meta' => array('name' => 'keywords', 'content' => 'these, are, some, meta, keywords')));
-		$this->assertRegExp('/\s+\/>$/', $result);
 
 		$result = $this->Html->meta('description', 'this is the meta description');
 		$this->assertTags($result, array('meta' => array('name' => 'description', 'content' => 'this is the meta description')));
@@ -1884,6 +1925,21 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->tableCells($tr, array('class' => 'odd'), array('class' => 'even'), false, false);
 		$expected = "<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>";
 		$this->assertEquals($expected, $result);
+
+		$tr = array(
+			'td content 1',
+			'td content 2',
+			array('td content 3', array('class' => 'foo'))
+		);
+		$result = $this->Html->tableCells($tr, null, null, true);
+		$expected = array(
+			'<tr',
+			array('td' => array('class' => 'column-1')), 'td content 1', '/td',
+			array('td' => array('class' => 'column-2')), 'td content 2', '/td',
+			array('td' => array('class' => 'foo column-3')), 'td content 3', '/td',
+			'/tr'
+		);
+		$this->assertTags($result, $expected);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
index bbada6605..246f368be 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
@@ -212,7 +212,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
 		$this->Paginator->request->params['paging']['Article']['options']['sort'] = null;
-		$result = $this->Paginator->sort('title', 'Title', array('direction' => 'asc'));
+		$result = $this->Paginator->sort('title', 'Title', array('direction' => 'ASC'));
 		$this->assertRegExp('/\/accounts\/index\/param\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
 
 		$this->Paginator->request->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
@@ -1006,6 +1006,23 @@ class PaginatorHelperTest extends CakeTestCase {
 			)
 		);
 
+		$result = $this->Paginator->prev('<i class="fa fa-angle-left"></i>', array('escape' => false), null, array('class' => 'prev disabled'));
+		$expected = array(
+			'span' => array('class' => 'prev disabled'),
+			'i' => array('class' => 'fa fa-angle-left'),
+			'/i',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<i class="fa fa-angle-left"></i>', array('escape' => false), null, array('escape' => true));
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'&lt;i class=&quot;fa fa-angle-left&quot;&gt;&lt;/i&gt;',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
 		$expected = array(
 			'span' => array('class' => 'prev'),
@@ -1243,6 +1260,14 @@ class PaginatorHelperTest extends CakeTestCase {
 				'paramType' => 'named'
 			)
 		);
+		$result = $this->Paginator->sort('title', 'Title', array('model' => 'Client'));
+		$expected = array(
+			'a' => array('href' => '/index/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Paginator->next('Next', array('model' => 'Client'));
 		$expected = array(
 			'span' => array('class' => 'next'),
@@ -1260,6 +1285,39 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test creating paging links for missing models.
+ *
+ * @return void
+ */
+	public function testPagingLinksMissingModel() {
+		$result = $this->Paginator->sort('title', 'Title', array('model' => 'Missing'));
+		$expected = array(
+			'a' => array('href' => '/index/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next', array('model' => 'Missing'));
+		$expected = array(
+			'span' => array('class' => 'next'),
+			'a' => array('href' => '/index/page:2', 'rel' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('Prev', array('model' => 'Missing'));
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'Prev',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * testGenericLinks method
  *
@@ -1671,6 +1729,147 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 1,
+				'current' => 10,
+				'count' => 30,
+				'prevPage' => false,
+				'nextPage' => 2,
+				'pageCount' => 3,
+				'options' => array(
+					'page' => 1,
+				),
+				'paramType' => 'named'
+			)
+		);
+		$options = array('modulus' => 10);
+		$result = $this->Paginator->numbers($options);
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('modulus' => 3, 'currentTag' => 'span', 'tag' => 'li'));
+		$expected = array(
+			array('li' => array('class' => 'current')), array('span' => array()), '1', '/span', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/li',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2,
+				'current' => 10,
+				'count' => 31,
+				'prevPage' => true,
+				'nextPage' => true,
+				'pageCount' => 4,
+				'options' => array(
+					'page' => 1,
+					'order' => array('Client.name' => 'DESC'),
+				),
+				'paramType' => 'named'
+			)
+		);
+		$result = $this->Paginator->numbers(array('class' => 'page-link'));
+		$expected = array(
+			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/sort:Client.name/direction:DESC')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current page-link')), '2', '/span',
+			' | ',
+			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/page:3/sort:Client.name/direction:DESC')), '3', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/page:4/sort:Client.name/direction:DESC')), '4', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2,
+				'current' => 2,
+				'count' => 30,
+				'prevPage' => false,
+				'nextPage' => 3,
+				'pageCount' => 3,
+				'options' => array(
+					'page' => 1,
+				),
+				'paramType' => 'named'
+			)
+		);
+
+		$request = new CakeRequest();
+		$request->addParams(array(
+			'controller' => 'clients', 'action' => 'index', 'plugin' => null, 'page' => 2
+		));
+		$request->base = '';
+		$request->here = '/clients/index/page:2';
+		$request->webroot = '/';
+
+		Router::setRequestInfo($request);
+
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/clients')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/clients/index/page:3')), '3', '/a', '/span',
+
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->request->params['paging'] = array(
+			'Client' => array(
+				'page' => 2,
+				'current' => 2,
+				'count' => 30,
+				'prevPage' => false,
+				'nextPage' => 3,
+				'pageCount' => 3,
+				'options' => array(
+					'page' => 1,
+				),
+				'paramType' => 'querystring'
+			)
+		);
+
+		$request = new CakeRequest();
+		$request->addParams(array(
+			'controller' => 'clients', 'action' => 'index', 'plugin' => null
+		));
+		$request->base = '';
+		$request->here = '/clients?page=2';
+		$request->webroot = '/';
+
+		Router::setRequestInfo($request);
+
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/clients')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/clients?page=3')), '3', '/a', '/span',
+
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test that numbers() works with first and last options.
+ *
+ * @return void
+ */
+	public function testNumbersFirstAndLast() {
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
 				'page' => 10,
@@ -1794,68 +1993,6 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 1,
-				'current' => 10,
-				'count' => 30,
-				'prevPage' => false,
-				'nextPage' => 2,
-				'pageCount' => 3,
-				'options' => array(
-					'page' => 1,
-				),
-				'paramType' => 'named'
-			)
-		);
-		$options = array('modulus' => 10);
-		$result = $this->Paginator->numbers($options);
-		$expected = array(
-			array('span' => array('class' => 'current')), '1', '/span',
-			' | ',
-			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
-			' | ',
-			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Paginator->numbers(array('modulus' => 3, 'currentTag' => 'span', 'tag' => 'li'));
-		$expected = array(
-			array('li' => array('class' => 'current')), array('span' => array()), '1', '/span', '/li',
-			' | ',
-			array('li' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/li',
-			' | ',
-			array('li' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/li',
-		);
-		$this->assertTags($result, $expected);
-
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 2,
-				'current' => 10,
-				'count' => 31,
-				'prevPage' => true,
-				'nextPage' => true,
-				'pageCount' => 4,
-				'options' => array(
-					'page' => 1,
-					'order' => array('Client.name' => 'DESC'),
-				),
-				'paramType' => 'named'
-			)
-		);
-		$result = $this->Paginator->numbers(array('class' => 'page-link'));
-		$expected = array(
-			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/sort:Client.name/direction:DESC')), '1', '/a', '/span',
-			' | ',
-			array('span' => array('class' => 'current page-link')), '2', '/span',
-			' | ',
-			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/page:3/sort:Client.name/direction:DESC')), '3', '/a', '/span',
-			' | ',
-			array('span' => array('class' => 'page-link')), array('a' => array('href' => '/index/page:4/sort:Client.name/direction:DESC')), '4', '/a', '/span',
-		);
-		$this->assertTags($result, $expected);
-
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
 				'page' => 4895,
@@ -2073,15 +2210,22 @@ class PaginatorHelperTest extends CakeTestCase {
 			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
 		);
 		$this->assertTags($result, $expected);
+	}
 
+/**
+ * Test first/last options as strings.
+ *
+ * @return void
+ */
+	public function testNumbersStringFirstAndLast() {
 		$this->Paginator->request->params['paging'] = array(
 			'Client' => array(
-				'page' => 2,
-				'current' => 2,
+				'page' => 10,
+				'current' => 3,
 				'count' => 30,
 				'prevPage' => false,
-				'nextPage' => 3,
-				'pageCount' => 3,
+				'nextPage' => 2,
+				'pageCount' => 15,
 				'options' => array(
 					'page' => 1,
 				),
@@ -2089,60 +2233,29 @@ class PaginatorHelperTest extends CakeTestCase {
 			)
 		);
 
-		$request = new CakeRequest();
-		$request->addParams(array(
-			'controller' => 'clients', 'action' => 'index', 'plugin' => null, 'page' => 2
-		));
-		$request->base = '';
-		$request->here = '/clients/index/page:2';
-		$request->webroot = '/';
-
-		Router::setRequestInfo($request);
-
-		$result = $this->Paginator->numbers();
+		$result = $this->Paginator->numbers(array('first' => '1', 'last' => '1'));
 		$expected = array(
-			array('span' => array()), array('a' => array('href' => '/clients')), '1', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
 			' | ',
-			array('span' => array('class' => 'current')), '2', '/span',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/clients/index/page:3')), '3', '/a', '/span',
-
-		);
-		$this->assertTags($result, $expected);
-
-		$this->Paginator->request->params['paging'] = array(
-			'Client' => array(
-				'page' => 2,
-				'current' => 2,
-				'count' => 30,
-				'prevPage' => false,
-				'nextPage' => 3,
-				'pageCount' => 3,
-				'options' => array(
-					'page' => 1,
-				),
-				'paramType' => 'querystring'
-			)
-		);
-
-		$request = new CakeRequest();
-		$request->addParams(array(
-			'controller' => 'clients', 'action' => 'index', 'plugin' => null
-		));
-		$request->base = '';
-		$request->here = '/clients?page=2';
-		$request->webroot = '/';
-
-		Router::setRequestInfo($request);
-
-		$result = $this->Paginator->numbers();
-		$expected = array(
-			array('span' => array()), array('a' => array('href' => '/clients')), '1', '/a', '/span',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
 			' | ',
-			array('span' => array('class' => 'current')), '2', '/span',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
 			' | ',
-			array('span' => array()), array('a' => array('href' => '/clients?page=3')), '3', '/a', '/span',
-
+			array('span' => array('class' => 'current')), '10', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:14')), '14', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), '15', '/a', '/span',
 		);
 		$this->assertTags($result, $expected);
 	}
@@ -2175,6 +2288,9 @@ class PaginatorHelperTest extends CakeTestCase {
 			'/li',
 		);
 		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last('2', array('tag' => 'li', 'class' => 'last'));
+		$this->assertTags($result, $expected);
 	}
 
 /**
@@ -2326,6 +2442,10 @@ class PaginatorHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
+		// Test stringy number.
+		$result = $this->Paginator->last('2');
+		$this->assertTags($result, $expected);
+
 		$result = $this->Paginator->last(3);
 		$this->assertEquals('', $result, 'When inside the last links range, no links should be made');
 	}
@@ -2731,9 +2851,9 @@ class PaginatorHelperTest extends CakeTestCase {
 				'paramType' => 'named',
 			)
 		);
-		$this->assertFalse($this->Paginator->numbers());
-		$this->assertFalse($this->Paginator->first());
-		$this->assertFalse($this->Paginator->last());
+		$this->assertSame('', $this->Paginator->numbers());
+		$this->assertSame('', $this->Paginator->first());
+		$this->assertSame('', $this->Paginator->last());
 	}
 
 /**
@@ -2763,4 +2883,135 @@ class PaginatorHelperTest extends CakeTestCase {
 		$expected = '0 of 1';
 		$this->assertEquals($expected, $result);
 	}
+
+/**
+ * Verify that no next and prev links are created for single page results
+ *
+ * @return void
+ */
+	public function testMetaPage0() {
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 1,
+				'prevPage' => false,
+				'nextPage' => false,
+				'pageCount' => 1,
+			)
+		);
+		$expected = '';
+		$result = $this->Paginator->meta();
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Verify that page 1 only has a next link
+ *
+ * @return void
+ */
+	public function testMetaPage1() {
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 1,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 2,
+				'options' => array(),
+				'paramType' => 'querystring'
+			)
+		);
+		$expected = '<link href="/?page=2" rel="next"/>';
+		$result = $this->Paginator->meta();
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Verify that the method will append to a block
+ *
+ * @return void
+ */
+	public function testMetaPage1InlineFalse() {
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 1,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 2,
+				'options' => array(),
+				'paramType' => 'querystring'
+			)
+		);
+		$expected = '<link href="/?page=2" rel="next"/>';
+		$this->Paginator->meta(array('block' => true));
+		$result = $this->View->fetch('meta');
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Verify that the last page only has a prev link
+ *
+ * @return void
+ */
+	public function testMetaPage1Last() {
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 2,
+				'prevPage' => true,
+				'nextPage' => false,
+				'pageCount' => 2,
+				'options' => array(),
+				'paramType' => 'querystring'
+			)
+		);
+		$expected = '<link href="/" rel="prev"/>';
+		$result = $this->Paginator->meta();
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Verify that a page in the middle has both links
+ *
+ * @return void
+ */
+	public function testMetaPage10Last() {
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 5,
+				'prevPage' => true,
+				'nextPage' => true,
+				'pageCount' => 10,
+				'options' => array(),
+				'paramType' => 'querystring'
+			)
+		);
+		$expected = '<link href="/?page=4" rel="prev"/>';
+		$expected .= '<link href="/?page=6" rel="next"/>';
+		$result = $this->Paginator->meta();
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Verify that meta() uses URL options
+ *
+ * @return void
+ */
+	public function testMetaPageUrlOptions() {
+		$this->Paginator->options(array(
+			'url' => array('?' => array('a' => 'b'))
+		));
+		$this->Paginator->request['paging'] = array(
+			'Article' => array(
+				'page' => 5,
+				'prevPage' => true,
+				'nextPage' => true,
+				'pageCount' => 10,
+				'options' => array(),
+				'paramType' => 'querystring'
+			)
+		);
+		$expected = '<link href="/?a=b&amp;page=4" rel="prev"/>';
+		$expected .= '<link href="/?a=b&amp;page=6" rel="next"/>';
+		$result = $this->Paginator->meta();
+		$this->assertSame($expected, $result);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
index d38d60529..f38dc402a 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
@@ -26,7 +26,7 @@ App::uses('TextHelper', 'View/Helper');
  */
 class TextHelperTestObject extends TextHelper {
 
-	public function attach(StringMock $string) {
+	public function attach(CakeTextMock $string) {
 		$this->_engine = $string;
 	}
 
@@ -37,11 +37,11 @@ class TextHelperTestObject extends TextHelper {
 }
 
 /**
- * StringMock class
+ * CakeTextMock class
  *
  * @package       Cake.Test.Case.View.Helper
  */
-class StringMock {
+class CakeTextMock {
 }
 
 /**
@@ -79,13 +79,13 @@ class TextHelperTest extends CakeTestCase {
  */
 	public function testTextHelperProxyMethodCalls() {
 		$methods = array(
-			'highlight', 'stripLinks', 'truncate', 'excerpt', 'toList',
+			'highlight', 'stripLinks', 'truncate', 'tail', 'excerpt', 'toList',
 			);
-		$String = $this->getMock('StringMock', $methods);
-		$Text = new TextHelperTestObject($this->View, array('engine' => 'StringMock'));
-		$Text->attach($String);
+		$CakeText = $this->getMock('CakeTextMock', $methods);
+		$Text = new TextHelperTestObject($this->View, array('engine' => 'CakeTextMock'));
+		$Text->attach($CakeText);
 		foreach ($methods as $method) {
-			$String->expects($this->at(0))->method($method);
+			$CakeText->expects($this->at(0))->method($method);
 			$Text->{$method}('who', 'what', 'when', 'where', 'how');
 		}
 	}
@@ -117,6 +117,10 @@ class TextHelperTest extends CakeTestCase {
  * @return void
  */
 	public function testAutoLink() {
+		$text = 'The AWWWARD show happened today';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($text, $result);
+
 		$text = 'This is a test text';
 		$expected = 'This is a test text';
 		$result = $this->Text->autoLink($text);
@@ -127,6 +131,10 @@ class TextHelperTest extends CakeTestCase {
 		$expected = 'Text with a partial <a href="http://www.cakephp.org">www.cakephp.org</a> URL and <a href="mailto:test@cakephp\.org">test@cakephp\.org</a> email address';
 		$this->assertRegExp('#^' . $expected . '$#', $result);
 
+		$text = 'Text with a partial <a href="//www.cakephp.org">link</a> link';
+		$result = $this->Text->autoLink($text, array('escape' => false));
+		$this->assertEquals($text, $result);
+
 		$text = 'This is a test text with URL http://www.cakephp.org';
 		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>';
 		$result = $this->Text->autoLink($text);
@@ -146,6 +154,31 @@ class TextHelperTest extends CakeTestCase {
 		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>(and some more text)';
 		$result = $this->Text->autoLink($text);
 		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text with URL (http://www.cakephp.org/page/4) in brackets';
+		$expected = 'This is a test text with URL (<a href="http://www.cakephp.org/page/4">http://www.cakephp.org/page/4</a>) in brackets';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text with URL [http://www.cakephp.org/page/4] in square brackets';
+		$expected = 'This is a test text with URL [<a href="http://www.cakephp.org/page/4">http://www.cakephp.org/page/4</a>] in square brackets';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text with URL [http://www.example.com?aParam[]=value1&aParam[]=value2&aParam[]=value3] in square brackets';
+		$expected = 'This is a test text with URL [<a href="http://www.example.com?aParam[]=value1&amp;aParam[]=value2&amp;aParam[]=value3">http://www.example.com?aParam[]=value1&amp;aParam[]=value2&amp;aParam[]=value3</a>] in square brackets';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text with URL ;http://www.cakephp.org/page/4; semi-colon';
+		$expected = 'This is a test text with URL ;<a href="http://www.cakephp.org/page/4">http://www.cakephp.org/page/4</a>; semi-colon';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($expected, $result);
+
+		$text = 'This is a test text with URL (http://www.cakephp.org/page/4/other(thing)) brackets';
+		$expected = 'This is a test text with URL (<a href="http://www.cakephp.org/page/4/other(thing)">http://www.cakephp.org/page/4/other(thing)</a>) brackets';
+		$result = $this->Text->autoLink($text);
+		$this->assertEquals($expected, $result);
 	}
 
 /**
@@ -265,6 +298,10 @@ class TextHelperTest extends CakeTestCase {
 				'Text with a url http://www.not--work.com and more',
 				'Text with a url <a href="http://www.not--work.com">http://www.not--work.com</a> and more',
 			),
+			array(
+				'Text with a url http://www.sub_domain.domain.pl and more',
+				'Text with a url <a href="http://www.sub_domain.domain.pl">http://www.sub_domain.domain.pl</a> and more',
+			),
 			array(
 				'Text with a partial www.küchenschöhn-not-working.de URL',
 				'Text with a partial <a href="http://www.küchenschöhn-not-working.de">www.küchenschöhn-not-working.de</a> URL'
@@ -310,6 +347,16 @@ class TextHelperTest extends CakeTestCase {
  * @return void
  */
 	public function testAutoLinkUrlsEscape() {
+		$text = 'Text with a partial <a href="http://www.example.com">http://www.example.com</a> link';
+		$expected = 'Text with a partial <a href="http://www.example.com">http://www.example.com</a> link';
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
+		$this->assertEquals($expected, $result);
+
+		$text = 'Text with a partial <a href="http://www.example.com">www.example.com</a> link';
+		$expected = 'Text with a partial <a href="http://www.example.com">www.example.com</a> link';
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
+		$this->assertEquals($expected, $result);
+
 		$text = 'Text with a partial <a href="http://www.cakephp.org">link</a> link';
 		$expected = 'Text with a partial <a href="http://www.cakephp.org">link</a> link';
 		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
@@ -327,22 +374,22 @@ class TextHelperTest extends CakeTestCase {
 
 		$text = 'Text with a url <a href="http://www.not-working-www.com">www.not-working-www.com</a> and more';
 		$expected = 'Text with a url &lt;a href=&quot;http://www.not-working-www.com&quot;&gt;www.not-working-www.com&lt;/a&gt; and more';
-		$result = $this->Text->autoLinkUrls($text);
+		$result = $this->Text->autoLinkUrls($text, array('escape' => true));
 		$this->assertEquals($expected, $result);
 
 		$text = 'Text with a url www.not-working-www.com and more';
 		$expected = 'Text with a url <a href="http://www.not-working-www.com">www.not-working-www.com</a> and more';
-		$result = $this->Text->autoLinkUrls($text);
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
 		$this->assertEquals($expected, $result);
 
 		$text = 'Text with a url http://www.not-working-www.com and more';
 		$expected = 'Text with a url <a href="http://www.not-working-www.com">http://www.not-working-www.com</a> and more';
-		$result = $this->Text->autoLinkUrls($text);
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
 		$this->assertEquals($expected, $result);
 
 		$text = 'Text with a url http://www.www.not-working-www.com and more';
 		$expected = 'Text with a url <a href="http://www.www.not-working-www.com">http://www.www.not-working-www.com</a> and more';
-		$result = $this->Text->autoLinkUrls($text);
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
 		$this->assertEquals($expected, $result);
 	}
 
@@ -359,54 +406,82 @@ class TextHelperTest extends CakeTestCase {
 	}
 
 /**
- * testAutoLinkEmails method
+ * Data provider for autoLinkEmail.
  *
  * @return void
  */
-	public function testAutoLinkEmails() {
-		$text = 'This is a test text';
-		$expected = 'This is a test text';
-		$result = $this->Text->autoLinkUrls($text);
-		$this->assertEquals($expected, $result);
+	public function autoLinkEmailProvider() {
+		return array(
+			array(
+				'This is a test text',
+				'This is a test text',
+			),
 
-		$text = 'email@example.com address';
-		$expected = '<a href="mailto:email@example.com">email@example.com</a> address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				'email@example.com address',
+				'<a href="mailto:email@example.com">email@example.com</a> address',
+			),
 
-		$text = 'email@example.com address';
-		$expected = '<a href="mailto:email@example.com">email@example.com</a> address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				'email@example.com address',
+				'<a href="mailto:email@example.com">email@example.com</a> address',
+			),
 
-		$text = '(email@example.com) address';
-		$expected = '(<a href="mailto:email@example.com">email@example.com</a>) address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				'(email@example.com) address',
+				'(<a href="mailto:email@example.com">email@example.com</a>) address',
+			),
 
-		$text = 'Text with email@example.com address';
-		$expected = 'Text with <a href="mailto:email@example.com">email@example.com</a> address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				'Text with email@example.com address',
+				'Text with <a href="mailto:email@example.com">email@example.com</a> address',
+			),
 
-		$text = "Text with o'hare._-bob@example.com address";
-		$expected = 'Text with <a href="mailto:o&#039;hare._-bob@example.com">o&#039;hare._-bob@example.com</a> address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				"Text with o'hare._-bob@example.com address",
+				'Text with <a href="mailto:o&#039;hare._-bob@example.com">o&#039;hare._-bob@example.com</a> address',
+			),
 
-		$text = 'Text with email@example.com address';
-		$expected = 'Text with <a href="mailto:email@example.com" class="link">email@example.com</a> address';
-		$result = $this->Text->autoLinkEmails($text, array('class' => 'link'));
-		$this->assertEquals($expected, $result);
+			array(
+				'Text with düsentrieb@küchenschöhn-not-working.de address',
+				'Text with <a href="mailto:düsentrieb@küchenschöhn-not-working.de">düsentrieb@küchenschöhn-not-working.de</a> address',
+			),
 
-		$text = 'Text with düsentrieb@küchenschöhn-not-working.de address';
-		$expected = 'Text with <a href="mailto:düsentrieb@küchenschöhn-not-working.de">düsentrieb@küchenschöhn-not-working.de</a> address';
-		$result = $this->Text->autoLinkEmails($text);
-		$this->assertEquals($expected, $result);
+			array(
+				'Text with me@subdomain.küchenschöhn.de address',
+				'Text with <a href="mailto:me@subdomain.küchenschöhn.de">me@subdomain.küchenschöhn.de</a> address',
+			),
 
-		$text = 'Text with me@subdomain.küchenschöhn.de address';
-		$expected = 'Text with <a href="mailto:me@subdomain.küchenschöhn.de">me@subdomain.küchenschöhn.de</a> address';
-		$result = $this->Text->autoLinkEmails($text);
+			array(
+				'Text with email@example.com address',
+				'Text with <a href="mailto:email@example.com" class="link">email@example.com</a> address',
+				array('class' => 'link'),
+			),
+
+			array(
+				'<p>mark@example.com</p>',
+				'<p><a href="mailto:mark@example.com">mark@example.com</a></p>',
+				array('escape' => false)
+			),
+
+			array(
+				'Some&nbsp;mark@example.com&nbsp;Text',
+				'Some&nbsp;<a href="mailto:mark@example.com">mark@example.com</a>&nbsp;Text',
+				array('escape' => false)
+			),
+		);
+	}
+
+/**
+ * testAutoLinkEmails method
+ *
+ * @param string $text The text to link
+ * @param string $expected The expected results.
+ * @dataProvider autoLinkEmailProvider
+ * @return void
+ */
+	public function testAutoLinkEmails($text, $expected, $attrs = array()) {
+		$result = $this->Text->autoLinkEmails($text, $attrs);
 		$this->assertEquals($expected, $result);
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
index 3b7ab5cad..e781c85b5 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
@@ -175,7 +175,7 @@ class TimeHelperTest extends CakeTestCase {
 				'title' => $timestamp,
 				'class' => 'time-ago-in-words'
 			),
-			'2 weeks',
+			'in 2 weeks',
 			'/div'
 		);
 		$this->assertTags($result, $expected);
diff --git a/web/api/lib/Cake/Test/Case/View/HelperTest.php b/web/api/lib/Cake/Test/Case/View/HelperTest.php
index 2d5bbaa62..d57d71f8f 100644
--- a/web/api/lib/Cake/Test/Case/View/HelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/HelperTest.php
@@ -31,7 +31,7 @@ class HelperTestPost extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -71,7 +71,7 @@ class HelperTestComment extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -105,7 +105,7 @@ class HelperTestTag extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
@@ -136,7 +136,7 @@ class HelperTestPostsTag extends Model {
 /**
  * useTable property
  *
- * @var boolean
+ * @var bool
  */
 	public $useTable = false;
 
diff --git a/web/api/lib/Cake/Test/Case/View/JsonViewTest.php b/web/api/lib/Cake/Test/Case/View/JsonViewTest.php
index 5a661c78b..d90596f47 100644
--- a/web/api/lib/Cake/Test/Case/View/JsonViewTest.php
+++ b/web/api/lib/Cake/Test/Case/View/JsonViewTest.php
@@ -28,6 +28,11 @@ App::uses('JsonView', 'View');
  */
 class JsonViewTest extends CakeTestCase {
 
+/**
+ * setUp method
+ *
+ * @return void
+ **/
 	public function setUp() {
 		parent::setUp();
 		Configure::write('debug', 0);
@@ -156,6 +161,20 @@ class JsonViewTest extends CakeTestCase {
 		);
 	}
 
+/**
+ * Custom error handler for use while testing methods that use json_encode
+ * @param int $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param int $errline
+ * @param array $errcontext
+ * @return void
+ * @throws CakeException
+ **/
+	public function jsonEncodeErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
+		throw new CakeException($errstr, 0, $errno, $errfile, $errline);
+	}
+
 /**
  * Test render with a valid string in _serialize.
  *
@@ -175,6 +194,31 @@ class JsonViewTest extends CakeTestCase {
 		$this->assertSame($expected, $output);
 	}
 
+/**
+ * Test render with _jsonOptions setting.
+ *
+ * @return void
+ */
+	public function testRenderWithoutViewJsonOptions() {
+		$this->skipIf(!version_compare(PHP_VERSION, '5.3.0', '>='), 'Needs PHP5.3+ for these constants to be tested');
+
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+
+		// Test render with encode <, >, ', &, and " for RFC4627-compliant to be serialized.
+		$data = array('rfc4627_escape' => '<tag> \'quote\' "double-quote" &');
+		$serialize = 'rfc4627_escape';
+		$expected = json_encode('<tag> \'quote\' "double-quote" &', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
+
+		$Controller->set($data);
+		$Controller->set('_serialize', $serialize);
+		$Controller->set('_jsonOptions', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
+		$View = new JsonView($Controller);
+		$output = $View->render(false);
+
+		$this->assertSame($expected, $output);
+	}
 /**
  * Test that rendering with _serialize does not load helpers.
  *
@@ -306,4 +350,58 @@ class JsonViewTest extends CakeTestCase {
 		$this->assertSame($expected, $output);
 		$this->assertSame('application/javascript', $Response->type());
 	}
+
+/**
+ * JsonViewTest::testRenderInvalidJSON()
+ *
+ * @return void
+ */
+	public function testRenderInvalidJSON() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+
+		// non utf-8 stuff
+		$bar = 'bar';
+		$bar .= chr(0x97);
+		$data = array('data' => array('foo' => $bar));
+
+		$Controller->set($data);
+		$Controller->set('_serialize', 'data');
+		$View = new JsonView($Controller);
+
+		// Use a custom error handler
+		set_error_handler(array($this, 'jsonEncodeErrorHandler'));
+
+		try {
+			$View->render();
+			restore_error_handler();
+			$this->fail('Failed asserting that exception of type "CakeException" is thrown.');
+		} catch (CakeException $e) {
+			restore_error_handler();
+			$this->assertRegExp('/UTF-8/', $e->getMessage());
+			return;
+		}
+	}
+
+/**
+ * JsonViewTest::testRenderJSONBoolFalse()
+ *
+ * @return void
+ */
+	public function testRenderJSONBoolFalse() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+
+		// encoding a false, ensure this doesn't trigger exception
+		$data = false;
+
+		$Controller->set($data);
+		$Controller->set('_serialize', 'data');
+		$View = new JsonView($Controller);
+		$output = $View->render();
+		$this->assertSame('null', $output);
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/View/MediaViewTest.php b/web/api/lib/Cake/Test/Case/View/MediaViewTest.php
index d3b8dc70d..4fc0a7242 100644
--- a/web/api/lib/Cake/Test/Case/View/MediaViewTest.php
+++ b/web/api/lib/Cake/Test/Case/View/MediaViewTest.php
@@ -77,9 +77,6 @@ class MediaViewTest extends CakeTestCase {
 				array('name' => null, 'download' => null)
 			);
 
-		$this->MediaView->response->expects($this->once())
-			->method('send');
-
 		$this->MediaView->render();
 	}
 
@@ -115,9 +112,6 @@ class MediaViewTest extends CakeTestCase {
 				)
 			);
 
-		$this->MediaView->response->expects($this->once())
-			->method('send');
-
 		$this->MediaView->render();
 	}
 
@@ -137,10 +131,6 @@ class MediaViewTest extends CakeTestCase {
 			->with('jpg')
 			->will($this->returnArgument(0));
 
-		$this->MediaView->response->expects($this->at(0))
-			->method('send')
-			->will($this->returnValue(true));
-
 		$this->MediaView->render();
 	}
 
diff --git a/web/api/lib/Cake/Test/Case/View/ViewTest.php b/web/api/lib/Cake/Test/Case/View/ViewTest.php
index 7ad86dd15..4973c688f 100644
--- a/web/api/lib/Cake/Test/Case/View/ViewTest.php
+++ b/web/api/lib/Cake/Test/Case/View/ViewTest.php
@@ -22,6 +22,8 @@ App::uses('Controller', 'Controller');
 App::uses('CacheHelper', 'View/Helper');
 App::uses('HtmlHelper', 'View/Helper');
 App::uses('ErrorHandler', 'Error');
+App::uses('CakeEventManager', 'Event');
+App::uses('CakeEventListener', 'Event');
 
 /**
  * ViewPostsController class
@@ -40,7 +42,7 @@ class ViewPostsController extends Controller {
 /**
  * uses property
  *
- * @var mixed null
+ * @var mixed
  */
 	public $uses = null;
 
@@ -163,7 +165,7 @@ class TestView extends View {
  * paths method
  *
  * @param string $plugin Optional plugin name to scan for view files.
- * @param boolean $cached Set to true to force a refresh of view paths.
+ * @param bool $cached Set to true to force a refresh of view paths.
  * @return array paths
  */
 	public function paths($plugin = null, $cached = true) {
@@ -238,6 +240,61 @@ class TestObjectWithToString {
 class TestObjectWithoutToString {
 }
 
+/**
+ * Class TestViewEventListener
+ *
+ * An event listener to test cakePHP events
+ */
+class TestViewEventListener implements CakeEventListener {
+
+/**
+ * type of view before rendering has occurred
+ *
+ * @var string
+ */
+	public $beforeRenderViewType;
+
+/**
+ * type of view after rendering has occurred
+ *
+ * @var string
+ */
+	public $afterRenderViewType;
+
+/**
+ * implementedEvents method
+ *
+ * @return array
+ */
+	public function implementedEvents() {
+		return array(
+				'View.beforeRender' => 'beforeRender',
+				'View.afterRender' => 'afterRender'
+				);
+	}
+
+/**
+ * beforeRender method
+ *
+ * @param CakeEvent $event the event being sent
+ * @return void
+ */
+	public function beforeRender($event) {
+		$this->beforeRenderViewType = $event->subject()->getCurrentType();
+	}
+
+/**
+ * afterRender method
+ *
+ * @param CakeEvent $event the event being sent
+ * @return void
+ */
+	public function afterRender($event) {
+		$this->afterRenderViewType = $event->subject()->getCurrentType();
+	}
+
+}
+
 /**
  * ViewTest class
  *
@@ -338,6 +395,26 @@ class ViewTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * Test that plugin files with absolute file paths are scoped
+ * to the plugin and do now allow any file path.
+ *
+ * @expectedException MissingViewException
+ * @return void
+ */
+	public function testPluginGetTemplateAbsoluteFail() {
+		$this->Controller->viewPath = 'Pages';
+		$this->Controller->action = 'display';
+		$this->Controller->params['pass'] = array('home');
+
+		$view = new TestThemeView($this->Controller);
+		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'Company' . DS . 'TestPluginThree' . DS . 'View' . DS . 'Pages' . DS . 'index.ctp';
+		$result = $view->getViewFileName('Company/TestPluginThree./Pages/index');
+		$this->assertPathEquals($expected, $result);
+
+		$view->getViewFileName('Company/TestPluginThree./etc/passwd');
+	}
+
 /**
  * Test getLayoutFileName method on plugin
  *
@@ -808,6 +885,30 @@ class ViewTest extends CakeTestCase {
 		Cache::drop('test_view');
 	}
 
+/**
+ * Test element events
+ *
+ * @return void
+ */
+	public function testViewEvent() {
+		$View = new View($this->PostsController);
+		$View->autoLayout = false;
+		$listener = new TestViewEventListener();
+
+		$View->getEventManager()->attach($listener);
+
+		$View->render('index');
+		$this->assertEquals(View::TYPE_VIEW, $listener->beforeRenderViewType);
+		$this->assertEquals(View::TYPE_VIEW, $listener->afterRenderViewType);
+
+		$this->assertEquals($View->getCurrentType(), View::TYPE_VIEW);
+		$View->element('test_element', array(), array('callbacks' => true));
+		$this->assertEquals($View->getCurrentType(), View::TYPE_VIEW);
+
+		$this->assertEquals(View::TYPE_ELEMENT, $listener->beforeRenderViewType);
+		$this->assertEquals(View::TYPE_ELEMENT, $listener->afterRenderViewType);
+	}
+
 /**
  * Test __get allowing access to helpers.
  *
@@ -1020,7 +1121,7 @@ class ViewTest extends CakeTestCase {
 		$this->PostsController->set('url', 'flash');
 		$this->PostsController->set('message', 'yo what up');
 		$this->PostsController->set('pause', 3);
-		$this->PostsController->set('page_title', 'yo what up');
+		$this->PostsController->set('pageTitle', 'yo what up');
 
 		$View = new TestView($this->PostsController);
 		$result = $View->render(false, 'flash');
@@ -1344,6 +1445,17 @@ class ViewTest extends CakeTestCase {
 		$this->assertSame('', $result);
 	}
 
+/**
+ * Test checking a block's existance.
+ *
+ * @return void
+ */
+	public function testBlockExist() {
+		$this->assertFalse($this->View->exists('test'));
+		$this->View->assign('test', 'Block content');
+		$this->assertTrue($this->View->exists('test'));
+	}
+
 /**
  * Test setting a block's content to null
  *
diff --git a/web/api/lib/Cake/Test/Case/View/XmlViewTest.php b/web/api/lib/Cake/Test/Case/View/XmlViewTest.php
index 89399beef..65a9bdcd4 100644
--- a/web/api/lib/Cake/Test/Case/View/XmlViewTest.php
+++ b/web/api/lib/Cake/Test/Case/View/XmlViewTest.php
@@ -96,6 +96,76 @@ class XmlViewTest extends CakeTestCase {
 		$this->assertFalse(isset($View->Html), 'No helper loaded.');
 	}
 
+/**
+ * Test that rendering with _serialize respects XML options.
+ *
+ * @return void
+ */
+	public function testRenderSerializeWithOptions() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+		$data = array(
+			'_serialize' => array('tags'),
+			'_xmlOptions' => array('format' => 'attributes', 'return' => 'domdocument'),
+			'tags' => array(
+				'tag' => array(
+					array(
+						'id' => '1',
+						'name' => 'defect'
+					),
+					array(
+						'id' => '2',
+						'name' => 'enhancement'
+					)
+				)
+			)
+		);
+		$Controller->set($data);
+		$Controller->viewClass = 'Xml';
+		$View = new XmlView($Controller);
+		$result = $View->render();
+
+		$expected = Xml::build(array('response' => array('tags' => $data['tags'])), $data['_xmlOptions'])->saveXML();
+		$this->assertSame($expected, $result);
+	}
+
+/**
+ * Test that rendering with _serialize can work with string setting.
+ *
+ * @return void
+ */
+	public function testRenderSerializeWithString() {
+		$Request = new CakeRequest();
+		$Response = new CakeResponse();
+		$Controller = new Controller($Request, $Response);
+		$data = array(
+			'_serialize' => 'tags',
+			'_xmlOptions' => array('format' => 'attributes'),
+			'tags' => array(
+				'tags' => array(
+					'tag' => array(
+						array(
+							'id' => '1',
+							'name' => 'defect'
+						),
+						array(
+							'id' => '2',
+							'name' => 'enhancement'
+						)
+					)
+				)
+			)
+		);
+		$Controller->set($data);
+		$Controller->viewClass = 'Xml';
+		$View = new XmlView($Controller);
+		$result = $View->render();
+
+		$expected = Xml::build($data['tags'], $data['_xmlOptions'])->asXML();
+		$this->assertSame($expected, $result);
+	}
+
 /**
  * Test render with an array in _serialize
  *
diff --git a/web/api/lib/Cake/Test/Fixture/AfterTreeFixture.php b/web/api/lib/Cake/Test/Fixture/AfterTreeFixture.php
index dd3775276..9dcc44997 100644
--- a/web/api/lib/Cake/Test/Fixture/AfterTreeFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/AfterTreeFixture.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * AdFixture class
+ * AfterTreeFixture class
  *
  * @package       Cake.Test.Fixture
  */
diff --git a/web/api/lib/Cake/Test/Fixture/ArmorFixture.php b/web/api/lib/Cake/Test/Fixture/ArmorFixture.php
index 6da638e5a..87b8e2bdb 100644
--- a/web/api/lib/Cake/Test/Fixture/ArmorFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/ArmorFixture.php
@@ -28,7 +28,7 @@ class ArmorFixture extends CakeTestFixture {
  *
  * Used for Multi database fixture test
  *
- * @var string 'test2'
+ * @var string
  */
 	public $useDbConfig = 'test2';
 
diff --git a/web/api/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php b/web/api/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php
index 93f61ef1b..bbb2ec4bf 100644
--- a/web/api/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/ArmorsPlayerFixture.php
@@ -28,7 +28,7 @@ class ArmorsPlayerFixture extends CakeTestFixture {
  *
  * Used for Multi database fixture test
  *
- * @var string 'test_database_three'
+ * @var string
  */
 	public $useDbConfig = 'test_database_three';
 
diff --git a/web/api/lib/Cake/Test/Fixture/DependencyFixture.php b/web/api/lib/Cake/Test/Fixture/DependencyFixture.php
index 5054ac281..9f97a1d40 100644
--- a/web/api/lib/Cake/Test/Fixture/DependencyFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/DependencyFixture.php
@@ -30,6 +30,7 @@ class DependencyFixture extends CakeTestFixture {
  * @var array
  */
 	public $fields = array(
+		'id' => 'integer',
 		'child_id' => 'integer',
 		'parent_id' => 'integer'
 	);
@@ -40,6 +41,6 @@ class DependencyFixture extends CakeTestFixture {
  * @var array
  */
 	public $records = array(
-		array('child_id' => 1, 'parent_id' => 2),
+		array('id' => 1, 'child_id' => 1, 'parent_id' => 2),
 	);
 }
diff --git a/web/api/lib/Cake/Test/Fixture/JoinABFixture.php b/web/api/lib/Cake/Test/Fixture/JoinABFixture.php
index 037f81b1a..2342b840f 100644
--- a/web/api/lib/Cake/Test/Fixture/JoinABFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/JoinABFixture.php
@@ -26,7 +26,7 @@ class JoinABFixture extends CakeTestFixture {
 /**
  * name property
  *
- * @var string 'JoinAsJoinB'
+ * @var string
  */
 	public $name = 'JoinAsJoinB';
 
diff --git a/web/api/lib/Cake/Test/Fixture/JoinACFixture.php b/web/api/lib/Cake/Test/Fixture/JoinACFixture.php
index 885891565..860c8697b 100644
--- a/web/api/lib/Cake/Test/Fixture/JoinACFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/JoinACFixture.php
@@ -26,7 +26,7 @@ class JoinACFixture extends CakeTestFixture {
 /**
  * name property
  *
- * @var string 'JoinAsJoinC'
+ * @var string
  */
 	public $name = 'JoinAsJoinC';
 
diff --git a/web/api/lib/Cake/Test/Fixture/NumberTreeFixture.php b/web/api/lib/Cake/Test/Fixture/NumberTreeFixture.php
index cea904921..78d34cf21 100644
--- a/web/api/lib/Cake/Test/Fixture/NumberTreeFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/NumberTreeFixture.php
@@ -37,6 +37,7 @@ class NumberTreeFixture extends CakeTestFixture {
 		'name'	=> array('type' => 'string', 'null' => false),
 		'parent_id' => 'integer',
 		'lft'	=> array('type' => 'integer', 'null' => false),
-		'rght'	=> array('type' => 'integer', 'null' => false)
+		'rght'	=> array('type' => 'integer', 'null' => false),
+		'level'	=> array('type' => 'integer', 'null' => true)
 	);
 }
diff --git a/web/api/lib/Cake/Test/Fixture/TagFixture.php b/web/api/lib/Cake/Test/Fixture/TagFixture.php
index 3ab1c5139..d69825f0a 100644
--- a/web/api/lib/Cake/Test/Fixture/TagFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/TagFixture.php
@@ -31,8 +31,8 @@ class TagFixture extends CakeTestFixture {
 	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'tag' => array('type' => 'string', 'null' => false),
-		'created' => 'datetime',
-		'updated' => 'datetime'
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
 	);
 
 /**
diff --git a/web/api/lib/Cake/Test/Fixture/TranslateArticleFixture.php b/web/api/lib/Cake/Test/Fixture/TranslateArticleFixture.php
index 85cd4f13a..96483bfb0 100644
--- a/web/api/lib/Cake/Test/Fixture/TranslateArticleFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/TranslateArticleFixture.php
@@ -26,7 +26,7 @@ class TranslateArticleFixture extends CakeTestFixture {
 /**
  * table property
  *
- * @var string 'i18n'
+ * @var string
  */
 	public $table = 'article_i18n';
 
diff --git a/web/api/lib/Cake/Test/Fixture/TranslateFixture.php b/web/api/lib/Cake/Test/Fixture/TranslateFixture.php
index 19e07a87c..bd37911d1 100644
--- a/web/api/lib/Cake/Test/Fixture/TranslateFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/TranslateFixture.php
@@ -26,7 +26,7 @@ class TranslateFixture extends CakeTestFixture {
 /**
  * table property
  *
- * @var string 'i18n'
+ * @var string
  */
 	public $table = 'i18n';
 
diff --git a/web/api/lib/Cake/Test/Fixture/TranslateTableFixture.php b/web/api/lib/Cake/Test/Fixture/TranslateTableFixture.php
index b03c5184f..351bae576 100644
--- a/web/api/lib/Cake/Test/Fixture/TranslateTableFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/TranslateTableFixture.php
@@ -26,7 +26,7 @@ class TranslateTableFixture extends CakeTestFixture {
 /**
  * table property
  *
- * @var string 'another_i18n'
+ * @var string
  */
 	public $table = 'another_i18n';
 
diff --git a/web/api/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php b/web/api/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
index a33186778..9787ac85c 100644
--- a/web/api/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
+++ b/web/api/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
@@ -15,9 +15,6 @@
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
  * @package       Cake.Test.Fixture
  * @since         CakePHP(tm) v 1.2.0.5669
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 /**
@@ -30,7 +27,7 @@ class TranslateWithPrefixFixture extends CakeTestFixture {
 /**
  * table property
  *
- * @var string 'i18n'
+ * @var string
  */
 	public $table = 'i18n_translate_with_prefixes';
 
diff --git a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
index 5cd6a4dee..b4072d770 100644
--- a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
+++ b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
@@ -33,10 +33,10 @@
 		if ($this->request->is('post')) {
 			$this->BakeArticle->create();
 			if ($this->BakeArticle->save($this->request->data)) {
-				$this->Session->setFlash(__('The bake article has been saved.'));
+				$this->Flash->success(__('The bake article has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The bake article could not be saved. Please, try again.'));
+				$this->Flash->error(__('The bake article could not be saved. Please, try again.'));
 			}
 		}
 		$bakeTags = $this->BakeArticle->BakeTag->find('list');
@@ -56,10 +56,10 @@
 		}
 		if ($this->request->is(array('post', 'put'))) {
 			if ($this->BakeArticle->save($this->request->data)) {
-				$this->Session->setFlash(__('The bake article has been saved.'));
+				$this->Flash->success(__('The bake article has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The bake article could not be saved. Please, try again.'));
+				$this->Flash->error(__('The bake article could not be saved. Please, try again.'));
 			}
 		} else {
 			$options = array('conditions' => array('BakeArticle.' . $this->BakeArticle->primaryKey => $id));
@@ -83,9 +83,9 @@
 		}
 		$this->request->allowMethod('post', 'delete');
 		if ($this->BakeArticle->delete()) {
-			$this->Session->setFlash(__('The bake article has been deleted.'));
+			$this->Flash->success(__('The bake article has been deleted.'));
 		} else {
-			$this->Session->setFlash(__('The bake article could not be deleted. Please, try again.'));
+			$this->Flash->error(__('The bake article could not be deleted. Please, try again.'));
 		}
 		return $this->redirect(array('action' => 'index'));
 	}
diff --git a/web/api/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp b/web/api/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp
index 325fdb991..757e0eabd 100644
--- a/web/api/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp
+++ b/web/api/lib/Cake/Test/bake_compare/Controller/Scaffold.ctp
@@ -2,7 +2,6 @@
 App::uses('AppController', 'Controller');
 /**
  * Articles Controller
- *
  */
 class ArticlesController extends AppController {
 
diff --git a/web/api/lib/Cake/Test/bake_compare/View/index.ctp b/web/api/lib/Cake/Test/bake_compare/View/index.ctp
new file mode 100644
index 000000000..b2738e4b3
--- /dev/null
+++ b/web/api/lib/Cake/Test/bake_compare/View/index.ctp
@@ -0,0 +1,58 @@
+<div class="viewTaskComments index">
+	<h2><?php echo __('View Task Comments'); ?></h2>
+	<table cellpadding="0" cellspacing="0">
+	<thead>
+	<tr>
+			<th><?php echo $this->Paginator->sort('id'); ?></th>
+			<th><?php echo $this->Paginator->sort('article_id'); ?></th>
+			<th><?php echo $this->Paginator->sort('user_id'); ?></th>
+			<th><?php echo $this->Paginator->sort('comment'); ?></th>
+			<th><?php echo $this->Paginator->sort('published'); ?></th>
+			<th><?php echo $this->Paginator->sort('created'); ?></th>
+			<th><?php echo $this->Paginator->sort('updated'); ?></th>
+			<th class="actions"><?php echo __('Actions'); ?></th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($viewTaskComments as $viewTaskComment): ?>
+	<tr>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['id']); ?>&nbsp;</td>
+		<td>
+			<?php echo $this->Html->link($viewTaskComment['Article']['title'], array('controller' => 'view_task_articles', 'action' => 'view', $viewTaskComment['Article']['id'])); ?>
+		</td>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['user_id']); ?>&nbsp;</td>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['comment']); ?>&nbsp;</td>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['published']); ?>&nbsp;</td>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['created']); ?>&nbsp;</td>
+		<td><?php echo h($viewTaskComment['ViewTaskComment']['updated']); ?>&nbsp;</td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View'), array('action' => 'view', $viewTaskComment['ViewTaskComment']['id'])); ?>
+			<?php echo $this->Html->link(__('Edit'), array('action' => 'edit', $viewTaskComment['ViewTaskComment']['id'])); ?>
+			<?php echo $this->Form->postLink(__('Delete'), array('action' => 'delete', $viewTaskComment['ViewTaskComment']['id']), array('confirm' => __('Are you sure you want to delete # %s?', $viewTaskComment['ViewTaskComment']['id']))); ?>
+		</td>
+	</tr>
+<?php endforeach; ?>
+	</tbody>
+	</table>
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+		'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')
+	));
+	?>	</p>
+	<div class="paging">
+	<?php
+		echo $this->Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled'));
+		echo $this->Paginator->numbers(array('separator' => ''));
+		echo $this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled'));
+	?>
+	</div>
+</div>
+<div class="actions">
+	<h3><?php echo __('Actions'); ?></h3>
+	<ul>
+		<li><?php echo $this->Html->link(__('New View Task Comment'), array('action' => 'add')); ?></li>
+		<li><?php echo $this->Html->link(__('List View Task Articles'), array('controller' => 'view_task_articles', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('New Article'), array('controller' => 'view_task_articles', 'action' => 'add')); ?> </li>
+	</ul>
+</div>
diff --git a/web/api/lib/Cake/Test/test_app/Controller/TestsAppsController.php b/web/api/lib/Cake/Test/test_app/Controller/TestsAppsController.php
index 8cd847c5d..35783548d 100644
--- a/web/api/lib/Cake/Test/test_app/Controller/TestsAppsController.php
+++ b/web/api/lib/Cake/Test/test_app/Controller/TestsAppsController.php
@@ -44,6 +44,10 @@ class TestsAppsController extends AppController {
 		$this->render('index');
 	}
 
+	public function file() {
+		$this->response->file(__FILE__);
+	}
+
 	public function redirect_to() {
 		return $this->redirect('http://cakephp.org');
 	}
diff --git a/web/api/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php b/web/api/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
index 263592db2..4d89deb43 100644
--- a/web/api/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
+++ b/web/api/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
@@ -46,4 +46,7 @@ class TestAppCacheEngine extends CacheEngine {
 
 	public function clearGroup($group) {
 	}
+
+	public function add($key, $value, $duration) {
+	}
 }
diff --git a/web/api/lib/Cake/Test/test_app/Locale/nld/LC_MESSAGES/default.po b/web/api/lib/Cake/Test/test_app/Locale/nld/LC_MESSAGES/default.po
new file mode 100644
index 000000000..9bfcc2e4b
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Locale/nld/LC_MESSAGES/default.po
@@ -0,0 +1,32 @@
+msgctxt "character"
+msgid "letter"
+msgid_plural "letters"
+msgstr[0] "letter"
+msgstr[1] "letters"
+
+msgctxt "mail"
+msgid "letter"
+msgid_plural "letters"
+msgstr[0] "brief"
+msgstr[1] "brieven"
+
+msgctxt "spherical object"
+msgid "ball"
+msgstr "bal"
+
+msgctxt "social gathering"
+msgid "ball"
+msgstr "danspartij"
+
+msgid "ball"
+msgstr "bal"
+
+msgid "balance"
+msgstr "balans"
+
+msgctxt "money"
+msgid "balance"
+msgstr "saldo"
+
+msgid "zoo"
+msgstr "dierentuin"
diff --git a/web/api/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo b/web/api/lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo
new file mode 100644
index 0000000000000000000000000000000000000000..83a8e6273c556f0fe297ccf839b763bcf1ba87ba
GIT binary patch
literal 392
zcmZXOF;2rk5JiW?0Te`pKu9SlQsopBbQIhmq8YD;c&*K@wYwl0iDS@lAj&kf9Dy_N
z$2Msg>G|pJ>U;M4vUn%VDYyZT;0%0#6YvQNum?-<1+KskI0us>qHFkK^ctQb-@?c6
z-I(v;1@Z%|y$w8rYj_TOSbN==-{1+dzCj1E|DV27N8hA<?dX*3*c(whGBrmwSz_TN
zLo_JSj;;H57QA%DUq1z7*{!ymYl+rx^}<nVH5pulvJsPq)7KD&y-77LIqWK<l_%2g
Zi+D=xsz4R{)N;(W=^K@mC_X=1Prp8|Pc#4k

literal 0
HcmV?d00001

diff --git a/web/api/lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/test_plugin.po b/web/api/lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/test_plugin.po
new file mode 100644
index 000000000..586a0bde0
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Locale/po/LC_MESSAGES/test_plugin.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 1"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1"
+msgstr[1] "%d = 0 or > 1"
diff --git a/web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo b/web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/core.mo
new file mode 100644
index 0000000000000000000000000000000000000000..54ae1eeb2fc2e42de1eac36f1d5a00aebef7b055
GIT binary patch
literal 875
zcmaJ<%We}f6dhihS$2oS;%*v&go8avt7Os%NFf!G+7h(`Vu_i#NnB>^$oBN{6YTg0
zeuLj&!MAWHQ<$nEwRGewpX2-fz4Q2cK<5$R8KF;jLO3GS=QH6YK@y%4z7c*t2!bDU
z|00|}41!&{r{sX1|DD<&QAFmDfPm)<Yf8wB#TU&J2V-G;hnW|Zl?9wu1>R+>ImgVi
zS<XJ9b;{@%Ch{xJ-_0RK=Ut^dhV%C+n^=^dc=lF$j3MHp&qT!dK8Rr)amIU`laQU_
zg{uAB=)xnZmz7*1OHr1s^O+c&KnG@mpHLuK!hsT8cQcB;Uaj9OOR0)(X3BARJUgDY
z$%!rxCq{eJo~74o%EaT9f3+^8(j&-L(mM3XhxCvQTAh{JEzq*5&P=ZKGKRqy<-?{e
z?9kZK#h}-lF1ciX1dW;KB;oKHI1rm8f=tnv5t&hK?h4MwNe?=m#y&_y{iD}%Lfj&U
zLn8Y`?v27vY;G`Dp8f4m3}@;JHraq#K$D$ob!Vos8BUrKW2pRsYOJTO9HrQ90{FV#
zg2t3@mV)Tpi}D{jy5~3Q+`*;tE8smw#chw%DurNF={?E|wAX$`lK?CnZc{cLxLMo1
GZK^+|wD?#6

literal 0
HcmV?d00001

diff --git a/web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo b/web/api/lib/Cake/Test/test_app/Locale/rule_15_mo/LC_MESSAGES/default.mo
new file mode 100644
index 0000000000000000000000000000000000000000..aa402fe9d4f345181be1f1232c274b68c2cded75
GIT binary patch
literal 769
zcmZuv&2G~`5H^1oOI#2)ILxIH95(DaX_YwLfD{@LsVz}!5Jwh!k}TM3Yj+*mJFmc%
zci~02@g9upfGK69Pcu8;c=nrF|9EisYe05~@R%?p+#?(l8hcN8NKl0Pge~FwtswY9
z{u^O_I|v?;|4E+G0l7cc^bGbgkRV#ep|mii(=xBE%Hgceu{qiDBc`4$GWHg&)1`@F
zras~F)e;hP-qqS;xO|<knMLJ^XD^k<7$Po)Ohk+yfEdRSXMDgp6|ytj>ZZ@GE<9Fd
zU8^;+1Xa;BUx?8u^k5<QDP5!rIMjlheoA*&o9e~7P&)6YWibs;7AHrYIML_ftTY~t
zXUSznN<3cpXH~AWnLxTx)}fbgk~tf7bygX-Ld%X!T4vg;V;FtVK5SRP=A|uM45qr;
zjFSfwXhUhF<nSCg5G$piP_$u0Vbp|sg7c{yK(E)vhf*|O3_4DTzsT{J$RUyYlkgo|
zmY8YJes3s-bA16<YM@*}tIl<G=VfhEoV6pyQ2Q0l*u1WGB=L!Frp)PavZuSG_+K)*
skwlX@_^kZ~_<)i8e>-)&5R4|c!Ee!C`VH+BFn4&JZ>QM(Zu{4{UrX@Q7ytkO

literal 0
HcmV?d00001

diff --git a/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po b/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..1f8d1fe9c
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/core.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2014-12-06 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Poedit-Language: Six Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 15 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 0 (from core translated)"
+msgstr[1] "%d is 1 (from core translated)"
+msgstr[2] "%d is 2 (from core translated)"
+msgstr[3] "%d ends with 03-10 (from core translated)"
+msgstr[4] "%d ends with 11-99 (from core translated)"
+msgstr[5] "%d everything else (from core translated)"
+
diff --git a/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po b/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..3a2998804
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Locale/rule_15_po/LC_MESSAGES/default.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2014-12-06 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Poedit-Language: Six Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 15 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 0 (translated)"
+msgstr[1] "%d is 1 (translated)"
+msgstr[2] "%d is 2 (translated)"
+msgstr[3] "%d ends with 03-10 (translated)"
+msgstr[4] "%d ends with 11-99 (translated)"
+msgstr[5] "%d everything else (translated)"
+
diff --git a/web/api/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php b/web/api/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
index e7b5f9f30..d4ac56fd8 100644
--- a/web/api/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
+++ b/web/api/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Test suite app/Model/Datasource/Session session handler
- *
  */
 
 App::uses('CakeSessionHandlerInterface', 'Model/Datasource/Session');
@@ -13,18 +12,23 @@ class TestAppLibSession implements CakeSessionHandlerInterface {
 	}
 
 	public function close() {
+		return true;
 	}
 
 	public function read($id) {
+		return '';
 	}
 
 	public function write($id, $data) {
+		return true;
 	}
 
 	public function destroy($id) {
+		return true;
 	}
 
 	public function gc($expires = null) {
+		return true;
 	}
 
 }
diff --git a/web/api/lib/Cake/Test/test_app/Model/Extract.php b/web/api/lib/Cake/Test/test_app/Model/Extract.php
index 0cd7218c4..2c5469055 100644
--- a/web/api/lib/Cake/Test/test_app/Model/Extract.php
+++ b/web/api/lib/Cake/Test/test_app/Model/Extract.php
@@ -36,7 +36,7 @@ class Extract extends AppModel {
 				'message' => 'double "quoted" validation'
 			),
 			'between' => array(
-				'rule' => array('between', 5, 15),
+				'rule' => array('lengthBetween', 5, 15),
 				'message' => "single 'quoted' validation"
 			)
 		),
diff --git a/web/api/lib/Cake/Test/test_app/Model/PersisterOne.php b/web/api/lib/Cake/Test/test_app/Model/PersisterOne.php
index 0a14b0f4a..e5c699945 100644
--- a/web/api/lib/Cake/Test/test_app/Model/PersisterOne.php
+++ b/web/api/lib/Cake/Test/test_app/Model/PersisterOne.php
@@ -38,7 +38,7 @@ class PersisterOne extends AppModel {
 				'message' => 'Post title is required'
 			),
 			'between' => array(
-				'rule' => array('between', 5, 15),
+				'rule' => array('lengthBetween', 5, 15),
 				'message' => array('You may enter up to %s chars (minimum is %s chars)', 14, 6)
 			)
 		),
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
new file mode 100644
index 000000000..b756c643a
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+ * @package       Cake.Test.TestApp.Plugin.TestPlugin.Console.Command
+ * @since         CakePHP(tm) v 2.7.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+/**
+ * Class TestPluginShell
+ * @package       Cake.Test.TestApp.Plugin.TestPlugin.Console.Command
+ */
+class TestPluginShell extends Shell {
+
+/**
+ * main method
+ *
+ * @return void
+ */
+	public function main() {
+		$this->out('This is the main method called from TestPlugin.TestPluginShell');
+	}
+}
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
index aca459cba..6f2a4c792 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
@@ -43,4 +43,7 @@ class TestPluginCacheEngine extends CacheEngine {
 
 	public function clearGroup($group) {
 	}
+
+	public function add($key, $value, $duration) {
+	}
 }
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
index 770612d85..3f86bbc39 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/Test2DispatcherFilter.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
index e0c7064fa..708c5626c 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Filter/TestDispatcherFilter.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterOneBehavior.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterOneBehavior.php
index ffda73b66..4d2f2a6e6 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterOneBehavior.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterOneBehavior.php
@@ -15,9 +15,6 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model.Behavior
  * @since         CakePHP(tm) v 1.2.0.5669
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterTwoBehavior.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterTwoBehavior.php
index d342c477c..2143cc7c1 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterTwoBehavior.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/TestPluginPersisterTwoBehavior.php
@@ -15,9 +15,6 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model.Behavior
  * @since         CakePHP(tm) v 1.2.0.5669
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
index acad188e0..b297fb47f 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
@@ -12,18 +12,23 @@ class TestPluginSession implements CakeSessionHandlerInterface {
 	}
 
 	public function close() {
+		return true;
 	}
 
 	public function read($id) {
+		return '';
 	}
 
 	public function write($id, $data) {
+		return true;
 	}
 
 	public function destroy($id) {
+		return true;
 	}
 
 	public function gc($expires = null) {
+		return true;
 	}
 
 }
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
index 70509bd59..21162cfff 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthUser.php
@@ -40,7 +40,7 @@ class TestPluginAuthUser extends TestPluginAppModel {
 /**
  * useDbConfig property
  *
- * @var string 'test'
+ * @var string
  */
 	public $useDbConfig = 'test';
 }
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
index 5ea7ee3a2..a52c21e75 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
@@ -13,9 +13,6 @@
  * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  * @since         CakePHP v 1.2.0.7726
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
@@ -32,8 +29,8 @@ class TestPluginAuthors extends TestPluginAppModel {
 
 	public $validate = array(
 		'field' => array(
-			'notEmpty' => array(
-				'rule' => 'notEmpty',
+			'notBlank' => array(
+				'rule' => 'notBlank',
 				'message' => 'I can haz plugin model validation message',
 			),
 		),
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
index b49d0c405..69f83bd9a 100644
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginComment.php
@@ -13,9 +13,6 @@
  * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       Cake.Test.TestApp.Plugin.TestPlugin.Model
  * @since         CakePHP v 1.2.0.7726
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
diff --git a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp
new file mode 100644
index 000000000..3be431d07
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Errors/error500.ctp
@@ -0,0 +1,10 @@
+test plugin error500
+<h2><?php echo $message; ?></h2>
+<p class="error">
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
+</p>
+<?php
+if (Configure::read('debug') > 0):
+	echo $this->element('exception_stack_trace');
+endif;
diff --git a/web/api/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp b/web/api/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp
new file mode 100644
index 000000000..fd1533971
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/View/Elements/Flash/default.ctp
@@ -0,0 +1 @@
+<div class="message"><?php echo $message ?></div>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp b/web/api/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp
new file mode 100644
index 000000000..6fd3a5d3f
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/View/Elements/flash_classy.ctp
@@ -0,0 +1 @@
+<div id="<?php echo $key ?>-message"><?php echo $message; ?></div>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp b/web/api/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp
new file mode 100644
index 000000000..43be11a88
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/View/Elements/flash_helper.ctp
@@ -0,0 +1,5 @@
+<div id="notificationLayout">
+	<h1><?php echo $params['name']; ?></h1>
+	<h3><?php echo $params['title']; ?></h3>
+	<p><?php echo $message; ?></p>
+</div>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Elements/html_call.ctp b/web/api/lib/Cake/Test/test_app/View/Elements/html_call.ctp
index 8c2c08978..fb5122dd2 100644
--- a/web/api/lib/Cake/Test/test_app/View/Elements/html_call.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Elements/html_call.ctp
@@ -1,3 +1,2 @@
 <?php
-echo $this->Html->link('Test', 'http://example.com');
-?>
\ No newline at end of file
+echo $this->Html->link('Test', 'http://example.com');
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Emails/html/default.ctp b/web/api/lib/Cake/Test/test_app/View/Emails/html/default.ctp
index 5d6eabd09..538e907f5 100644
--- a/web/api/lib/Cake/Test/test_app/View/Emails/html/default.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Emails/html/default.ctp
@@ -3,5 +3,4 @@ $content = explode("\n", $content);
 
 foreach ($content as $line):
 	echo '<p> ' . $line . '</p>';
-endforeach;
-?>
\ No newline at end of file
+endforeach;
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp b/web/api/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp
new file mode 100644
index 000000000..4bf8bbdab
--- /dev/null
+++ b/web/api/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp
@@ -0,0 +1,14 @@
+<?php
+echo '<a>34567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'1234567890123456789012345678901234567890123456x';
diff --git a/web/api/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp b/web/api/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
index 433315990..25c20f425 100644
--- a/web/api/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
@@ -1,2 +1,3 @@
 Ajax!
-<?php echo $this->fetch('content'); ?>
\ No newline at end of file
+<?php
+echo $this->fetch('content');
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Layouts/flash.ctp b/web/api/lib/Cake/Test/test_app/View/Layouts/flash.ctp
index aa1c74438..2314363eb 100644
--- a/web/api/lib/Cake/Test/test_app/View/Layouts/flash.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Layouts/flash.ctp
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><?php echo $page_title?></title>
+<title><?php echo $pageTitle?></title>
 <?php echo $this->Html->charset(); ?>
 
 <?php if (!Configure::read('debug')) { ?>
@@ -16,4 +16,4 @@ A:HOVER { text-decoration: underline; color:#44E }
 <body>
 <p><a href="<?php echo $url?>"><?php echo $message?></a></p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/web/api/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp b/web/api/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
index df2f0ab19..f0af9c0d8 100644
--- a/web/api/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
@@ -12,6 +12,4 @@ echo $this->Rss->document(
 	$this->Rss->channel(
 		array(), $channel, $this->fetch('content')
 	)
-);
-
-?>
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Pages/extract.ctp b/web/api/lib/Cake/Test/test_app/View/Pages/extract.ctp
index e2180fe33..63e8c73a5 100644
--- a/web/api/lib/Cake/Test/test_app/View/Pages/extract.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Pages/extract.ctp
@@ -28,4 +28,14 @@ __('Hot features!'
 		. ' Join us #cakephp on IRC. We\'d love to help you get started');
 
 // Category
+echo __c('You have a new message (category: LC_NUMERIC).', 4);
+// LC_TIME is skipped.
 echo __c('You have a new message (category: LC_TIME).', 5);
+
+// Context
+echo __('letter');
+echo __x('A', 'letter');
+echo __x('B', 'letter');
+echo __x('A', 'letter');
+echo __n('%d letter', '%d letters', $count);
+echo __xn('A', '%d letter', '%d letters', $count);
diff --git a/web/api/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp b/web/api/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
index 100c5f51b..610d33ad9 100644
--- a/web/api/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
@@ -1,4 +1,3 @@
 <?php
 echo $html;
-echo $this->Html->link('Test link', '#');
-?>
\ No newline at end of file
+echo $this->Html->link('Test link', '#');
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Posts/parent_view.ctp b/web/api/lib/Cake/Test/test_app/View/Posts/parent_view.ctp
index e338b784f..ee4689544 100644
--- a/web/api/lib/Cake/Test/test_app/View/Posts/parent_view.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Posts/parent_view.ctp
@@ -1,2 +1,2 @@
 Parent View.
-<?php echo $this->fetch('content') ?>
+<?php echo $this->fetch('content'); ?>
diff --git a/web/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp b/web/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
index c0b2ac283..19a88e339 100644
--- a/web/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp
@@ -47,7 +47,7 @@
 		<?php
 			echo __d('cake', 'Your database configuration file is ');
 			$filePresent = null;
-			if (file_exists(APP . 'Config'.'database.php')):
+			if (file_exists(APP . 'Config' . 'database.php')):
 				echo __d('cake', 'present.');
 				$filePresent = true;
 			else:
diff --git a/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Emails/text/themed.ctp b/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Emails/text/themed.ctp
index f49115333..976b94995 100644
--- a/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Emails/text/themed.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Emails/text/themed.ctp
@@ -1,2 +1,2 @@
 In TestTheme
-<?php echo $this->Html->image('test.jpg') ?>
\ No newline at end of file
+<?php echo $this->Html->image('test.jpg'); ?>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp b/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
index 9f2aa062d..d4e3dd586 100644
--- a/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
+++ b/web/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
@@ -1,2 +1,2 @@
 default test_theme layout
-<?php echo $this->fetch('content') ?>
+<?php echo $this->fetch('content'); ?>
diff --git a/web/api/lib/Cake/TestSuite/CakeTestCase.php b/web/api/lib/Cake/TestSuite/CakeTestCase.php
index 77228fef6..c375717fe 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestCase.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestCase.php
@@ -48,7 +48,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * between each test method. Tables will still be dropped at the
  * end of each test runner execution.
  *
- * @var boolean
+ * @var bool
  */
 	public $dropTables = true;
 
@@ -71,7 +71,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * If no TestResult object is passed a new one will be created.
  * This method is run for each test method in this class
  *
- * @param PHPUnit_Framework_TestResult $result
+ * @param PHPUnit_Framework_TestResult $result The test result object
  * @return PHPUnit_Framework_TestResult
  * @throws InvalidArgumentException
  */
@@ -107,9 +107,9 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 /**
  * Overrides SimpleTestCase::skipIf to provide a boolean return value
  *
- * @param boolean $shouldSkip
- * @param string $message
- * @return boolean
+ * @param bool $shouldSkip Whether or not the test should be skipped.
+ * @param string $message The message to display.
+ * @return bool
  */
 	public function skipIf($shouldSkip, $message = '') {
 		if ($shouldSkip) {
@@ -196,8 +196,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 /**
  * Chooses which fixtures to load for a given test
  *
- * @param string $fixture Each parameter is a model name that corresponds to a
- *                        fixture, i.e. 'Post', 'Author', etc.
+ * Each parameter is a model name that corresponds to a fixture, i.e. 'Post', 'Author', etc.
+ *
  * @return void
  * @see CakeTestCase::$autoFixtures
  * @throws Exception when no fixture manager is available.
@@ -218,8 +218,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  *
  * @param string $expected The expected value.
  * @param string $result The actual value.
- * @param message The message to use for failure.
- * @return boolean
+ * @param string $message The message to use for failure.
+ * @return bool
  */
 	public function assertTextNotEquals($expected, $result, $message = '') {
 		$expected = str_replace(array("\r\n", "\r"), "\n", $expected);
@@ -233,8 +233,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  *
  * @param string $expected The expected value.
  * @param string $result The actual value.
- * @param message The message to use for failure.
- * @return boolean
+ * @param string $message message The message to use for failure.
+ * @return bool
  */
 	public function assertTextEquals($expected, $result, $message = '') {
 		$expected = str_replace(array("\r\n", "\r"), "\n", $expected);
@@ -246,10 +246,10 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Asserts that a string starts with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $prefix
- * @param string $string
- * @param string $message
- * @return boolean
+ * @param string $prefix The prefix to check for.
+ * @param string $string The string to search in.
+ * @param string $message The message to use for failure.
+ * @return bool
  */
 	public function assertTextStartsWith($prefix, $string, $message = '') {
 		$prefix = str_replace(array("\r\n", "\r"), "\n", $prefix);
@@ -261,10 +261,10 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Asserts that a string starts not with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $prefix
- * @param string $string
- * @param string $message
- * @return boolean
+ * @param string $prefix The prefix to not find.
+ * @param string $string The string to search.
+ * @param string $message The message to use for failure.
+ * @return bool
  */
 	public function assertTextStartsNotWith($prefix, $string, $message = '') {
 		$prefix = str_replace(array("\r\n", "\r"), "\n", $prefix);
@@ -276,10 +276,10 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Asserts that a string ends with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $suffix
- * @param string $string
- * @param string $message
- * @return boolean
+ * @param string $suffix The suffix to find.
+ * @param string $string The string to search.
+ * @param string $message The message to use for failure.
+ * @return bool
  */
 	public function assertTextEndsWith($suffix, $string, $message = '') {
 		$suffix = str_replace(array("\r\n", "\r"), "\n", $suffix);
@@ -291,10 +291,10 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Asserts that a string ends not with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $suffix
- * @param string $string
- * @param string $message
- * @return boolean
+ * @param string $suffix The suffix to not find.
+ * @param string $string The string to search.
+ * @param string $message The message to use for failure.
+ * @return bool
  */
 	public function assertTextEndsNotWith($suffix, $string, $message = '') {
 		$suffix = str_replace(array("\r\n", "\r"), "\n", $suffix);
@@ -306,11 +306,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Assert that a string contains another string, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $needle
- * @param string $haystack
- * @param string $message
- * @param boolean $ignoreCase
- * @return boolean
+ * @param string $needle The string to search for.
+ * @param string $haystack The string to search through.
+ * @param string $message The message to display on failure.
+ * @param bool $ignoreCase Whether or not the search should be case-sensitive.
+ * @return bool
  */
 	public function assertTextContains($needle, $haystack, $message = '', $ignoreCase = false) {
 		$needle = str_replace(array("\r\n", "\r"), "\n", $needle);
@@ -322,11 +322,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Assert that a text doesn't contain another text, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $needle
- * @param string $haystack
- * @param string $message
- * @param boolean $ignoreCase
- * @return boolean
+ * @param string $needle The string to search for.
+ * @param string $haystack The string to search through.
+ * @param string $message The message to display on failure.
+ * @param bool $ignoreCase Whether or not the search should be case-sensitive.
+ * @return bool
  */
 	public function assertTextNotContains($needle, $haystack, $message = '', $ignoreCase = false) {
 		$needle = str_replace(array("\r\n", "\r"), "\n", $needle);
@@ -341,13 +341,13 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * Checks for an input tag with a name attribute (contains any non-empty value) and an id
  * attribute that contains 'my-input':
  *
- * {{{
+ * ```
  * array('input' => array('name', 'id' => 'my-input'))
- * }}}
+ * ```
  *
  * Checks for two p elements with some text in them:
  *
- * {{{
+ * ```
  * array(
  *   array('p' => true),
  *   'textA',
@@ -356,25 +356,25 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  *   'textB',
  *   '/p'
  * )
- * }}}
+ * ```
  *
  * You can also specify a pattern expression as part of the attribute values, or the tag
  * being defined, if you prepend the value with preg: and enclose it with slashes, like so:
  *
- * {{{
+ * ```
  * array(
  *   array('input' => array('name', 'id' => 'preg:/FieldName\d+/')),
  *   'preg:/My\s+field/'
  * )
- * }}}
+ * ```
  *
  * Important: This function is very forgiving about whitespace and also accepts any
  * permutation of attribute order. It will also allow whitespace between specified tags.
  *
  * @param string $string An HTML/XHTML/XML string
  * @param array $expected An array, see above
- * @param string $message SimpleTest failure output string
- * @return boolean
+ * @param string $fullDebug Whether or not more verbose output should be used.
+ * @return bool
  */
 	public function assertTags($string, $expected, $fullDebug = false) {
 		$regex = array();
@@ -541,15 +541,14 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 /**
  * Compatibility wrapper function for assertEquals
  *
- *
  * @param mixed $result
  * @param mixed $expected
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertEqual($result, $expected, $message = '') {
-		return self::assertEquals($expected, $result, $message);
+		return static::assertEquals($expected, $result, $message);
 	}
 
 /**
@@ -558,11 +557,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $result
  * @param mixed $expected
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertNotEqual($result, $expected, $message = '') {
-		return self::assertNotEquals($expected, $result, $message);
+		return static::assertNotEquals($expected, $result, $message);
 	}
 
 /**
@@ -571,11 +570,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $pattern a regular expression
  * @param string $string the text to be matched
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertPattern($pattern, $string, $message = '') {
-		return self::assertRegExp($pattern, $string, $message);
+		return static::assertRegExp($pattern, $string, $message);
 	}
 
 /**
@@ -584,11 +583,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $actual
  * @param mixed $expected
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertIdentical($actual, $expected, $message = '') {
-		return self::assertSame($expected, $actual, $message);
+		return static::assertSame($expected, $actual, $message);
 	}
 
 /**
@@ -597,11 +596,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $actual
  * @param mixed $expected
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertNotIdentical($actual, $expected, $message = '') {
-		return self::assertNotSame($expected, $actual, $message);
+		return static::assertNotSame($expected, $actual, $message);
 	}
 
 /**
@@ -610,17 +609,17 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $pattern a regular expression
  * @param string $string the text to be matched
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertNoPattern($pattern, $string, $message = '') {
-		return self::assertNotRegExp($pattern, $string, $message);
+		return static::assertNotRegExp($pattern, $string, $message);
 	}
 
 /**
  * assert no errors
  *
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected function assertNoErrors() {
@@ -631,7 +630,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  *
  * @param mixed $expected the name of the Exception or error
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected function expectError($expected = false, $message = '') {
@@ -644,9 +643,9 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 /**
  * Compatibility wrapper function for setExpectedException
  *
- * @param mixed $expected the name of the Exception
+ * @param mixed $name The name of the expected Exception.
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatibility wrapper for 1.x. It will be removed in 3.0.
  * @return void
  */
 	protected function expectException($name = 'Exception', $message = '') {
@@ -659,11 +658,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param mixed $first
  * @param mixed $second
  * @param string $message the text to display if the assertion is not correct
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertReference(&$first, &$second, $message = '') {
-		return self::assertSame($first, $second, $message);
+		return static::assertSame($first, $second, $message);
 	}
 
 /**
@@ -672,11 +671,11 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
  * @param string $object
  * @param string $type
  * @param string $message
- * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
+ * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
  */
 	protected static function assertIsA($object, $type, $message = '') {
-		return self::assertInstanceOf($type, $object, $message);
+		return static::assertInstanceOf($type, $object, $message);
 	}
 
 /**
@@ -691,15 +690,15 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 	protected static function assertWithinMargin($result, $expected, $margin, $message = '') {
 		$upper = $result + $margin;
 		$lower = $result - $margin;
-		return self::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message);
+		return static::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message);
 	}
 
 /**
  * Compatibility function for skipping.
  *
- * @param boolean $condition Condition to trigger skipping
+ * @param bool $condition Condition to trigger skipping
  * @param string $message Message for skip
- * @return boolean
+ * @return bool
  */
 	protected function skipUnless($condition, $message = '') {
 		if (!$condition) {
@@ -712,9 +711,9 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 /**
  * Mock a model, maintain fixtures and table association
  *
- * @param string $model
- * @param mixed $methods
- * @param array $config
+ * @param string $model The model to get a mock for.
+ * @param mixed $methods The list of methods to mock
+ * @param array $config The config data for the mock's constructor.
  * @throws MissingModelException
  * @return Model
  */
@@ -723,13 +722,24 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 
 		list($plugin, $name) = pluginSplit($model, true);
 		App::uses($name, $plugin . 'Model');
+
 		$config = array_merge((array)$config, array('name' => $name));
+		unset($config['ds']);
 
 		if (!class_exists($name)) {
 			throw new MissingModelException(array($model));
 		}
-
 		$mock = $this->getMock($name, $methods, array($config));
+
+		$availableDs = array_keys(ConnectionManager::enumConnectionObjects());
+
+		if ($mock->useDbConfig !== 'test' && in_array('test_' . $mock->useDbConfig, $availableDs)) {
+			$mock->setDataSource('test_' . $mock->useDbConfig);
+		} else {
+			$mock->useDbConfig = 'test';
+			$mock->setDataSource('test');
+		}
+
 		ClassRegistry::removeObject($name);
 		ClassRegistry::addObject($name, $mock);
 		return $mock;
diff --git a/web/api/lib/Cake/TestSuite/CakeTestLoader.php b/web/api/lib/Cake/TestSuite/CakeTestLoader.php
index 2679cd943..3fe681bde 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestLoader.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestLoader.php
@@ -30,8 +30,8 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 /**
  * Load a file and find the first test case / suite in that file.
  *
- * @param string $filePath
- * @param string $params
+ * @param string $filePath The file path to load
+ * @param string $params Additional parameters
  * @return ReflectionClass
  */
 	public function load($filePath, $params = '') {
@@ -42,9 +42,9 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 /**
  * Convert path fragments used by CakePHP's test runner to absolute paths that can be fed to PHPUnit.
  *
- * @param string $filePath
- * @param string $params
- * @return void
+ * @param string $filePath The file path to load.
+ * @param string $params Additional parameters.
+ * @return string Converted path fragments.
  */
 	protected function _resolveTestFile($filePath, $params) {
 		$basePath = $this->_basePath($params) . DS . $filePath;
@@ -55,7 +55,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 /**
  * Generates the base path to a set of tests based on the parameters.
  *
- * @param array $params
+ * @param array $params The path parameters.
  * @return string The base path.
  */
 	protected static function _basePath($params) {
@@ -81,12 +81,12 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 /**
  * Get the list of files for the test listing.
  *
- * @param string $params
+ * @param string $params Path parameters
  * @return array
  */
 	public static function generateTestList($params) {
-		$directory = self::_basePath($params);
-		$fileList = self::_getRecursiveFileList($directory);
+		$directory = static::_basePath($params);
+		$fileList = static::_getRecursiveFileList($directory);
 
 		$testCases = array();
 		foreach ($fileList as $testCaseFile) {
diff --git a/web/api/lib/Cake/TestSuite/CakeTestRunner.php b/web/api/lib/Cake/TestSuite/CakeTestRunner.php
index 541d5beac..d512724cc 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestRunner.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestRunner.php
@@ -15,7 +15,9 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if (!defined('__PHPUNIT_PHAR__')) {
+	require_once 'PHPUnit/TextUI/TestRunner.php';
+}
 
 App::uses('CakeFixtureManager', 'TestSuite/Fixture');
 
@@ -29,7 +31,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
 /**
  * Lets us pass in some options needed for CakePHP's webrunner.
  *
- * @param mixed $loader
+ * @param mixed $loader The test suite loader
  * @param array $params list of options to be used for this run
  */
 	public function __construct($loader, $params) {
@@ -40,13 +42,13 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
 /**
  * Actually run a suite of tests. Cake initializes fixtures here using the chosen fixture manager
  *
- * @param PHPUnit_Framework_Test $suite
- * @param array $arguments
+ * @param PHPUnit_Framework_Test $suite The test suite to run
+ * @param array $arguments The CLI arguments
  * @return void
  */
 	public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) {
 		if (isset($arguments['printer'])) {
-			self::$versionStringPrinted = true;
+			static::$versionStringPrinted = true;
 		}
 
 		$fixture = $this->_getFixtureManager($arguments);
@@ -85,7 +87,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
 /**
  * Get the fixture manager class specified or use the default one.
  *
- * @param array $arguments
+ * @param array $arguments The CLI arguments.
  * @return mixed instance of a fixture manager.
  * @throws RuntimeException When fixture manager class cannot be loaded.
  */
diff --git a/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php b/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
index 1af5baa8e..c4134c535 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
@@ -16,7 +16,9 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-require_once 'PHPUnit/TextUI/Command.php';
+if (!defined('__PHPUNIT_PHAR__')) {
+	require_once 'PHPUnit/TextUI/Command.php';
+}
 
 App::uses('CakeTestRunner', 'TestSuite');
 App::uses('CakeTestLoader', 'TestSuite');
@@ -35,7 +37,7 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
 /**
  * Construct method
  *
- * @param mixed $loader
+ * @param mixed $loader The loader instance to use.
  * @param array $params list of options to be used for this run
  * @throws MissingTestLoaderException When a loader class could not be found.
  */
@@ -55,8 +57,8 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
 /**
  * Ugly hack to get around PHPUnit having a hard coded class name for the Runner. :(
  *
- * @param array   $argv
- * @param boolean $exit
+ * @param array $argv The command arguments
+ * @param bool $exit The exit mode.
  * @return void
  */
 	public function run(array $argv, $exit = true) {
@@ -131,7 +133,7 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
 /**
  * Handles output flag used to change printing on webrunner.
  *
- * @param string $reporter
+ * @param string $reporter The reporter class to use.
  * @return void
  */
 	public function handleReporter($reporter) {
diff --git a/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
index 3f470f712..85c6e2278 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -37,7 +37,7 @@ class CakeTestSuiteDispatcher {
 		'codeCoverage' => false,
 		'case' => null,
 		'core' => false,
-		'app' => true,
+		'app' => false,
 		'plugin' => null,
 		'output' => 'html',
 		'show' => 'groups',
@@ -63,7 +63,7 @@ class CakeTestSuiteDispatcher {
 /**
  * boolean to set auto parsing of params.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_paramsParsed = false;
 
@@ -130,17 +130,33 @@ class CakeTestSuiteDispatcher {
 /**
  * Checks for the existence of the test framework files
  *
- * @return boolean true if found, false otherwise
+ * @return bool true if found, false otherwise
  */
 	public function loadTestFramework() {
 		if (class_exists('PHPUnit_Framework_TestCase')) {
 			return true;
 		}
-		foreach (App::path('vendors') as $vendor) {
+		$phpunitPath = 'phpunit' . DS . 'phpunit';
+		if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+			$composerGlobalDir[] = env('APPDATA') . DS . 'Composer' . DS . 'vendor' . DS;
+		} else {
+			$composerGlobalDir[] = env('HOME') . DS . '.composer' . DS . 'vendor' . DS;
+		}
+		$vendors = array_merge(App::path('vendors'), $composerGlobalDir);
+		foreach ($vendors as $vendor) {
 			$vendor = rtrim($vendor, DS);
-			if (is_dir($vendor . DS . 'PHPUnit')) {
+			if (is_dir($vendor . DS . $phpunitPath)) {
+				ini_set('include_path', $vendor . DS . $phpunitPath . PATH_SEPARATOR . ini_get('include_path'));
+				break;
+			} elseif (is_dir($vendor . DS . 'PHPUnit')) {
 				ini_set('include_path', $vendor . PATH_SEPARATOR . ini_get('include_path'));
 				break;
+			} elseif (is_file($vendor . DS . 'phpunit.phar')) {
+				$backup = $GLOBALS['_SERVER']['SCRIPT_NAME'];
+				$GLOBALS['_SERVER']['SCRIPT_NAME'] = '-';
+				$included = include_once $vendor . DS . 'phpunit.phar';
+				$GLOBALS['_SERVER']['SCRIPT_NAME'] = $backup;
+				return $included;
 			}
 		}
 		include 'PHPUnit' . DS . 'Autoload.php';
@@ -238,7 +254,7 @@ class CakeTestSuiteDispatcher {
 		restore_error_handler();
 
 		try {
-			self::time();
+			static::time();
 			$command = new CakeTestSuiteCommand('CakeTestLoader', $commandArgs);
 			$command->run($options);
 		} catch (MissingConnectionException $exception) {
@@ -252,8 +268,8 @@ class CakeTestSuiteDispatcher {
 /**
  * Sets a static timestamp
  *
- * @param boolean $reset to set new static timestamp.
- * @return integer timestamp
+ * @param bool $reset to set new static timestamp.
+ * @return int timestamp
  */
 	public static function time($reset = false) {
 		static $now;
@@ -271,7 +287,7 @@ class CakeTestSuiteDispatcher {
  * @return string formatted date
  */
 	public static function date($format) {
-		return date($format, self::time());
+		return date($format, static::time());
 	}
 
 }
diff --git a/web/api/lib/Cake/TestSuite/ControllerTestCase.php b/web/api/lib/Cake/TestSuite/ControllerTestCase.php
index b5ef7f3ee..b580921f9 100644
--- a/web/api/lib/Cake/TestSuite/ControllerTestCase.php
+++ b/web/api/lib/Cake/TestSuite/ControllerTestCase.php
@@ -41,13 +41,15 @@ class ControllerTestDispatcher extends Dispatcher {
 /**
  * Use custom routes during tests
  *
- * @var boolean
+ * @var bool
  */
 	public $loadRoutes = true;
 
 /**
  * Returns the test controller
  *
+ * @param CakeRequest $request The request instance.
+ * @param CakeResponse $response The response instance.
  * @return Controller
  */
 	protected function _getController($request, $response) {
@@ -107,6 +109,7 @@ class InterceptContentHelper extends Helper {
  * ControllerTestCase class
  *
  * @package       Cake.TestSuite
+ * @method        mixed testAction() testAction($url, $options = array())  Lets you do functional tests of a controller action.
  */
 abstract class ControllerTestCase extends CakeTestCase {
 
@@ -120,14 +123,14 @@ abstract class ControllerTestCase extends CakeTestCase {
 /**
  * Automatically mock controllers that aren't mocked
  *
- * @var boolean
+ * @var bool
  */
 	public $autoMock = true;
 
 /**
  * Use custom routes during tests
  *
- * @var boolean
+ * @var bool
  */
 	public $loadRoutes = true;
 
@@ -171,7 +174,7 @@ abstract class ControllerTestCase extends CakeTestCase {
  * Once a test has been run on a controller it should be rebuilt
  * to clean up properties.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_dirtyController = false;
 
@@ -181,7 +184,7 @@ abstract class ControllerTestCase extends CakeTestCase {
  *
  * @param string $name The name of the function
  * @param array $arguments Array of arguments
- * @return the return of _testAction
+ * @return mixed The return of _testAction.
  * @throws BadMethodCallException when you call methods that don't exist.
  */
 	public function __call($name, $arguments) {
@@ -208,11 +211,12 @@ abstract class ControllerTestCase extends CakeTestCase {
  *     - `result` Get the return value of the controller action. Useful
  *       for testing requestAction methods.
  *
- * @param string $url The url to test
+ * @param string|array $url The URL to test.
  * @param array $options See options
- * @return mixed
+ * @return mixed The specified return type.
+ * @triggers ControllerTestCase $Dispatch, array('request' => $request)
  */
-	protected function _testAction($url = '', $options = array()) {
+	protected function _testAction($url, $options = array()) {
 		$this->vars = $this->result = $this->view = $this->contents = $this->headers = null;
 
 		$options += array(
@@ -221,6 +225,10 @@ abstract class ControllerTestCase extends CakeTestCase {
 			'return' => 'result'
 		);
 
+		if (is_array($url)) {
+			$url = Router::url($url);
+		}
+
 		$restore = array('get' => $_GET, 'post' => $_POST);
 
 		$_SERVER['REQUEST_METHOD'] = strtoupper($options['method']);
@@ -251,7 +259,7 @@ abstract class ControllerTestCase extends CakeTestCase {
 		$Dispatch->parseParams(new CakeEvent('ControllerTestCase', $Dispatch, array('request' => $request)));
 		if (!isset($request->params['controller']) && Router::currentRoute()) {
 			$this->headers = Router::currentRoute()->response->header();
-			return;
+			return null;
 		}
 		if ($this->_dirtyController) {
 			$this->controller = null;
@@ -268,7 +276,7 @@ abstract class ControllerTestCase extends CakeTestCase {
 			$params['requested'] = 1;
 		}
 		$Dispatch->testController = $this->controller;
-		$Dispatch->response = $this->getMock('CakeResponse', array('send'));
+		$Dispatch->response = $this->getMock('CakeResponse', array('send', '_clearBuffer'));
 		$this->result = $Dispatch->dispatch($request, $Dispatch->response, $params);
 		$this->controller = $Dispatch->testController;
 		$this->vars = $this->controller->viewVars;
diff --git a/web/api/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php b/web/api/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
index 0c9ecb2f3..639c9c41a 100644
--- a/web/api/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
+++ b/web/api/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
@@ -19,6 +19,9 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
+App::uses('Inflector', 'Utility');
+App::uses('CakePlugin', 'Core');
+
 /**
  * Abstract class for common CoverageReport methods.
  * Provides several template methods for custom output.
@@ -102,7 +105,7 @@ abstract class BaseCoverageReport {
 		if ($this->appTest) {
 			$path .= APP_DIR . DS;
 		} elseif ($this->pluginTest) {
-			$path = App::pluginPath($this->pluginTest);
+			$path = CakePlugin::path($this->pluginTest);
 		} else {
 			$path = CAKE;
 		}
@@ -134,8 +137,8 @@ abstract class BaseCoverageReport {
  * 3.5 uses -1 for uncovered, and -2 for dead.
  * 3.6 uses array() for uncovered and null for dead.
  *
- * @param array $fileLines
- * @param array $coverageData
+ * @param array $fileLines The lines in the file.
+ * @param array $coverageData The raw coverage data.
  * @return array Array of covered, total lines.
  */
 	protected function _calculateCoveredLines($fileLines, $coverageData) {
diff --git a/web/api/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php b/web/api/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
index 136cec4fe..0d194f795 100644
--- a/web/api/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
+++ b/web/api/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
@@ -28,14 +28,14 @@ class HtmlCoverageReport extends BaseCoverageReport {
 /**
  * Holds the total number of processed rows.
  *
- * @var integer
+ * @var int
  */
 	protected $_total = 0;
 
 /**
  * Holds the total number of covered rows.
  *
- * @var integer
+ * @var int
  */
 	protected $_covered = 0;
 
@@ -127,7 +127,7 @@ HTML;
 /**
  * Guess the class name the test was for based on the test case filename.
  *
- * @param ReflectionClass $testReflection.
+ * @param ReflectionClass $testReflection The class to reflect
  * @return string Possible test subject name.
  */
 	protected function _guessSubjectName($testReflection) {
@@ -143,10 +143,10 @@ HTML;
 /**
  * Renders the HTML for a single line in the HTML diff.
  *
- * @param string $line
- * @param integer $linenumber
- * @param string $class
- * @param array $coveringTests
+ * @param string $line The line content.
+ * @param int $linenumber The line number
+ * @param string $class The classname to use.
+ * @param array $coveringTests The tests covering the line.
  * @return string
  */
 	protected function _paintLine($line, $linenumber, $class, $coveringTests) {
@@ -195,11 +195,12 @@ HTML;
 /**
  * Generate an HTML snippet for coverage headers
  *
- * @param string $filename
- * @param string $percent
+ * @param string $filename The file name being covered
+ * @param string $percent The percentage covered
  * @return string
  */
 	public function coverageHeader($filename, $percent) {
+		$hash = md5($filename);
 		$filename = basename($filename);
 		list($file) = explode('.', $filename);
 		$display = in_array($file, $this->_testNames) ? 'block' : 'none';
@@ -207,11 +208,11 @@ HTML;
 		return <<<HTML
 	<div class="coverage-container $primary" style="display:$display;">
 	<h4>
-		<a href="#coverage-$filename" onclick="coverage_show_hide('coverage-$filename');">
+		<a href="#coverage-$filename-$hash" onclick="coverage_show_hide('coverage-$filename-$hash');">
 			$filename Code coverage: $percent%
 		</a>
 	</h4>
-	<div class="code-coverage-results" id="coverage-$filename" style="display:none;">
+	<div class="code-coverage-results" id="coverage-$filename-$hash" style="display:none;">
 	<pre>
 HTML;
 	}
diff --git a/web/api/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/web/api/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
index 86007d2f4..aa9a43cad 100644
--- a/web/api/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
+++ b/web/api/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
@@ -29,7 +29,7 @@ class CakeFixtureManager {
 /**
  * Was this class already initialized?
  *
- * @var boolean
+ * @var bool
  */
 	protected $_initialized = false;
 
@@ -179,7 +179,7 @@ class CakeFixtureManager {
  *
  * @param CakeTestFixture $fixture the fixture object to create
  * @param DataSource $db the datasource instance to use
- * @param boolean $drop whether drop the fixture if it is already created or not
+ * @param bool $drop whether drop the fixture if it is already created or not
  * @return void
  */
 	protected function _setupTable($fixture, $db = null, $drop = true) {
@@ -262,7 +262,7 @@ class CakeFixtureManager {
  *
  * @param string $name of the fixture
  * @param DataSource $db DataSource instance or leave null to get DataSource from the fixture
- * @param boolean $dropTables Whether or not tables should be dropped and re-created.
+ * @param bool $dropTables Whether or not tables should be dropped and re-created.
  * @return void
  * @throws UnexpectedValueException if $name is not a previously loaded class
  */
diff --git a/web/api/lib/Cake/TestSuite/Fixture/CakeTestFixture.php b/web/api/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
index d925678e1..a09ed21e2 100644
--- a/web/api/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
+++ b/web/api/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -86,7 +86,7 @@ class CakeTestFixture {
  * When table is created for a fixture the MEMORY engine is used
  * where possible. Set $canUseMemory to false if you don't want this.
  *
- * @var boolean
+ * @var bool
  */
 	public $canUseMemory = true;
 
@@ -200,7 +200,7 @@ class CakeTestFixture {
  * Run before all tests execute, should return SQL statement to create table for this fixture could be executed successfully.
  *
  * @param DboSource $db An instance of the database object used to create the fixture table
- * @return boolean True on success, false on failure
+ * @return bool True on success, false on failure
  */
 	public function create($db) {
 		if (!isset($this->fields) || empty($this->fields)) {
@@ -251,7 +251,7 @@ class CakeTestFixture {
  * Run after all tests executed, should return SQL statement to drop table for this fixture.
  *
  * @param DboSource $db An instance of the database object used to create the fixture table
- * @return boolean True on success, false on failure
+ * @return bool True on success, false on failure
  */
 	public function drop($db) {
 		if (empty($this->fields)) {
@@ -273,7 +273,7 @@ class CakeTestFixture {
  * of this fixture could be executed successfully.
  *
  * @param DboSource $db An instance of the database into which the records will be inserted
- * @return boolean on success or if there are no records to insert, or false on failure
+ * @return bool on success or if there are no records to insert, or false on failure
  * @throws CakeException if counts of values and fields do not match.
  */
 	public function insert($db) {
@@ -287,17 +287,25 @@ class CakeTestFixture {
 				$fields = array_unique($fields);
 				$default = array_fill_keys($fields, null);
 				foreach ($this->records as $record) {
-					$merge = array_values(array_merge($default, $record));
+					$mergeData = array_merge($default, $record);
+					$merge = array_values($mergeData);
 					if (count($fields) !== count($merge)) {
-						throw new CakeException('Fixture invalid: Count of fields does not match count of values');
+
+						$mergeFields = array_diff_key(array_keys($mergeData), $fields);
+
+						$message = 'Fixture invalid: Count of fields does not match count of values in ' . get_class($this) . "\n";
+						foreach ($mergeFields as $field) {
+							$message .= "The field '" . $field . "' is in the data fixture but not in the schema." . "\n";
+						}
+
+						throw new CakeException($message);
 					}
 					$values[] = $merge;
 				}
 				$nested = $db->useNestedTransactions;
 				$db->useNestedTransactions = false;
 				$result = $db->insertMulti($this->table, $fields, $values);
-				if (
-					$this->primaryKey &&
+				if ($this->primaryKey &&
 					isset($this->fields[$this->primaryKey]['type']) &&
 					in_array($this->fields[$this->primaryKey]['type'], array('integer', 'biginteger'))
 				) {
@@ -315,7 +323,7 @@ class CakeTestFixture {
  * CakeFixture to trigger other events before / after truncate.
  *
  * @param DboSource $db A reference to a db instance
- * @return boolean
+ * @return bool
  */
 	public function truncate($db) {
 		$fullDebug = $db->fullDebug;
diff --git a/web/api/lib/Cake/TestSuite/Fixture/CakeTestModel.php b/web/api/lib/Cake/TestSuite/Fixture/CakeTestModel.php
index dc4254211..bc072aabc 100644
--- a/web/api/lib/Cake/TestSuite/Fixture/CakeTestModel.php
+++ b/web/api/lib/Cake/TestSuite/Fixture/CakeTestModel.php
@@ -32,7 +32,7 @@ class CakeTestModel extends Model {
  * incorrect order when no order has been defined in the finds.
  * Postgres can return the results in any order it considers appropriate if none is specified
  *
- * @param integer|string|array $id Set this ID for this model on startup, can also be an array of options, see above.
+ * @param int|string|array $id Set this ID for this model on startup, can also be an array of options, see above.
  * @param string $table Name of database table to use.
  * @param string $ds DataSource connection name.
  */
@@ -44,10 +44,10 @@ class CakeTestModel extends Model {
 /**
  * Overriding save() to set CakeTestSuiteDispatcher::date() as formatter for created, modified and updated fields
  *
- * @param array $data
- * @param boolean|array $validate
- * @param array $fieldList
- * @return void
+ * @param array $data Data to save
+ * @param bool|array $validate Validate or options.
+ * @param array $fieldList Whitelist of fields
+ * @return mixed
  */
 	public function save($data = null, $validate = true, $fieldList = array()) {
 		$db = $this->getDataSource();
diff --git a/web/api/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php b/web/api/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
index f98cde85c..c89ead4df 100644
--- a/web/api/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
+++ b/web/api/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
@@ -15,7 +15,9 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-require_once 'PHPUnit/TextUI/ResultPrinter.php';
+if (!defined('__PHPUNIT_PHAR__')) {
+	require_once 'PHPUnit/TextUI/ResultPrinter.php';
+}
 
 /**
  * CakeBaseReporter contains common reporting features used in the CakePHP Test suite
@@ -27,7 +29,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * Headers sent
  *
- * @var boolean
+ * @var bool
  */
 	protected $_headerSent = false;
 
@@ -121,7 +123,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * Print result
  *
- * @param PHPUnit_Framework_TestResult $result
+ * @param PHPUnit_Framework_TestResult $result The result object
  * @return void
  */
 	public function printResult(PHPUnit_Framework_TestResult $result) {
@@ -131,7 +133,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * Paint result
  *
- * @param PHPUnit_Framework_TestResult $result
+ * @param PHPUnit_Framework_TestResult $result The result object
  * @return void
  */
 	public function paintResult(PHPUnit_Framework_TestResult $result) {
@@ -141,9 +143,9 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * An error occurred.
  *
- * @param  PHPUnit_Framework_Test $test
- * @param  Exception              $e
- * @param  float                  $time
+ * @param PHPUnit_Framework_Test $test The test to add an error for.
+ * @param Exception $e The exception object to add.
+ * @param float $time The current time.
  * @return void
  */
 	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {
@@ -153,9 +155,9 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * A failure occurred.
  *
- * @param  PHPUnit_Framework_Test $test
- * @param  PHPUnit_Framework_AssertionFailedError $e
- * @param  float $time
+ * @param PHPUnit_Framework_Test $test The test that failed
+ * @param PHPUnit_Framework_AssertionFailedError $e The assertion that failed.
+ * @param float $time The current time.
  * @return void
  */
 	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {
@@ -165,9 +167,9 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * Incomplete test.
  *
- * @param  PHPUnit_Framework_Test $test
- * @param  Exception $e
- * @param  float $time
+ * @param PHPUnit_Framework_Test $test The test that was incomplete.
+ * @param Exception $e The incomplete exception
+ * @param float $time The current time.
  * @return void
  */
 	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
@@ -177,9 +179,9 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * Skipped test.
  *
- * @param  PHPUnit_Framework_Test $test
- * @param  Exception $e
- * @param  float $time
+ * @param PHPUnit_Framework_Test $test The test that failed.
+ * @param Exception $e The skip object.
+ * @param float $time The current time.
  * @return void
  */
 	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
@@ -189,7 +191,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * A test suite started.
  *
- * @param  PHPUnit_Framework_TestSuite $suite
+ * @param PHPUnit_Framework_TestSuite $suite The suite to start
  * @return void
  */
 	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
@@ -202,7 +204,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * A test suite ended.
  *
- * @param  PHPUnit_Framework_TestSuite $suite
+ * @param PHPUnit_Framework_TestSuite $suite The suite that ended.
  * @return void
  */
 	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
@@ -211,7 +213,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * A test started.
  *
- * @param  PHPUnit_Framework_Test $test
+ * @param PHPUnit_Framework_Test $test The test that started.
  * @return void
  */
 	public function startTest(PHPUnit_Framework_Test $test) {
@@ -220,8 +222,8 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
 /**
  * A test ended.
  *
- * @param  PHPUnit_Framework_Test $test
- * @param  float $time
+ * @param PHPUnit_Framework_Test $test The test that ended
+ * @param float $time The current time.
  * @return void
  */
 	public function endTest(PHPUnit_Framework_Test $test, $time) {
diff --git a/web/api/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php b/web/api/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
index 73da81ca4..3e68005f3 100644
--- a/web/api/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
+++ b/web/api/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
@@ -169,7 +169,7 @@ class CakeHtmlReporter extends CakeBaseReporter {
 /**
  * Paints a code coverage report.
  *
- * @param array $coverage
+ * @param array $coverage The coverage data
  * @return void
  */
 	public function paintCoverage(array $coverage) {
@@ -199,12 +199,12 @@ class CakeHtmlReporter extends CakeBaseReporter {
 		if (!empty($this->params['case'])) {
 			$query['case'] = $this->params['case'];
 		}
-		$show = $this->_queryString($show);
-		$query = $this->_queryString($query);
+		list($show, $query) = $this->_getQueryLink();
 
 		echo "<p><a href='" . $this->baseUrl() . $show . "'>Run more tests</a> | <a href='" . $this->baseUrl() . $query . "&amp;show_passes=1'>Show Passes</a> | \n";
 		echo "<a href='" . $this->baseUrl() . $query . "&amp;debug=1'>Enable Debug Output</a> | \n";
-		echo "<a href='" . $this->baseUrl() . $query . "&amp;code_coverage=true'>Analyze Code Coverage</a></p>\n";
+		echo "<a href='" . $this->baseUrl() . $query . "&amp;code_coverage=true'>Analyze Code Coverage</a> | \n";
+		echo "<a href='" . $this->baseUrl() . $query . "&amp;code_coverage=true&amp;show_passes=1&amp;debug=1'>All options enabled</a></p>\n";
 	}
 
 /**
@@ -243,12 +243,13 @@ class CakeHtmlReporter extends CakeBaseReporter {
  *
  * @param PHPUnit_Framework_AssertionFailedError $message Failure object displayed in
  *   the context of the other tests.
- * @param mixed $test
+ * @param mixed $test The test case to paint a failure for.
  * @return void
  */
 	public function paintFail($message, $test) {
 		$trace = $this->_getStackTrace($message);
-		$testName = get_class($test) . '(' . $test->getName() . ')';
+		$className = get_class($test);
+		$testName = $className . '::' . $test->getName() . '()';
 
 		$actualMsg = $expectedMsg = null;
 		if (method_exists($message, 'getComparisonFailure')) {
@@ -264,11 +265,15 @@ class CakeHtmlReporter extends CakeBaseReporter {
 		echo "<div class='msg'><pre>" . $this->_htmlEntities($message->toString());
 
 		if ((is_string($actualMsg) && is_string($expectedMsg)) || (is_array($actualMsg) && is_array($expectedMsg))) {
-			echo "<br />" . PHPUnit_Util_Diff::diff($expectedMsg, $actualMsg);
+			echo "<br />" . $this->_htmlEntities(PHPUnit_Util_Diff::diff($expectedMsg, $actualMsg));
 		}
 
 		echo "</pre></div>\n";
 		echo "<div class='msg'>" . __d('cake_dev', 'Test case: %s', $testName) . "</div>\n";
+		if (strpos($className, "PHPUnit_") === false) {
+			list($show, $query) = $this->_getQueryLink();
+			echo "<div class='msg'><a href='" . $this->baseUrl() . $query . "&amp;filter=" . $test->getName() . "'>" . __d('cake_dev', 'Rerun only this test: %s', $testName) . "</a></div>\n";
+		}
 		echo "<div class='msg'>" . __d('cake_dev', 'Stack trace:') . '<br />' . $trace . "</div>\n";
 		echo "</li>\n";
 	}
@@ -278,7 +283,7 @@ class CakeHtmlReporter extends CakeBaseReporter {
  * trail of the nesting test suites below the
  * top level test.
  *
- * @param PHPUnit_Framework_Test test method that just passed
+ * @param PHPUnit_Framework_Test $test Test method that just passed
  * @param float $time time spent to run the test method
  * @return void
  */
@@ -295,8 +300,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
 /**
  * Paints a PHP exception.
  *
- * @param Exception $exception Exception to display.
- * @param mixed $test
+ * @param Exception $message Exception to display.
+ * @param mixed $test The test that failed.
  * @return void
  */
 	public function paintException($message, $test) {
@@ -370,7 +375,7 @@ class CakeHtmlReporter extends CakeBaseReporter {
 /**
  * A test suite started.
  *
- * @param PHPUnit_Framework_TestSuite $suite
+ * @param PHPUnit_Framework_TestSuite $suite The test suite to start.
  * @return void
  */
 	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
@@ -380,4 +385,32 @@ class CakeHtmlReporter extends CakeBaseReporter {
 		echo '<h2>' . __d('cake_dev', 'Running  %s', $suite->getName()) . '</h2>';
 	}
 
+/**
+ * Returns the query string formatted for ouput in links
+ * 
+ * @return string
+ */
+	protected function _getQueryLink() {
+		$show = $query = array();
+		if (!empty($this->params['case'])) {
+			$show['show'] = 'cases';
+		}
+
+		if (!empty($this->params['core'])) {
+			$show['core'] = $query['core'] = 'true';
+		}
+		if (!empty($this->params['plugin'])) {
+			$show['plugin'] = $query['plugin'] = $this->params['plugin'];
+		}
+		if (!empty($this->params['case'])) {
+			$query['case'] = $this->params['case'];
+		}
+		if (!empty($this->params['filter'])) {
+			$query['filter'] = $this->params['filter'];
+		}
+		$show = $this->_queryString($show);
+		$query = $this->_queryString($query);
+		return array($show, $query);
+	}
+
 }
diff --git a/web/api/lib/Cake/TestSuite/Stub/ConsoleOutputStub.php b/web/api/lib/Cake/TestSuite/Stub/ConsoleOutputStub.php
new file mode 100644
index 000000000..176c62084
--- /dev/null
+++ b/web/api/lib/Cake/TestSuite/Stub/ConsoleOutputStub.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         2.8
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+App::uses("ConsoleOutput", "Console");
+
+/**
+ * StubOutput makes testing shell commands/shell helpers easier.
+ *
+ * You can use this class by injecting it into a Helper instance:
+ *
+ * ```
+ * App::uses("ConsoleOutputStub", "TestSuite/Stub");
+ *
+ * $output = new ConsoleOutputStub();
+ * $helper = new ProgressHelper($output);
+ * ```
+ */
+class ConsoleOutputStub extends ConsoleOutput {
+
+/**
+ * Buffered messages.
+ *
+ * @var array
+ */
+	protected $_out = array();
+
+/**
+ * The number of bytes written by last call to write
+ *
+ * @var int
+ */
+	protected $_lastWritten = 0;
+
+/**
+ * Write output to the buffer.
+ *
+ * @param string|array $message A string or an array of strings to output
+ * @param int $newlines Number of newlines to append
+ * @return void
+ */
+	public function write($message, $newlines = 1) {
+		foreach ((array)$message as $line) {
+			$this->_out[] = $line;
+			$this->_lastWritten = strlen($line);
+		}
+		$newlines--;
+		while ($newlines > 0) {
+			$this->_out[] = '';
+			$this->_lastWritten = 0;
+			$newlines--;
+		}
+	}
+
+/**
+ * Overwrite output already written to the buffer.
+ *
+ * @param array|string $message The message to output.
+ * @param int $newlines Number of newlines to append.
+ * @param int $size The number of bytes to overwrite. Defaults to the
+ *    length of the last message output.
+ * @return void
+ */
+	public function overwrite($message, $newlines = 1, $size = null) {
+		//insert an empty array to mock deletion of existing output
+		$this->_out[] = "";
+		//append new message to output
+		$this->write($message, $newlines);
+	}
+
+/**
+ * Get the buffered output.
+ *
+ * @return array
+ */
+	public function messages() {
+		return $this->_out;
+	}
+}
\ No newline at end of file
diff --git a/web/api/lib/Cake/TestSuite/templates/header.php b/web/api/lib/Cake/TestSuite/templates/header.php
index 616bc179f..60afa7559 100644
--- a/web/api/lib/Cake/TestSuite/templates/header.php
+++ b/web/api/lib/Cake/TestSuite/templates/header.php
@@ -106,7 +106,7 @@
 			div.code-coverage-results span.line-num strong { color:#666; }
 			div.code-coverage-results div.start {
 				border:1px solid #aaa;
-				border-width:1px 1px 0px 1px;
+				border-width:1px 1px 0 1px;
 				margin-top:30px;
 				padding-top:5px;
 			}
diff --git a/web/api/lib/Cake/TestSuite/templates/phpunit.php b/web/api/lib/Cake/TestSuite/templates/phpunit.php
index f25d8d971..3f39a59d9 100644
--- a/web/api/lib/Cake/TestSuite/templates/phpunit.php
+++ b/web/api/lib/Cake/TestSuite/templates/phpunit.php
@@ -20,12 +20,7 @@
 <div id="content">
 	<h2>PHPUnit is not installed!</h2>
 	<p>You must install PHPUnit to use the CakePHP(tm) Test Suite.</p>
-	<p>PHPUnit can be installed with pear, using the pear installer.</p>
-	<p>To install with the PEAR installer run the following commands:</p>
-	<ul>
-		<li><code>pear config-set auto_discover 1</code></li>
-		<li><code>pear install pear.phpunit.de/PHPUnit</code></li>
-	</ul>
+	<p>PHPUnit can be installed with Composer, or downloaded as a phar archive.</p>
 	<p>Once PHPUnit is installed make sure its located on PHP's <code>include_path</code> by checking your php.ini</p>
 	<p>For full instructions on how to <a href="http://www.phpunit.de/manual/current/en/installation.html" target="_blank">install PHPUnit, see the PHPUnit installation guide</a>.</p>
 	<p><a href="https://github.com/sebastianbergmann/phpunit" target="_blank">Download PHPUnit</a></p>
diff --git a/web/api/lib/Cake/Utility/CakeNumber.php b/web/api/lib/Cake/Utility/CakeNumber.php
index f7c005a93..970f734e9 100644
--- a/web/api/lib/Cake/Utility/CakeNumber.php
+++ b/web/api/lib/Cake/Utility/CakeNumber.php
@@ -88,7 +88,7 @@ class CakeNumber {
 /**
  * If native number_format() should be used. If >= PHP5.4
  *
- * @var boolean
+ * @var bool
  */
 	protected static $_numberFormatSupport = null;
 
@@ -96,7 +96,7 @@ class CakeNumber {
  * Formats a number with a level of precision.
  *
  * @param float $value A floating point number.
- * @param integer $precision The precision of the returned number.
+ * @param int $precision The precision of the returned number.
  * @return float Formatted float.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::precision
  */
@@ -107,7 +107,7 @@ class CakeNumber {
 /**
  * Returns a formatted-for-humans file size.
  *
- * @param integer $size Size in bytes
+ * @param int $size Size in bytes
  * @return string Human readable size
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::toReadableSize
  */
@@ -116,13 +116,13 @@ class CakeNumber {
 			case $size < 1024:
 				return __dn('cake', '%d Byte', '%d Bytes', $size, $size);
 			case round($size / 1024) < 1024:
-				return __d('cake', '%s KB', self::precision($size / 1024, 0));
+				return __d('cake', '%s KB', static::precision($size / 1024, 0));
 			case round($size / 1024 / 1024, 2) < 1024:
-				return __d('cake', '%s MB', self::precision($size / 1024 / 1024, 2));
+				return __d('cake', '%s MB', static::precision($size / 1024 / 1024, 2));
 			case round($size / 1024 / 1024 / 1024, 2) < 1024:
-				return __d('cake', '%s GB', self::precision($size / 1024 / 1024 / 1024, 2));
+				return __d('cake', '%s GB', static::precision($size / 1024 / 1024 / 1024, 2));
 			default:
-				return __d('cake', '%s TB', self::precision($size / 1024 / 1024 / 1024 / 1024, 2));
+				return __d('cake', '%s TB', static::precision($size / 1024 / 1024 / 1024 / 1024, 2));
 		}
 	}
 
@@ -171,7 +171,7 @@ class CakeNumber {
  * - `multiply`: Multiply the input value by 100 for decimal percentages.
  *
  * @param float $value A floating point number
- * @param integer $precision The precision of the returned number
+ * @param int $precision The precision of the returned number
  * @param array $options Options
  * @return string Percentage string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::toPercentage
@@ -181,14 +181,14 @@ class CakeNumber {
 		if ($options['multiply']) {
 			$value *= 100;
 		}
-		return self::precision($value, $precision) . '%';
+		return static::precision($value, $precision) . '%';
 	}
 
 /**
  * Formats a number into a currency format.
  *
  * @param float $value A floating point number
- * @param integer $options If integer then places, if string then before, if (,.-) then use it
+ * @param int $options If integer then places, if string then before, if (,.-) then use it
  *   or array with places and before keys
  * @return string formatted number
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::format
@@ -221,8 +221,8 @@ class CakeNumber {
 			extract($options);
 		}
 
-		$value = self::_numberFormat($value, $places, '.', '');
-		$out = $before . self::_numberFormat($value, $places, $decimals, $thousands) . $after;
+		$value = static::_numberFormat($value, $places, '.', '');
+		$out = $before . static::_numberFormat($value, $places, $decimals, $thousands) . $after;
 
 		if ($escape) {
 			return h($out);
@@ -243,32 +243,32 @@ class CakeNumber {
  * - `decimals` - Decimal separator symbol ie. '.'
  *
  * @param float $value A floating point number
- * @param array $options
+ * @param array $options Options list.
  * @return string formatted delta
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::formatDelta
  */
 	public static function formatDelta($value, $options = array()) {
 		$places = isset($options['places']) ? $options['places'] : 0;
-		$value = self::_numberFormat($value, $places, '.', '');
+		$value = static::_numberFormat($value, $places, '.', '');
 		$sign = $value > 0 ? '+' : '';
 		$options['before'] = isset($options['before']) ? $options['before'] . $sign : $sign;
-		return self::format($value, $options);
+		return static::format($value, $options);
 	}
 
 /**
  * Alternative number_format() to accommodate multibyte decimals and thousands < PHP 5.4
  *
- * @param float $value
- * @param integer $places
- * @param string $decimals
- * @param string $thousands
+ * @param float $value Value to format.
+ * @param int $places Decimal places to use.
+ * @param string $decimals Decimal position string.
+ * @param string $thousands Thousands separator string.
  * @return string
  */
 	protected static function _numberFormat($value, $places = 0, $decimals = '.', $thousands = ',') {
-		if (!isset(self::$_numberFormatSupport)) {
-			self::$_numberFormatSupport = version_compare(PHP_VERSION, '5.4.0', '>=');
+		if (!isset(static::$_numberFormatSupport)) {
+			static::$_numberFormatSupport = version_compare(PHP_VERSION, '5.4.0', '>=');
 		}
-		if (self::$_numberFormatSupport) {
+		if (static::$_numberFormatSupport) {
 			return number_format($value, $places, $decimals, $thousands);
 		}
 		$value = number_format($value, $places, '.', '');
@@ -315,21 +315,21 @@ class CakeNumber {
  *   By default all currencies contain utf-8 symbols and don't need this changed. If you require
  *   non HTML encoded symbols you will need to update the settings with the correct bytes.
  *
- * @param float $value
+ * @param float $value Value to format.
  * @param string $currency Shortcut to default options. Valid values are
  *   'USD', 'EUR', 'GBP', otherwise set at least 'before' and 'after' options.
- * @param array $options
+ * @param array $options Options list.
  * @return string Number formatted as a currency.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::currency
  */
 	public static function currency($value, $currency = null, $options = array()) {
-		$defaults = self::$_currencyDefaults;
+		$defaults = static::$_currencyDefaults;
 		if ($currency === null) {
-			$currency = self::defaultCurrency();
+			$currency = static::defaultCurrency();
 		}
 
-		if (isset(self::$_currencies[$currency])) {
-			$defaults = self::$_currencies[$currency];
+		if (isset(static::$_currencies[$currency])) {
+			$defaults = static::$_currencies[$currency];
 		} elseif (is_string($currency)) {
 			$options['before'] = $currency;
 		}
@@ -364,7 +364,7 @@ class CakeNumber {
 		$options[$position] = $options[$symbolKey . 'Symbol'];
 
 		$abs = abs($value);
-		$result = self::format($abs, $options);
+		$result = static::format($abs, $options);
 
 		if ($value < 0) {
 			if ($options['negative'] === '()') {
@@ -380,11 +380,11 @@ class CakeNumber {
  * Add a currency format to the Number helper. Makes reusing
  * currency formats easier.
  *
- * {{{ $number->addFormat('NOK', array('before' => 'Kr. ')); }}}
+ * ``` $number->addFormat('NOK', array('before' => 'Kr. ')); ```
  *
  * You can now use `NOK` as a shortform when formatting currency amounts.
  *
- * {{{ $number->currency($value, 'NOK'); }}}
+ * ``` $number->currency($value, 'NOK'); ```
  *
  * Added formats are merged with the defaults defined in CakeNumber::$_currencyDefaults
  * See CakeNumber::currency() for more information on the various options and their function.
@@ -396,7 +396,7 @@ class CakeNumber {
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::addFormat
  */
 	public static function addFormat($formatName, $options) {
-		self::$_currencies[$formatName] = $options + self::$_currencyDefaults;
+		static::$_currencies[$formatName] = $options + static::$_currencyDefaults;
 	}
 
 /**
@@ -408,9 +408,9 @@ class CakeNumber {
  */
 	public static function defaultCurrency($currency = null) {
 		if ($currency) {
-			self::$_defaultCurrency = $currency;
+			static::$_defaultCurrency = $currency;
 		}
-		return self::$_defaultCurrency;
+		return static::$_defaultCurrency;
 	}
 
 }
diff --git a/web/api/lib/Cake/Utility/CakeText.php b/web/api/lib/Cake/Utility/CakeText.php
new file mode 100644
index 000000000..4bedb915b
--- /dev/null
+++ b/web/api/lib/Cake/Utility/CakeText.php
@@ -0,0 +1,710 @@
+<?php
+/**
+ * String handling methods.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       Cake.Utility
+ * @since         CakePHP(tm) v 1.2.0.5551
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+/**
+ * String handling methods.
+ *
+ * @package       Cake.Utility
+ */
+class CakeText {
+
+/**
+ * Generate a random UUID
+ *
+ * @see http://www.ietf.org/rfc/rfc4122.txt
+ * @return string RFC 4122 UUID
+ */
+	public static function uuid() {
+		$node = env('SERVER_ADDR');
+
+		if (strpos($node, ':') !== false) {
+			if (substr_count($node, '::')) {
+				$node = str_replace(
+					'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
+				);
+			}
+			$node = explode(':', $node);
+			$ipSix = '';
+
+			foreach ($node as $id) {
+				$ipSix .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT);
+			}
+			$node = base_convert($ipSix, 2, 10);
+
+			if (strlen($node) < 38) {
+				$node = null;
+			} else {
+				$node = crc32($node);
+			}
+		} elseif (empty($node)) {
+			$host = env('HOSTNAME');
+
+			if (empty($host)) {
+				$host = env('HOST');
+			}
+
+			if (!empty($host)) {
+				$ip = gethostbyname($host);
+
+				if ($ip === $host) {
+					$node = crc32($host);
+				} else {
+					$node = ip2long($ip);
+				}
+			}
+		} elseif ($node !== '127.0.0.1') {
+			$node = ip2long($node);
+		} else {
+			$node = null;
+		}
+
+		if (empty($node)) {
+			$node = crc32(Configure::read('Security.salt'));
+		}
+
+		if (function_exists('hphp_get_thread_id')) {
+			$pid = hphp_get_thread_id();
+		} elseif (function_exists('zend_thread_id')) {
+			$pid = zend_thread_id();
+		} else {
+			$pid = getmypid();
+		}
+
+		if (!$pid || $pid > 65535) {
+			$pid = mt_rand(0, 0xfff) | 0x4000;
+		}
+
+		list($timeMid, $timeLow) = explode(' ', microtime());
+		return sprintf(
+			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff,
+			mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node
+		);
+	}
+
+/**
+ * Tokenizes a string using $separator, ignoring any instance of $separator that appears between
+ * $leftBound and $rightBound.
+ *
+ * @param string $data The data to tokenize.
+ * @param string $separator The token to split the data on.
+ * @param string $leftBound The left boundary to ignore separators in.
+ * @param string $rightBound The right boundary to ignore separators in.
+ * @return mixed Array of tokens in $data or original input if empty.
+ */
+	public static function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') {
+		if (empty($data)) {
+			return array();
+		}
+
+		$depth = 0;
+		$offset = 0;
+		$buffer = '';
+		$results = array();
+		$length = mb_strlen($data);
+		$open = false;
+
+		while ($offset <= $length) {
+			$tmpOffset = -1;
+			$offsets = array(
+				mb_strpos($data, $separator, $offset),
+				mb_strpos($data, $leftBound, $offset),
+				mb_strpos($data, $rightBound, $offset)
+			);
+			for ($i = 0; $i < 3; $i++) {
+				if ($offsets[$i] !== false && ($offsets[$i] < $tmpOffset || $tmpOffset == -1)) {
+					$tmpOffset = $offsets[$i];
+				}
+			}
+			if ($tmpOffset !== -1) {
+				$buffer .= mb_substr($data, $offset, ($tmpOffset - $offset));
+				$char = mb_substr($data, $tmpOffset, 1);
+				if (!$depth && $char === $separator) {
+					$results[] = $buffer;
+					$buffer = '';
+				} else {
+					$buffer .= $char;
+				}
+				if ($leftBound !== $rightBound) {
+					if ($char === $leftBound) {
+						$depth++;
+					}
+					if ($char === $rightBound) {
+						$depth--;
+					}
+				} else {
+					if ($char === $leftBound) {
+						if (!$open) {
+							$depth++;
+							$open = true;
+						} else {
+							$depth--;
+						}
+					}
+				}
+				$offset = ++$tmpOffset;
+			} else {
+				$results[] = $buffer . mb_substr($data, $offset);
+				$offset = $length + 1;
+			}
+		}
+		if (empty($results) && !empty($buffer)) {
+			$results[] = $buffer;
+		}
+
+		if (!empty($results)) {
+			return array_map('trim', $results);
+		}
+
+		return array();
+	}
+
+/**
+ * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array
+ * corresponds to a variable placeholder name in $str.
+ * Example: `CakeText::insert(':name is :age years old.', array('name' => 'Bob', '65'));`
+ * Returns: Bob is 65 years old.
+ *
+ * Available $options are:
+ *
+ * - before: The character or string in front of the name of the variable placeholder (Defaults to `:`)
+ * - after: The character or string after the name of the variable placeholder (Defaults to null)
+ * - escape: The character or string used to escape the before character / string (Defaults to `\`)
+ * - format: A regex to use for matching variable placeholders. Default is: `/(?<!\\)\:%s/`
+ *   (Overwrites before, after, breaks escape / clean)
+ * - clean: A boolean or array with instructions for CakeText::cleanInsert
+ *
+ * @param string $str A string containing variable placeholders
+ * @param array $data A key => val array where each key stands for a placeholder variable name
+ *     to be replaced with val
+ * @param array $options An array of options, see description above
+ * @return string
+ */
+	public static function insert($str, $data, $options = array()) {
+		$defaults = array(
+			'before' => ':', 'after' => null, 'escape' => '\\', 'format' => null, 'clean' => false
+		);
+		$options += $defaults;
+		$format = $options['format'];
+		$data = (array)$data;
+		if (empty($data)) {
+			return ($options['clean']) ? CakeText::cleanInsert($str, $options) : $str;
+		}
+
+		if (!isset($format)) {
+			$format = sprintf(
+				'/(?<!%s)%s%%s%s/',
+				preg_quote($options['escape'], '/'),
+				str_replace('%', '%%', preg_quote($options['before'], '/')),
+				str_replace('%', '%%', preg_quote($options['after'], '/'))
+			);
+		}
+
+		if (strpos($str, '?') !== false && is_numeric(key($data))) {
+			$offset = 0;
+			while (($pos = strpos($str, '?', $offset)) !== false) {
+				$val = array_shift($data);
+				$offset = $pos + strlen($val);
+				$str = substr_replace($str, $val, $pos, 1);
+			}
+			return ($options['clean']) ? CakeText::cleanInsert($str, $options) : $str;
+		}
+
+		asort($data);
+
+		$dataKeys = array_keys($data);
+		$hashKeys = array_map('crc32', $dataKeys);
+		$tempData = array_combine($dataKeys, $hashKeys);
+		krsort($tempData);
+
+		foreach ($tempData as $key => $hashVal) {
+			$key = sprintf($format, preg_quote($key, '/'));
+			$str = preg_replace($key, $hashVal, $str);
+		}
+		$dataReplacements = array_combine($hashKeys, array_values($data));
+		foreach ($dataReplacements as $tmpHash => $tmpValue) {
+			$tmpValue = (is_array($tmpValue)) ? '' : $tmpValue;
+			$str = str_replace($tmpHash, $tmpValue, $str);
+		}
+
+		if (!isset($options['format']) && isset($options['before'])) {
+			$str = str_replace($options['escape'] . $options['before'], $options['before'], $str);
+		}
+		return ($options['clean']) ? CakeText::cleanInsert($str, $options) : $str;
+	}
+
+/**
+ * Cleans up a CakeText::insert() formatted string with given $options depending on the 'clean' key in
+ * $options. The default method used is text but html is also available. The goal of this function
+ * is to replace all whitespace and unneeded markup around placeholders that did not get replaced
+ * by CakeText::insert().
+ *
+ * @param string $str CakeText to clean.
+ * @param array $options Options list.
+ * @return string
+ * @see CakeText::insert()
+ */
+	public static function cleanInsert($str, $options) {
+		$clean = $options['clean'];
+		if (!$clean) {
+			return $str;
+		}
+		if ($clean === true) {
+			$clean = array('method' => 'text');
+		}
+		if (!is_array($clean)) {
+			$clean = array('method' => $options['clean']);
+		}
+		switch ($clean['method']) {
+			case 'html':
+				$clean = array_merge(array(
+					'word' => '[\w,.]+',
+					'andText' => true,
+					'replacement' => '',
+				), $clean);
+				$kleenex = sprintf(
+					'/[\s]*[a-z]+=(")(%s%s%s[\s]*)+\\1/i',
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/')
+				);
+				$str = preg_replace($kleenex, $clean['replacement'], $str);
+				if ($clean['andText']) {
+					$options['clean'] = array('method' => 'text');
+					$str = CakeText::cleanInsert($str, $options);
+				}
+				break;
+			case 'text':
+				$clean = array_merge(array(
+					'word' => '[\w,.]+',
+					'gap' => '[\s]*(?:(?:and|or)[\s]*)?',
+					'replacement' => '',
+				), $clean);
+
+				$kleenex = sprintf(
+					'/(%s%s%s%s|%s%s%s%s)/',
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/'),
+					$clean['gap'],
+					$clean['gap'],
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/')
+				);
+				$str = preg_replace($kleenex, $clean['replacement'], $str);
+				break;
+		}
+		return $str;
+	}
+
+/**
+ * Wraps text to a specific width, can optionally wrap at word breaks.
+ *
+ * ### Options
+ *
+ * - `width` The width to wrap to. Defaults to 72.
+ * - `wordWrap` Only wrap on words breaks (spaces) Defaults to true.
+ * - `indent` CakeText to indent with. Defaults to null.
+ * - `indentAt` 0 based index to start indenting at. Defaults to 0.
+ *
+ * @param string $text The text to format.
+ * @param array|int $options Array of options to use, or an integer to wrap the text to.
+ * @return string Formatted text.
+ */
+	public static function wrap($text, $options = array()) {
+		if (is_numeric($options)) {
+			$options = array('width' => $options);
+		}
+		$options += array('width' => 72, 'wordWrap' => true, 'indent' => null, 'indentAt' => 0);
+		if ($options['wordWrap']) {
+			$wrapped = static::wordWrap($text, $options['width'], "\n");
+		} else {
+			$wrapped = trim(chunk_split($text, $options['width'] - 1, "\n"));
+		}
+		if (!empty($options['indent'])) {
+			$chunks = explode("\n", $wrapped);
+			for ($i = $options['indentAt'], $len = count($chunks); $i < $len; $i++) {
+				$chunks[$i] = $options['indent'] . $chunks[$i];
+			}
+			$wrapped = implode("\n", $chunks);
+		}
+		return $wrapped;
+	}
+
+/**
+ * Unicode aware version of wordwrap.
+ *
+ * @param string $text The text to format.
+ * @param int $width The width to wrap to. Defaults to 72.
+ * @param string $break The line is broken using the optional break parameter. Defaults to '\n'.
+ * @param bool $cut If the cut is set to true, the string is always wrapped at the specified width.
+ * @return string Formatted text.
+ */
+	public static function wordWrap($text, $width = 72, $break = "\n", $cut = false) {
+		$paragraphs = explode($break, $text);
+		foreach ($paragraphs as &$paragraph) {
+			$paragraph = static::_wordWrap($paragraph, $width, $break, $cut);
+		}
+		return implode($break, $paragraphs);
+	}
+
+/**
+ * Helper method for wordWrap().
+ *
+ * @param string $text The text to format.
+ * @param int $width The width to wrap to. Defaults to 72.
+ * @param string $break The line is broken using the optional break parameter. Defaults to '\n'.
+ * @param bool $cut If the cut is set to true, the string is always wrapped at the specified width.
+ * @return string Formatted text.
+ */
+	protected static function _wordWrap($text, $width = 72, $break = "\n", $cut = false) {
+		if ($cut) {
+			$parts = array();
+			while (mb_strlen($text) > 0) {
+				$part = mb_substr($text, 0, $width);
+				$parts[] = trim($part);
+				$text = trim(mb_substr($text, mb_strlen($part)));
+			}
+			return implode($break, $parts);
+		}
+
+		$parts = array();
+		while (mb_strlen($text) > 0) {
+			if ($width >= mb_strlen($text)) {
+				$parts[] = trim($text);
+				break;
+			}
+
+			$part = mb_substr($text, 0, $width);
+			$nextChar = mb_substr($text, $width, 1);
+			if ($nextChar !== ' ') {
+				$breakAt = mb_strrpos($part, ' ');
+				if ($breakAt === false) {
+					$breakAt = mb_strpos($text, ' ', $width);
+				}
+				if ($breakAt === false) {
+					$parts[] = trim($text);
+					break;
+				}
+				$part = mb_substr($text, 0, $breakAt);
+			}
+
+			$part = trim($part);
+			$parts[] = $part;
+			$text = trim(mb_substr($text, mb_strlen($part)));
+		}
+
+		return implode($break, $parts);
+	}
+
+/**
+ * Highlights a given phrase in a text. You can specify any expression in highlighter that
+ * may include the \1 expression to include the $phrase found.
+ *
+ * ### Options:
+ *
+ * - `format` The piece of html with that the phrase will be highlighted
+ * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted
+ * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu'
+ *
+ * @param string $text Text to search the phrase in.
+ * @param string|array $phrase The phrase or phrases that will be searched.
+ * @param array $options An array of html attributes and options.
+ * @return string The highlighted text
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight
+ */
+	public static function highlight($text, $phrase, $options = array()) {
+		if (empty($phrase)) {
+			return $text;
+		}
+
+		$defaults = array(
+			'format' => '<span class="highlight">\1</span>',
+			'html' => false,
+			'regex' => "|%s|iu"
+		);
+		$options += $defaults;
+		extract($options);
+
+		if (is_array($phrase)) {
+			$replace = array();
+			$with = array();
+
+			foreach ($phrase as $key => $segment) {
+				$segment = '(' . preg_quote($segment, '|') . ')';
+				if ($html) {
+					$segment = "(?![^<]+>)$segment(?![^<]+>)";
+				}
+
+				$with[] = (is_array($format)) ? $format[$key] : $format;
+				$replace[] = sprintf($options['regex'], $segment);
+			}
+
+			return preg_replace($replace, $with, $text);
+		}
+
+		$phrase = '(' . preg_quote($phrase, '|') . ')';
+		if ($html) {
+			$phrase = "(?![^<]+>)$phrase(?![^<]+>)";
+		}
+
+		return preg_replace(sprintf($options['regex'], $phrase), $format, $text);
+	}
+
+/**
+ * Strips given text of all links (<a href=....).
+ *
+ * @param string $text Text
+ * @return string The text without links
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::stripLinks
+ */
+	public static function stripLinks($text) {
+		return preg_replace('|<a\s+[^>]+>|im', '', preg_replace('|<\/a>|im', '', $text));
+	}
+
+/**
+ * Truncates text starting from the end.
+ *
+ * Cuts a string to the length of $length and replaces the first characters
+ * with the ellipsis if the text is longer than length.
+ *
+ * ### Options:
+ *
+ * - `ellipsis` Will be used as Beginning and prepended to the trimmed string
+ * - `exact` If false, $text will not be cut mid-word
+ *
+ * @param string $text CakeText to truncate.
+ * @param int $length Length of returned string, including ellipsis.
+ * @param array $options An array of options.
+ * @return string Trimmed string.
+ */
+	public static function tail($text, $length = 100, $options = array()) {
+		$defaults = array(
+			'ellipsis' => '...', 'exact' => true
+		);
+		$options += $defaults;
+		extract($options);
+
+		if (!function_exists('mb_strlen')) {
+			class_exists('Multibyte');
+		}
+
+		if (mb_strlen($text) <= $length) {
+			return $text;
+		}
+
+		$truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis));
+		if (!$exact) {
+			$spacepos = mb_strpos($truncate, ' ');
+			$truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos));
+		}
+
+		return $ellipsis . $truncate;
+	}
+
+/**
+ * Truncates text.
+ *
+ * Cuts a string to the length of $length and replaces the last characters
+ * with the ellipsis if the text is longer than length.
+ *
+ * ### Options:
+ *
+ * - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated)
+ * - `exact` If false, $text will not be cut mid-word
+ * - `html` If true, HTML tags would be handled correctly
+ *
+ * @param string $text CakeText to truncate.
+ * @param int $length Length of returned string, including ellipsis.
+ * @param array $options An array of html attributes and options.
+ * @return string Trimmed string.
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate
+ */
+	public static function truncate($text, $length = 100, $options = array()) {
+		$defaults = array(
+			'ellipsis' => '...', 'exact' => true, 'html' => false
+		);
+		if (isset($options['ending'])) {
+			$defaults['ellipsis'] = $options['ending'];
+		} elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
+			$defaults['ellipsis'] = "\xe2\x80\xa6";
+		}
+		$options += $defaults;
+		extract($options);
+
+		if (!function_exists('mb_strlen')) {
+			class_exists('Multibyte');
+		}
+
+		if ($html) {
+			if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
+				return $text;
+			}
+			$totalLength = mb_strlen(strip_tags($ellipsis));
+			$openTags = array();
+			$truncate = '';
+
+			preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+			foreach ($tags as $tag) {
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
+					if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
+						array_unshift($openTags, $tag[2]);
+					} elseif (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
+						$pos = array_search($closeTag[1], $openTags);
+						if ($pos !== false) {
+							array_splice($openTags, $pos, 1);
+						}
+					}
+				}
+				$truncate .= $tag[1];
+
+				$contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3]));
+				if ($contentLength + $totalLength > $length) {
+					$left = $length - $totalLength;
+					$entitiesLength = 0;
+					if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) {
+						foreach ($entities[0] as $entity) {
+							if ($entity[1] + 1 - $entitiesLength <= $left) {
+								$left--;
+								$entitiesLength += mb_strlen($entity[0]);
+							} else {
+								break;
+							}
+						}
+					}
+
+					$truncate .= mb_substr($tag[3], 0, $left + $entitiesLength);
+					break;
+				} else {
+					$truncate .= $tag[3];
+					$totalLength += $contentLength;
+				}
+				if ($totalLength >= $length) {
+					break;
+				}
+			}
+		} else {
+			if (mb_strlen($text) <= $length) {
+				return $text;
+			}
+			$truncate = mb_substr($text, 0, $length - mb_strlen($ellipsis));
+		}
+		if (!$exact) {
+			$spacepos = mb_strrpos($truncate, ' ');
+			if ($html) {
+				$truncateCheck = mb_substr($truncate, 0, $spacepos);
+				$lastOpenTag = mb_strrpos($truncateCheck, '<');
+				$lastCloseTag = mb_strrpos($truncateCheck, '>');
+				if ($lastOpenTag > $lastCloseTag) {
+					preg_match_all('/<[\w]+[^>]*>/s', $truncate, $lastTagMatches);
+					$lastTag = array_pop($lastTagMatches[0]);
+					$spacepos = mb_strrpos($truncate, $lastTag) + mb_strlen($lastTag);
+				}
+				$bits = mb_substr($truncate, $spacepos);
+				preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
+				if (!empty($droppedTags)) {
+					if (!empty($openTags)) {
+						foreach ($droppedTags as $closingTag) {
+							if (!in_array($closingTag[1], $openTags)) {
+								array_unshift($openTags, $closingTag[1]);
+							}
+						}
+					} else {
+						foreach ($droppedTags as $closingTag) {
+							$openTags[] = $closingTag[1];
+						}
+					}
+				}
+			}
+			$truncate = mb_substr($truncate, 0, $spacepos);
+		}
+		$truncate .= $ellipsis;
+
+		if ($html) {
+			foreach ($openTags as $tag) {
+				$truncate .= '</' . $tag . '>';
+			}
+		}
+
+		return $truncate;
+	}
+
+/**
+ * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side
+ * determined by radius.
+ *
+ * @param string $text CakeText to search the phrase in
+ * @param string $phrase Phrase that will be searched for
+ * @param int $radius The amount of characters that will be returned on each side of the founded phrase
+ * @param string $ellipsis Ending that will be appended
+ * @return string Modified string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt
+ */
+	public static function excerpt($text, $phrase, $radius = 100, $ellipsis = '...') {
+		if (empty($text) || empty($phrase)) {
+			return static::truncate($text, $radius * 2, array('ellipsis' => $ellipsis));
+		}
+
+		$append = $prepend = $ellipsis;
+
+		$phraseLen = mb_strlen($phrase);
+		$textLen = mb_strlen($text);
+
+		$pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase));
+		if ($pos === false) {
+			return mb_substr($text, 0, $radius) . $ellipsis;
+		}
+
+		$startPos = $pos - $radius;
+		if ($startPos <= 0) {
+			$startPos = 0;
+			$prepend = '';
+		}
+
+		$endPos = $pos + $phraseLen + $radius;
+		if ($endPos >= $textLen) {
+			$endPos = $textLen;
+			$append = '';
+		}
+
+		$excerpt = mb_substr($text, $startPos, $endPos - $startPos);
+		$excerpt = $prepend . $excerpt . $append;
+
+		return $excerpt;
+	}
+
+/**
+ * Creates a comma separated list where the last two items are joined with 'and', forming natural language.
+ *
+ * @param array $list The list to be joined.
+ * @param string $and The word used to join the last and second last items together with. Defaults to 'and'.
+ * @param string $separator The separator used to join all the other items together. Defaults to ', '.
+ * @return string The glued together string.
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList
+ */
+	public static function toList($list, $and = null, $separator = ', ') {
+		if ($and === null) {
+			$and = __d('cake', 'and');
+		}
+		if (count($list) > 1) {
+			return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
+		}
+
+		return array_pop($list);
+	}
+}
diff --git a/web/api/lib/Cake/Utility/CakeTime.php b/web/api/lib/Cake/Utility/CakeTime.php
index 84abf5c76..f59d6d6d0 100644
--- a/web/api/lib/Cake/Utility/CakeTime.php
+++ b/web/api/lib/Cake/Utility/CakeTime.php
@@ -65,13 +65,13 @@ class CakeTime {
  * @see CakeTime::timeAgoInWords()
  */
 	public static $wordAccuracy = array(
-		'year' => "day",
-		'month' => "day",
-		'week' => "day",
-		'day' => "hour",
-		'hour' => "minute",
-		'minute' => "minute",
-		'second' => "second",
+		'year' => 'day',
+		'month' => 'day',
+		'week' => 'day',
+		'day' => 'hour',
+		'hour' => 'minute',
+		'minute' => 'minute',
+		'second' => 'second',
 	);
 
 /**
@@ -85,7 +85,7 @@ class CakeTime {
 /**
  * Temporary variable containing the timestamp value, used internally in convertSpecifiers()
  *
- * @var integer
+ * @var int
  */
 	protected static $_time = null;
 
@@ -100,7 +100,7 @@ class CakeTime {
 	public function __set($name, $value) {
 		switch ($name) {
 			case 'niceFormat':
-				self::${$name} = $value;
+				static::${$name} = $value;
 				break;
 		}
 	}
@@ -115,7 +115,7 @@ class CakeTime {
 	public function __get($name) {
 		switch ($name) {
 			case 'niceFormat':
-				return self::${$name};
+				return static::${$name};
 			default:
 				return null;
 		}
@@ -123,25 +123,25 @@ class CakeTime {
 
 /**
  * Converts a string representing the format for the function strftime and returns a
- * windows safe and i18n aware format.
+ * Windows safe and i18n aware format.
  *
  * @param string $format Format with specifiers for strftime function.
  *    Accepts the special specifier %S which mimics the modifier S for date()
  * @param string $time UNIX timestamp
- * @return string windows safe and date() function compatible format for strftime
+ * @return string Windows safe and date() function compatible format for strftime
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::convertSpecifiers
  */
 	public static function convertSpecifiers($format, $time = null) {
 		if (!$time) {
 			$time = time();
 		}
-		self::$_time = $time;
+		static::$_time = $time;
 		return preg_replace_callback('/\%(\w+)/', array('CakeTime', '_translateSpecifier'), $format);
 	}
 
 /**
  * Auxiliary function to translate a matched specifier element from a regular expression into
- * a windows safe and i18n aware specifier
+ * a Windows safe and i18n aware specifier
  *
  * @param array $specifier match from regular expression
  * @return string converted element
@@ -151,47 +151,47 @@ class CakeTime {
 			case 'a':
 				$abday = __dc('cake', 'abday', 5);
 				if (is_array($abday)) {
-					return $abday[date('w', self::$_time)];
+					return $abday[date('w', static::$_time)];
 				}
 				break;
 			case 'A':
 				$day = __dc('cake', 'day', 5);
 				if (is_array($day)) {
-					return $day[date('w', self::$_time)];
+					return $day[date('w', static::$_time)];
 				}
 				break;
 			case 'c':
 				$format = __dc('cake', 'd_t_fmt', 5);
 				if ($format !== 'd_t_fmt') {
-					return self::convertSpecifiers($format, self::$_time);
+					return static::convertSpecifiers($format, static::$_time);
 				}
 				break;
 			case 'C':
-				return sprintf("%02d", date('Y', self::$_time) / 100);
+				return sprintf("%02d", date('Y', static::$_time) / 100);
 			case 'D':
 				return '%m/%d/%y';
 			case 'e':
 				if (DS === '/') {
 					return '%e';
 				}
-				$day = date('j', self::$_time);
+				$day = date('j', static::$_time);
 				if ($day < 10) {
 					$day = ' ' . $day;
 				}
 				return $day;
 			case 'eS' :
-				return date('jS', self::$_time);
+				return date('jS', static::$_time);
 			case 'b':
 			case 'h':
 				$months = __dc('cake', 'abmon', 5);
 				if (is_array($months)) {
-					return $months[date('n', self::$_time) - 1];
+					return $months[date('n', static::$_time) - 1];
 				}
 				return '%b';
 			case 'B':
 				$months = __dc('cake', 'mon', 5);
 				if (is_array($months)) {
-					return $months[date('n', self::$_time) - 1];
+					return $months[date('n', static::$_time) - 1];
 				}
 				break;
 			case 'n':
@@ -199,7 +199,7 @@ class CakeTime {
 			case 'p':
 			case 'P':
 				$default = array('am' => 0, 'pm' => 1);
-				$meridiem = $default[date('a', self::$_time)];
+				$meridiem = $default[date('a', static::$_time)];
 				$format = __dc('cake', 'am_pm', 5);
 				if (is_array($format)) {
 					$meridiem = $format[$meridiem];
@@ -209,27 +209,27 @@ class CakeTime {
 			case 'r':
 				$complete = __dc('cake', 't_fmt_ampm', 5);
 				if ($complete !== 't_fmt_ampm') {
-					return str_replace('%p', self::_translateSpecifier(array('%p', 'p')), $complete);
+					return str_replace('%p', static::_translateSpecifier(array('%p', 'p')), $complete);
 				}
 				break;
 			case 'R':
-				return date('H:i', self::$_time);
+				return date('H:i', static::$_time);
 			case 't':
 				return "\t";
 			case 'T':
 				return '%H:%M:%S';
 			case 'u':
-				return ($weekDay = date('w', self::$_time)) ? $weekDay : 7;
+				return ($weekDay = date('w', static::$_time)) ? $weekDay : 7;
 			case 'x':
 				$format = __dc('cake', 'd_fmt', 5);
 				if ($format !== 'd_fmt') {
-					return self::convertSpecifiers($format, self::$_time);
+					return static::convertSpecifiers($format, static::$_time);
 				}
 				break;
 			case 'X':
 				$format = __dc('cake', 't_fmt', 5);
 				if ($format !== 't_fmt') {
-					return self::convertSpecifiers($format, self::$_time);
+					return static::convertSpecifiers($format, static::$_time);
 				}
 				break;
 		}
@@ -241,7 +241,7 @@ class CakeTime {
  *
  * @param string $serverTime UNIX timestamp
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return integer UNIX timestamp
+ * @return int UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::convert
  */
 	public static function convert($serverTime, $timezone) {
@@ -254,7 +254,7 @@ class CakeTime {
 		if (is_numeric($timezone)) {
 			$userOffset = $timezone * (60 * 60);
 		} else {
-			$timezone = self::timezone($timezone);
+			$timezone = static::timezone($timezone);
 			$userOffset = $timezone->getOffset(new DateTime('@' . $gmtTime));
 		}
 		$userTime = $gmtTime + $userOffset;
@@ -295,7 +295,7 @@ class CakeTime {
 /**
  * Returns server's offset from GMT in seconds.
  *
- * @return integer Offset
+ * @return int Offset
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::serverOffset
  */
 	public static function serverOffset() {
@@ -305,7 +305,7 @@ class CakeTime {
 /**
  * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Parsed timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::fromString
@@ -321,9 +321,8 @@ class CakeTime {
 		}
 
 		if (is_int($dateString) || is_numeric($dateString)) {
-			$date = intval($dateString);
-		} elseif (
-			$dateString instanceof DateTime &&
+			$date = (int)$dateString;
+		} elseif ($dateString instanceof DateTime &&
 			$dateString->getTimezone()->getName() != date_default_timezone_get()
 		) {
 			$clone = clone $dateString;
@@ -344,7 +343,7 @@ class CakeTime {
 		}
 
 		if ($timezone !== null) {
-			return self::convert($date, $timezone);
+			return static::convert($date, $timezone);
 		}
 		return $date;
 	}
@@ -355,9 +354,9 @@ class CakeTime {
  * See http://php.net/manual/en/function.strftime.php for information on formatting
  * using locale strings.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @param string $format The format to use. If null, `TimeHelper::$niceFormat` is used
+ * @param string $format The format to use. If null, `CakeTime::$niceFormat` is used
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::nice
  */
@@ -365,12 +364,12 @@ class CakeTime {
 		if (!$dateString) {
 			$dateString = time();
 		}
-		$date = self::fromString($dateString, $timezone);
+		$date = static::fromString($dateString, $timezone);
 
 		if (!$format) {
-			$format = self::$niceFormat;
+			$format = static::$niceFormat;
 		}
-		return self::_strftime(self::convertSpecifiers($format, $date), $date);
+		return static::_strftime(static::convertSpecifiers($format, $date), $date);
 	}
 
 /**
@@ -383,7 +382,7 @@ class CakeTime {
  * If $dateString's year is the current year, the returned string does not
  * include mention of the year.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Described, relative date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::niceShort
@@ -392,19 +391,19 @@ class CakeTime {
 		if (!$dateString) {
 			$dateString = time();
 		}
-		$date = self::fromString($dateString, $timezone);
+		$date = static::fromString($dateString, $timezone);
 
-		if (self::isToday($dateString, $timezone)) {
-			return __d('cake', 'Today, %s', self::_strftime("%H:%M", $date));
+		if (static::isToday($dateString, $timezone)) {
+			return __d('cake', 'Today, %s', static::_strftime("%H:%M", $date));
 		}
-		if (self::wasYesterday($dateString, $timezone)) {
-			return __d('cake', 'Yesterday, %s', self::_strftime("%H:%M", $date));
+		if (static::wasYesterday($dateString, $timezone)) {
+			return __d('cake', 'Yesterday, %s', static::_strftime("%H:%M", $date));
 		}
-		if (self::isTomorrow($dateString, $timezone)) {
-			return __d('cake', 'Tomorrow, %s', self::_strftime("%H:%M", $date));
+		if (static::isTomorrow($dateString, $timezone)) {
+			return __d('cake', 'Tomorrow, %s', static::_strftime("%H:%M", $date));
 		}
 
-		$d = self::_strftime("%w", $date);
+		$d = static::_strftime("%w", $date);
 		$day = array(
 			__d('cake', 'Sunday'),
 			__d('cake', 'Monday'),
@@ -414,33 +413,33 @@ class CakeTime {
 			__d('cake', 'Friday'),
 			__d('cake', 'Saturday')
 		);
-		if (self::wasWithinLast('7 days', $dateString, $timezone)) {
-			return sprintf('%s %s', $day[$d], self::_strftime(self::$niceShortFormat, $date));
+		if (static::wasWithinLast('7 days', $dateString, $timezone)) {
+			return sprintf('%s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date));
 		}
-		if (self::isWithinNext('7 days', $dateString, $timezone)) {
-			return __d('cake', 'On %s %s', $day[$d], self::_strftime(self::$niceShortFormat, $date));
+		if (static::isWithinNext('7 days', $dateString, $timezone)) {
+			return __d('cake', 'On %s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date));
 		}
 
 		$y = '';
-		if (!self::isThisYear($date)) {
+		if (!static::isThisYear($date)) {
 			$y = ' %Y';
 		}
-		return self::_strftime(self::convertSpecifiers("%b %eS{$y}, %H:%M", $date), $date);
+		return static::_strftime(static::convertSpecifiers("%b %eS{$y}, %H:%M", $date), $date);
 	}
 
 /**
  * Returns a partial SQL string to search for all records between two dates.
  *
- * @param integer|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
- * @param integer|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::daysAsSql
  */
 	public static function daysAsSql($begin, $end, $fieldName, $timezone = null) {
-		$begin = self::fromString($begin, $timezone);
-		$end = self::fromString($end, $timezone);
+		$begin = static::fromString($begin, $timezone);
+		$end = static::fromString($end, $timezone);
 		$begin = date('Y-m-d', $begin) . ' 00:00:00';
 		$end = date('Y-m-d', $end) . ' 23:59:59';
 
@@ -451,137 +450,137 @@ class CakeTime {
  * Returns a partial SQL string to search for all records between two times
  * occurring on the same day.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Partial SQL string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::dayAsSql
  */
 	public static function dayAsSql($dateString, $fieldName, $timezone = null) {
-		return self::daysAsSql($dateString, $dateString, $fieldName, $timezone);
+		return static::daysAsSql($dateString, $dateString, $fieldName, $timezone);
 	}
 
 /**
  * Returns true if given datetime string is today.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is today
+ * @return bool True if datetime string is today
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isToday
  */
 	public static function isToday($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$now = self::fromString('now', $timezone);
-		return date('Y-m-d', $timestamp) == date('Y-m-d', $now);
+		$timestamp = static::fromString($dateString, $timezone);
+		$now = static::fromString('now', $timezone);
+		return date('Y-m-d', $timestamp) === date('Y-m-d', $now);
 	}
 
 /**
  * Returns true if given datetime string is in the future.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is in the future
+ * @return bool True if datetime string is in the future
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isFuture
  */
 	public static function isFuture($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
 		return $timestamp > time();
 	}
 
 /**
  * Returns true if given datetime string is in the past.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is in the past
+ * @return bool True if datetime string is in the past
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isPast
  */
 	public static function isPast($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
 		return $timestamp < time();
 	}
 
 /**
  * Returns true if given datetime string is within this week.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current week
+ * @return bool True if datetime string is within current week
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisWeek
  */
 	public static function isThisWeek($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$now = self::fromString('now', $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
+		$now = static::fromString('now', $timezone);
 		return date('W o', $timestamp) === date('W o', $now);
 	}
 
 /**
  * Returns true if given datetime string is within this month
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current month
+ * @return bool True if datetime string is within current month
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisMonth
  */
 	public static function isThisMonth($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$now = self::fromString('now', $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
+		$now = static::fromString('now', $timezone);
 		return date('m Y', $timestamp) === date('m Y', $now);
 	}
 
 /**
  * Returns true if given datetime string is within current year.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current year
+ * @return bool True if datetime string is within current year
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isThisYear
  */
 	public static function isThisYear($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$now = self::fromString('now', $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
+		$now = static::fromString('now', $timezone);
 		return date('Y', $timestamp) === date('Y', $now);
 	}
 
 /**
  * Returns true if given datetime string was yesterday.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string was yesterday
+ * @return bool True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::wasYesterday
  */
 	public static function wasYesterday($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$yesterday = self::fromString('yesterday', $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
+		$yesterday = static::fromString('yesterday', $timezone);
 		return date('Y-m-d', $timestamp) === date('Y-m-d', $yesterday);
 	}
 
 /**
  * Returns true if given datetime string is tomorrow.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean True if datetime string was yesterday
+ * @return bool True if datetime string was yesterday
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::isTomorrow
  */
 	public static function isTomorrow($dateString, $timezone = null) {
-		$timestamp = self::fromString($dateString, $timezone);
-		$tomorrow = self::fromString('tomorrow', $timezone);
+		$timestamp = static::fromString($dateString, $timezone);
+		$tomorrow = static::fromString('tomorrow', $timezone);
 		return date('Y-m-d', $timestamp) === date('Y-m-d', $tomorrow);
 	}
 
 /**
  * Returns the quarter
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
- * @param boolean $range if true returns a range in Y-m-d format
- * @return mixed 1, 2, 3, or 4 quarter of year or array if $range true
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param bool $range if true returns a range in Y-m-d format
+ * @return int|array 1, 2, 3, or 4 quarter of year or array if $range true
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toQuarter
  */
 	public static function toQuarter($dateString, $range = false) {
-		$time = self::fromString($dateString);
-		$date = ceil(date('m', $time) / 3);
+		$time = static::fromString($dateString);
+		$date = (int)ceil(date('m', $time) / 3);
 		if ($range === false) {
 			return $date;
 		}
@@ -602,13 +601,13 @@ class CakeTime {
 /**
  * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime().
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return integer Unix timestamp
+ * @return int Unix timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toUnix
  */
 	public static function toUnix($dateString, $timezone = null) {
-		return self::fromString($dateString, $timezone);
+		return static::fromString($dateString, $timezone);
 	}
 
 /**
@@ -620,7 +619,7 @@ class CakeTime {
  * If no timezone parameter is given and no DateTime object, the passed $dateString will be
  * considered to be in the UTC timezone.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @param string $format date format string
  * @return mixed Formatted date
@@ -659,19 +658,19 @@ class CakeTime {
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toAtom
  */
 	public static function toAtom($dateString, $timezone = null) {
-		return date('Y-m-d\TH:i:s\Z', self::fromString($dateString, $timezone));
+		return date('Y-m-d\TH:i:s\Z', static::fromString($dateString, $timezone));
 	}
 
 /**
  * Formats date for RSS feeds
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::toRSS
  */
 	public static function toRSS($dateString, $timezone = null) {
-		$date = self::fromString($dateString, $timezone);
+		$date = static::fromString($dateString, $timezone);
 
 		if ($timezone === null) {
 			return date("r", $date);
@@ -713,9 +712,10 @@ class CakeTime {
  *    - minute => The format if minutes > 0 (default "minute")
  *    - second => The format if seconds > 0 (default "second")
  * - `end` => The end of relative time telling
- * - `relativeString` => The printf compatible string when outputting relative time
+ * - `relativeString` => The printf compatible string when outputting past relative time
+ * - `relativeStringFuture` => The printf compatible string when outputting future relative time
  * - `absoluteString` => The printf compatible string when outputting absolute time
- * - `userOffset` => Users offset from GMT (in hours) *Deprecated* use timezone intead.
+ * - `userOffset` => Users offset from GMT (in hours) *Deprecated* use timezone instead.
  * - `timezone` => The user timezone the timestamp should be formatted in.
  *
  * Relative dates look something like this:
@@ -730,20 +730,23 @@ class CakeTime {
  *
  * NOTE: If the difference is one week or more, the lowest level of accuracy is day
  *
- * @param integer|string|DateTime $dateTime Datetime UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateTime Datetime UNIX timestamp, strtotime() valid string or DateTime object
  * @param array $options Default format if timestamp is used in $dateString
  * @return string Relative time string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::timeAgoInWords
  */
 	public static function timeAgoInWords($dateTime, $options = array()) {
 		$timezone = null;
-		$format = self::$wordFormat;
-		$end = self::$wordEnd;
-		$relativeString = __d('cake', '%s ago');
+		$accuracies = static::$wordAccuracy;
+		$format = static::$wordFormat;
+		$relativeEnd = static::$wordEnd;
+		$relativeStringPast = __d('cake', '%s ago');
+		$relativeStringFuture = __d('cake', 'in %s');
 		$absoluteString = __d('cake', 'on %s');
-		$accuracy = self::$wordAccuracy;
 
-		if (is_array($options)) {
+		if (is_string($options)) {
+			$format = $options;
+		} elseif (!empty($options)) {
 			if (isset($options['timezone'])) {
 				$timezone = $options['timezone'];
 			} elseif (isset($options['userOffset'])) {
@@ -752,10 +755,10 @@ class CakeTime {
 
 			if (isset($options['accuracy'])) {
 				if (is_array($options['accuracy'])) {
-					$accuracy = array_merge($accuracy, $options['accuracy']);
+					$accuracies = array_merge($accuracies, $options['accuracy']);
 				} else {
-					foreach ($accuracy as $key => $level) {
-						$accuracy[$key] = $options['accuracy'];
+					foreach ($accuracies as $key => $level) {
+						$accuracies[$key] = $options['accuracy'];
 					}
 				}
 			}
@@ -764,47 +767,56 @@ class CakeTime {
 				$format = $options['format'];
 			}
 			if (isset($options['end'])) {
-				$end = $options['end'];
+				$relativeEnd = $options['end'];
 			}
 			if (isset($options['relativeString'])) {
-				$relativeString = $options['relativeString'];
+				$relativeStringPast = $options['relativeString'];
 				unset($options['relativeString']);
 			}
+			if (isset($options['relativeStringFuture'])) {
+				$relativeStringFuture = $options['relativeStringFuture'];
+				unset($options['relativeStringFuture']);
+			}
 			if (isset($options['absoluteString'])) {
 				$absoluteString = $options['absoluteString'];
 				unset($options['absoluteString']);
 			}
 			unset($options['end'], $options['format']);
+		}
+
+		$now = static::fromString(time(), $timezone);
+		$inSeconds = static::fromString($dateTime, $timezone);
+		$isFuture = ($inSeconds > $now);
+
+		if ($isFuture) {
+			$startTime = $now;
+			$endTime = $inSeconds;
 		} else {
-			$format = $options;
+			$startTime = $inSeconds;
+			$endTime = $now;
 		}
+		$diff = $endTime - $startTime;
 
-		$now = self::fromString(time(), $timezone);
-		$inSeconds = self::fromString($dateTime, $timezone);
-		$backwards = ($inSeconds > $now);
-
-		$futureTime = $now;
-		$pastTime = $inSeconds;
-		if ($backwards) {
-			$futureTime = $inSeconds;
-			$pastTime = $now;
-		}
-		$diff = $futureTime - $pastTime;
-
-		if (!$diff) {
+		if ($diff === 0) {
 			return __d('cake', 'just now', 'just now');
 		}
 
-		if ($diff > abs($now - self::fromString($end))) {
-			return sprintf($absoluteString, date($format, $inSeconds));
+		$isAbsoluteDate = $diff > abs($now - static::fromString($relativeEnd));
+		if ($isAbsoluteDate) {
+			if (strpos($format, '%') === false) {
+				$date = date($format, $inSeconds);
+			} else {
+				$date = static::_strftime($format, $inSeconds);
+			}
+			return sprintf($absoluteString, $date);
 		}
 
+		$years = $months = $weeks = $days = $hours = $minutes = $seconds = 0;
+
 		// If more than a week, then take into account the length of months
 		if ($diff >= 604800) {
-			list($future['H'], $future['i'], $future['s'], $future['d'], $future['m'], $future['Y']) = explode('/', date('H/i/s/d/m/Y', $futureTime));
-
-			list($past['H'], $past['i'], $past['s'], $past['d'], $past['m'], $past['Y']) = explode('/', date('H/i/s/d/m/Y', $pastTime));
-			$years = $months = $weeks = $days = $hours = $minutes = $seconds = 0;
+			list($future['H'], $future['i'], $future['s'], $future['d'], $future['m'], $future['Y']) = explode('/', date('H/i/s/d/m/Y', $endTime));
+			list($past['H'], $past['i'], $past['s'], $past['d'], $past['m'], $past['Y']) = explode('/', date('H/i/s/d/m/Y', $startTime));
 
 			$years = $future['Y'] - $past['Y'];
 			$months = $future['m'] + ((12 * $years) - $past['m']);
@@ -820,13 +832,13 @@ class CakeTime {
 			if ($future['d'] >= $past['d']) {
 				$days = $future['d'] - $past['d'];
 			} else {
-				$daysInPastMonth = date('t', $pastTime);
+				$daysInPastMonth = date('t', $startTime);
 				$daysInFutureMonth = date('t', mktime(0, 0, 0, $future['m'] - 1, 1, $future['Y']));
 
-				if (!$backwards) {
-					$days = ($daysInPastMonth - $past['d']) + $future['d'];
-				} else {
+				if ($isFuture) {
 					$days = ($daysInFutureMonth - $past['d']) + $future['d'];
+				} else {
+					$days = ($daysInPastMonth - $past['d']) + $future['d'];
 				}
 
 				if ($future['m'] != $past['m']) {
@@ -849,9 +861,7 @@ class CakeTime {
 				$days = $days - ($weeks * 7);
 			}
 		} else {
-			$years = $months = $weeks = 0;
 			$days = floor($diff / 86400);
-
 			$diff = $diff - ($days * 86400);
 
 			$hours = floor($diff / 3600);
@@ -859,69 +869,58 @@ class CakeTime {
 
 			$minutes = floor($diff / 60);
 			$diff = $diff - ($minutes * 60);
+
 			$seconds = $diff;
 		}
 
-		$fWord = $accuracy['second'];
+		$accuracy = $accuracies['second'];
 		if ($years > 0) {
-			$fWord = $accuracy['year'];
+			$accuracy = $accuracies['year'];
 		} elseif (abs($months) > 0) {
-			$fWord = $accuracy['month'];
+			$accuracy = $accuracies['month'];
 		} elseif (abs($weeks) > 0) {
-			$fWord = $accuracy['week'];
+			$accuracy = $accuracies['week'];
 		} elseif (abs($days) > 0) {
-			$fWord = $accuracy['day'];
+			$accuracy = $accuracies['day'];
 		} elseif (abs($hours) > 0) {
-			$fWord = $accuracy['hour'];
+			$accuracy = $accuracies['hour'];
 		} elseif (abs($minutes) > 0) {
-			$fWord = $accuracy['minute'];
+			$accuracy = $accuracies['minute'];
 		}
 
-		$fNum = str_replace(array('year', 'month', 'week', 'day', 'hour', 'minute', 'second'), array(1, 2, 3, 4, 5, 6, 7), $fWord);
+		$accuracyNum = str_replace(array('year', 'month', 'week', 'day', 'hour', 'minute', 'second'), array(1, 2, 3, 4, 5, 6, 7), $accuracy);
 
-		$relativeDate = '';
-		if ($fNum >= 1 && $years > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d year', '%d years', $years, $years);
+		$relativeDate = array();
+		if ($accuracyNum >= 1 && $years > 0) {
+			$relativeDate[] = __dn('cake', '%d year', '%d years', $years, $years);
 		}
-		if ($fNum >= 2 && $months > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d month', '%d months', $months, $months);
+		if ($accuracyNum >= 2 && $months > 0) {
+			$relativeDate[] = __dn('cake', '%d month', '%d months', $months, $months);
 		}
-		if ($fNum >= 3 && $weeks > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d week', '%d weeks', $weeks, $weeks);
+		if ($accuracyNum >= 3 && $weeks > 0) {
+			$relativeDate[] = __dn('cake', '%d week', '%d weeks', $weeks, $weeks);
 		}
-		if ($fNum >= 4 && $days > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d day', '%d days', $days, $days);
+		if ($accuracyNum >= 4 && $days > 0) {
+			$relativeDate[] = __dn('cake', '%d day', '%d days', $days, $days);
 		}
-		if ($fNum >= 5 && $hours > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d hour', '%d hours', $hours, $hours);
+		if ($accuracyNum >= 5 && $hours > 0) {
+			$relativeDate[] = __dn('cake', '%d hour', '%d hours', $hours, $hours);
 		}
-		if ($fNum >= 6 && $minutes > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d minute', '%d minutes', $minutes, $minutes);
+		if ($accuracyNum >= 6 && $minutes > 0) {
+			$relativeDate[] = __dn('cake', '%d minute', '%d minutes', $minutes, $minutes);
 		}
-		if ($fNum >= 7 && $seconds > 0) {
-			$relativeDate .= ($relativeDate ? ', ' : '') . __dn('cake', '%d second', '%d seconds', $seconds, $seconds);
+		if ($accuracyNum >= 7 && $seconds > 0) {
+			$relativeDate[] = __dn('cake', '%d second', '%d seconds', $seconds, $seconds);
 		}
+		$relativeDate = implode(', ', $relativeDate);
 
-		// When time has passed
-		if (!$backwards && $relativeDate) {
+		if ($relativeDate) {
+			$relativeString = ($isFuture) ? $relativeStringFuture : $relativeStringPast;
 			return sprintf($relativeString, $relativeDate);
 		}
-		if (!$backwards) {
-			$aboutAgo = array(
-				'second' => __d('cake', 'about a second ago'),
-				'minute' => __d('cake', 'about a minute ago'),
-				'hour' => __d('cake', 'about an hour ago'),
-				'day' => __d('cake', 'about a day ago'),
-				'week' => __d('cake', 'about a week ago'),
-				'year' => __d('cake', 'about a year ago')
-			);
 
-			return $aboutAgo[$fWord];
-		}
-
-		// When time is to come
-		if (!$relativeDate) {
-			$aboutIn = array(
+		if ($isFuture) {
+			$strings = array(
 				'second' => __d('cake', 'in about a second'),
 				'minute' => __d('cake', 'in about a minute'),
 				'hour' => __d('cake', 'in about an hour'),
@@ -929,21 +928,28 @@ class CakeTime {
 				'week' => __d('cake', 'in about a week'),
 				'year' => __d('cake', 'in about a year')
 			);
-
-			return $aboutIn[$fWord];
+		} else {
+			$strings = array(
+				'second' => __d('cake', 'about a second ago'),
+				'minute' => __d('cake', 'about a minute ago'),
+				'hour' => __d('cake', 'about an hour ago'),
+				'day' => __d('cake', 'about a day ago'),
+				'week' => __d('cake', 'about a week ago'),
+				'year' => __d('cake', 'about a year ago')
+			);
 		}
 
-		return $relativeDate;
+		return $strings[$accuracy];
 	}
 
 /**
  * Returns true if specified datetime was within the interval specified, else false.
  *
- * @param string|integer $timeInterval the numeric value with space then time type.
+ * @param string|int $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::wasWithinLast
  */
 	public static function wasWithinLast($timeInterval, $dateString, $timezone = null) {
@@ -952,9 +958,9 @@ class CakeTime {
 			$timeInterval = $tmp . ' ' . __d('cake', 'days');
 		}
 
-		$date = self::fromString($dateString, $timezone);
-		$interval = self::fromString('-' . $timeInterval);
-		$now = self::fromString('now', $timezone);
+		$date = static::fromString($dateString, $timezone);
+		$interval = static::fromString('-' . $timeInterval);
+		$now = static::fromString('now', $timezone);
 
 		return $date >= $interval && $date <= $now;
 	}
@@ -962,11 +968,11 @@ class CakeTime {
 /**
  * Returns true if specified datetime is within the interval specified, else false.
  *
- * @param string|integer $timeInterval the numeric value with space then time type.
+ * @param string|int $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return boolean
+ * @return bool
  */
 	public static function isWithinNext($timeInterval, $dateString, $timezone = null) {
 		$tmp = str_replace(' ', '', $timeInterval);
@@ -974,9 +980,9 @@ class CakeTime {
 			$timeInterval = $tmp . ' ' . __d('cake', 'days');
 		}
 
-		$date = self::fromString($dateString, $timezone);
-		$interval = self::fromString('+' . $timeInterval);
-		$now = self::fromString('now', $timezone);
+		$date = static::fromString($dateString, $timezone);
+		$interval = static::fromString('+' . $timeInterval);
+		$now = static::fromString('now', $timezone);
 
 		return $date <= $interval && $date >= $now;
 	}
@@ -984,22 +990,22 @@ class CakeTime {
 /**
  * Returns gmt as a UNIX timestamp.
  *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
- * @return integer UNIX timestamp
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @return int UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::gmt
  */
 	public static function gmt($dateString = null) {
 		$time = time();
 		if ($dateString) {
-			$time = self::fromString($dateString);
+			$time = static::fromString($dateString);
 		}
 		return gmmktime(
-			intval(date('G', $time)),
-			intval(date('i', $time)),
-			intval(date('s', $time)),
-			intval(date('n', $time)),
-			intval(date('j', $time)),
-			intval(date('Y', $time))
+			(int)date('G', $time),
+			(int)date('i', $time),
+			(int)date('s', $time),
+			(int)date('n', $time),
+			(int)date('j', $time),
+			(int)date('Y', $time)
 		);
 	}
 
@@ -1012,16 +1018,16 @@ class CakeTime {
  *
  * Create localized & formatted time:
  *
- * {{{
+ * ```
  *   CakeTime::format('2012-02-15', '%m-%d-%Y'); // returns 02-15-2012
  *   CakeTime::format('2012-02-15 23:01:01', '%c'); // returns preferred date and time based on configured locale
  *   CakeTime::format('0000-00-00', '%d-%m-%Y', 'N/A'); // return N/A becuase an invalid date was passed
  *   CakeTime::format('2012-02-15 23:01:01', '%c', 'N/A', 'America/New_York'); // converts passed date to timezone
- * }}}
+ * ```
  *
- * @param integer|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
- * @param integer|string|DateTime $format date format string (or UNIX timestamp, strtotime() valid string or DateTime object)
- * @param boolean|string $default if an invalid date is passed it will output supplied default value. Pass false if you want raw conversion value
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
+ * @param int|string|DateTime $format date format string (or UNIX timestamp, strtotime() valid string or DateTime object)
+ * @param bool|string $default if an invalid date is passed it will output supplied default value. Pass false if you want raw conversion value
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::format
@@ -1029,10 +1035,10 @@ class CakeTime {
  */
 	public static function format($date, $format = null, $default = false, $timezone = null) {
 		//Backwards compatible params re-order test
-		$time = self::fromString($format, $timezone);
+		$time = static::fromString($format, $timezone);
 
 		if ($time === false) {
-			return self::i18nFormat($date, $format, $default, $timezone);
+			return static::i18nFormat($date, $format, $default, $timezone);
 		}
 		return date($date, $time);
 	}
@@ -1041,37 +1047,58 @@ class CakeTime {
  * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
  * It takes into account the default date format for the current language if a LC_TIME file is used.
  *
- * @param integer|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $format strftime format string.
- * @param boolean|string $default if an invalid date is passed it will output supplied default value. Pass false if you want raw conversion value
+ * @param bool|string $default if an invalid date is passed it will output supplied default value. Pass false if you want raw conversion value
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Formatted and translated date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::i18nFormat
  */
 	public static function i18nFormat($date, $format = null, $default = false, $timezone = null) {
-		$date = self::fromString($date, $timezone);
+		$date = static::fromString($date, $timezone);
 		if ($date === false && $default !== false) {
 			return $default;
 		}
+		if ($date === false) {
+			return '';
+		}
 		if (empty($format)) {
 			$format = '%x';
 		}
-		return self::_strftime(self::convertSpecifiers($format, $date), $date);
+		return static::_strftime(static::convertSpecifiers($format, $date), $date);
 	}
 
 /**
  * Get list of timezone identifiers
  *
- * @param integer|string $filter A regex to filter identifer
+ * @param int|string $filter A regex to filter identifier
  * 	Or one of DateTimeZone class constants (PHP 5.3 and above)
  * @param string $country A two-letter ISO 3166-1 compatible country code.
  * 	This option is only used when $filter is set to DateTimeZone::PER_COUNTRY (available only in PHP 5.3 and above)
- * @param boolean $group If true (default value) groups the identifiers list by primary region
+ * @param bool|array $options If true (default value) groups the identifiers list by primary region.
+ * 	Otherwise, an array containing `group`, `abbr`, `before`, and `after` keys.
+ * 	Setting `group` and `abbr` to true will group results and append timezone
+ * 	abbreviation in the display value. Set `before` and `after` to customize
+ * 	the abbreviation wrapper.
  * @return array List of timezone identifiers
  * @since 2.2
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::listTimezones
  */
-	public static function listTimezones($filter = null, $country = null, $group = true) {
+	public static function listTimezones($filter = null, $country = null, $options = array()) {
+		if (is_bool($options)) {
+			$options = array(
+				'group' => $options,
+			);
+		}
+		$defaults = array(
+			'group' => true,
+			'abbr' => false,
+			'before' => ' - ',
+			'after' => null,
+		);
+		$options += $defaults;
+		$group = $options['group'];
+
 		$regex = null;
 		if (is_string($filter)) {
 			$regex = $filter;
@@ -1099,12 +1126,23 @@ class CakeTime {
 
 		if ($group) {
 			$return = array();
+			$now = time();
+			$before = $options['before'];
+			$after = $options['after'];
 			foreach ($identifiers as $key => $tz) {
+				$abbr = null;
+				if ($options['abbr']) {
+					$dateTimeZone = new DateTimeZone($tz);
+					$trans = $dateTimeZone->getTransitions($now, $now);
+					$abbr = isset($trans[0]['abbr']) ?
+						$before . $trans[0]['abbr'] . $after :
+						null;
+				}
 				$item = explode('/', $tz, 2);
 				if (isset($item[1])) {
-					$return[$item[0]][$tz] = $item[1];
+					$return[$item[0]][$tz] = $item[1] . $abbr;
 				} else {
-					$return[$item[0]] = array($tz => $item[0]);
+					$return[$item[0]] = array($tz => $item[0] . $abbr);
 				}
 			}
 			return $return;
@@ -1118,7 +1156,7 @@ class CakeTime {
  * Handles utf8_encoding the result of strftime when necessary.
  *
  * @param string $format Format string.
- * @param integer $date Timestamp to format.
+ * @param int $date Timestamp to format.
  * @return string formatted string with correct encoding.
  */
 	protected static function _strftime($format, $date) {
@@ -1129,7 +1167,7 @@ class CakeTime {
 			if (function_exists('mb_check_encoding')) {
 				$valid = mb_check_encoding($format, $encoding);
 			} else {
-				$valid = !Multibyte::checkMultibyte($format);
+				$valid = Multibyte::checkMultibyte($format);
 			}
 			if (!$valid) {
 				$format = utf8_encode($format);
diff --git a/web/api/lib/Cake/Utility/ClassRegistry.php b/web/api/lib/Cake/Utility/ClassRegistry.php
index 03cdf70ce..1208b4401 100644
--- a/web/api/lib/Cake/Utility/ClassRegistry.php
+++ b/web/api/lib/Cake/Utility/ClassRegistry.php
@@ -79,18 +79,19 @@ class ClassRegistry {
  *
  * When $class is a numeric keyed array, multiple class instances will be stored in the registry,
  *  no instance of the object will be returned
- * {{{
+ * ```
  * array(
  *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry'),
  *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry'),
  *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry')
  * );
- * }}}
+ * ```
+ *
  * @param string|array $class as a string or a single key => value array instance will be created,
  *  stored in the registry and returned.
- * @param boolean $strict if set to true it will return false if the class was not found instead
+ * @param bool $strict if set to true it will return false if the class was not found instead
  *	of trying to create an AppModel
- * @return object instance of ClassName.
+ * @return $class instance of ClassName.
  * @throws CakeException when you try to construct an interface or abstract class.
  */
 	public static function init($class, $strict = false) {
@@ -180,15 +181,9 @@ class ClassRegistry {
 					} elseif ($plugin && class_exists($plugin . 'AppModel')) {
 						$appModel = $plugin . 'AppModel';
 					}
-					if (!empty($appModel)) {
-						$settings['name'] = $class;
-						$instance = new $appModel($settings);
-					}
 
-					if (!isset($instance)) {
-						trigger_error(__d('cake_dev', '(ClassRegistry::init() could not create instance of %s', $class), E_USER_WARNING);
-						return false;
-					}
+					$settings['name'] = $class;
+					$instance = new $appModel($settings);
 				}
 				$_this->map($alias, $class);
 			}
@@ -205,7 +200,7 @@ class ClassRegistry {
  *
  * @param string $key Key for the object in registry
  * @param object $object Object to store
- * @return boolean True if the object was written, false if $key already exists
+ * @return bool True if the object was written, false if $key already exists
  */
 	public static function addObject($key, $object) {
 		$_this = ClassRegistry::getInstance();
@@ -235,7 +230,7 @@ class ClassRegistry {
  * Returns true if given key is present in the ClassRegistry.
  *
  * @param string $key Key to look for
- * @return boolean true if key exists in registry, false otherwise
+ * @return bool true if key exists in registry, false otherwise
  */
 	public static function isKeySet($key) {
 		$_this = ClassRegistry::getInstance();
@@ -303,9 +298,9 @@ class ClassRegistry {
 /**
  * Checks to see if $alias is a duplicate $class Object
  *
- * @param string $alias
- * @param string $class
- * @return boolean
+ * @param string $alias Alias to check.
+ * @param string $class Class name.
+ * @return bool
  */
 	protected function &_duplicate($alias, $class) {
 		$duplicate = false;
diff --git a/web/api/lib/Cake/Utility/Debugger.php b/web/api/lib/Cake/Utility/Debugger.php
index 92e624a7e..50587f6e8 100644
--- a/web/api/lib/Cake/Utility/Debugger.php
+++ b/web/api/lib/Cake/Utility/Debugger.php
@@ -19,7 +19,7 @@
  */
 
 App::uses('CakeLog', 'Log');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 /**
  * Provide custom logging and error handling.
@@ -91,7 +91,6 @@ class Debugger {
 
 /**
  * Constructor.
- *
  */
 	public function __construct() {
 		$docRef = ini_get('docref_root');
@@ -148,7 +147,7 @@ class Debugger {
 /**
  * Returns a reference to the Debugger singleton object instance.
  *
- * @param string $class
+ * @param string $class Debugger class name.
  * @return object
  */
 	public static function getInstance($class = null) {
@@ -167,7 +166,6 @@ class Debugger {
 /**
  * Recursively formats and outputs the contents of the supplied variable.
  *
- *
  * @param mixed $var the variable to dump
  * @param int $depth The depth to output to. Defaults to 3.
  * @return void
@@ -175,7 +173,7 @@ class Debugger {
  * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::dump
  */
 	public static function dump($var, $depth = 3) {
-		pr(self::exportVar($var, $depth));
+		pr(static::exportVar($var, $depth));
 	}
 
 /**
@@ -183,26 +181,26 @@ class Debugger {
  * as well as export the variable using exportVar. By default the log is written to the debug log.
  *
  * @param mixed $var Variable or content to log
- * @param integer $level type of log to use. Defaults to LOG_DEBUG
+ * @param int $level type of log to use. Defaults to LOG_DEBUG
  * @param int $depth The depth to output to. Defaults to 3.
  * @return void
  * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::log
  */
 	public static function log($var, $level = LOG_DEBUG, $depth = 3) {
-		$source = self::trace(array('start' => 1)) . "\n";
-		CakeLog::write($level, "\n" . $source . self::exportVar($var, $depth));
+		$source = static::trace(array('start' => 1)) . "\n";
+		CakeLog::write($level, "\n" . $source . static::exportVar($var, $depth));
 	}
 
 /**
  * Overrides PHP's default error handling.
  *
- * @param integer $code Code of error
+ * @param int $code Code of error
  * @param string $description Error description
  * @param string $file File on which error occurred
- * @param integer $line Line that triggered the error
+ * @param int $line Line that triggered the error
  * @param array $context Context
- * @return boolean true if error was handled
- * @deprecated Will be removed in 3.0. This function is superseded by Debugger::outputError().
+ * @return bool|null True if error was handled, otherwise null.
+ * @deprecated 3.0.0 Will be removed in 3.0. This function is superseded by Debugger::outputError().
  */
 	public static function showError($code, $description, $file = null, $line = null, $context = null) {
 		$self = Debugger::getInstance();
@@ -218,7 +216,7 @@ class Debugger {
 		if (!in_array($info, $self->errors)) {
 			$self->errors[] = $info;
 		} else {
-			return;
+			return null;
 		}
 
 		switch ($code) {
@@ -248,7 +246,7 @@ class Debugger {
 				$level = LOG_NOTICE;
 				break;
 			default:
-				return;
+				return null;
 		}
 
 		$data = compact(
@@ -335,10 +333,10 @@ class Debugger {
 				} else {
 					$tpl = $self->_templates['base']['traceLine'];
 				}
-				$trace['path'] = self::trimPath($trace['file']);
+				$trace['path'] = static::trimPath($trace['file']);
 				$trace['reference'] = $reference;
 				unset($trace['object'], $trace['args']);
-				$back[] = String::insert($tpl, $trace, array('before' => '{:', 'after' => '}'));
+				$back[] = CakeText::insert($tpl, $trace, array('before' => '{:', 'after' => '}'));
 			}
 		}
 
@@ -384,8 +382,8 @@ class Debugger {
  * applied.
  *
  * @param string $file Absolute path to a PHP file
- * @param integer $line Line number to highlight
- * @param integer $context Number of lines of context to extract above and below $line
+ * @param int $line Line number to highlight
+ * @param int $context Number of lines of context to extract above and below $line
  * @return array Set of lines highlighted
  * @see http://php.net/highlight_string
  * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::excerpt
@@ -409,7 +407,7 @@ class Debugger {
 			if (!isset($data[$i])) {
 				continue;
 			}
-			$string = str_replace(array("\r\n", "\n"), "", self::_highlight($data[$i]));
+			$string = str_replace(array("\r\n", "\n"), "", static::_highlight($data[$i]));
 			if ($i == $line) {
 				$lines[] = '<span class="code-highlight">' . $string . '</span>';
 			} else {
@@ -457,31 +455,29 @@ class Debugger {
  *  - host
  *  - database
  *  - port
- *  - prefix
- *  - schema
  *
  * This is done to protect database credentials, which could be accidentally
  * shown in an error message if CakePHP is deployed in development mode.
  *
  * @param string $var Variable to convert
- * @param integer $depth The depth to output to. Defaults to 3.
+ * @param int $depth The depth to output to. Defaults to 3.
  * @return string Variable as a formatted string
  * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::exportVar
  */
 	public static function exportVar($var, $depth = 3) {
-		return self::_export($var, $depth, 0);
+		return static::_export($var, $depth, 0);
 	}
 
 /**
  * Protected export function used to keep track of indentation and recursion.
  *
  * @param mixed $var The variable to dump.
- * @param integer $depth The remaining depth.
- * @param integer $indent The current indentation level.
+ * @param int $depth The remaining depth.
+ * @param int $indent The current indentation level.
  * @return string The dumped variable.
  */
 	protected static function _export($var, $depth, $indent) {
-		switch (self::getType($var)) {
+		switch (static::getType($var)) {
 			case 'boolean':
 				return ($var) ? 'true' : 'false';
 			case 'integer':
@@ -494,7 +490,7 @@ class Debugger {
 				}
 				return "'" . $var . "'";
 			case 'array':
-				return self::_array($var, $depth - 1, $indent + 1);
+				return static::_array($var, $depth - 1, $indent + 1);
 			case 'resource':
 				return strtolower(gettype($var));
 			case 'null':
@@ -502,7 +498,7 @@ class Debugger {
 			case 'unknown':
 				return 'unknown';
 			default:
-				return self::_object($var, $depth - 1, $indent + 1);
+				return static::_object($var, $depth - 1, $indent + 1);
 		}
 	}
 
@@ -516,12 +512,10 @@ class Debugger {
  * - host
  * - database
  * - port
- * - prefix
- * - schema
  *
  * @param array $var The array to export.
- * @param integer $depth The current depth, used for recursion tracking.
- * @param integer $indent The current indentation level.
+ * @param int $depth The current depth, used for recursion tracking.
+ * @param int $indent The current indentation level.
  * @return string Exported array.
  */
 	protected static function _array(array $var, $depth, $indent) {
@@ -530,9 +524,7 @@ class Debugger {
 			'login' => '*****',
 			'host' => '*****',
 			'database' => '*****',
-			'port' => '*****',
-			'prefix' => '*****',
-			'schema' => '*****'
+			'port' => '*****'
 		);
 		$replace = array_intersect_key($secrets, $var);
 		$var = $replace + $var;
@@ -551,9 +543,9 @@ class Debugger {
 				if ($key === 'GLOBALS' && is_array($val) && isset($val['GLOBALS'])) {
 					$val = '[recursion]';
 				} elseif ($val !== $var) {
-					$val = self::_export($val, $depth, $indent);
+					$val = static::_export($val, $depth, $indent);
 				}
-				$vars[] = $break . self::exportVar($key) .
+				$vars[] = $break . static::exportVar($key) .
 					' => ' .
 					$val;
 			}
@@ -567,8 +559,8 @@ class Debugger {
  * Handles object to string conversion.
  *
  * @param string $var Object to convert
- * @param integer $depth The current depth, used for tracking recursion.
- * @param integer $indent The current indentation level.
+ * @param int $depth The current depth, used for tracking recursion.
+ * @param int $indent The current indentation level.
  * @return string
  * @see Debugger::exportVar()
  */
@@ -584,7 +576,7 @@ class Debugger {
 			$break = "\n" . str_repeat("\t", $indent);
 			$objectVars = get_object_vars($var);
 			foreach ($objectVars as $key => $value) {
-				$value = self::_export($value, $depth - 1, $indent);
+				$value = static::_export($value, $depth - 1, $indent);
 				$props[] = "$key => " . $value;
 			}
 
@@ -601,7 +593,7 @@ class Debugger {
 						$reflectionProperty->setAccessible(true);
 						$property = $reflectionProperty->getValue($var);
 
-						$value = self::_export($property, $depth - 1, $indent);
+						$value = static::_export($property, $depth - 1, $indent);
 						$key = $reflectionProperty->name;
 						$props[] = sprintf('[%s] %s => %s', $visibility, $key, $value);
 					}
@@ -638,7 +630,7 @@ class Debugger {
  *
  * `Debugger::addFormat('custom', $data);`
  *
- * Where $data is an array of strings that use String::insert() variable
+ * Where $data is an array of strings that use CakeText::insert() variable
  * replacement. The template vars should be in a `{:id}` style.
  * An error formatter can have the following keys:
  *
@@ -697,10 +689,10 @@ class Debugger {
  *    straight HTML output, or 'txt' for unformatted text.
  * @param array $strings Template strings to be used for the output format.
  * @return string
- * @deprecated Use Debugger::outputAs() and Debugger::addFormat(). Will be removed
+ * @deprecated 3.0.0 Use Debugger::outputAs() and Debugger::addFormat(). Will be removed
  *   in 3.0
  */
-	public function output($format = null, $strings = array()) {
+	public static function output($format = null, $strings = array()) {
 		$self = Debugger::getInstance();
 		$data = null;
 
@@ -724,7 +716,7 @@ class Debugger {
 /**
  * Takes a processed array of data from an error and displays it in the chosen format.
  *
- * @param string $data
+ * @param string $data Data to output.
  * @return void
  */
 	public function outputError($data) {
@@ -776,7 +768,7 @@ class Debugger {
 
 		if (isset($tpl['links'])) {
 			foreach ($tpl['links'] as $key => $val) {
-				$links[$key] = String::insert($val, $data, $insertOpts);
+				$links[$key] = CakeText::insert($val, $data, $insertOpts);
 			}
 		}
 
@@ -792,14 +784,14 @@ class Debugger {
 			if (is_array($value)) {
 				$value = implode("\n", $value);
 			}
-			$info .= String::insert($tpl[$key], array($key => $value) + $data, $insertOpts);
+			$info .= CakeText::insert($tpl[$key], array($key => $value) + $data, $insertOpts);
 		}
 		$links = implode(' ', $links);
 
 		if (isset($tpl['callback']) && is_callable($tpl['callback'])) {
 			return call_user_func($tpl['callback'], $data, compact('links', 'info'));
 		}
-		echo String::insert($tpl['error'], compact('links', 'info') + $data, $insertOpts);
+		echo CakeText::insert($tpl['error'], compact('links', 'info') + $data, $insertOpts);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Utility/File.php b/web/api/lib/Cake/Utility/File.php
index c23b3f2d9..e1d62c912 100644
--- a/web/api/lib/Cake/Utility/File.php
+++ b/web/api/lib/Cake/Utility/File.php
@@ -60,7 +60,7 @@ class File {
 /**
  * Enable locking for file reading and writing
  *
- * @var boolean
+ * @var bool
  * http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::$lock
  */
 	public $lock = null;
@@ -70,7 +70,7 @@ class File {
  *
  * Current file's absolute path
  *
- * @var mixed null
+ * @var mixed
  * http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::$path
  */
 	public $path = null;
@@ -79,8 +79,8 @@ class File {
  * Constructor
  *
  * @param string $path Path to file
- * @param boolean $create Create file if it does not exist (if true)
- * @param integer $mode Mode to apply to the folder holding the file
+ * @param bool $create Create file if it does not exist (if true)
+ * @param int $mode Mode to apply to the folder holding the file
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File
  */
 	public function __construct($path, $create = false, $mode = 0755) {
@@ -102,7 +102,7 @@ class File {
 /**
  * Creates the file.
  *
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::create
  */
 	public function create() {
@@ -119,8 +119,8 @@ class File {
  * Opens the current file with a given $mode
  *
  * @param string $mode A valid 'fopen' mode string (r|w|a ...)
- * @param boolean $force If true then the file will be re-opened even if its already opened, otherwise it won't
- * @return boolean True on success, false on failure
+ * @param bool $force If true then the file will be re-opened even if its already opened, otherwise it won't
+ * @return bool True on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::open
  */
 	public function open($mode = 'r', $force = false) {
@@ -145,7 +145,7 @@ class File {
  *
  * @param string $bytes where to start
  * @param string $mode A `fread` compatible mode.
- * @param boolean $force If true then the file will be re-opened even if its already opened, otherwise it won't
+ * @param bool $force If true then the file will be re-opened even if its already opened, otherwise it won't
  * @return mixed string on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::read
  */
@@ -180,8 +180,8 @@ class File {
 /**
  * Sets or gets the offset for the currently opened file.
  *
- * @param integer|boolean $offset The $offset in bytes to seek. If set to false then the current offset is returned.
- * @param integer $seek PHP Constant SEEK_SET | SEEK_CUR | SEEK_END determining what the $offset is relative to
+ * @param int|bool $offset The $offset in bytes to seek. If set to false then the current offset is returned.
+ * @param int $seek PHP Constant SEEK_SET | SEEK_CUR | SEEK_END determining what the $offset is relative to
  * @return mixed True on success, false on failure (set mode), false on failure or integer offset on success (get mode)
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::offset
  */
@@ -197,12 +197,12 @@ class File {
 	}
 
 /**
- * Prepares a ASCII string for writing. Converts line endings to the
+ * Prepares an ASCII string for writing. Converts line endings to the
  * correct terminator for the current platform. If Windows, "\r\n" will be used,
  * all other platforms will use "\n"
  *
  * @param string $data Data to prepare for writing.
- * @param boolean $forceWindows
+ * @param bool $forceWindows If true forces usage Windows newline string.
  * @return string The with converted line endings.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::prepare
  */
@@ -220,7 +220,7 @@ class File {
  * @param string $data Data to write to this File.
  * @param string $mode Mode of writing. {@link http://php.net/fwrite See fwrite()}.
  * @param string $force Force the file to open
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::write
  */
 	public function write($data, $mode = 'w', $force = false) {
@@ -247,7 +247,7 @@ class File {
  *
  * @param string $data Data to write
  * @param string $force Force the file to open
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::append
  */
 	public function append($data, $force = false) {
@@ -257,7 +257,7 @@ class File {
 /**
  * Closes the current file if it is opened.
  *
- * @return boolean True if closing was successful or file was already closed, otherwise false
+ * @return bool True if closing was successful or file was already closed, otherwise false
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::close
  */
 	public function close() {
@@ -270,7 +270,7 @@ class File {
 /**
  * Deletes the file.
  *
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::delete
  */
 	public function delete() {
@@ -352,7 +352,7 @@ class File {
  *
  * @param string $name The name of the file to make safe if different from $this->name
  * @param string $ext The name of the extension to make safe if different from $this->ext
- * @return string $ext The extension of the file
+ * @return string ext The extension of the file
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::safe
  */
 	public function safe($name = null, $ext = null) {
@@ -368,7 +368,7 @@ class File {
 /**
  * Get md5 Checksum of file with previous check of Filesize
  *
- * @param integer|boolean $maxsize in MB or true to force
+ * @param int|bool $maxsize in MB or true to force
  * @return string|false md5 Checksum {@link http://php.net/md5_file See md5_file()}, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::md5
  */
@@ -393,7 +393,10 @@ class File {
  */
 	public function pwd() {
 		if ($this->path === null) {
-			$this->path = $this->Folder->slashTerm($this->Folder->pwd()) . $this->name;
+			$dir = $this->Folder->pwd();
+			if (is_dir($dir)) {
+				$this->path = $this->Folder->slashTerm($dir) . $this->name;
+			}
 		}
 		return $this->path;
 	}
@@ -401,7 +404,7 @@ class File {
 /**
  * Returns true if the file exists.
  *
- * @return boolean True if it exists, false otherwise
+ * @return bool True if it exists, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::exists
  */
 	public function exists() {
@@ -425,7 +428,7 @@ class File {
 /**
  * Returns the file size
  *
- * @return integer|false Size of the file in bytes, or false in case of an error
+ * @return int|false Size of the file in bytes, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::size
  */
 	public function size() {
@@ -438,7 +441,7 @@ class File {
 /**
  * Returns true if the file is writable.
  *
- * @return boolean True if it's writable, false otherwise
+ * @return bool True if it's writable, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::writable
  */
 	public function writable() {
@@ -448,7 +451,7 @@ class File {
 /**
  * Returns true if the File is executable.
  *
- * @return boolean True if it's executable, false otherwise
+ * @return bool True if it's executable, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::executable
  */
 	public function executable() {
@@ -458,7 +461,7 @@ class File {
 /**
  * Returns true if the file is readable.
  *
- * @return boolean True if file is readable, false otherwise
+ * @return bool True if file is readable, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::readable
  */
 	public function readable() {
@@ -468,7 +471,7 @@ class File {
 /**
  * Returns the file's owner.
  *
- * @return integer|false The file owner, or false in case of an error
+ * @return int|false The file owner, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::owner
  */
 	public function owner() {
@@ -481,7 +484,7 @@ class File {
 /**
  * Returns the file's group.
  *
- * @return integer|false The file group, or false in case of an error
+ * @return int|false The file group, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::group
  */
 	public function group() {
@@ -494,7 +497,7 @@ class File {
 /**
  * Returns last access time.
  *
- * @return integer|false Timestamp of last access time, or false in case of an error
+ * @return int|false Timestamp of last access time, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::lastAccess
  */
 	public function lastAccess() {
@@ -507,7 +510,7 @@ class File {
 /**
  * Returns last modified time.
  *
- * @return integer|false Timestamp of last modification, or false in case of an error
+ * @return int|false Timestamp of last modification, or false in case of an error
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::lastChange
  */
 	public function lastChange() {
@@ -531,8 +534,8 @@ class File {
  * Copy the File to $dest
  *
  * @param string $dest Destination for the copy
- * @param boolean $overwrite Overwrite $dest if exists
- * @return boolean Success
+ * @param bool $overwrite Overwrite $dest if exists
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::copy
  */
 	public function copy($dest, $overwrite = true) {
@@ -573,7 +576,7 @@ class File {
  * For 5.3 onwards it's possible to clear cache for just a single file. Passing true
  * will clear all the stat cache.
  *
- * @param boolean $all Clear all cache or not
+ * @param bool $all Clear all cache or not
  * @return void
  */
 	public function clearStatCache($all = false) {
@@ -589,7 +592,7 @@ class File {
  *
  * @param string|array $search Text(s) to search for.
  * @param string|array $replace Text(s) to replace with.
- * @return boolean Success
+ * @return bool Success
  */
 	public function replaceText($search, $replace) {
 		if (!$this->open('r+')) {
diff --git a/web/api/lib/Cake/Utility/Folder.php b/web/api/lib/Cake/Utility/Folder.php
index 3cbc3745b..e23f70e5a 100644
--- a/web/api/lib/Cake/Utility/Folder.php
+++ b/web/api/lib/Cake/Utility/Folder.php
@@ -58,15 +58,15 @@ class Folder {
  * Sortedness. Whether or not list results
  * should be sorted by name.
  *
- * @var boolean
+ * @var bool
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::$sort
  */
 	public $sort = false;
 
 /**
- * Mode to be used on create. Does nothing on windows platforms.
+ * Mode to be used on create. Does nothing on Windows platforms.
  *
- * @var integer
+ * @var int
  * http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::$mode
  */
 	public $mode = 0755;
@@ -103,8 +103,8 @@ class Folder {
  * Constructor.
  *
  * @param string $path Path to folder
- * @param boolean $create Create folder if not found
- * @param string|boolean $mode Mode (CHMOD) to apply to created folder, false to ignore
+ * @param bool $create Create folder if not found
+ * @param string|bool $mode Mode (CHMOD) to apply to created folder, false to ignore
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder
  */
 	public function __construct($path = false, $create = false, $mode = false) {
@@ -155,10 +155,10 @@ class Folder {
  * Returns an array of the contents of the current directory.
  * The returned array holds two arrays: One of directories and one of files.
  *
- * @param boolean $sort Whether you want the results sorted, set this and the sort property
+ * @param bool $sort Whether you want the results sorted, set this and the sort property
  *   to false to get unsorted results.
- * @param array|boolean $exceptions Either an array or boolean true will not grab dot files
- * @param boolean $fullPath True returns the full path
+ * @param array|bool $exceptions Either an array or boolean true will not grab dot files
+ * @param bool $fullPath True returns the full path
  * @return mixed Contents of current directory as an array, an empty array on failure
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::read
  */
@@ -207,7 +207,7 @@ class Folder {
  * Returns an array of all matching files in current directory.
  *
  * @param string $regexpPattern Preg_match pattern (Defaults to: .*)
- * @param boolean $sort Whether results should be sorted.
+ * @param bool $sort Whether results should be sorted.
  * @return array Files that match given pattern
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::find
  */
@@ -220,7 +220,7 @@ class Folder {
  * Returns an array of all matching files in and below current directory.
  *
  * @param string $pattern Preg_match pattern (Defaults to: .*)
- * @param boolean $sort Whether results should be sorted.
+ * @param bool $sort Whether results should be sorted.
  * @return array Files matching $pattern
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::findRecursive
  */
@@ -238,7 +238,7 @@ class Folder {
  * Private helper function for findRecursive.
  *
  * @param string $pattern Pattern to match against
- * @param boolean $sort Whether results should be sorted.
+ * @param bool $sort Whether results should be sorted.
  * @return array Files matching pattern
  */
 	protected function _findRecursive($pattern, $sort = false) {
@@ -263,7 +263,7 @@ class Folder {
  * Returns true if given $path is a Windows path.
  *
  * @param string $path Path to check
- * @return boolean true if windows path, false otherwise
+ * @return bool true if Windows path, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isWindowsPath
  */
 	public static function isWindowsPath($path) {
@@ -274,11 +274,33 @@ class Folder {
  * Returns true if given $path is an absolute path.
  *
  * @param string $path Path to check
- * @return boolean true if path is absolute.
+ * @return bool true if path is absolute.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isAbsolute
  */
 	public static function isAbsolute($path) {
-		return !empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\');
+		if (empty($path)) {
+			return false;
+		}
+
+		return $path[0] === '/' ||
+			preg_match('/^[A-Z]:\\\\/i', $path) ||
+			substr($path, 0, 2) === '\\\\' ||
+			static::isRegisteredStreamWrapper($path);
+	}
+
+/**
+ * Returns true if given $path is a registered stream wrapper.
+ *
+ * @param string $path Path to check
+ * @return boo true If path is registered stream wrapper.
+ */
+	public static function isRegisteredStreamWrapper($path) {
+		if (preg_match('/^[A-Z]+(?=:\/\/)/i', $path, $matches) &&
+			in_array($matches[0], stream_get_wrappers())
+		) {
+			return true;
+		}
+		return false;
 	}
 
 /**
@@ -335,7 +357,7 @@ class Folder {
  * Returns true if the File is in a given CakePath.
  *
  * @param string $path The path to check.
- * @return boolean
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inCakePath
  */
 	public function inCakePath($path = '') {
@@ -349,8 +371,8 @@ class Folder {
  * Returns true if the File is in given path.
  *
  * @param string $path The path to check that the current pwd() resides with in.
- * @param boolean $reverse Reverse the search, check that pwd() resides within $path.
- * @return boolean
+ * @param bool $reverse Reverse the search, check that pwd() resides within $path.
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::inPath
  */
 	public function inPath($path = '', $reverse = false) {
@@ -368,11 +390,11 @@ class Folder {
 /**
  * Change the mode on a directory structure recursively. This includes changing the mode on files as well.
  *
- * @param string $path The path to chmod
- * @param integer $mode octal value 0755
- * @param boolean $recursive chmod recursively, set to false to only change the current directory.
- * @param array $exceptions array of files, directories to skip
- * @return boolean Returns TRUE on success, FALSE on failure
+ * @param string $path The path to chmod.
+ * @param int $mode Octal value, e.g. 0755.
+ * @param bool $recursive Chmod recursively, set to false to only change the current directory.
+ * @param array $exceptions Array of files, directories to skip.
+ * @return bool Success.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::chmod
  */
 	public function chmod($path, $mode = false, $recursive = true, $exceptions = array()) {
@@ -425,7 +447,7 @@ class Folder {
  * Returns an array of nested directories and files in each directory
  *
  * @param string $path the directory path to build the tree from
- * @param array|boolean $exceptions Either an array of files/folder to exclude
+ * @param array|bool $exceptions Either an array of files/folder to exclude
  *   or boolean true to not grab dot files/folders
  * @param string $type either 'file' or 'dir'. null returns both files and directories
  * @return mixed array of nested directories and files in each directory
@@ -487,12 +509,15 @@ class Folder {
 	}
 
 /**
- * Create a directory structure recursively. Can be used to create
- * deep path structures like `/foo/bar/baz/shoe/horn`
+ * Create a directory structure recursively.
  *
- * @param string $pathname The directory structure to create
- * @param integer $mode octal value 0755
- * @return boolean Returns TRUE on success, FALSE on failure
+ * Can be used to create deep path structures like `/foo/bar/baz/shoe/horn`
+ *
+ * @param string $pathname The directory structure to create. Either an absolute or relative
+ *   path. If the path is relative and exists in the process' cwd it will not be created.
+ *   Otherwise relative paths will be prefixed with the current pwd().
+ * @param int $mode octal value 0755
+ * @return bool Returns TRUE on success, FALSE on failure
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::create
  */
 	public function create($pathname, $mode = false) {
@@ -500,6 +525,10 @@ class Folder {
 			return true;
 		}
 
+		if (!static::isAbsolute($pathname)) {
+			$pathname = static::addPathElement($this->pwd(), $pathname);
+		}
+
 		if (!$mode) {
 			$mode = $this->mode;
 		}
@@ -530,7 +559,7 @@ class Folder {
 /**
  * Returns the size in bytes of this Folder and its contents.
  *
- * @return integer size in bytes of current folder
+ * @return int size in bytes of current folder
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::dirsize
  */
 	public function dirsize() {
@@ -567,7 +596,7 @@ class Folder {
  * Recursively Remove directories if the system allows.
  *
  * @param string $path Path of directory to delete
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::delete
  */
 	public function delete($path = null) {
@@ -575,7 +604,7 @@ class Folder {
 			$path = $this->pwd();
 		}
 		if (!$path) {
-			return null;
+			return false;
 		}
 		$path = Folder::slashTerm($path);
 		if (is_dir($path)) {
@@ -628,12 +657,12 @@ class Folder {
  *
  * - `to` The directory to copy to.
  * - `from` The directory to copy from, this will cause a cd() to occur, changing the results of pwd().
- * - `mode` The mode to copy the files/directories with.
+ * - `mode` The mode to copy the files/directories with as integer, e.g. 0775.
  * - `skip` Files/directories to skip.
  * - `scheme` Folder::MERGE, Folder::OVERWRITE, Folder::SKIP
  *
  * @param array|string $options Either an array of options (see above) or a string of the destination directory.
- * @return boolean Success
+ * @return bool Success.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::copy
  */
 	public function copy($options) {
@@ -645,7 +674,13 @@ class Folder {
 			$to = $options;
 			$options = array();
 		}
-		$options += array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array(), 'scheme' => Folder::MERGE);
+		$options += array(
+			'to' => $to,
+			'from' => $this->path,
+			'mode' => $this->mode,
+			'skip' => array(),
+			'scheme' => Folder::MERGE
+		);
 
 		$fromDir = $options['from'];
 		$toDir = $options['to'];
@@ -673,7 +708,7 @@ class Folder {
 				$to = Folder::addPathElement($toDir, $item);
 				if (($options['scheme'] != Folder::SKIP || !is_dir($to)) && !in_array($item, $exceptions)) {
 					$from = Folder::addPathElement($fromDir, $item);
-					if (is_file($from)) {
+					if (is_file($from) && (!is_file($to) || $options['scheme'] != Folder::SKIP)) {
 						if (copy($from, $to)) {
 							chmod($to, intval($mode, 8));
 							touch($to, filemtime($from));
@@ -683,7 +718,7 @@ class Folder {
 						}
 					}
 
-					if (is_dir($from) && file_exists($to) && $options['scheme'] == Folder::OVERWRITE) {
+					if (is_dir($from) && file_exists($to) && $options['scheme'] === Folder::OVERWRITE) {
 						$this->delete($to);
 					}
 
@@ -700,7 +735,7 @@ class Folder {
 						} else {
 							$this->_errors[] = __d('cake_dev', '%s not created', $to);
 						}
-					} elseif (is_dir($from) && $options['scheme'] == Folder::MERGE) {
+					} elseif (is_dir($from) && $options['scheme'] === Folder::MERGE) {
 						$options = array('to' => $to, 'from' => $from) + $options;
 						$this->copy($options);
 					}
@@ -729,7 +764,7 @@ class Folder {
  * - `scheme` Folder::MERGE, Folder::OVERWRITE, Folder::SKIP
  *
  * @param array $options (to, from, chmod, skip, scheme)
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::move
  */
 	public function move($options) {
@@ -751,7 +786,7 @@ class Folder {
 /**
  * get messages from latest method
  *
- * @param boolean $reset Reset message stack after reading
+ * @param bool $reset Reset message stack after reading
  * @return array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::messages
  */
@@ -766,7 +801,7 @@ class Folder {
 /**
  * get error from latest method
  *
- * @param boolean $reset Reset error stack after reading
+ * @param bool $reset Reset error stack after reading
  * @return array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::errors
  */
@@ -786,13 +821,13 @@ class Folder {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::realpath
  */
 	public function realpath($path) {
-		$path = str_replace('/', DS, trim($path));
 		if (strpos($path, '..') === false) {
 			if (!Folder::isAbsolute($path)) {
 				$path = Folder::addPathElement($this->path, $path);
 			}
 			return $path;
 		}
+		$path = str_replace('/', DS, trim($path));
 		$parts = explode(DS, $path);
 		$newparts = array();
 		$newpath = '';
@@ -822,7 +857,7 @@ class Folder {
  * Returns true if given $path ends in a slash (i.e. is slash-terminated).
  *
  * @param string $path Path to check
- * @return boolean true if path ends with slash, false otherwise
+ * @return bool true if path ends with slash, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isSlashTerm
  */
 	public static function isSlashTerm($path) {
diff --git a/web/api/lib/Cake/Utility/Hash.php b/web/api/lib/Cake/Utility/Hash.php
index 960ab9af6..2c9dd5f0b 100644
--- a/web/api/lib/Cake/Utility/Hash.php
+++ b/web/api/lib/Cake/Utility/Hash.php
@@ -14,7 +14,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 /**
  * Library of array functions for manipulating and extracting data
@@ -38,18 +38,26 @@ class Hash {
  * @param string|array $path The path being searched for. Either a dot
  *   separated string, or an array of path segments.
  * @param mixed $default The return value when the path does not exist
+ * @throws InvalidArgumentException
  * @return mixed The value fetched from the array, or null.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::get
  */
 	public static function get(array $data, $path, $default = null) {
-		if (empty($data)) {
+		if (empty($data) || $path === '' || $path === null) {
 			return $default;
 		}
 		if (is_string($path) || is_numeric($path)) {
 			$parts = explode('.', $path);
 		} else {
+			if (!is_array($path)) {
+				throw new InvalidArgumentException(__d('cake_dev',
+					'Invalid Parameter %s, should be dot separated path or array.',
+					$path
+				));
+			}
 			$parts = $path;
 		}
+
 		foreach ($parts as $key) {
 			if (is_array($data) && isset($data[$key])) {
 				$data =& $data[$key];
@@ -57,6 +65,7 @@ class Hash {
 				return $default;
 			}
 		}
+
 		return $data;
 	}
 
@@ -67,6 +76,7 @@ class Hash {
  *
  * - `{n}` Matches any numeric key, or integer.
  * - `{s}` Matches any string key.
+ * - `{*}` Matches any value.
  * - `Foo` Matches any key with the exact same value.
  *
  * There are a number of attribute operators:
@@ -96,13 +106,13 @@ class Hash {
 
 		// Simple paths.
 		if (!preg_match('/[{\[]/', $path)) {
-			return (array)self::get($data, $path);
+			return (array)static::get($data, $path);
 		}
 
 		if (strpos($path, '[') === false) {
 			$tokens = explode('.', $path);
 		} else {
-			$tokens = String::tokenize($path, '.', '[', ']');
+			$tokens = CakeText::tokenize($path, '.', '[', ']');
 		}
 
 		$_key = '__set_item__';
@@ -112,11 +122,11 @@ class Hash {
 		foreach ($tokens as $token) {
 			$next = array();
 
-			list($token, $conditions) = self::_splitConditions($token);
+			list($token, $conditions) = static::_splitConditions($token);
 
 			foreach ($context[$_key] as $item) {
 				foreach ((array)$item as $k => $v) {
-					if (self::_matchToken($k, $token)) {
+					if (static::_matchToken($k, $token)) {
 						$next[] = $v;
 					}
 				}
@@ -126,7 +136,7 @@ class Hash {
 			if ($conditions) {
 				$filter = array();
 				foreach ($next as $item) {
-					if (is_array($item) && self::_matches($item, $conditions)) {
+					if (is_array($item) && static::_matches($item, $conditions)) {
 						$filter[] = $item;
 					}
 				}
@@ -159,19 +169,19 @@ class Hash {
  *
  * @param string $key The key in the array being searched.
  * @param string $token The token being matched.
- * @return boolean
+ * @return bool
  */
 	protected static function _matchToken($key, $token) {
-		if ($token === '{n}') {
-			return is_numeric($key);
+		switch ($token) {
+			case '{n}':
+				return is_numeric($key);
+			case '{s}':
+				return is_string($key);
+			case '{*}':
+				return true;
+			default:
+				return is_numeric($token) ? ($key == $token) : $key === $token;
 		}
-		if ($token === '{s}') {
-			return is_string($key);
-		}
-		if (is_numeric($token)) {
-			return ($key == $token);
-		}
-		return ($key === $token);
 	}
 
 /**
@@ -179,7 +189,7 @@ class Hash {
  *
  * @param array $data Array of data to match.
  * @param string $selector The patterns to match.
- * @return boolean Fitness of expression.
+ * @return bool Fitness of expression.
  */
 	protected static function _matches(array $data, $selector) {
 		preg_match_all(
@@ -208,7 +218,10 @@ class Hash {
 			if (isset($data[$attr])) {
 				$prop = $data[$attr];
 			}
-			if ($prop === true || $prop === false) {
+			$isBool = is_bool($prop);
+			if ($isBool && is_numeric($val)) {
+				$prop = $prop ? '1' : '0';
+			} elseif ($isBool) {
 				$prop = $prop ? 'true' : 'false';
 			}
 
@@ -217,8 +230,7 @@ class Hash {
 				if (!preg_match($val, $prop)) {
 					return false;
 				}
-			} elseif (
-				($op === '=' && $prop != $val) ||
+			} elseif (($op === '=' && $prop != $val) ||
 				($op === '!=' && $prop == $val) ||
 				($op === '>' && $prop <= $val) ||
 				($op === '<' && $prop >= $val) ||
@@ -238,7 +250,7 @@ class Hash {
  *
  * @param array $data The data to insert into.
  * @param string $path The path to insert at.
- * @param array $values The values to insert.
+ * @param mixed $values The values to insert.
  * @return array The data with $values inserted.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::insert
  */
@@ -246,26 +258,26 @@ class Hash {
 		if (strpos($path, '[') === false) {
 			$tokens = explode('.', $path);
 		} else {
-			$tokens = String::tokenize($path, '.', '[', ']');
+			$tokens = CakeText::tokenize($path, '.', '[', ']');
 		}
 
 		if (strpos($path, '{') === false && strpos($path, '[') === false) {
-			return self::_simpleOp('insert', $data, $tokens, $values);
+			return static::_simpleOp('insert', $data, $tokens, $values);
 		}
 
 		$token = array_shift($tokens);
 		$nextPath = implode('.', $tokens);
 
-		list($token, $conditions) = self::_splitConditions($token);
+		list($token, $conditions) = static::_splitConditions($token);
 
 		foreach ($data as $k => $v) {
-			if (self::_matchToken($k, $token)) {
-				if ($conditions && self::_matches($v, $conditions)) {
+			if (static::_matchToken($k, $token)) {
+				if ($conditions && static::_matches($v, $conditions)) {
 					$data[$k] = array_merge($v, $values);
 					continue;
 				}
 				if (!$conditions) {
-					$data[$k] = self::insert($v, $nextPath, $values);
+					$data[$k] = static::insert($v, $nextPath, $values);
 				}
 			}
 		}
@@ -279,7 +291,7 @@ class Hash {
  * @param array $data The data to operate on.
  * @param array $path The path to work on.
  * @param mixed $values The values to insert when doing inserts.
- * @return array $data.
+ * @return array data.
  */
 	protected static function _simpleOp($op, $data, $path, $values = null) {
 		$_list =& $data;
@@ -287,8 +299,8 @@ class Hash {
 		$count = count($path);
 		$last = $count - 1;
 		foreach ($path as $i => $key) {
-			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
-				$key = intval($key);
+			if ((is_numeric($key) && intval($key) > 0 || $key === '0') && strpos($key, '0') !== 0) {
+				$key = (int)$key;
 			}
 			if ($op === 'insert') {
 				if ($i === $last) {
@@ -329,30 +341,30 @@ class Hash {
 		if (strpos($path, '[') === false) {
 			$tokens = explode('.', $path);
 		} else {
-			$tokens = String::tokenize($path, '.', '[', ']');
+			$tokens = CakeText::tokenize($path, '.', '[', ']');
 		}
 
 		if (strpos($path, '{') === false && strpos($path, '[') === false) {
-			return self::_simpleOp('remove', $data, $tokens);
+			return static::_simpleOp('remove', $data, $tokens);
 		}
 
 		$token = array_shift($tokens);
 		$nextPath = implode('.', $tokens);
 
-		list($token, $conditions) = self::_splitConditions($token);
+		list($token, $conditions) = static::_splitConditions($token);
 
 		foreach ($data as $k => $v) {
-			$match = self::_matchToken($k, $token);
+			$match = static::_matchToken($k, $token);
 			if ($match && is_array($v)) {
-				if ($conditions && self::_matches($v, $conditions)) {
+				if ($conditions && static::_matches($v, $conditions)) {
 					unset($data[$k]);
 					continue;
 				}
-				$data[$k] = self::remove($v, $nextPath);
+				$data[$k] = static::remove($v, $nextPath);
 				if (empty($data[$k])) {
 					unset($data[$k]);
 				}
-			} elseif ($match) {
+			} elseif ($match && empty($nextPath)) {
 				unset($data[$k]);
 			}
 		}
@@ -380,9 +392,9 @@ class Hash {
 
 		if (is_array($keyPath)) {
 			$format = array_shift($keyPath);
-			$keys = self::format($data, $keyPath, $format);
+			$keys = static::format($data, $keyPath, $format);
 		} else {
-			$keys = self::extract($data, $keyPath);
+			$keys = static::extract($data, $keyPath);
 		}
 		if (empty($keys)) {
 			return array();
@@ -390,9 +402,9 @@ class Hash {
 
 		if (!empty($valuePath) && is_array($valuePath)) {
 			$format = array_shift($valuePath);
-			$vals = self::format($data, $valuePath, $format);
+			$vals = static::format($data, $valuePath, $format);
 		} elseif (!empty($valuePath)) {
-			$vals = self::extract($data, $valuePath);
+			$vals = static::extract($data, $valuePath);
 		}
 		if (empty($vals)) {
 			$vals = array_fill(0, count($keys), null);
@@ -406,7 +418,7 @@ class Hash {
 		}
 
 		if ($groupPath !== null) {
-			$group = self::extract($data, $groupPath);
+			$group = static::extract($data, $groupPath);
 			if (!empty($group)) {
 				$c = count($keys);
 				for ($i = 0; $i < $c; $i++) {
@@ -433,9 +445,9 @@ class Hash {
  *
  * Usage:
  *
- * {{{
+ * ```
  * $result = Hash::format($users, array('{n}.User.id', '{n}.User.name'), '%s : %s');
- * }}}
+ * ```
  *
  * The `$format` string can use any format options that `vsprintf()` and `sprintf()` do.
  *
@@ -453,11 +465,11 @@ class Hash {
 		$count = count($paths);
 
 		if (!$count) {
-			return;
+			return null;
 		}
 
 		for ($i = 0; $i < $count; $i++) {
-			$extracted[] = self::extract($data, $paths[$i]);
+			$extracted[] = static::extract($data, $paths[$i]);
 		}
 		$out = array();
 		$data = $extracted;
@@ -481,7 +493,7 @@ class Hash {
  *
  * @param array $data The data to search through.
  * @param array $needle The values to file in $data
- * @return boolean true if $data contains $needle, false otherwise
+ * @return bool true if $data contains $needle, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::contains
  */
 	public static function contains(array $data, array $needle) {
@@ -522,12 +534,12 @@ class Hash {
  *
  * @param array $data The data to check.
  * @param string $path The path to check for.
- * @return boolean Existence of path.
+ * @return bool Existence of path.
  * @see Hash::extract()
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::check
  */
 	public static function check(array $data, $path) {
-		$results = self::extract($data, $path);
+		$results = static::extract($data, $path);
 		if (!is_array($results)) {
 			return false;
 		}
@@ -539,14 +551,14 @@ class Hash {
  *
  * @param array $data Either an array to filter, or value when in callback
  * @param callable $callback A function to filter the data with. Defaults to
- *   `self::_filter()` Which strips out all non-zero empty values.
+ *   `static::_filter()` Which strips out all non-zero empty values.
  * @return array Filtered array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::filter
  */
 	public static function filter(array $data, $callback = array('self', '_filter')) {
 		foreach ($data as $k => $v) {
 			if (is_array($v)) {
-				$data[$k] = self::filter($v, $callback);
+				$data[$k] = static::filter($v, $callback);
 			}
 		}
 		return array_filter($data, $callback);
@@ -556,7 +568,7 @@ class Hash {
  * Callback function for filtering.
  *
  * @param array $var Array to filter.
- * @return boolean
+ * @return bool
  */
 	protected static function _filter($var) {
 		if ($var === 0 || $var === '0' || !empty($var)) {
@@ -619,6 +631,9 @@ class Hash {
  */
 	public static function expand($data, $separator = '.') {
 		$result = array();
+
+		$stack = array();
+
 		foreach ($data as $flat => $value) {
 			$keys = explode($separator, $flat);
 			$keys = array_reverse($keys);
@@ -631,7 +646,24 @@ class Hash {
 					$k => $child
 				);
 			}
-			$result = self::merge($result, $child);
+
+			$stack[] = array($child, &$result);
+
+			while (!empty($stack)) {
+				foreach ($stack as $curKey => &$curMerge) {
+					foreach ($curMerge[0] as $key => &$val) {
+						if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key] === $curMerge[1][$key] && (array)$val === $val) {
+							$stack[] = array(&$val, &$curMerge[1][$key]);
+						} elseif ((int)$key === $key && isset($curMerge[1][$key])) {
+							$curMerge[1][] = $val;
+						} else {
+							$curMerge[1][$key] = $val;
+						}
+					}
+					unset($stack[$curKey]);
+				}
+				unset($curMerge);
+			}
 		}
 		return $result;
 	}
@@ -651,19 +683,28 @@ class Hash {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::merge
  */
 	public static function merge(array $data, $merge) {
-		$args = func_get_args();
-		$return = current($args);
+		$args = array_slice(func_get_args(), 1);
+		$return = $data;
 
-		while (($arg = next($args)) !== false) {
-			foreach ((array)$arg as $key => $val) {
-				if (!empty($return[$key]) && is_array($return[$key]) && is_array($val)) {
-					$return[$key] = self::merge($return[$key], $val);
-				} elseif (is_int($key) && isset($return[$key])) {
-					$return[] = $val;
-				} else {
-					$return[$key] = $val;
+		foreach ($args as &$curArg) {
+			$stack[] = array((array)$curArg, &$return);
+		}
+		unset($curArg);
+
+		while (!empty($stack)) {
+			foreach ($stack as $curKey => &$curMerge) {
+				foreach ($curMerge[0] as $key => &$val) {
+					if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key] === $curMerge[1][$key] && (array)$val === $val) {
+						$stack[] = array(&$val, &$curMerge[1][$key]);
+					} elseif ((int)$key === $key && isset($curMerge[1][$key])) {
+						$curMerge[1][] = $val;
+					} else {
+						$curMerge[1][$key] = $val;
+					}
 				}
+				unset($stack[$curKey]);
 			}
+			unset($curMerge);
 		}
 		return $return;
 	}
@@ -671,8 +712,8 @@ class Hash {
 /**
  * Checks to see if all the values in the array are numeric
  *
- * @param array $array The array to check.
- * @return boolean true if values are numeric, false otherwise
+ * @param array $data The array to check.
+ * @return bool true if values are numeric, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::numeric
  */
 	public static function numeric(array $data) {
@@ -689,8 +730,8 @@ class Hash {
  * If you have an un-even or heterogenous array, consider using Hash::maxDimensions()
  * to get the dimensions of the array.
  *
- * @param array $array Array to count dimensions on
- * @return integer The number of dimensions in $data
+ * @param array $data Array to count dimensions on
+ * @return int The number of dimensions in $data
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::dimensions
  */
 	public static function dimensions(array $data) {
@@ -715,17 +756,17 @@ class Hash {
  * number of dimensions in a mixed array.
  *
  * @param array $data Array to count dimensions on
- * @return integer The maximum number of dimensions in $data
+ * @return int The maximum number of dimensions in $data
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::maxDimensions
  */
-	public static function maxDimensions(array $data) {
+	public static function maxDimensions($data) {
 		$depth = array();
 		if (is_array($data) && reset($data) !== false) {
 			foreach ($data as $value) {
-				$depth[] = self::dimensions((array)$value) + 1;
+				$depth[] = static::maxDimensions($value) + 1;
 			}
 		}
-		return max($depth);
+		return empty($depth) ? 0 : max($depth);
 	}
 
 /**
@@ -739,7 +780,7 @@ class Hash {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::map
  */
 	public static function map(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array)static::extract($data, $path);
 		return array_map($function, $values);
 	}
 
@@ -753,7 +794,7 @@ class Hash {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::reduce
  */
 	public static function reduce(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array)static::extract($data, $path);
 		return array_reduce($values, $function);
 	}
 
@@ -778,7 +819,7 @@ class Hash {
  * @return mixed The results of the applied method.
  */
 	public static function apply(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array)static::extract($data, $path);
 		return call_user_func($function, $values);
 	}
 
@@ -798,14 +839,23 @@ class Hash {
  * - `natural` Compare items as strings using "natural ordering" in a human friendly way.
  *   Will sort foo10 below foo2 as an example. Requires PHP 5.4 or greater or it will fallback to 'regular'
  *
+ * To do case insensitive sorting, pass the type as an array as follows:
+ *
+ * ```
+ * array('type' => 'regular', 'ignoreCase' => true)
+ * ```
+ *
+ * When using the array form, `type` defaults to 'regular'. The `ignoreCase` option
+ * defaults to `false`.
+ *
  * @param array $data An array of data to sort
  * @param string $path A Set-compatible path to the array value
- * @param string $dir See directions above.
- * @param string $type See direction types above. Defaults to 'regular'.
+ * @param string $dir See directions above. Defaults to 'asc'.
+ * @param array|string $type See direction types above. Defaults to 'regular'.
  * @return array Sorted array of data
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::sort
  */
-	public static function sort(array $data, $path, $dir, $type = 'regular') {
+	public static function sort(array $data, $path, $dir = 'asc', $type = 'regular') {
 		if (empty($data)) {
 			return array();
 		}
@@ -814,7 +864,7 @@ class Hash {
 		if ($numeric) {
 			$data = array_values($data);
 		}
-		$sortValues = self::extract($data, $path);
+		$sortValues = static::extract($data, $path);
 		$sortCount = count($sortValues);
 		$dataCount = count($data);
 
@@ -823,15 +873,26 @@ class Hash {
 		if ($sortCount < $dataCount) {
 			$sortValues = array_pad($sortValues, $dataCount, null);
 		}
-		$result = self::_squash($sortValues);
-		$keys = self::extract($result, '{n}.id');
-		$values = self::extract($result, '{n}.value');
+		$result = static::_squash($sortValues);
+		$keys = static::extract($result, '{n}.id');
+		$values = static::extract($result, '{n}.value');
 
 		$dir = strtolower($dir);
-		$type = strtolower($type);
+		$ignoreCase = false;
+
+		// $type can be overloaded for case insensitive sort
+		if (is_array($type)) {
+			$type += array('ignoreCase' => false, 'type' => 'regular');
+			$ignoreCase = $type['ignoreCase'];
+			$type = $type['type'];
+		} else {
+			$type = strtolower($type);
+		}
+
 		if ($type === 'natural' && version_compare(PHP_VERSION, '5.4.0', '<')) {
 			$type = 'regular';
 		}
+
 		if ($dir === 'asc') {
 			$dir = SORT_ASC;
 		} else {
@@ -846,7 +907,12 @@ class Hash {
 		} else {
 			$type = SORT_REGULAR;
 		}
-		array_multisort($values, $dir, $type, $keys, $dir, $type);
+
+		if ($ignoreCase) {
+			$values = array_map('mb_strtolower', $values);
+		}
+		array_multisort($values, $dir, $type, $keys, $dir);
+
 		$sorted = array();
 		$keys = array_unique($keys);
 
@@ -880,7 +946,7 @@ class Hash {
 				$id = $key;
 			}
 			if (is_array($r) && !empty($r)) {
-				$stack = array_merge($stack, self::_squash($r, $id));
+				$stack = array_merge($stack, static::_squash($r, $id));
 			} else {
 				$stack[] = array('id' => $id, 'value' => $r);
 			}
@@ -936,7 +1002,7 @@ class Hash {
 			if (!array_key_exists($key, $data)) {
 				$data[$key] = $value;
 			} elseif (is_array($value)) {
-				$data[$key] = self::mergeDiff($data[$key], $compare[$key]);
+				$data[$key] = static::mergeDiff($data[$key], $compare[$key]);
 			}
 		}
 		return $data;
@@ -946,7 +1012,7 @@ class Hash {
  * Normalizes an array, and converts it to a standard format.
  *
  * @param array $data List to normalize
- * @param boolean $assoc If true, $data will be converted to an associative array.
+ * @param bool $assoc If true, $data will be converted to an associative array.
  * @return array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::normalize
  */
@@ -993,6 +1059,7 @@ class Hash {
  * @param array $options Options are:
  * @return array of results, nested
  * @see Hash::extract()
+ * @throws InvalidArgumentException When providing invalid data.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::nest
  */
 	public static function nest(array $data, $options = array()) {
@@ -1009,7 +1076,7 @@ class Hash {
 		);
 
 		$return = $idMap = array();
-		$ids = self::extract($data, $options['idPath']);
+		$ids = static::extract($data, $options['idPath']);
 
 		$idKeys = explode('.', $options['idPath']);
 		array_shift($idKeys);
@@ -1020,8 +1087,8 @@ class Hash {
 		foreach ($data as $result) {
 			$result[$options['children']] = array();
 
-			$id = self::get($result, $idKeys);
-			$parentId = self::get($result, $parentKeys);
+			$id = static::get($result, $idKeys);
+			$parentId = static::get($result, $parentKeys);
 
 			if (isset($idMap[$id][$options['children']])) {
 				$idMap[$id] = array_merge($result, (array)$idMap[$id]);
@@ -1035,15 +1102,21 @@ class Hash {
 			}
 		}
 
+		if (!$return) {
+			throw new InvalidArgumentException(__d('cake_dev',
+				'Invalid data array to nest.'
+			));
+		}
+
 		if ($options['root']) {
 			$root = $options['root'];
 		} else {
-			$root = self::get($return[0], $parentKeys);
+			$root = static::get($return[0], $parentKeys);
 		}
 
 		foreach ($return as $i => $result) {
-			$id = self::get($result, $idKeys);
-			$parentId = self::get($result, $parentKeys);
+			$id = static::get($result, $idKeys);
+			$parentId = static::get($result, $parentKeys);
 			if ($id !== $root && $parentId != $root) {
 				unset($return[$i]);
 			}
diff --git a/web/api/lib/Cake/Utility/Inflector.php b/web/api/lib/Cake/Utility/Inflector.php
index ef4685edf..40b9de281 100644
--- a/web/api/lib/Cake/Utility/Inflector.php
+++ b/web/api/lib/Cake/Utility/Inflector.php
@@ -32,7 +32,7 @@ class Inflector {
  */
 	protected static $_plural = array(
 		'rules' => array(
-			'/(s)tatus$/i' => '\1\2tatuses',
+			'/(s)tatus$/i' => '\1tatuses',
 			'/(quiz)$/i' => '\1zes',
 			'/^(ox)$/i' => '\1\2en',
 			'/([m|l])ouse$/i' => '\1ice',
@@ -44,10 +44,10 @@ class Inflector {
 			'/sis$/i' => 'ses',
 			'/([ti])um$/i' => '\1a',
 			'/(p)erson$/i' => '\1eople',
-			'/(m)an$/i' => '\1en',
+			'/(?<!u)(m)an$/i' => '\1en',
 			'/(c)hild$/i' => '\1hildren',
 			'/(buffal|tomat)o$/i' => '\1\2oes',
-			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin)us$/i' => '\1i',
 			'/us$/i' => 'uses',
 			'/(alias)$/i' => '\1es',
 			'/(ax|cris|test)is$/i' => '\1es',
@@ -56,7 +56,17 @@ class Inflector {
 			'/$/' => 's',
 		),
 		'uninflected' => array(
-			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people'
+			'.*[nrlm]ese',
+			'.*data',
+			'.*deer',
+			'.*fish',
+			'.*measles',
+			'.*ois',
+			'.*pox',
+			'.*sheep',
+			'people',
+			'feedback',
+			'stadia'
 		),
 		'irregular' => array(
 			'atlas' => 'atlases',
@@ -68,6 +78,7 @@ class Inflector {
 			'cookie' => 'cookies',
 			'corpus' => 'corpuses',
 			'cow' => 'cows',
+			'criterion' => 'criteria',
 			'ganglion' => 'ganglions',
 			'genie' => 'genies',
 			'genus' => 'genera',
@@ -96,7 +107,8 @@ class Inflector {
 			'hero' => 'heroes',
 			'tooth' => 'teeth',
 			'goose' => 'geese',
-			'foot' => 'feet'
+			'foot' => 'feet',
+			'sieve' => 'sieves'
 		)
 	);
 
@@ -143,7 +155,8 @@ class Inflector {
 			'/s$/i' => ''
 		),
 		'uninflected' => array(
-			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
+			'.*data',
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss', 'feedback'
 		),
 		'irregular' => array(
 			'foes' => 'foe',
@@ -162,9 +175,9 @@ class Inflector {
 		'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
 		'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
 		'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', '.*?media',
-		'metadata', 'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
+		'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
 		'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
-		'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
+		'proceedings', 'rabies', 'research', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
 		'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'swine', 'testes',
 		'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting', 'wildebeest',
 		'Yengeese'
@@ -176,56 +189,63 @@ class Inflector {
  * @var array
  */
 	protected static $_transliteration = array(
-		'/ä|æ|ǽ/' => 'ae',
-		'/ö|œ/' => 'oe',
-		'/ü/' => 'ue',
-		'/Ä/' => 'Ae',
-		'/Ü/' => 'Ue',
-		'/Ö/' => 'Oe',
 		'/À|Á|Â|Ã|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
-		'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
-		'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
-		'/ç|ć|ĉ|ċ|č/' => 'c',
-		'/Ð|Ď|Đ/' => 'D',
-		'/ð|ď|đ/' => 'd',
-		'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
-		'/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
-		'/Ĝ|Ğ|Ġ|Ģ/' => 'G',
-		'/ĝ|ğ|ġ|ģ/' => 'g',
-		'/Ĥ|Ħ/' => 'H',
-		'/ĥ|ħ/' => 'h',
-		'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ/' => 'I',
-		'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı/' => 'i',
-		'/Ĵ/' => 'J',
-		'/ĵ/' => 'j',
-		'/Ķ/' => 'K',
-		'/ķ/' => 'k',
-		'/Ĺ|Ļ|Ľ|Ŀ|Ł/' => 'L',
-		'/ĺ|ļ|ľ|ŀ|ł/' => 'l',
-		'/Ñ|Ń|Ņ|Ň/' => 'N',
-		'/ñ|ń|ņ|ň|ʼn/' => 'n',
-		'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ/' => 'O',
-		'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
-		'/Ŕ|Ŗ|Ř/' => 'R',
-		'/ŕ|ŗ|ř/' => 'r',
-		'/Ś|Ŝ|Ş|Ș|Š/' => 'S',
-		'/ś|ŝ|ş|ș|š|ſ/' => 's',
-		'/Ţ|Ț|Ť|Ŧ/' => 'T',
-		'/ţ|ț|ť|ŧ/' => 't',
-		'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
-		'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
-		'/Ý|Ÿ|Ŷ/' => 'Y',
-		'/ý|ÿ|ŷ/' => 'y',
-		'/Ŵ/' => 'W',
-		'/ŵ/' => 'w',
-		'/Ź|Ż|Ž/' => 'Z',
-		'/ź|ż|ž/' => 'z',
 		'/Æ|Ǽ/' => 'AE',
-		'/ß/' => 'ss',
+		'/Ä/' => 'Ae',
+		'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
+		'/Ð|Ď|Đ/' => 'D',
+		'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
+		'/Ĝ|Ğ|Ġ|Ģ|Ґ/' => 'G',
+		'/Ĥ|Ħ/' => 'H',
+		'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|І/' => 'I',
 		'/IJ/' => 'IJ',
-		'/ij/' => 'ij',
+		'/Ĵ/' => 'J',
+		'/Ķ/' => 'K',
+		'/Ĺ|Ļ|Ľ|Ŀ|Ł/' => 'L',
+		'/Ñ|Ń|Ņ|Ň/' => 'N',
+		'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ/' => 'O',
 		'/Œ/' => 'OE',
-		'/ƒ/' => 'f'
+		'/Ö/' => 'Oe',
+		'/Ŕ|Ŗ|Ř/' => 'R',
+		'/Ś|Ŝ|Ş|Ș|Š/' => 'S',
+		'/ẞ/' => 'SS',
+		'/Ţ|Ț|Ť|Ŧ/' => 'T',
+		'/Þ/' => 'TH',
+		'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
+		'/Ü/' => 'Ue',
+		'/Ŵ/' => 'W',
+		'/Ý|Ÿ|Ŷ/' => 'Y',
+		'/Є/' => 'Ye',
+		'/Ї/' => 'Yi',
+		'/Ź|Ż|Ž/' => 'Z',
+		'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
+		'/ä|æ|ǽ/' => 'ae',
+		'/ç|ć|ĉ|ċ|č/' => 'c',
+		'/ð|ď|đ/' => 'd',
+		'/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
+		'/ƒ/' => 'f',
+		'/ĝ|ğ|ġ|ģ|ґ/' => 'g',
+		'/ĥ|ħ/' => 'h',
+		'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|і/' => 'i',
+		'/ij/' => 'ij',
+		'/ĵ/' => 'j',
+		'/ķ/' => 'k',
+		'/ĺ|ļ|ľ|ŀ|ł/' => 'l',
+		'/ñ|ń|ņ|ň|ʼn/' => 'n',
+		'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
+		'/ö|œ/' => 'oe',
+		'/ŕ|ŗ|ř/' => 'r',
+		'/ś|ŝ|ş|ș|š|ſ/' => 's',
+		'/ß/' => 'ss',
+		'/ţ|ț|ť|ŧ/' => 't',
+		'/þ/' => 'th',
+		'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
+		'/ü/' => 'ue',
+		'/ŵ/' => 'w',
+		'/ý|ÿ|ŷ/' => 'y',
+		'/є/' => 'ye',
+		'/ї/' => 'yi',
+		'/ź|ż|ž/' => 'z',
 	);
 
 /**
@@ -254,13 +274,13 @@ class Inflector {
 		$key = '_' . $key;
 		$type = '_' . $type;
 		if ($value !== false) {
-			self::$_cache[$type][$key] = $value;
+			static::$_cache[$type][$key] = $value;
 			return $value;
 		}
-		if (!isset(self::$_cache[$type][$key])) {
+		if (!isset(static::$_cache[$type][$key])) {
 			return false;
 		}
-		return self::$_cache[$type][$key];
+		return static::$_cache[$type][$key];
 	}
 
 /**
@@ -270,13 +290,13 @@ class Inflector {
  * @return void
  */
 	public static function reset() {
-		if (empty(self::$_initialState)) {
-			self::$_initialState = get_class_vars('Inflector');
+		if (empty(static::$_initialState)) {
+			static::$_initialState = get_class_vars('Inflector');
 			return;
 		}
-		foreach (self::$_initialState as $key => $val) {
+		foreach (static::$_initialState as $key => $val) {
 			if ($key !== '_initialState') {
-				self::${$key} = $val;
+				static::${$key} = $val;
 			}
 		}
 	}
@@ -286,7 +306,7 @@ class Inflector {
  *
  * ### Usage:
  *
- * {{{
+ * ```
  * Inflector::rules('plural', array('/^(inflect)or$/i' => '\1ables'));
  * Inflector::rules('plural', array(
  *     'rules' => array('/^(inflect)ors$/i' => '\1ables'),
@@ -294,11 +314,11 @@ class Inflector {
  *     'irregular' => array('red' => 'redlings')
  * ));
  * Inflector::rules('transliteration', array('/å/' => 'aa'));
- * }}}
+ * ```
  *
  * @param string $type The type of inflection, either 'plural', 'singular' or 'transliteration'
  * @param array $rules Array of rules to be added.
- * @param boolean $reset If true, will unset default inflections for all
+ * @param bool $reset If true, will unset default inflections for all
  *        new rules that are being defined in $rules.
  * @return void
  */
@@ -308,9 +328,9 @@ class Inflector {
 		switch ($type) {
 			case 'transliteration':
 				if ($reset) {
-					self::$_transliteration = $rules;
+					static::$_transliteration = $rules;
 				} else {
-					self::$_transliteration = $rules + self::$_transliteration;
+					static::$_transliteration = $rules + static::$_transliteration;
 				}
 				break;
 
@@ -318,26 +338,26 @@ class Inflector {
 				foreach ($rules as $rule => $pattern) {
 					if (is_array($pattern)) {
 						if ($reset) {
-							self::${$var}[$rule] = $pattern;
+							static::${$var}[$rule] = $pattern;
 						} else {
 							if ($rule === 'uninflected') {
-								self::${$var}[$rule] = array_merge($pattern, self::${$var}[$rule]);
+								static::${$var}[$rule] = array_merge($pattern, static::${$var}[$rule]);
 							} else {
-								self::${$var}[$rule] = $pattern + self::${$var}[$rule];
+								static::${$var}[$rule] = $pattern + static::${$var}[$rule];
 							}
 						}
-						unset($rules[$rule], self::${$var}['cache' . ucfirst($rule)]);
-						if (isset(self::${$var}['merged'][$rule])) {
-							unset(self::${$var}['merged'][$rule]);
+						unset($rules[$rule], static::${$var}['cache' . ucfirst($rule)]);
+						if (isset(static::${$var}['merged'][$rule])) {
+							unset(static::${$var}['merged'][$rule]);
 						}
 						if ($type === 'plural') {
-							self::$_cache['pluralize'] = self::$_cache['tableize'] = array();
+							static::$_cache['pluralize'] = static::$_cache['tableize'] = array();
 						} elseif ($type === 'singular') {
-							self::$_cache['singularize'] = array();
+							static::$_cache['singularize'] = array();
 						}
 					}
 				}
-				self::${$var}['rules'] = $rules + self::${$var}['rules'];
+				static::${$var}['rules'] = $rules + static::${$var}['rules'];
 		}
 	}
 
@@ -349,37 +369,39 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::pluralize
  */
 	public static function pluralize($word) {
-		if (isset(self::$_cache['pluralize'][$word])) {
-			return self::$_cache['pluralize'][$word];
+		if (isset(static::$_cache['pluralize'][$word])) {
+			return static::$_cache['pluralize'][$word];
 		}
 
-		if (!isset(self::$_plural['merged']['irregular'])) {
-			self::$_plural['merged']['irregular'] = self::$_plural['irregular'];
+		if (!isset(static::$_plural['merged']['irregular'])) {
+			static::$_plural['merged']['irregular'] = static::$_plural['irregular'];
 		}
 
-		if (!isset(self::$_plural['merged']['uninflected'])) {
-			self::$_plural['merged']['uninflected'] = array_merge(self::$_plural['uninflected'], self::$_uninflected);
+		if (!isset(static::$_plural['merged']['uninflected'])) {
+			static::$_plural['merged']['uninflected'] = array_merge(static::$_plural['uninflected'], static::$_uninflected);
 		}
 
-		if (!isset(self::$_plural['cacheUninflected']) || !isset(self::$_plural['cacheIrregular'])) {
-			self::$_plural['cacheUninflected'] = '(?:' . implode('|', self::$_plural['merged']['uninflected']) . ')';
-			self::$_plural['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$_plural['merged']['irregular'])) . ')';
+		if (!isset(static::$_plural['cacheUninflected']) || !isset(static::$_plural['cacheIrregular'])) {
+			static::$_plural['cacheUninflected'] = '(?:' . implode('|', static::$_plural['merged']['uninflected']) . ')';
+			static::$_plural['cacheIrregular'] = '(?:' . implode('|', array_keys(static::$_plural['merged']['irregular'])) . ')';
 		}
 
-		if (preg_match('/(.*)\\b(' . self::$_plural['cacheIrregular'] . ')$/i', $word, $regs)) {
-			self::$_cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$_plural['merged']['irregular'][strtolower($regs[2])], 1);
-			return self::$_cache['pluralize'][$word];
+		if (preg_match('/(.*?(?:\\b|_))(' . static::$_plural['cacheIrregular'] . ')$/i', $word, $regs)) {
+			static::$_cache['pluralize'][$word] = $regs[1] .
+				substr($regs[2], 0, 1) .
+				substr(static::$_plural['merged']['irregular'][strtolower($regs[2])], 1);
+			return static::$_cache['pluralize'][$word];
 		}
 
-		if (preg_match('/^(' . self::$_plural['cacheUninflected'] . ')$/i', $word, $regs)) {
-			self::$_cache['pluralize'][$word] = $word;
+		if (preg_match('/^(' . static::$_plural['cacheUninflected'] . ')$/i', $word, $regs)) {
+			static::$_cache['pluralize'][$word] = $word;
 			return $word;
 		}
 
-		foreach (self::$_plural['rules'] as $rule => $replacement) {
+		foreach (static::$_plural['rules'] as $rule => $replacement) {
 			if (preg_match($rule, $word)) {
-				self::$_cache['pluralize'][$word] = preg_replace($rule, $replacement, $word);
-				return self::$_cache['pluralize'][$word];
+				static::$_cache['pluralize'][$word] = preg_replace($rule, $replacement, $word);
+				return static::$_cache['pluralize'][$word];
 			}
 		}
 	}
@@ -392,46 +414,48 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::singularize
  */
 	public static function singularize($word) {
-		if (isset(self::$_cache['singularize'][$word])) {
-			return self::$_cache['singularize'][$word];
+		if (isset(static::$_cache['singularize'][$word])) {
+			return static::$_cache['singularize'][$word];
 		}
 
-		if (!isset(self::$_singular['merged']['uninflected'])) {
-			self::$_singular['merged']['uninflected'] = array_merge(
-				self::$_singular['uninflected'],
-				self::$_uninflected
+		if (!isset(static::$_singular['merged']['uninflected'])) {
+			static::$_singular['merged']['uninflected'] = array_merge(
+				static::$_singular['uninflected'],
+				static::$_uninflected
 			);
 		}
 
-		if (!isset(self::$_singular['merged']['irregular'])) {
-			self::$_singular['merged']['irregular'] = array_merge(
-				self::$_singular['irregular'],
-				array_flip(self::$_plural['irregular'])
+		if (!isset(static::$_singular['merged']['irregular'])) {
+			static::$_singular['merged']['irregular'] = array_merge(
+				static::$_singular['irregular'],
+				array_flip(static::$_plural['irregular'])
 			);
 		}
 
-		if (!isset(self::$_singular['cacheUninflected']) || !isset(self::$_singular['cacheIrregular'])) {
-			self::$_singular['cacheUninflected'] = '(?:' . implode('|', self::$_singular['merged']['uninflected']) . ')';
-			self::$_singular['cacheIrregular'] = '(?:' . implode('|', array_keys(self::$_singular['merged']['irregular'])) . ')';
+		if (!isset(static::$_singular['cacheUninflected']) || !isset(static::$_singular['cacheIrregular'])) {
+			static::$_singular['cacheUninflected'] = '(?:' . implode('|', static::$_singular['merged']['uninflected']) . ')';
+			static::$_singular['cacheIrregular'] = '(?:' . implode('|', array_keys(static::$_singular['merged']['irregular'])) . ')';
 		}
 
-		if (preg_match('/(.*)\\b(' . self::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) {
-			self::$_cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$_singular['merged']['irregular'][strtolower($regs[2])], 1);
-			return self::$_cache['singularize'][$word];
+		if (preg_match('/(.*?(?:\\b|_))(' . static::$_singular['cacheIrregular'] . ')$/i', $word, $regs)) {
+			static::$_cache['singularize'][$word] = $regs[1] .
+				substr($regs[2], 0, 1) .
+				substr(static::$_singular['merged']['irregular'][strtolower($regs[2])], 1);
+			return static::$_cache['singularize'][$word];
 		}
 
-		if (preg_match('/^(' . self::$_singular['cacheUninflected'] . ')$/i', $word, $regs)) {
-			self::$_cache['singularize'][$word] = $word;
+		if (preg_match('/^(' . static::$_singular['cacheUninflected'] . ')$/i', $word, $regs)) {
+			static::$_cache['singularize'][$word] = $word;
 			return $word;
 		}
 
-		foreach (self::$_singular['rules'] as $rule => $replacement) {
+		foreach (static::$_singular['rules'] as $rule => $replacement) {
 			if (preg_match($rule, $word)) {
-				self::$_cache['singularize'][$word] = preg_replace($rule, $replacement, $word);
-				return self::$_cache['singularize'][$word];
+				static::$_cache['singularize'][$word] = preg_replace($rule, $replacement, $word);
+				return static::$_cache['singularize'][$word];
 			}
 		}
-		self::$_cache['singularize'][$word] = $word;
+		static::$_cache['singularize'][$word] = $word;
 		return $word;
 	}
 
@@ -443,9 +467,9 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::camelize
  */
 	public static function camelize($lowerCaseAndUnderscoredWord) {
-		if (!($result = self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
+		if (!($result = static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
 			$result = str_replace(' ', '', Inflector::humanize($lowerCaseAndUnderscoredWord));
-			self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
+			static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
 		}
 		return $result;
 	}
@@ -458,9 +482,10 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::underscore
  */
 	public static function underscore($camelCasedWord) {
-		if (!($result = self::_cache(__FUNCTION__, $camelCasedWord))) {
-			$result = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $camelCasedWord));
-			self::_cache(__FUNCTION__, $camelCasedWord, $result);
+		if (!($result = static::_cache(__FUNCTION__, $camelCasedWord))) {
+			$underscoredWord = preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $camelCasedWord);
+			$result = mb_strtolower($underscoredWord);
+			static::_cache(__FUNCTION__, $camelCasedWord, $result);
 		}
 		return $result;
 	}
@@ -474,9 +499,13 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::humanize
  */
 	public static function humanize($lowerCaseAndUnderscoredWord) {
-		if (!($result = self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
-			$result = ucwords(str_replace('_', ' ', $lowerCaseAndUnderscoredWord));
-			self::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
+		if (!($result = static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
+			$result = explode(' ', str_replace('_', ' ', $lowerCaseAndUnderscoredWord));
+			foreach ($result as &$word) {
+				$word = mb_strtoupper(mb_substr($word, 0, 1)) . mb_substr($word, 1);
+			}
+			$result = implode(' ', $result);
+			static::_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
 		}
 		return $result;
 	}
@@ -489,9 +518,9 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::tableize
  */
 	public static function tableize($className) {
-		if (!($result = self::_cache(__FUNCTION__, $className))) {
+		if (!($result = static::_cache(__FUNCTION__, $className))) {
 			$result = Inflector::pluralize(Inflector::underscore($className));
-			self::_cache(__FUNCTION__, $className, $result);
+			static::_cache(__FUNCTION__, $className, $result);
 		}
 		return $result;
 	}
@@ -504,9 +533,9 @@ class Inflector {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::classify
  */
 	public static function classify($tableName) {
-		if (!($result = self::_cache(__FUNCTION__, $tableName))) {
+		if (!($result = static::_cache(__FUNCTION__, $tableName))) {
 			$result = Inflector::camelize(Inflector::singularize($tableName));
-			self::_cache(__FUNCTION__, $tableName, $result);
+			static::_cache(__FUNCTION__, $tableName, $result);
 		}
 		return $result;
 	}
@@ -514,16 +543,16 @@ class Inflector {
 /**
  * Returns camelBacked version of an underscored string.
  *
- * @param string $string
+ * @param string $string String to convert.
  * @return string in variable form
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::variable
  */
 	public static function variable($string) {
-		if (!($result = self::_cache(__FUNCTION__, $string))) {
+		if (!($result = static::_cache(__FUNCTION__, $string))) {
 			$camelized = Inflector::camelize(Inflector::underscore($string));
 			$replace = strtolower(substr($camelized, 0, 1));
 			$result = preg_replace('/\\w/', $replace, $camelized, 1);
-			self::_cache(__FUNCTION__, $string, $result);
+			static::_cache(__FUNCTION__, $string, $result);
 		}
 		return $result;
 	}
@@ -546,7 +575,7 @@ class Inflector {
 			sprintf('/^[%s]+|[%s]+$/', $quotedReplacement, $quotedReplacement) => '',
 		);
 
-		$map = self::$_transliteration + $merge;
+		$map = static::$_transliteration + $merge;
 		return preg_replace(array_keys($map), array_values($map), $string);
 	}
 
diff --git a/web/api/lib/Cake/Utility/ObjectCollection.php b/web/api/lib/Cake/Utility/ObjectCollection.php
index b1f344885..49e4ae9f8 100644
--- a/web/api/lib/Cake/Utility/ObjectCollection.php
+++ b/web/api/lib/Cake/Utility/ObjectCollection.php
@@ -44,7 +44,7 @@ abstract class ObjectCollection {
 /**
  * Default object priority. A non zero integer.
  *
- * @var integer
+ * @var int
  */
 	public $defaultPriority = 10;
 
@@ -82,8 +82,7 @@ abstract class ObjectCollection {
  *    Any non-null value will modify the parameter index indicated.
  *    Defaults to false.
  *
- *
- * @param string $callback|CakeEvent Method to fire on all the objects. Its assumed all the objects implement
+ * @param string|CakeEvent $callback Method to fire on all the objects. Its assumed all the objects implement
  *   the method you are calling. If an instance of CakeEvent is provided, then then Event name will parsed to
  *   get the callback name. This is done by getting the last word after any dot in the event name
  *   (eg. `Model.afterSave` event will trigger the `afterSave` callback)
@@ -130,8 +129,7 @@ abstract class ObjectCollection {
 			if ($options['collectReturn'] === true) {
 				$collected[] = $result;
 			}
-			if (
-				$options['break'] && ($result === $options['breakOn'] ||
+			if ($options['break'] && ($result === $options['breakOn'] ||
 				(is_array($options['breakOn']) && in_array($result, $options['breakOn'], true)))
 			) {
 				return $result;
@@ -162,7 +160,7 @@ abstract class ObjectCollection {
  * Provide isset access to _loaded
  *
  * @param string $name Name of object being checked.
- * @return boolean
+ * @return bool
  */
 	public function __isset($name) {
 		return isset($this->_loaded[$name]);
@@ -172,12 +170,13 @@ abstract class ObjectCollection {
  * Enables callbacks on an object or array of objects
  *
  * @param string|array $name CamelCased name of the object(s) to enable (string or array)
- * @param boolean Prioritize enabled list after enabling object(s)
+ * @param bool $prioritize Prioritize enabled list after enabling object(s)
  * @return void
  */
 	public function enable($name, $prioritize = true) {
 		$enabled = false;
 		foreach ((array)$name as $object) {
+			list(, $object) = pluginSplit($object);
 			if (isset($this->_loaded[$object]) && !isset($this->_enabled[$object])) {
 				$priority = $this->defaultPriority;
 				if (isset($this->_loaded[$object]->settings['priority'])) {
@@ -213,7 +212,7 @@ abstract class ObjectCollection {
  * @param string|array $name CamelCased name of the object(s) to enable (string or array)
  * 	If string the second param $priority is used else it should be an associative array
  * 	with keys as object names and values as priorities to set.
- * @param integer|null Integer priority to set or null for default
+ * @param int|null $priority Integer priority to set or null for default
  * @return void
  */
 	public function setPriority($name, $priority = null) {
@@ -221,6 +220,7 @@ abstract class ObjectCollection {
 			$name = array($name => $priority);
 		}
 		foreach ($name as $object => $objectPriority) {
+			list(, $object) = pluginSplit($object);
 			if (isset($this->_loaded[$object])) {
 				if ($objectPriority === null) {
 					$objectPriority = $this->defaultPriority;
@@ -235,7 +235,7 @@ abstract class ObjectCollection {
 	}
 
 /**
- * Disables callbacks on a object or array of objects. Public object methods are still
+ * Disables callbacks on an object or array of objects. Public object methods are still
  * callable as normal.
  *
  * @param string|array $name CamelCased name of the objects(s) to disable (string or array)
@@ -243,6 +243,7 @@ abstract class ObjectCollection {
  */
 	public function disable($name) {
 		foreach ((array)$name as $object) {
+			list(, $object) = pluginSplit($object);
 			unset($this->_enabled[$object]);
 		}
 	}
@@ -257,6 +258,7 @@ abstract class ObjectCollection {
  */
 	public function enabled($name = null) {
 		if (!empty($name)) {
+			list(, $name) = pluginSplit($name);
 			return isset($this->_enabled[$name]);
 		}
 		return array_keys($this->_enabled);
@@ -269,7 +271,7 @@ abstract class ObjectCollection {
  *   returns an array of currently-attached objects
  * @return mixed If $name is specified, returns the boolean status of the corresponding object.
  *    Otherwise, returns an array of all attached objects.
- * @deprecated Will be removed in 3.0. Use loaded instead.
+ * @deprecated 3.0.0 Will be removed in 3.0. Use loaded instead.
  */
 	public function attached($name = null) {
 		return $this->loaded($name);
@@ -285,6 +287,7 @@ abstract class ObjectCollection {
  */
 	public function loaded($name = null) {
 		if (!empty($name)) {
+			list(, $name) = pluginSplit($name);
 			return isset($this->_loaded[$name]);
 		}
 		return array_keys($this->_loaded);
diff --git a/web/api/lib/Cake/Utility/Sanitize.php b/web/api/lib/Cake/Utility/Sanitize.php
index c4a2212df..770f25c38 100644
--- a/web/api/lib/Cake/Utility/Sanitize.php
+++ b/web/api/lib/Cake/Utility/Sanitize.php
@@ -27,7 +27,7 @@ App::uses('ConnectionManager', 'Model');
  * and all of the above on arrays.
  *
  * @package       Cake.Utility
- * @deprecated    Deprecated since version 2.4
+ * @deprecated    3.0.0 Deprecated since version 2.4
  */
 class Sanitize {
 
@@ -184,7 +184,7 @@ class Sanitize {
  *
  * Will remove all `<b>`, `<p>`, and `<div>` tags from the $dirty string.
  *
- * @param string $str,... String to sanitize
+ * @param string $str String to sanitize.
  * @return string sanitized String
  */
 	public static function stripTags($str) {
diff --git a/web/api/lib/Cake/Utility/Security.php b/web/api/lib/Cake/Utility/Security.php
index 39e0fcf36..511cf5efc 100644
--- a/web/api/lib/Cake/Utility/Security.php
+++ b/web/api/lib/Cake/Utility/Security.php
@@ -16,7 +16,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 
 /**
  * Security Library contains utility methods related to security
@@ -42,8 +42,8 @@ class Security {
 /**
  * Get allowed minutes of inactivity based on security level.
  *
- * @deprecated Exists for backwards compatibility only, not used by the core
- * @return integer Allowed inactivity in minutes
+ * @deprecated 3.0.0 Exists for backwards compatibility only, not used by the core
+ * @return int Allowed inactivity in minutes
  */
 	public static function inactiveMins() {
 		switch (Configure::read('Security.level')) {
@@ -63,14 +63,14 @@ class Security {
  * @return string Hash
  */
 	public static function generateAuthKey() {
-		return Security::hash(String::uuid());
+		return Security::hash(CakeText::uuid());
 	}
 
 /**
  * Validate authorization hash.
  *
  * @param string $authKey Authorization hash
- * @return boolean Success
+ * @return bool Success
  */
 	public static function validateAuthKey($authKey) {
 		return true;
@@ -91,9 +91,9 @@ class Security {
  *
  * Creating a blowfish/bcrypt hash:
  *
- * {{{
+ * ```
  * 	$hash = Security::hash($password, 'blowfish');
- * }}}
+ * ```
  *
  * @param string $string String to hash
  * @param string $type Method to use (sha1/sha256/md5/blowfish)
@@ -105,12 +105,12 @@ class Security {
  */
 	public static function hash($string, $type = null, $salt = false) {
 		if (empty($type)) {
-			$type = self::$hashType;
+			$type = static::$hashType;
 		}
 		$type = strtolower($type);
 
 		if ($type === 'blowfish') {
-			return self::_crypt($string, $salt);
+			return static::_crypt($string, $salt);
 		}
 		if ($salt) {
 			if (!is_string($salt)) {
@@ -145,13 +145,13 @@ class Security {
  * @see Security::hash()
  */
 	public static function setHash($hash) {
-		self::$hashType = $hash;
+		static::$hashType = $hash;
 	}
 
 /**
  * Sets the cost for they blowfish hash method.
  *
- * @param integer $cost Valid values are 4-31
+ * @param int $cost Valid values are 4-31
  * @return void
  */
 	public static function setCost($cost) {
@@ -163,7 +163,7 @@ class Security {
 			), E_USER_WARNING);
 			return null;
 		}
-		self::$hashCost = $cost;
+		static::$hashCost = $cost;
 	}
 
 /**
@@ -179,7 +179,7 @@ class Security {
  * @param string $text Encrypted string to decrypt, normal string to encrypt
  * @param string $key Key to use
  * @return string Encrypted/Decrypted string
- * @deprecated Will be removed in 3.0.
+ * @deprecated 3.0.0 Will be removed in 3.0.
  */
 	public static function cipher($text, $key) {
 		if (empty($key)) {
@@ -187,7 +187,7 @@ class Security {
 			return '';
 		}
 
-		srand(Configure::read('Security.cipherSeed'));
+		srand((int)Configure::read('Security.cipherSeed'));
 		$out = '';
 		$keyLength = strlen($key);
 		for ($i = 0, $textLength = strlen($text); $i < $textLength; $i++) {
@@ -252,7 +252,7 @@ class Security {
  * The salt length should not exceed 27. The salt will be composed of
  * [./0-9A-Za-z]{$length}.
  *
- * @param integer $length The length of the returned salt
+ * @param int $length The length of the returned salt
  * @return string The generated salt
  */
 	protected static function _salt($length = 22) {
@@ -273,11 +273,16 @@ class Security {
  */
 	protected static function _crypt($password, $salt = false) {
 		if ($salt === false) {
-			$salt = self::_salt(22);
-			$salt = vsprintf('$2a$%02d$%s', array(self::$hashCost, $salt));
+			$salt = static::_salt(22);
+			$salt = vsprintf('$2a$%02d$%s', array(static::$hashCost, $salt));
 		}
 
-		if ($salt === true || strpos($salt, '$2a$') !== 0 || strlen($salt) < 29) {
+		$invalidCipher = (
+			strpos($salt, '$2y$') !== 0 &&
+			strpos($salt, '$2x$') !== 0 &&
+			strpos($salt, '$2a$') !== 0
+		);
+		if ($salt === true || $invalidCipher || strlen($salt) < 29) {
 			trigger_error(__d(
 				'cake_dev',
 				'Invalid salt: %s for %s Please visit http://www.php.net/crypt and read the appropriate section for building %s salts.',
@@ -302,7 +307,7 @@ class Security {
  * @throws CakeException On invalid data or key.
  */
 	public static function encrypt($plain, $key, $hmacSalt = null) {
-		self::_checkKey($key, 'encrypt()');
+		static::_checkKey($key, 'encrypt()');
 
 		if ($hmacSalt === null) {
 			$hmacSalt = Configure::read('Security.salt');
@@ -324,7 +329,7 @@ class Security {
 /**
  * Check the encryption key for proper length.
  *
- * @param string $key
+ * @param string $key Key to check.
  * @param string $method The method the key is being checked for.
  * @return void
  * @throws CakeException When key length is not 256 bit/32 bytes
@@ -345,7 +350,7 @@ class Security {
  * @throws CakeException On invalid data or key.
  */
 	public static function decrypt($cipher, $key, $hmacSalt = null) {
-		self::_checkKey($key, 'decrypt()');
+		static::_checkKey($key, 'decrypt()');
 		if (empty($cipher)) {
 			throw new CakeException(__d('cake_dev', 'The data to decrypt cannot be empty.'));
 		}
diff --git a/web/api/lib/Cake/Utility/Set.php b/web/api/lib/Cake/Utility/Set.php
index 1e685f49b..10750c1c6 100644
--- a/web/api/lib/Cake/Utility/Set.php
+++ b/web/api/lib/Cake/Utility/Set.php
@@ -16,14 +16,14 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('Hash', 'Utility');
 
 /**
  * Class used for manipulation of arrays.
  *
  * @package       Cake.Utility
- * @deprecated Will be removed in 3.0. Use Hash instead.
+ * @deprecated 3.0.0 Will be removed in 3.0. Use Hash instead.
  */
 class Set {
 
@@ -97,7 +97,7 @@ class Set {
  *
  * @param string $class A class name of the type of object to map to
  * @param string $tmp A temporary class name used as $class if $class is an array
- * @return object Hierarchical object
+ * @return object|null Hierarchical object
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::map
  */
 	public static function map($class = 'stdClass', $tmp = 'stdClass') {
@@ -120,9 +120,9 @@ class Set {
  * returned object (recursively). If $key is numeric will maintain array
  * structure
  *
- * @param array $array Array to map
+ * @param array &$array Array to map
  * @param string $class Class name
- * @param boolean $primary whether to assign first array key as the _name_
+ * @param bool $primary whether to assign first array key as the _name_
  * @return mixed Mapped object
  */
 	protected static function _map(&$array, $class, $primary = false) {
@@ -186,7 +186,7 @@ class Set {
  * Checks to see if all the values in the array are numeric
  *
  * @param array $array The array to check. If null, the value of the current Set object
- * @return boolean true if values are numeric, false otherwise
+ * @return bool true if values are numeric, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::numeric
  */
 	public static function numeric($array = null) {
@@ -228,7 +228,7 @@ class Set {
  * @param array $data Source array from which to extract the data
  * @param string $format Format string into which values will be inserted, see sprintf()
  * @param array $keys An array containing one or more Set::extract()-style key paths
- * @return array An array of strings extracted from $keys and formatted with $format
+ * @return array|null An array of strings extracted from $keys and formatted with $format, otherwise null.
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::format
  */
 	public static function format($data, $format, $keys) {
@@ -236,7 +236,7 @@ class Set {
 		$count = count($keys);
 
 		if (!$count) {
-			return;
+			return null;
 		}
 
 		for ($i = 0; $i < $count; $i++) {
@@ -457,9 +457,9 @@ class Set {
  *
  * @param string|array $conditions An array of condition strings or an XPath expression
  * @param array $data An array of data to execute the match on
- * @param integer $i Optional: The 'nth'-number of the item being matched.
- * @param integer $length
- * @return boolean
+ * @param int $i Optional: The 'nth'-number of the item being matched.
+ * @param int $length Length.
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::matches
  */
 	public static function matches($conditions, $data = array(), $i = null, $length = null) {
@@ -549,7 +549,7 @@ class Set {
 			return null;
 		}
 		if (is_string($path) && strpos($path, '{') !== false) {
-			$path = String::tokenize($path, '.', '{', '}');
+			$path = CakeText::tokenize($path, '.', '{', '}');
 		} elseif (is_string($path)) {
 			$path = explode('.', $path);
 		}
@@ -560,7 +560,7 @@ class Set {
 		}
 
 		foreach ($path as $i => $key) {
-			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
+			if (is_numeric($key) && (int)$key > 0 || $key === '0') {
 				if (isset($data[$key])) {
 					$data = $data[$key];
 				} else {
@@ -645,7 +645,7 @@ class Set {
  *
  * @param string|array $data Data to check on
  * @param string|array $path A dot-separated string.
- * @return boolean true if path is found, false otherwise
+ * @return bool true if path is found, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::check
  */
 	public static function check($data, $path = null) {
@@ -657,8 +657,8 @@ class Set {
 		}
 
 		foreach ($path as $i => $key) {
-			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
-				$key = intval($key);
+			if (is_numeric($key) && (int)$key > 0 || $key === '0') {
+				$key = (int)$key;
 			}
 			if ($i === count($path) - 1) {
 				return (is_array($data) && array_key_exists($key, $data));
@@ -705,7 +705,7 @@ class Set {
  *
  * @param array $val1 First value
  * @param array $val2 Second value
- * @return boolean true if $val1 contains $val2, false otherwise
+ * @return bool true if $val1 contains $val2, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::contains
  */
 	public static function contains($val1, $val2 = null) {
@@ -730,9 +730,9 @@ class Set {
  * only consider the dimension of the first element in the array.
  *
  * @param array $array Array to count dimensions on
- * @param boolean $all Set to true to count the dimension considering all elements in array
- * @param integer $count Start the dimension count at this number
- * @return integer The number of dimensions in $array
+ * @param bool $all Set to true to count the dimension considering all elements in array
+ * @param int $count Start the dimension count at this number
+ * @return int The number of dimensions in $array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::countDim
  */
 	public static function countDim($array, $all = false, $count = 0) {
@@ -758,9 +758,9 @@ class Set {
  * Normalizes a string or array list.
  *
  * @param mixed $list List to normalize
- * @param boolean $assoc If true, $list will be converted to an associative array
+ * @param bool $assoc If true, $list will be converted to an associative array
  * @param string $sep If $list is a string, it will be split into an array with $sep
- * @param boolean $trim If true, separated strings will be trimmed
+ * @param bool $trim If true, separated strings will be trimmed
  * @return array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::normalize
  */
@@ -851,6 +851,7 @@ class Set {
 
 /**
  * Converts an object into an array.
+ *
  * @param object $object Object to reverse
  * @return array Array representation of given object
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::reverse
@@ -909,7 +910,7 @@ class Set {
 	}
 
 /**
- * Expand/unflattens an string to an array
+ * Expand/unflattens a string to an array
  *
  * For example, unflattens an array that was collapsed with `Set::flatten()`
  * into a multi-dimensional array. So, `array('0.Foo.Bar' => 'Far')` becomes
@@ -926,8 +927,8 @@ class Set {
 /**
  * Flattens an array for sorting
  *
- * @param array $results
- * @param string $key
+ * @param array $results Array to flatten.
+ * @param string $key Key.
  * @return array
  */
 	protected static function _flatten($results, $key = null) {
@@ -1026,7 +1027,7 @@ class Set {
 /**
  * Takes in a flat array and returns a nested array
  *
- * @param mixed $data
+ * @param mixed $data Data
  * @param array $options Options are:
  *      children   - the key name to use in the resultset for children
  *      idPath     - the path to a key that identifies each entry
diff --git a/web/api/lib/Cake/Utility/String.php b/web/api/lib/Cake/Utility/String.php
index 4731337f5..bacb45f41 100644
--- a/web/api/lib/Cake/Utility/String.php
+++ b/web/api/lib/Cake/Utility/String.php
@@ -15,676 +15,13 @@
  * @since         CakePHP(tm) v 1.2.0.5551
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+App::uses('CakeText', 'Utility');
 
 /**
  * String handling methods.
  *
- *
- * @package       Cake.Utility
+ * @package Cake.Utility
+ * @deprecated 3.0.0 Deprecated since version 2.7, use CakeText class instead.
  */
-class String {
-
-/**
- * Generate a random UUID
- *
- * @see http://www.ietf.org/rfc/rfc4122.txt
- * @return RFC 4122 UUID
- */
-	public static function uuid() {
-		$node = env('SERVER_ADDR');
-
-		if (strpos($node, ':') !== false) {
-			if (substr_count($node, '::')) {
-				$node = str_replace(
-					'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
-				);
-			}
-			$node = explode(':', $node);
-			$ipSix = '';
-
-			foreach ($node as $id) {
-				$ipSix .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT);
-			}
-			$node = base_convert($ipSix, 2, 10);
-
-			if (strlen($node) < 38) {
-				$node = null;
-			} else {
-				$node = crc32($node);
-			}
-		} elseif (empty($node)) {
-			$host = env('HOSTNAME');
-
-			if (empty($host)) {
-				$host = env('HOST');
-			}
-
-			if (!empty($host)) {
-				$ip = gethostbyname($host);
-
-				if ($ip === $host) {
-					$node = crc32($host);
-				} else {
-					$node = ip2long($ip);
-				}
-			}
-		} elseif ($node !== '127.0.0.1') {
-			$node = ip2long($node);
-		} else {
-			$node = null;
-		}
-
-		if (empty($node)) {
-			$node = crc32(Configure::read('Security.salt'));
-		}
-
-		if (function_exists('hphp_get_thread_id')) {
-			$pid = hphp_get_thread_id();
-		} elseif (function_exists('zend_thread_id')) {
-			$pid = zend_thread_id();
-		} else {
-			$pid = getmypid();
-		}
-
-		if (!$pid || $pid > 65535) {
-			$pid = mt_rand(0, 0xfff) | 0x4000;
-		}
-
-		list($timeMid, $timeLow) = explode(' ', microtime());
-		return sprintf(
-			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff,
-			mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node
-		);
-	}
-
-/**
- * Tokenizes a string using $separator, ignoring any instance of $separator that appears between
- * $leftBound and $rightBound.
- *
- * @param string $data The data to tokenize.
- * @param string $separator The token to split the data on.
- * @param string $leftBound The left boundary to ignore separators in.
- * @param string $rightBound The right boundary to ignore separators in.
- * @return mixed Array of tokens in $data or original input if empty.
- */
-	public static function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') {
-		if (empty($data)) {
-			return array();
-		}
-
-		$depth = 0;
-		$offset = 0;
-		$buffer = '';
-		$results = array();
-		$length = strlen($data);
-		$open = false;
-
-		while ($offset <= $length) {
-			$tmpOffset = -1;
-			$offsets = array(
-				strpos($data, $separator, $offset),
-				strpos($data, $leftBound, $offset),
-				strpos($data, $rightBound, $offset)
-			);
-			for ($i = 0; $i < 3; $i++) {
-				if ($offsets[$i] !== false && ($offsets[$i] < $tmpOffset || $tmpOffset == -1)) {
-					$tmpOffset = $offsets[$i];
-				}
-			}
-			if ($tmpOffset !== -1) {
-				$buffer .= substr($data, $offset, ($tmpOffset - $offset));
-				if (!$depth && $data{$tmpOffset} == $separator) {
-					$results[] = $buffer;
-					$buffer = '';
-				} else {
-					$buffer .= $data{$tmpOffset};
-				}
-				if ($leftBound != $rightBound) {
-					if ($data{$tmpOffset} == $leftBound) {
-						$depth++;
-					}
-					if ($data{$tmpOffset} == $rightBound) {
-						$depth--;
-					}
-				} else {
-					if ($data{$tmpOffset} == $leftBound) {
-						if (!$open) {
-							$depth++;
-							$open = true;
-						} else {
-							$depth--;
-						}
-					}
-				}
-				$offset = ++$tmpOffset;
-			} else {
-				$results[] = $buffer . substr($data, $offset);
-				$offset = $length + 1;
-			}
-		}
-		if (empty($results) && !empty($buffer)) {
-			$results[] = $buffer;
-		}
-
-		if (!empty($results)) {
-			return array_map('trim', $results);
-		}
-
-		return array();
-	}
-
-/**
- * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array
- * corresponds to a variable placeholder name in $str.
- * Example: `String::insert(':name is :age years old.', array('name' => 'Bob', '65'));`
- * Returns: Bob is 65 years old.
- *
- * Available $options are:
- *
- * - before: The character or string in front of the name of the variable placeholder (Defaults to `:`)
- * - after: The character or string after the name of the variable placeholder (Defaults to null)
- * - escape: The character or string used to escape the before character / string (Defaults to `\`)
- * - format: A regex to use for matching variable placeholders. Default is: `/(?<!\\)\:%s/`
- *   (Overwrites before, after, breaks escape / clean)
- * - clean: A boolean or array with instructions for String::cleanInsert
- *
- * @param string $str A string containing variable placeholders
- * @param array $data A key => val array where each key stands for a placeholder variable name
- *     to be replaced with val
- * @param array $options An array of options, see description above
- * @return string
- */
-	public static function insert($str, $data, $options = array()) {
-		$defaults = array(
-			'before' => ':', 'after' => null, 'escape' => '\\', 'format' => null, 'clean' => false
-		);
-		$options += $defaults;
-		$format = $options['format'];
-		$data = (array)$data;
-		if (empty($data)) {
-			return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
-		}
-
-		if (!isset($format)) {
-			$format = sprintf(
-				'/(?<!%s)%s%%s%s/',
-				preg_quote($options['escape'], '/'),
-				str_replace('%', '%%', preg_quote($options['before'], '/')),
-				str_replace('%', '%%', preg_quote($options['after'], '/'))
-			);
-		}
-
-		if (strpos($str, '?') !== false && is_numeric(key($data))) {
-			$offset = 0;
-			while (($pos = strpos($str, '?', $offset)) !== false) {
-				$val = array_shift($data);
-				$offset = $pos + strlen($val);
-				$str = substr_replace($str, $val, $pos, 1);
-			}
-			return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
-		}
-
-		asort($data);
-
-		$dataKeys = array_keys($data);
-		$hashKeys = array_map('crc32', $dataKeys);
-		$tempData = array_combine($dataKeys, $hashKeys);
-		krsort($tempData);
-
-		foreach ($tempData as $key => $hashVal) {
-			$key = sprintf($format, preg_quote($key, '/'));
-			$str = preg_replace($key, $hashVal, $str);
-		}
-		$dataReplacements = array_combine($hashKeys, array_values($data));
-		foreach ($dataReplacements as $tmpHash => $tmpValue) {
-			$tmpValue = (is_array($tmpValue)) ? '' : $tmpValue;
-			$str = str_replace($tmpHash, $tmpValue, $str);
-		}
-
-		if (!isset($options['format']) && isset($options['before'])) {
-			$str = str_replace($options['escape'] . $options['before'], $options['before'], $str);
-		}
-		return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
-	}
-
-/**
- * Cleans up a String::insert() formatted string with given $options depending on the 'clean' key in
- * $options. The default method used is text but html is also available. The goal of this function
- * is to replace all whitespace and unneeded markup around placeholders that did not get replaced
- * by String::insert().
- *
- * @param string $str
- * @param array $options
- * @return string
- * @see String::insert()
- */
-	public static function cleanInsert($str, $options) {
-		$clean = $options['clean'];
-		if (!$clean) {
-			return $str;
-		}
-		if ($clean === true) {
-			$clean = array('method' => 'text');
-		}
-		if (!is_array($clean)) {
-			$clean = array('method' => $options['clean']);
-		}
-		switch ($clean['method']) {
-			case 'html':
-				$clean = array_merge(array(
-					'word' => '[\w,.]+',
-					'andText' => true,
-					'replacement' => '',
-				), $clean);
-				$kleenex = sprintf(
-					'/[\s]*[a-z]+=(")(%s%s%s[\s]*)+\\1/i',
-					preg_quote($options['before'], '/'),
-					$clean['word'],
-					preg_quote($options['after'], '/')
-				);
-				$str = preg_replace($kleenex, $clean['replacement'], $str);
-				if ($clean['andText']) {
-					$options['clean'] = array('method' => 'text');
-					$str = String::cleanInsert($str, $options);
-				}
-				break;
-			case 'text':
-				$clean = array_merge(array(
-					'word' => '[\w,.]+',
-					'gap' => '[\s]*(?:(?:and|or)[\s]*)?',
-					'replacement' => '',
-				), $clean);
-
-				$kleenex = sprintf(
-					'/(%s%s%s%s|%s%s%s%s)/',
-					preg_quote($options['before'], '/'),
-					$clean['word'],
-					preg_quote($options['after'], '/'),
-					$clean['gap'],
-					$clean['gap'],
-					preg_quote($options['before'], '/'),
-					$clean['word'],
-					preg_quote($options['after'], '/')
-				);
-				$str = preg_replace($kleenex, $clean['replacement'], $str);
-				break;
-		}
-		return $str;
-	}
-
-/**
- * Wraps text to a specific width, can optionally wrap at word breaks.
- *
- * ### Options
- *
- * - `width` The width to wrap to. Defaults to 72.
- * - `wordWrap` Only wrap on words breaks (spaces) Defaults to true.
- * - `indent` String to indent with. Defaults to null.
- * - `indentAt` 0 based index to start indenting at. Defaults to 0.
- *
- * @param string $text The text to format.
- * @param array|integer $options Array of options to use, or an integer to wrap the text to.
- * @return string Formatted text.
- */
-	public static function wrap($text, $options = array()) {
-		if (is_numeric($options)) {
-			$options = array('width' => $options);
-		}
-		$options += array('width' => 72, 'wordWrap' => true, 'indent' => null, 'indentAt' => 0);
-		if ($options['wordWrap']) {
-			$wrapped = self::wordWrap($text, $options['width'], "\n");
-		} else {
-			$wrapped = trim(chunk_split($text, $options['width'] - 1, "\n"));
-		}
-		if (!empty($options['indent'])) {
-			$chunks = explode("\n", $wrapped);
-			for ($i = $options['indentAt'], $len = count($chunks); $i < $len; $i++) {
-				$chunks[$i] = $options['indent'] . $chunks[$i];
-			}
-			$wrapped = implode("\n", $chunks);
-		}
-		return $wrapped;
-	}
-
-/**
- * Unicode aware version of wordwrap.
- *
- * @param string $text The text to format.
- * @param integer $width The width to wrap to. Defaults to 72.
- * @param string $break The line is broken using the optional break parameter. Defaults to '\n'.
- * @param boolean $cut If the cut is set to true, the string is always wrapped at the specified width.
- * @return string Formatted text.
- */
-	public static function wordWrap($text, $width = 72, $break = "\n", $cut = false) {
-		if ($cut) {
-			$parts = array();
-			while (mb_strlen($text) > 0) {
-				$part = mb_substr($text, 0, $width);
-				$parts[] = trim($part);
-				$text = trim(mb_substr($text, mb_strlen($part)));
-			}
-			return implode($break, $parts);
-		}
-
-		$parts = array();
-		while (mb_strlen($text) > 0) {
-			if ($width >= mb_strlen($text)) {
-				$parts[] = trim($text);
-				break;
-			}
-
-			$part = mb_substr($text, 0, $width);
-			$nextChar = mb_substr($text, $width, 1);
-			if ($nextChar !== ' ') {
-				$breakAt = mb_strrpos($part, ' ');
-				if ($breakAt === false) {
-					$breakAt = mb_strpos($text, ' ', $width);
-				}
-				if ($breakAt === false) {
-					$parts[] = trim($text);
-					break;
-				}
-				$part = mb_substr($text, 0, $breakAt);
-			}
-
-			$part = trim($part);
-			$parts[] = $part;
-			$text = trim(mb_substr($text, mb_strlen($part)));
-		}
-
-		return implode($break, $parts);
-	}
-
-/**
- * Highlights a given phrase in a text. You can specify any expression in highlighter that
- * may include the \1 expression to include the $phrase found.
- *
- * ### Options:
- *
- * - `format` The piece of html with that the phrase will be highlighted
- * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted
- * - `regex` a custom regex rule that is used to match words, default is '|$tag|iu'
- *
- * @param string $text Text to search the phrase in.
- * @param string|array $phrase The phrase or phrases that will be searched.
- * @param array $options An array of html attributes and options.
- * @return string The highlighted text
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight
- */
-	public static function highlight($text, $phrase, $options = array()) {
-		if (empty($phrase)) {
-			return $text;
-		}
-
-		$defaults = array(
-			'format' => '<span class="highlight">\1</span>',
-			'html' => false,
-			'regex' => "|%s|iu"
-		);
-		$options += $defaults;
-		extract($options);
-
-		if (is_array($phrase)) {
-			$replace = array();
-			$with = array();
-
-			foreach ($phrase as $key => $segment) {
-				$segment = '(' . preg_quote($segment, '|') . ')';
-				if ($html) {
-					$segment = "(?![^<]+>)$segment(?![^<]+>)";
-				}
-
-				$with[] = (is_array($format)) ? $format[$key] : $format;
-				$replace[] = sprintf($options['regex'], $segment);
-			}
-
-			return preg_replace($replace, $with, $text);
-		}
-
-		$phrase = '(' . preg_quote($phrase, '|') . ')';
-		if ($html) {
-			$phrase = "(?![^<]+>)$phrase(?![^<]+>)";
-		}
-
-		return preg_replace(sprintf($options['regex'], $phrase), $format, $text);
-	}
-
-/**
- * Strips given text of all links (<a href=....).
- *
- * @param string $text Text
- * @return string The text without links
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::stripLinks
- */
-	public static function stripLinks($text) {
-		return preg_replace('|<a\s+[^>]+>|im', '', preg_replace('|<\/a>|im', '', $text));
-	}
-
-/**
- * Truncates text starting from the end.
- *
- * Cuts a string to the length of $length and replaces the first characters
- * with the ellipsis if the text is longer than length.
- *
- * ### Options:
- *
- * - `ellipsis` Will be used as Beginning and prepended to the trimmed string
- * - `exact` If false, $text will not be cut mid-word
- *
- * @param string $text String to truncate.
- * @param integer $length Length of returned string, including ellipsis.
- * @param array $options An array of options.
- * @return string Trimmed string.
- */
-	public static function tail($text, $length = 100, $options = array()) {
-		$defaults = array(
-			'ellipsis' => '...', 'exact' => true
-		);
-		$options += $defaults;
-		extract($options);
-
-		if (!function_exists('mb_strlen')) {
-			class_exists('Multibyte');
-		}
-
-		if (mb_strlen($text) <= $length) {
-			return $text;
-		}
-
-		$truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis));
-		if (!$exact) {
-			$spacepos = mb_strpos($truncate, ' ');
-			$truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos));
-		}
-
-		return $ellipsis . $truncate;
-	}
-
-/**
- * Truncates text.
- *
- * Cuts a string to the length of $length and replaces the last characters
- * with the ellipsis if the text is longer than length.
- *
- * ### Options:
- *
- * - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated)
- * - `exact` If false, $text will not be cut mid-word
- * - `html` If true, HTML tags would be handled correctly
- *
- * @param string $text String to truncate.
- * @param integer $length Length of returned string, including ellipsis.
- * @param array $options An array of html attributes and options.
- * @return string Trimmed string.
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate
- */
-	public static function truncate($text, $length = 100, $options = array()) {
-		$defaults = array(
-			'ellipsis' => '...', 'exact' => true, 'html' => false
-		);
-		if (isset($options['ending'])) {
-			$defaults['ellipsis'] = $options['ending'];
-		} elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
-			$defaults['ellipsis'] = "\xe2\x80\xa6";
-		}
-		$options += $defaults;
-		extract($options);
-
-		if (!function_exists('mb_strlen')) {
-			class_exists('Multibyte');
-		}
-
-		if ($html) {
-			if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
-				return $text;
-			}
-			$totalLength = mb_strlen(strip_tags($ellipsis));
-			$openTags = array();
-			$truncate = '';
-
-			preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
-			foreach ($tags as $tag) {
-				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
-					if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
-						array_unshift($openTags, $tag[2]);
-					} elseif (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
-						$pos = array_search($closeTag[1], $openTags);
-						if ($pos !== false) {
-							array_splice($openTags, $pos, 1);
-						}
-					}
-				}
-				$truncate .= $tag[1];
-
-				$contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3]));
-				if ($contentLength + $totalLength > $length) {
-					$left = $length - $totalLength;
-					$entitiesLength = 0;
-					if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) {
-						foreach ($entities[0] as $entity) {
-							if ($entity[1] + 1 - $entitiesLength <= $left) {
-								$left--;
-								$entitiesLength += mb_strlen($entity[0]);
-							} else {
-								break;
-							}
-						}
-					}
-
-					$truncate .= mb_substr($tag[3], 0, $left + $entitiesLength);
-					break;
-				} else {
-					$truncate .= $tag[3];
-					$totalLength += $contentLength;
-				}
-				if ($totalLength >= $length) {
-					break;
-				}
-			}
-		} else {
-			if (mb_strlen($text) <= $length) {
-				return $text;
-			}
-			$truncate = mb_substr($text, 0, $length - mb_strlen($ellipsis));
-		}
-		if (!$exact) {
-			$spacepos = mb_strrpos($truncate, ' ');
-			if ($html) {
-				$truncateCheck = mb_substr($truncate, 0, $spacepos);
-				$lastOpenTag = mb_strrpos($truncateCheck, '<');
-				$lastCloseTag = mb_strrpos($truncateCheck, '>');
-				if ($lastOpenTag > $lastCloseTag) {
-					preg_match_all('/<[\w]+[^>]*>/s', $truncate, $lastTagMatches);
-					$lastTag = array_pop($lastTagMatches[0]);
-					$spacepos = mb_strrpos($truncate, $lastTag) + mb_strlen($lastTag);
-				}
-				$bits = mb_substr($truncate, $spacepos);
-				preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
-				if (!empty($droppedTags)) {
-					if (!empty($openTags)) {
-						foreach ($droppedTags as $closingTag) {
-							if (!in_array($closingTag[1], $openTags)) {
-								array_unshift($openTags, $closingTag[1]);
-							}
-						}
-					} else {
-						foreach ($droppedTags as $closingTag) {
-							$openTags[] = $closingTag[1];
-						}
-					}
-				}
-			}
-			$truncate = mb_substr($truncate, 0, $spacepos);
-		}
-		$truncate .= $ellipsis;
-
-		if ($html) {
-			foreach ($openTags as $tag) {
-				$truncate .= '</' . $tag . '>';
-			}
-		}
-
-		return $truncate;
-	}
-
-/**
- * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side
- * determined by radius.
- *
- * @param string $text String to search the phrase in
- * @param string $phrase Phrase that will be searched for
- * @param integer $radius The amount of characters that will be returned on each side of the founded phrase
- * @param string $ellipsis Ending that will be appended
- * @return string Modified string
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt
- */
-	public static function excerpt($text, $phrase, $radius = 100, $ellipsis = '...') {
-		if (empty($text) || empty($phrase)) {
-			return self::truncate($text, $radius * 2, array('ellipsis' => $ellipsis));
-		}
-
-		$append = $prepend = $ellipsis;
-
-		$phraseLen = mb_strlen($phrase);
-		$textLen = mb_strlen($text);
-
-		$pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase));
-		if ($pos === false) {
-			return mb_substr($text, 0, $radius) . $ellipsis;
-		}
-
-		$startPos = $pos - $radius;
-		if ($startPos <= 0) {
-			$startPos = 0;
-			$prepend = '';
-		}
-
-		$endPos = $pos + $phraseLen + $radius;
-		if ($endPos >= $textLen) {
-			$endPos = $textLen;
-			$append = '';
-		}
-
-		$excerpt = mb_substr($text, $startPos, $endPos - $startPos);
-		$excerpt = $prepend . $excerpt . $append;
-
-		return $excerpt;
-	}
-
-/**
- * Creates a comma separated list where the last two items are joined with 'and', forming natural English
- *
- * @param array $list The list to be joined
- * @param string $and The word used to join the last and second last items together with. Defaults to 'and'
- * @param string $separator The separator used to join all the other items together. Defaults to ', '
- * @return string The glued together string.
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList
- */
-	public static function toList($list, $and = 'and', $separator = ', ') {
-		if (count($list) > 1) {
-			return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
-		}
-
-		return array_pop($list);
-	}
+class String extends CakeText {
 }
diff --git a/web/api/lib/Cake/Utility/Validation.php b/web/api/lib/Cake/Utility/Validation.php
index 766b62820..2f20d2739 100644
--- a/web/api/lib/Cake/Utility/Validation.php
+++ b/web/api/lib/Cake/Utility/Validation.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -50,6 +48,19 @@ class Validation {
  */
 	public static $errors = array();
 
+/**
+ * Backwards compatibility wrapper for Validation::notBlank().
+ *
+ * @param string|array $check Value to check.
+ * @return bool Success.
+ * @deprecated 2.7.0 Use Validation::notBlank() instead.
+ * @see Validation::notBlank()
+ */
+	public static function notEmpty($check) {
+		trigger_error('Validation::notEmpty() is deprecated. Use Validation::notBlank() instead.', E_USER_DEPRECATED);
+		return static::notBlank($check);
+	}
+
 /**
  * Checks that a string contains something other than whitespace
  *
@@ -59,17 +70,16 @@ class Validation {
  * array('check' => 'valueToCheck');
  *
  * @param string|array $check Value to check
- * @return boolean Success
+ * @return bool Success
  */
-	public static function notEmpty($check) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
-		if (empty($check) && $check != '0') {
+	public static function notBlank($check) {
+		if (!is_scalar($check)) {
 			return false;
 		}
-		return self::_check($check, '/[^\s]+/m');
+		if (empty($check) && (string)$check !== '0') {
+			return false;
+		}
+		return static::_check($check, '/[^\s]+/m');
 	}
 
 /**
@@ -81,17 +91,13 @@ class Validation {
  * array('check' => 'valueToCheck');
  *
  * @param string|array $check Value to check
- * @return boolean Success
+ * @return bool Success
  */
 	public static function alphaNumeric($check) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
 		if (empty($check) && $check != '0') {
 			return false;
 		}
-		return self::_check($check, '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/Du');
+		return static::_check($check, '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/Du');
 	}
 
 /**
@@ -100,15 +106,29 @@ class Validation {
  * Returns true is string matches value min, max, or between min and max,
  *
  * @param string $check Value to check for length
- * @param integer $min Minimum value in range (inclusive)
- * @param integer $max Maximum value in range (inclusive)
- * @return boolean Success
+ * @param int $min Minimum value in range (inclusive)
+ * @param int $max Maximum value in range (inclusive)
+ * @return bool Success
  */
-	public static function between($check, $min, $max) {
+	public static function lengthBetween($check, $min, $max) {
 		$length = mb_strlen($check);
 		return ($length >= $min && $length <= $max);
 	}
 
+/**
+ * Alias of Validator::lengthBetween() for backwards compatibility.
+ *
+ * @param string $check Value to check for length
+ * @param int $min Minimum value in range (inclusive)
+ * @param int $max Maximum value in range (inclusive)
+ * @return bool Success
+ * @see Validator::lengthBetween()
+ * @deprecated Deprecated 2.6. Use Validator::lengthBetween() instead.
+ */
+	public static function between($check, $min, $max) {
+		return static::lengthBetween($check, $min, $max);
+	}
+
 /**
  * Returns true if field is left blank -OR- only whitespace characters are present in its value
  * Whitespace characters include Space, Tab, Carriage Return, Newline
@@ -117,13 +137,10 @@ class Validation {
  * array('check' => 'valueToCheck');
  *
  * @param string|array $check Value to check
- * @return boolean Success
+ * @return bool Success
  */
 	public static function blank($check) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-		return !self::_check($check, '/[^\\s]/');
+		return !static::_check($check, '/[^\\s]/');
 	}
 
 /**
@@ -131,17 +148,18 @@ class Validation {
  * Returns true if $check is in the proper credit card format.
  *
  * @param string|array $check credit card number to validate
- * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit cards
+ * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit
+ * cards
  *    if an array is used only the values of the array are checked.
  *    Example: array('amex', 'bankcard', 'maestro')
- * @param boolean $deep set to true this will check the Luhn algorithm of the credit card.
+ * @param bool $deep set to true this will check the Luhn algorithm of the credit card.
  * @param string $regex A custom regex can also be passed, this will be used instead of the defined regex values
- * @return boolean Success
+ * @return bool Success
  * @see Validation::luhn()
  */
 	public static function cc($check, $type = 'fast', $deep = false, $regex = null) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
+		if (!is_scalar($check)) {
+			return false;
 		}
 
 		$check = str_replace(array('-', ' '), '', $check);
@@ -150,8 +168,8 @@ class Validation {
 		}
 
 		if ($regex !== null) {
-			if (self::_check($check, $regex)) {
-				return self::luhn($check, $deep);
+			if (static::_check($check, $regex)) {
+				return static::luhn($check, $deep);
 			}
 		}
 		$cards = array(
@@ -166,34 +184,36 @@ class Validation {
 				'maestro'	=> '/^(?:5020|6\\d{3})\\d{12}$/',
 				'mc'		=> '/^5[1-5]\\d{14}$/',
 				'solo'		=> '/^(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?$/',
-				'switch'	=> '/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
+				'switch'	=>
+				'/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
 				'visa'		=> '/^4\\d{12}(\\d{3})?$/',
 				'voyager'	=> '/^8699[0-9]{11}$/'
 			),
-			'fast' => '/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/'
+			'fast' =>
+			'/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/'
 		);
 
 		if (is_array($type)) {
 			foreach ($type as $value) {
 				$regex = $cards['all'][strtolower($value)];
 
-				if (self::_check($check, $regex)) {
-					return self::luhn($check, $deep);
+				if (static::_check($check, $regex)) {
+					return static::luhn($check, $deep);
 				}
 			}
 		} elseif ($type === 'all') {
 			foreach ($cards['all'] as $value) {
 				$regex = $value;
 
-				if (self::_check($check, $regex)) {
-					return self::luhn($check, $deep);
+				if (static::_check($check, $regex)) {
+					return static::luhn($check, $deep);
 				}
 			}
 		} else {
 			$regex = $cards['fast'];
 
-			if (self::_check($check, $regex)) {
-				return self::luhn($check, $deep);
+			if (static::_check($check, $regex)) {
+				return static::luhn($check, $deep);
 			}
 		}
 		return false;
@@ -207,12 +227,12 @@ class Validation {
  * @param string $operator Can be either a word or operand
  *    is greater >, is less <, greater or equal >=
  *    less or equal <=, is less <, equal to ==, not equal !=
- * @param integer $check2 only needed if $check1 is a string
- * @return boolean Success
+ * @param int $check2 only needed if $check1 is a string
+ * @return bool Success
  */
 	public static function comparison($check1, $operator = null, $check2 = null) {
-		if (is_array($check1)) {
-			extract($check1, EXTR_OVERWRITE);
+		if ((float)$check1 != $check1) {
+			return false;
 		}
 		$operator = str_replace(array(' ', "\t", "\n", "\r", "\0", "\x0B"), '', strtolower($operator));
 
@@ -254,7 +274,7 @@ class Validation {
 				}
 				break;
 			default:
-				self::$errors[] = __d('cake_dev', 'You must define the $operator parameter for %s', 'Validation::comparison()');
+				static::$errors[] = __d('cake_dev', 'You must define the $operator parameter for %s', 'Validation::comparison()');
 		}
 		return false;
 	}
@@ -265,22 +285,24 @@ class Validation {
  * @param string|array $check When used as a string, $regex must also be a valid regular expression.
  *    As and array: array('check' => value, 'regex' => 'valid regular expression')
  * @param string $regex If $check is passed as a string, $regex must also be set to valid regular expression
- * @return boolean Success
+ * @return bool Success
  */
 	public static function custom($check, $regex = null) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-		if ($regex === null) {
-			self::$errors[] = __d('cake_dev', 'You must define a regular expression for %s', 'Validation::custom()');
+		if (!is_scalar($check)) {
 			return false;
 		}
-		return self::_check($check, $regex);
+		if ($regex === null) {
+			static::$errors[] = __d('cake_dev', 'You must define a regular expression for %s', 'Validation::custom()');
+			return false;
+		}
+		return static::_check($check, $regex);
 	}
 
 /**
  * Date validation, determines if the string passed is a valid date.
- * keys that expect full month, day and year will validate leap years
+ * keys that expect full month, day and year will validate leap years.
+ *
+ * Years are valid from 1800 to 2999.
  *
  * ### Formats:
  *
@@ -298,15 +320,15 @@ class Validation {
  * @param string|array $format Use a string or an array of the keys above.
  *    Arrays should be passed as array('dmy', 'mdy', etc)
  * @param string $regex If a custom regular expression is used this is the only validation that will occur.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function date($check, $format = 'ymd', $regex = null) {
 		if ($regex !== null) {
-			return self::_check($check, $regex);
+			return static::_check($check, $regex);
 		}
 		$month = '(0[123456789]|10|11|12)';
 		$separator = '([- /.])';
-		$fourDigitYear = '(([1][9][0-9][0-9])|([2][0-9][0-9][0-9]))';
+		$fourDigitYear = '(([1][8-9][0-9][0-9])|([2][0-9][0-9][0-9]))';
 		$twoDigitYear = '([0-9]{2})';
 		$year = '(?:' . $fourDigitYear . '|' . $twoDigitYear . ')';
 
@@ -336,7 +358,7 @@ class Validation {
 
 		$format = (is_array($format)) ? array_values($format) : array($format);
 		foreach ($format as $key) {
-			if (self::_check($check, $regex[$key]) === true) {
+			if (static::_check($check, $regex[$key]) === true) {
 				return true;
 			}
 		}
@@ -351,7 +373,7 @@ class Validation {
  * @param string $check Value to check
  * @param string|array $dateFormat Format of the date part. See Validation::date for more information.
  * @param string $regex Regex for the date part. If a custom regular expression is used this is the only validation that will occur.
- * @return boolean True if the value is valid, false otherwise
+ * @return bool True if the value is valid, false otherwise
  * @see Validation::date
  * @see Validation::time
  */
@@ -361,7 +383,7 @@ class Validation {
 		if (!empty($parts) && count($parts) > 1) {
 			$time = array_pop($parts);
 			$date = implode(' ', $parts);
-			$valid = self::date($date, $dateFormat, $regex) && self::time($time);
+			$valid = static::date($date, $dateFormat, $regex) && static::time($time);
 		}
 		return $valid;
 	}
@@ -372,17 +394,17 @@ class Validation {
  * Does not allow/validate seconds.
  *
  * @param string $check a valid time string
- * @return boolean Success
+ * @return bool Success
  */
 	public static function time($check) {
-		return self::_check($check, '%^((0?[1-9]|1[012])(:[0-5]\d){0,2} ?([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%');
+		return static::_check($check, '%^((0?[1-9]|1[012])(:[0-5]\d){0,2} ?([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%');
 	}
 
 /**
  * Boolean validation, determines if value passed is a boolean integer or true/false.
  *
  * @param string $check a valid boolean
- * @return boolean Success
+ * @return bool Success
  */
 	public static function boolean($check) {
 		$booleanList = array(0, 1, '0', '1', true, false);
@@ -398,10 +420,10 @@ class Validation {
  * - true => Any number of decimal places greater than 0, or a float|double. The '.' is required.
  * - 1..N => Exactly that many number of decimal places. The '.' is required.
  *
- * @param float $check The value the test for decimal
- * @param integer $places
+ * @param float $check The value the test for decimal.
+ * @param int $places Decimal places.
  * @param string $regex If a custom regular expression is used, this is the only validation that will occur.
- * @return boolean Success
+ * @return bool Success
  */
 	public static function decimal($check, $places = null, $regex = null) {
 		if ($regex === null) {
@@ -431,34 +453,30 @@ class Validation {
 		$check = str_replace($data['thousands_sep'], '', $check);
 		$check = str_replace($data['decimal_point'], '.', $check);
 
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
  * Validates for an email address.
  *
  * Only uses getmxrr() checking for deep validation if PHP 5.3.0+ is used, or
- * any PHP version on a non-windows distribution
+ * any PHP version on a non-Windows distribution
  *
  * @param string $check Value to check
- * @param boolean $deep Perform a deeper validation (if true), by also checking availability of host
+ * @param bool $deep Perform a deeper validation (if true), by also checking availability of host
  * @param string $regex Regex to use (if none it will use built in regex)
- * @return boolean Success
+ * @return bool Success
  */
 	public static function email($check, $deep = false, $regex = null) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
 		if ($regex === null) {
-			$regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . self::$_pattern['hostname'] . '$/ui';
+			$regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . static::$_pattern['hostname'] . '$/ui';
 		}
-		$return = self::_check($check, $regex);
+		$return = static::_check($check, $regex);
 		if ($deep === false || $deep === null) {
 			return $return;
 		}
 
-		if ($return === true && preg_match('/@(' . self::$_pattern['hostname'] . ')$/i', $check, $regs)) {
+		if ($return === true && preg_match('/@(' . static::$_pattern['hostname'] . ')$/i', $check, $regs)) {
 			if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) {
 				return true;
 			}
@@ -475,7 +493,7 @@ class Validation {
  *
  * @param mixed $check Value to check
  * @param mixed $comparedTo Value to compare
- * @return boolean Success
+ * @return bool Success
  */
 	public static function equalTo($check, $comparedTo) {
 		return ($check === $comparedTo);
@@ -486,11 +504,11 @@ class Validation {
  *
  * @param string|array $check Value to check
  * @param array $extensions file extensions to allow. By default extensions are 'gif', 'jpeg', 'png', 'jpg'
- * @return boolean Success
+ * @return bool Success
  */
 	public static function extension($check, $extensions = array('gif', 'jpeg', 'png', 'jpg')) {
 		if (is_array($check)) {
-			return self::extension(array_shift($check), $extensions);
+			return static::extension(array_shift($check), $extensions);
 		}
 		$extension = strtolower(pathinfo($check, PATHINFO_EXTENSION));
 		foreach ($extensions as $value) {
@@ -506,7 +524,7 @@ class Validation {
  *
  * @param string $check The string to test.
  * @param string $type The IP Protocol version to validate against
- * @return boolean Success
+ * @return bool Success
  */
 	public static function ip($check, $type = 'both') {
 		$type = strtolower($type);
@@ -524,8 +542,8 @@ class Validation {
  * Checks whether the length of a string is greater or equal to a minimal length.
  *
  * @param string $check The string to test
- * @param integer $min The minimal string length
- * @return boolean Success
+ * @param int $min The minimal string length
+ * @return bool Success
  */
 	public static function minLength($check, $min) {
 		return mb_strlen($check) >= $min;
@@ -535,8 +553,8 @@ class Validation {
  * Checks whether the length of a string is smaller or equal to a maximal length..
  *
  * @param string $check The string to test
- * @param integer $max The maximal string length
- * @return boolean Success
+ * @param int $max The maximal string length
+ * @return bool Success
  */
 	public static function maxLength($check, $max) {
 		return mb_strlen($check) <= $max;
@@ -547,7 +565,7 @@ class Validation {
  *
  * @param string $check Value to check
  * @param string $symbolPosition Where symbol is located (left/right)
- * @return boolean Success
+ * @return bool Success
  */
 	public static function money($check, $symbolPosition = 'left') {
 		$money = '(?!0,?\d)(?:\d{1,3}(?:([, .])\d{3})?(?:\1\d{3})*|(?:\d+))((?!\1)[,.]\d{1,2})?';
@@ -556,7 +574,7 @@ class Validation {
 		} else {
 			$regex = '/^(?!\x{00a2})\p{Sc}?' . $money . '$/u';
 		}
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -570,14 +588,14 @@ class Validation {
  *
  * @param array $check Value to check
  * @param array $options Options for the check.
- * @param boolean $caseInsensitive Set to true for case insensitive comparison.
- * @return boolean Success
+ * @param bool $caseInsensitive Set to true for case insensitive comparison.
+ * @return bool Success
  */
 	public static function multiple($check, $options = array(), $caseInsensitive = false) {
 		$defaults = array('in' => null, 'max' => null, 'min' => null);
 		$options += $defaults;
 
-		$check = array_filter((array)$check);
+		$check = array_filter((array)$check, 'strlen');
 		if (empty($check)) {
 			return false;
 		}
@@ -608,7 +626,7 @@ class Validation {
  * Checks if a value is numeric.
  *
  * @param string $check Value to check
- * @return boolean Success
+ * @return bool Success
  */
 	public static function numeric($check) {
 		return is_numeric($check);
@@ -618,13 +636,13 @@ class Validation {
  * Checks if a value is a natural number.
  *
  * @param string $check Value to check
- * @param boolean $allowZero Set true to allow zero, defaults to false
- * @return boolean Success
+ * @param bool $allowZero Set true to allow zero, defaults to false
+ * @return bool Success
  * @see http://en.wikipedia.org/wiki/Natural_number
  */
 	public static function naturalNumber($check, $allowZero = false) {
 		$regex = $allowZero ? '/^(?:0|[1-9][0-9]*)$/' : '/^[1-9][0-9]*$/';
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -633,13 +651,9 @@ class Validation {
  * @param string|array $check Value to check (string or array)
  * @param string $regex Regular expression to use
  * @param string $country Country code (defaults to 'all')
- * @return boolean Success
+ * @return bool Success
  */
 	public static function phone($check, $regex = null, $country = 'all') {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
 		if ($regex === null) {
 			switch ($country) {
 				case 'us':
@@ -667,9 +681,9 @@ class Validation {
 			}
 		}
 		if (empty($regex)) {
-			return self::_pass('phone', $check, $country);
+			return static::_pass('phone', $check, $country);
 		}
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -678,13 +692,9 @@ class Validation {
  * @param string|array $check Value to check
  * @param string $regex Regular expression to use
  * @param string $country Country to use for formatting
- * @return boolean Success
+ * @return bool Success
  */
 	public static function postal($check, $regex = null, $country = 'us') {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
 		if ($regex === null) {
 			switch ($country) {
 				case 'uk':
@@ -708,9 +718,9 @@ class Validation {
 			}
 		}
 		if (empty($regex)) {
-			return self::_pass('postal', $check, $country);
+			return static::_pass('postal', $check, $country);
 		}
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -719,14 +729,17 @@ class Validation {
  * $check is a legal finite on this platform
  *
  * @param string $check Value to check
- * @param integer $lower Lower limit
- * @param integer $upper Upper limit
- * @return boolean Success
+ * @param int|float $lower Lower limit
+ * @param int|float $upper Upper limit
+ * @return bool Success
  */
 	public static function range($check, $lower = null, $upper = null) {
 		if (!is_numeric($check)) {
 			return false;
 		}
+		if ((float)$check != $check) {
+			return false;
+		}
 		if (isset($lower) && isset($upper)) {
 			return ($check > $lower && $check < $upper);
 		}
@@ -739,13 +752,10 @@ class Validation {
  * @param string|array $check Value to check
  * @param string $regex Regular expression to use
  * @param string $country Country
- * @return boolean Success
+ * @return bool Success
+ * @deprecated Deprecated 2.6. Will be removed in 3.0.
  */
 	public static function ssn($check, $regex = null, $country = null) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
-		}
-
 		if ($regex === null) {
 			switch ($country) {
 				case 'dk':
@@ -760,9 +770,9 @@ class Validation {
 			}
 		}
 		if (empty($regex)) {
-			return self::_pass('ssn', $check, $country);
+			return static::_pass('ssn', $check, $country);
 		}
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -779,18 +789,18 @@ class Validation {
  * - an optional fragment (anchor tag)
  *
  * @param string $check Value to check
- * @param boolean $strict Require URL to be prefixed by a valid scheme (one of http(s)/ftp(s)/file/news/gopher)
- * @return boolean Success
+ * @param bool $strict Require URL to be prefixed by a valid scheme (one of http(s)/ftp(s)/file/news/gopher)
+ * @return bool Success
  */
 	public static function url($check, $strict = false) {
-		self::_populateIp();
+		static::_populateIp();
 		$validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=~[]') . '\/0-9\p{L}\p{N}]|(%[0-9a-f]{2}))';
 		$regex = '/^(?:(?:https?|ftps?|sftp|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') .
-			'(?:' . self::$_pattern['IPv4'] . '|\[' . self::$_pattern['IPv6'] . '\]|' . self::$_pattern['hostname'] . ')(?::[1-9][0-9]{0,4})?' .
+			'(?:' . static::$_pattern['IPv4'] . '|\[' . static::$_pattern['IPv6'] . '\]|' . static::$_pattern['hostname'] . ')(?::[1-9][0-9]{0,4})?' .
 			'(?:\/?|\/' . $validChars . '*)?' .
 			'(?:\?' . $validChars . '*)?' .
 			'(?:#' . $validChars . '*)?$/iu';
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -798,18 +808,17 @@ class Validation {
  *
  * @param string $check Value to check.
  * @param array $list List to check against.
- * @param boolean $caseInsensitive Set to true for case insensitive comparison.
- * @return boolean Success.
+ * @param bool $caseInsensitive Set to true for case insensitive comparison.
+ * @return bool Success.
  */
 	public static function inList($check, $list, $caseInsensitive = false) {
-		$strict = !is_numeric($check);
-
 		if ($caseInsensitive) {
 			$list = array_map('mb_strtolower', $list);
 			$check = mb_strtolower($check);
+		} else {
+			$list = array_map('strval', $list);
 		}
-
-		return in_array((string)$check, $list, $strict);
+		return in_array((string)$check, $list, true);
 	}
 
 /**
@@ -829,11 +838,11 @@ class Validation {
  * Checks that a value is a valid UUID - http://tools.ietf.org/html/rfc4122
  *
  * @param string $check Value to check
- * @return boolean Success
+ * @return bool Success
  */
 	public static function uuid($check) {
 		$regex = '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[0-5][a-fA-F0-9]{3}-[089aAbB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$/';
-		return self::_check($check, $regex);
+		return static::_check($check, $regex);
 	}
 
 /**
@@ -865,49 +874,26 @@ class Validation {
  *
  * @param string $check Value to check against the $regex expression
  * @param string $regex Regular expression
- * @return boolean Success of match
+ * @return bool Success of match
  */
 	protected static function _check($check, $regex) {
-		if (is_string($regex) && preg_match($regex, $check)) {
+		if (is_string($regex) && is_scalar($check) && preg_match($regex, $check)) {
 			return true;
 		}
 		return false;
 	}
 
-/**
- * Get the values to use when value sent to validation method is
- * an array.
- *
- * @param array $params Parameters sent to validation method
- * @return void
- */
-	protected static function _defaults($params) {
-		self::_reset();
-		$defaults = array(
-			'check' => null,
-			'regex' => null,
-			'country' => null,
-			'deep' => false,
-			'type' => null
-		);
-		$params += $defaults;
-		if ($params['country'] !== null) {
-			$params['country'] = mb_strtolower($params['country']);
-		}
-		return $params;
-	}
-
 /**
  * Luhn algorithm
  *
- * @param string|array $check
- * @param boolean $deep
- * @return boolean Success
+ * @param string|array $check Value to check.
+ * @param bool $deep If true performs deep check.
+ * @return bool Success
  * @see http://en.wikipedia.org/wiki/Luhn_algorithm
  */
 	public static function luhn($check, $deep = false) {
-		if (is_array($check)) {
-			extract(self::_defaults($check));
+		if (!is_scalar($check)) {
+			return false;
 		}
 		if ($deep !== true) {
 			return true;
@@ -933,9 +919,9 @@ class Validation {
 /**
  * Checks the mime type of a file.
  *
- * @param string|array $check
+ * @param string|array $check Value to check.
  * @param array|string $mimeTypes Array of mime types or regex pattern to check.
- * @return boolean Success
+ * @return bool Success
  * @throws CakeException when mime type can not be determined.
  */
 	public static function mimeType($check, $mimeTypes = array()) {
@@ -951,7 +937,7 @@ class Validation {
 		}
 
 		if (is_string($mimeTypes)) {
-			return self::_check($mime, $mimeTypes);
+			return static::_check($mime, $mimeTypes);
 		}
 
 		foreach ($mimeTypes as $key => $val) {
@@ -963,10 +949,10 @@ class Validation {
 /**
  * Checks the filesize
  *
- * @param string|array $check
- * @param integer|string $size Size in bytes or human readable string like '5MB'
- * @param string $operator See `Validation::comparison()`
- * @return boolean Success
+ * @param string|array $check Value to check.
+ * @param string $operator See `Validation::comparison()`.
+ * @param int|string $size Size in bytes or human readable string like '5MB'.
+ * @return bool Success
  */
 	public static function fileSize($check, $operator = null, $size = null) {
 		if (is_array($check) && isset($check['tmp_name'])) {
@@ -978,31 +964,87 @@ class Validation {
 		}
 		$filesize = filesize($check);
 
-		return self::comparison($filesize, $operator, $size);
+		return static::comparison($filesize, $operator, $size);
 	}
 
 /**
  * Checking for upload errors
  *
- * @param string|array $check
- * @return boolean
+ * @param string|array $check Value to check.
+ * @param bool $allowNoFile Set to true to allow UPLOAD_ERR_NO_FILE as a pass.
+ * @return bool
  * @see http://www.php.net/manual/en/features.file-upload.errors.php
  */
-	public static function uploadError($check) {
+	public static function uploadError($check, $allowNoFile = false) {
 		if (is_array($check) && isset($check['error'])) {
 			$check = $check['error'];
 		}
+		if ($allowNoFile) {
+			return in_array((int)$check, array(UPLOAD_ERR_OK, UPLOAD_ERR_NO_FILE), true);
+		}
 
 		return (int)$check === UPLOAD_ERR_OK;
 	}
 
+/**
+ * Validate an uploaded file.
+ *
+ * Helps join `uploadError`, `fileSize` and `mimeType` into
+ * one higher level validation method.
+ *
+ * ### Options
+ *
+ * - `types` - A list of valid mime types. If empty all types
+ *   will be accepted. The `type` will not be looked at, instead
+ *   the file type will be checked with ext/finfo.
+ * - `minSize` - The minimum file size. Defaults to not checking.
+ * - `maxSize` - The maximum file size. Defaults to not checking.
+ * - `optional` - Whether or not this file is optional. Defaults to false.
+ *   If true a missing file will pass the validator regardless of other constraints.
+ *
+ * @param array $file The uploaded file data from PHP.
+ * @param array $options An array of options for the validation.
+ * @return bool
+ */
+	public static function uploadedFile($file, $options = array()) {
+		$options += array(
+			'minSize' => null,
+			'maxSize' => null,
+			'types' => null,
+			'optional' => false,
+		);
+		if (!is_array($file)) {
+			return false;
+		}
+		$keys = array('name', 'tmp_name', 'error', 'type', 'size');
+		if (array_keys($file) != $keys) {
+			return false;
+		}
+		if (!static::uploadError($file, $options['optional'])) {
+			return false;
+		}
+		if ($options['optional'] && (int)$file['error'] === UPLOAD_ERR_NO_FILE) {
+			return true;
+		}
+		if (isset($options['minSize']) && !static::fileSize($file, '>=', $options['minSize'])) {
+			return false;
+		}
+		if (isset($options['maxSize']) && !static::fileSize($file, '<=', $options['maxSize'])) {
+			return false;
+		}
+		if (isset($options['types']) && !static::mimeType($file, $options['types'])) {
+			return false;
+		}
+		return true;
+	}
+
 /**
  * Lazily populate the IP address patterns used for validations
  *
  * @return void
  */
 	protected static function _populateIp() {
-		if (!isset(self::$_pattern['IPv6'])) {
+		if (!isset(static::$_pattern['IPv6'])) {
 			$pattern = '((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}';
 			$pattern .= '(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})';
 			$pattern .= '|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})';
@@ -1018,11 +1060,11 @@ class Validation {
 			$pattern .= '\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4})';
 			$pattern .= '{1,2})))|(((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))(%.+)?';
 
-			self::$_pattern['IPv6'] = $pattern;
+			static::$_pattern['IPv6'] = $pattern;
 		}
-		if (!isset(self::$_pattern['IPv4'])) {
+		if (!isset(static::$_pattern['IPv4'])) {
 			$pattern = '(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])';
-			self::$_pattern['IPv4'] = $pattern;
+			static::$_pattern['IPv4'] = $pattern;
 		}
 	}
 
@@ -1032,7 +1074,7 @@ class Validation {
  * @return void
  */
 	protected static function _reset() {
-		self::$errors = array();
+		static::$errors = array();
 	}
 
 }
diff --git a/web/api/lib/Cake/Utility/Xml.php b/web/api/lib/Cake/Utility/Xml.php
index 7a95760fb..95bb4659e 100644
--- a/web/api/lib/Cake/Utility/Xml.php
+++ b/web/api/lib/Cake/Utility/Xml.php
@@ -52,7 +52,7 @@ class Xml {
  *
  * Building from an array:
  *
- * {{{
+ * ```
  * 	$value = array(
  * 		'tags' => array(
  * 			'tag' => array(
@@ -68,7 +68,7 @@ class Xml {
  * 		)
  * 	);
  * $xml = Xml::build($value);
- * }}}
+ * ```
  *
  * When building XML from an array ensure that there is only one top level element.
  *
@@ -77,6 +77,9 @@ class Xml {
  * - `return` Can be 'simplexml' to return object of SimpleXMLElement or 'domdocument' to return DOMDocument.
  * - `loadEntities` Defaults to false. Set to true to enable loading of `<!ENTITY` definitions. This
  *   is disabled by default for security reasons.
+ * - `readFile` Set to false to disable file reading. This is important to disable when
+ *   putting user data into Xml::build(). If enabled local & remote files will be read if they exist.
+ *   Defaults to true for backwards compatibility reasons.
  * - If using array as input, you can pass `options` from Xml::fromArray.
  *
  * @param string|array $input XML string, a path to a file, a URL or an array
@@ -91,23 +94,24 @@ class Xml {
 		$defaults = array(
 			'return' => 'simplexml',
 			'loadEntities' => false,
+			'readFile' => true
 		);
 		$options += $defaults;
 
 		if (is_array($input) || is_object($input)) {
-			return self::fromArray((array)$input, $options);
+			return static::fromArray((array)$input, $options);
 		} elseif (strpos($input, '<') !== false) {
-			return self::_loadXml($input, $options);
-		} elseif (file_exists($input)) {
-			return self::_loadXml(file_get_contents($input), $options);
-		} elseif (strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) {
+			return static::_loadXml($input, $options);
+		} elseif ($options['readFile'] && file_exists($input)) {
+			return static::_loadXml(file_get_contents($input), $options);
+		} elseif ($options['readFile'] && strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) {
 			try {
 				$socket = new HttpSocket(array('request' => array('redirect' => 10)));
 				$response = $socket->get($input);
 				if (!$response->isOk()) {
 					throw new XmlException(__d('cake_dev', 'XML cannot be read.'));
 				}
-				return self::_loadXml($response->body, $options);
+				return static::_loadXml($response->body, $options);
 			} catch (SocketException $e) {
 				throw new XmlException(__d('cake_dev', 'XML cannot be read.'));
 			}
@@ -156,7 +160,7 @@ class Xml {
  *
  * ### Options
  *
- * - `format` If create childs ('tags') or attributes ('attribute').
+ * - `format` If create childs ('tags') or attributes ('attributes').
  * - `pretty` Returns formatted Xml when set to `true`. Defaults to `false`
  * - `version` Version of XML document. Default is 1.0.
  * - `encoding` Encoding of XML document. If null remove from XML header. Default is the some of application.
@@ -164,7 +168,7 @@ class Xml {
  *
  * Using the following data:
  *
- * {{{
+ * ```
  * $value = array(
  *    'root' => array(
  *        'tag' => array(
@@ -174,13 +178,13 @@ class Xml {
  *         )
  *     )
  * );
- * }}}
+ * ```
  *
  * Calling `Xml::fromArray($value, 'tags');`  Will generate:
  *
  * `<root><tag><id>1</id><value>defect</value>description</tag></root>`
  *
- * And calling `Xml::fromArray($value, 'attribute');` Will generate:
+ * And calling `Xml::fromArray($value, 'attributes');` Will generate:
  *
  * `<root><tag id="1" value="defect">description</tag></root>`
  *
@@ -214,7 +218,7 @@ class Xml {
 		if ($options['pretty']) {
 			$dom->formatOutput = true;
 		}
-		self::_fromArray($dom, $dom, $input, $options['format']);
+		static::_fromArray($dom, $dom, $input, $options['format']);
 
 		$options['return'] = strtolower($options['return']);
 		if ($options['return'] === 'simplexml' || $options['return'] === 'simplexmlelement') {
@@ -228,8 +232,8 @@ class Xml {
  *
  * @param DOMDocument $dom Handler to DOMDocument
  * @param DOMElement $node Handler to DOMElement (child)
- * @param array $data Array of data to append to the $node.
- * @param string $format Either 'attribute' or 'tags'. This determines where nested keys go.
+ * @param array &$data Array of data to append to the $node.
+ * @param string $format Either 'attributes' or 'tags'. This determines where nested keys go.
  * @return void
  * @throws XmlException
  */
@@ -278,10 +282,10 @@ class Xml {
 						foreach ($value as $item) {
 							$itemData = compact('dom', 'node', 'key', 'format');
 							$itemData['value'] = $item;
-							self::_createChild($itemData);
+							static::_createChild($itemData);
 						}
 					} else { // Struct
-						self::_createChild(compact('dom', 'node', 'key', 'value', 'format'));
+						static::_createChild(compact('dom', 'node', 'key', 'value', 'format'));
 					}
 				}
 			} else {
@@ -320,12 +324,12 @@ class Xml {
 			$child->setAttribute('xmlns', $childNS);
 		}
 
-		self::_fromArray($dom, $child, $value, $format);
+		static::_fromArray($dom, $child, $value, $format);
 		$node->appendChild($child);
 	}
 
 /**
- * Returns this XML structure as a array.
+ * Returns this XML structure as an array.
  *
  * @param SimpleXMLElement|DOMDocument|DOMNode $obj SimpleXMLElement, DOMDocument or DOMNode instance
  * @return array Array representation of the XML structure.
@@ -340,7 +344,7 @@ class Xml {
 		}
 		$result = array();
 		$namespaces = array_merge(array('' => ''), $obj->getNamespaces(true));
-		self::_toArray($obj, $result, '', array_keys($namespaces));
+		static::_toArray($obj, $result, '', array_keys($namespaces));
 		return $result;
 	}
 
@@ -348,7 +352,7 @@ class Xml {
  * Recursive method to toArray
  *
  * @param SimpleXMLElement $xml SimpleXMLElement object
- * @param array $parentData Parent array with data
+ * @param array &$parentData Parent array with data
  * @param string $ns Namespace of current child
  * @param array $namespaces List of namespaces in XML
  * @return void
@@ -365,7 +369,7 @@ class Xml {
 			}
 
 			foreach ($xml->children($namespace, true) as $child) {
-				self::_toArray($child, $data, $namespace, $namespaces);
+				static::_toArray($child, $data, $namespace, $namespaces);
 			}
 		}
 
diff --git a/web/api/lib/Cake/VERSION.txt b/web/api/lib/Cake/VERSION.txt
index d93087dc5..d1eb33bc6 100644
--- a/web/api/lib/Cake/VERSION.txt
+++ b/web/api/lib/Cake/VERSION.txt
@@ -17,4 +17,4 @@
 // @license       http://www.opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-2.5.0-RC1
+2.8.0
diff --git a/web/api/lib/Cake/View/Elements/Flash/default.ctp b/web/api/lib/Cake/View/Elements/Flash/default.ctp
new file mode 100644
index 000000000..820340ed4
--- /dev/null
+++ b/web/api/lib/Cake/View/Elements/Flash/default.ctp
@@ -0,0 +1,7 @@
+<?php
+$class = 'message';
+if (!empty($params['class'])) {
+    $class .= ' ' . $params['class'];
+}
+?>
+<div id="<?php echo h($key) ?>Message" class="<?php echo h($class) ?>"><?php echo h($message) ?></div>
diff --git a/web/api/lib/Cake/View/Elements/Flash/error.ctp b/web/api/lib/Cake/View/Elements/Flash/error.ctp
new file mode 100644
index 000000000..278321458
--- /dev/null
+++ b/web/api/lib/Cake/View/Elements/Flash/error.ctp
@@ -0,0 +1 @@
+<div id="<?php echo h($key) ?>Message" class="message error"><?php echo h($message) ?></div>
diff --git a/web/api/lib/Cake/View/Elements/Flash/success.ctp b/web/api/lib/Cake/View/Elements/Flash/success.ctp
new file mode 100644
index 000000000..dd2f8e528
--- /dev/null
+++ b/web/api/lib/Cake/View/Elements/Flash/success.ctp
@@ -0,0 +1 @@
+<div id="<?php echo h($key) ?>Message" class="message success"><?php echo h($message) ?></div>
diff --git a/web/api/lib/Cake/View/Elements/exception_stack_trace.ctp b/web/api/lib/Cake/View/Elements/exception_stack_trace.ctp
index 224e5e6fa..e8f1912da 100644
--- a/web/api/lib/Cake/View/Elements/exception_stack_trace.ctp
+++ b/web/api/lib/Cake/View/Elements/exception_stack_trace.ctp
@@ -45,7 +45,7 @@ App::uses('Debugger', 'Utility');
 		if (!empty($stack['args'])):
 			foreach ((array)$stack['args'] as $arg):
 				$args[] = Debugger::getType($arg);
-				$params[] = Debugger::exportVar($arg, 2);
+				$params[] = Debugger::exportVar($arg, 4);
 			endforeach;
 		endif;
 
diff --git a/web/api/lib/Cake/View/Errors/fatal_error.ctp b/web/api/lib/Cake/View/Errors/fatal_error.ctp
index fc0e3ec58..8749a8f5a 100644
--- a/web/api/lib/Cake/View/Errors/fatal_error.ctp
+++ b/web/api/lib/Cake/View/Errors/fatal_error.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -34,3 +32,8 @@
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'fatal_error.ctp'); ?>
 </p>
+<?php
+if (extension_loaded('xdebug')) {
+	xdebug_print_function_stack();
+}
+?>
\ No newline at end of file
diff --git a/web/api/lib/Cake/View/Errors/missing_action.ctp b/web/api/lib/Cake/View/Errors/missing_action.ctp
index 75b41a2da..edc831124 100644
--- a/web/api/lib/Cake/View/Errors/missing_action.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_action.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -40,4 +38,6 @@ class <?php echo h($controller); ?> extends AppController {
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_action.ctp'); ?>
 </p>
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
\ No newline at end of file
diff --git a/web/api/lib/Cake/View/Errors/missing_behavior.ctp b/web/api/lib/Cake/View/Errors/missing_behavior.ctp
index 2bd13cc5f..e018ae73b 100644
--- a/web/api/lib/Cake/View/Errors/missing_behavior.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_behavior.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -38,4 +36,6 @@ class <?php echo h($class); ?> extends ModelBehavior {
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_behavior.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
\ No newline at end of file
diff --git a/web/api/lib/Cake/View/Errors/missing_component.ctp b/web/api/lib/Cake/View/Errors/missing_component.ctp
index ae72b0ea7..3ecc31554 100644
--- a/web/api/lib/Cake/View/Errors/missing_component.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_component.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -25,7 +23,7 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';
 </p>
 <p class="error">
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
-	<?php echo __d('cake_dev', 'Create the class %s below in file: %s', '<em>' . h($class) . '</em>', (empty($plugin) ? APP_DIR : CakePlugin::path($plugin)) . DS . 'Controller' . DS . 'Component' . DS . h($class) . '.php'); ?>
+	<?php echo __d('cake_dev', 'Create the class %s below in file: %s', '<em>' . h($class) . '</em>', (empty($plugin) ? APP_DIR . DS : CakePlugin::path($plugin)) . 'Controller' . DS . 'Component' . DS . h($class) . '.php'); ?>
 </p>
 <pre>
 &lt;?php
@@ -38,4 +36,6 @@ class <?php echo h($class); ?> extends Component {
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_component.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_connection.ctp b/web/api/lib/Cake/View/Errors/missing_connection.ctp
index 440b33d6e..6773e955f 100644
--- a/web/api/lib/Cake/View/Errors/missing_connection.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_connection.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
diff --git a/web/api/lib/Cake/View/Errors/missing_controller.ctp b/web/api/lib/Cake/View/Errors/missing_controller.ctp
index 4f6b53d00..8bfc90b7e 100644
--- a/web/api/lib/Cake/View/Errors/missing_controller.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_controller.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -38,4 +36,6 @@ class <?php echo h($class . ' extends ' . $plugin); ?>AppController {
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_controller.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_database.ctp b/web/api/lib/Cake/View/Errors/missing_database.ctp
index 2eda169a3..adca10936 100644
--- a/web/api/lib/Cake/View/Errors/missing_database.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_database.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -30,4 +28,6 @@
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_database.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_datasource.ctp b/web/api/lib/Cake/View/Errors/missing_datasource.ctp
index 0bc50b2f1..e8558e57c 100644
--- a/web/api/lib/Cake/View/Errors/missing_datasource.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_datasource.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -22,7 +20,7 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';
 <p class="error">
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
 	<?php echo __d('cake_dev', 'Datasource class %s could not be found.', '<em>' . h($pluginDot . $class) . '</em>'); ?>
-	<?php if (isset($message)):  ?>
+	<?php if (isset($message)): ?>
 		<?php echo h($message); ?>
 	<?php endif; ?>
 </p>
@@ -31,4 +29,6 @@ $pluginDot = empty($plugin) ? null : $plugin . '.';
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_datasource.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_datasource_config.ctp b/web/api/lib/Cake/View/Errors/missing_datasource_config.ctp
index c94a76327..115bdc7ba 100644
--- a/web/api/lib/Cake/View/Errors/missing_datasource_config.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_datasource_config.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -26,4 +24,6 @@
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_datasource_config.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_helper.ctp b/web/api/lib/Cake/View/Errors/missing_helper.ctp
index 02a76ff82..6e2dc0d67 100644
--- a/web/api/lib/Cake/View/Errors/missing_helper.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_helper.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -38,4 +36,6 @@ class <?php echo h($class); ?> extends AppHelper {
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_helper.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_layout.ctp b/web/api/lib/Cake/View/Errors/missing_layout.ctp
index fb366635e..cf1b53e10 100644
--- a/web/api/lib/Cake/View/Errors/missing_layout.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_layout.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -21,13 +19,28 @@
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
 	<?php echo __d('cake_dev', 'The layout file %s can not be found or does not exist.', '<em>' . h($file) . '</em>'); ?>
 </p>
-<p class="error">
-	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
-	<?php echo __d('cake_dev', 'Confirm you have created the file: %s', '<em>' . h($file) . '</em>'); ?>
+
+<p>
+	<?php echo __d('cake_dev', 'Confirm you have created the file: %s', h($file)); ?>
+	in one of the following paths:
 </p>
+<ul>
+<?php
+	$paths = $this->_paths($this->plugin);
+	foreach ($paths as $path):
+		if (strpos($path, CORE_PATH) !== false) {
+			continue;
+		}
+		echo sprintf('<li>%s%s</li>', h($path), h($file));
+	endforeach;
+?>
+</ul>
+
 <p class="notice">
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_layout.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_plugin.ctp b/web/api/lib/Cake/View/Errors/missing_plugin.ctp
index 35db6a7ae..3e7b4d1c3 100644
--- a/web/api/lib/Cake/View/Errors/missing_plugin.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_plugin.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -42,4 +40,6 @@ CakePlugin::loadAll();
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_plugin.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_table.ctp b/web/api/lib/Cake/View/Errors/missing_table.ctp
index 5139600d1..5fcf2ac32 100644
--- a/web/api/lib/Cake/View/Errors/missing_table.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_table.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -19,11 +17,13 @@
 <h2><?php echo __d('cake_dev', 'Missing Database Table'); ?></h2>
 <p class="error">
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
-	<?php echo __d('cake_dev', 'Table %1$s for model %2$s was not found in datasource %3$s.', '<em>' . h($table) . '</em>',  '<em>' . h($class) . '</em>', '<em>' . h($ds) . '</em>'); ?>
+	<?php echo __d('cake_dev', 'Table %1$s for model %2$s was not found in datasource %3$s.', '<em>' . h($table) . '</em>', '<em>' . h($class) . '</em>', '<em>' . h($ds) . '</em>'); ?>
 </p>
 <p class="notice">
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_table.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/missing_view.ctp b/web/api/lib/Cake/View/Errors/missing_view.ctp
index d9188b3ed..208afffe7 100644
--- a/web/api/lib/Cake/View/Errors/missing_view.ctp
+++ b/web/api/lib/Cake/View/Errors/missing_view.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -21,13 +19,28 @@
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
 	<?php echo __d('cake_dev', 'The view for %1$s%2$s was not found.', '<em>' . h(Inflector::camelize($this->request->controller)) . 'Controller::</em>', '<em>' . h($this->request->action) . '()</em>'); ?>
 </p>
-<p class="error">
-	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
+
+<p>
 	<?php echo __d('cake_dev', 'Confirm you have created the file: %s', h($file)); ?>
+	in one of the following paths:
 </p>
+<ul>
+<?php
+	$paths = $this->_paths($this->plugin);
+	foreach ($paths as $path):
+		if (strpos($path, CORE_PATH) !== false) {
+			continue;
+		}
+		echo sprintf('<li>%s%s</li>', h($path), h($file));
+	endforeach;
+?>
+</ul>
+
 <p class="notice">
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'missing_view.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/pdo_error.ctp b/web/api/lib/Cake/View/Errors/pdo_error.ctp
index 1efdb4b7c..2f8d4aa2b 100644
--- a/web/api/lib/Cake/View/Errors/pdo_error.ctp
+++ b/web/api/lib/Cake/View/Errors/pdo_error.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -35,4 +33,6 @@
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'pdo_error.ctp'); ?>
 </p>
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/private_action.ctp b/web/api/lib/Cake/View/Errors/private_action.ctp
index 096a36f65..0fd185855 100644
--- a/web/api/lib/Cake/View/Errors/private_action.ctp
+++ b/web/api/lib/Cake/View/Errors/private_action.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -26,4 +24,6 @@
 	<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'View' . DS . 'Errors' . DS . 'private_action.ctp'); ?>
 </p>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+echo $this->element('exception_stack_trace');
+?>
diff --git a/web/api/lib/Cake/View/Errors/scaffold_error.ctp b/web/api/lib/Cake/View/Errors/scaffold_error.ctp
index c2e1fe36a..9cfe10490 100644
--- a/web/api/lib/Cake/View/Errors/scaffold_error.ctp
+++ b/web/api/lib/Cake/View/Errors/scaffold_error.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -33,4 +31,8 @@ function _scaffoldError() {<br />
 
 </pre>
 
-<?php echo $this->element('exception_stack_trace'); ?>
+<?php
+if (isset($error) && $error instanceof Exception) {
+	echo $this->element('exception_stack_trace');
+}
+?>
\ No newline at end of file
diff --git a/web/api/lib/Cake/View/Helper.php b/web/api/lib/Cake/View/Helper.php
index 165ad6681..35aefff44 100644
--- a/web/api/lib/Cake/View/Helper.php
+++ b/web/api/lib/Cake/View/Helper.php
@@ -145,9 +145,48 @@ class Helper extends Object {
  * @var array
  */
 	protected $_minimizedAttributes = array(
-		'compact', 'checked', 'declare', 'readonly', 'disabled', 'selected',
-		'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize',
-		'autoplay', 'controls', 'loop', 'muted', 'required', 'novalidate', 'formnovalidate'
+		'allowfullscreen',
+		'async',
+		'autofocus',
+		'autoplay',
+		'checked',
+		'compact',
+		'controls',
+		'declare',
+		'default',
+		'defaultchecked',
+		'defaultmuted',
+		'defaultselected',
+		'defer',
+		'disabled',
+		'enabled',
+		'formnovalidate',
+		'hidden',
+		'indeterminate',
+		'inert',
+		'ismap',
+		'itemscope',
+		'loop',
+		'multiple',
+		'muted',
+		'nohref',
+		'noresize',
+		'noshade',
+		'novalidate',
+		'nowrap',
+		'open',
+		'pauseonexit',
+		'readonly',
+		'required',
+		'reversed',
+		'scoped',
+		'seamless',
+		'selected',
+		'sortable',
+		'spellcheck',
+		'truespeed',
+		'typemustmatch',
+		'visible'
 	);
 
 /**
@@ -197,7 +236,7 @@ class Helper extends Object {
  *
  * @param string $name Name of the property being accessed.
  * @return mixed Helper or property found at $name
- * @deprecated Accessing request properties through this method is deprecated and will be removed in 3.0.
+ * @deprecated 3.0.0 Accessing request properties through this method is deprecated and will be removed in 3.0.
  */
 	public function __get($name) {
 		if (isset($this->_helperMap[$name]) && !isset($this->{$name})) {
@@ -224,9 +263,9 @@ class Helper extends Object {
  * Provides backwards compatibility access for setting values to the request object.
  *
  * @param string $name Name of the property being accessed.
- * @param mixed $value
+ * @param mixed $value Value to set.
  * @return void
- * @deprecated This method will be removed in 3.0
+ * @deprecated 3.0.0 This method will be removed in 3.0
  */
 	public function __set($name, $value) {
 		switch ($name) {
@@ -251,7 +290,7 @@ class Helper extends Object {
  * @param string|array $url Either a relative string url like `/products/view/23` or
  *    an array of URL parameters. Using an array for URLs will allow you to leverage
  *    the reverse routing features of CakePHP.
- * @param boolean $full If true, the full base URL will be prepended to the result
+ * @param bool $full If true, the full base URL will be prepended to the result
  * @return string Full translated URL with base path.
  * @link http://book.cakephp.org/2.0/en/views/helpers.html
  */
@@ -299,7 +338,7 @@ class Helper extends Object {
  * Generate URL for given asset file. Depending on options passed provides full URL with domain name.
  * Also calls Helper::assetTimestamp() to add timestamp to local files
  *
- * @param string|array Path string or URL array
+ * @param string|array $path Path string or URL array
  * @param array $options Options array. Possible keys:
  *   `fullBase` Return full URL with domain name
  *   `pathPrefix` Path prefix for relative URLs
@@ -320,8 +359,7 @@ class Helper extends Object {
 		if (!empty($options['pathPrefix']) && $path[0] !== '/') {
 			$path = $options['pathPrefix'] . $path;
 		}
-		if (
-			!empty($options['ext']) &&
+		if (!empty($options['ext']) &&
 			strpos($path, '?') === false &&
 			substr($path, -strlen($options['ext'])) !== $options['ext']
 		) {
@@ -406,8 +444,8 @@ class Helper extends Object {
  * content is the best way to prevent all possible attacks.
  *
  * @param string|array $output Either an array of strings to clean or a single string to clean.
- * @return string|array cleaned content for output
- * @deprecated This method will be removed in 3.0
+ * @return string|array|null Cleaned content for output
+ * @deprecated 3.0.0 This method will be removed in 3.0
  */
 	public function clean($output) {
 		$this->_reset();
@@ -449,7 +487,7 @@ class Helper extends Object {
  * @param string $insertBefore String to be inserted before options.
  * @param string $insertAfter String to be inserted after options.
  * @return string Composed attributes.
- * @deprecated This method will be moved to HtmlHelper in 3.0
+ * @deprecated 3.0.0 This method will be moved to HtmlHelper in 3.0
  */
 	protected function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
 		if (!is_string($options)) {
@@ -481,9 +519,9 @@ class Helper extends Object {
  *
  * @param string $key The name of the attribute to create
  * @param string $value The value of the attribute to create.
- * @param boolean $escape Define if the value must be escaped
+ * @param bool $escape Define if the value must be escaped
  * @return string The composed attribute.
- * @deprecated This method will be moved to HtmlHelper in 3.0
+ * @deprecated 3.0.0 This method will be moved to HtmlHelper in 3.0
  */
 	protected function _formatAttribute($key, $value, $escape = true) {
 		if (is_array($value)) {
@@ -525,7 +563,7 @@ class Helper extends Object {
  * Sets this helper's model and field properties to the dot-separated value-pair in $entity.
  *
  * @param string $entity A field name, like "ModelName.fieldName" or "ModelName.ID.fieldName"
- * @param boolean $setScope Sets the view scope to the model specified in $tagValue
+ * @param bool $setScope Sets the view scope to the model specified in $tagValue
  * @return void
  */
 	public function setEntity($entity, $setScope = false) {
@@ -543,8 +581,7 @@ class Helper extends Object {
 		$lastPart = isset($parts[$count - 1]) ? $parts[$count - 1] : null;
 
 		// Either 'body' or 'date.month' type inputs.
-		if (
-			($count === 1 && $this->_modelScope && !$setScope) ||
+		if (($count === 1 && $this->_modelScope && !$setScope) ||
 			(
 				$count === 2 &&
 				in_array($lastPart, $this->_fieldSuffixes) &&
@@ -556,8 +593,7 @@ class Helper extends Object {
 		}
 
 		// 0.name, 0.created.month style inputs. Excludes inputs with the modelScope in them.
-		if (
-			$count >= 2 &&
+		if ($count >= 2 &&
 			is_numeric($parts[0]) &&
 			!is_numeric($parts[1]) &&
 			$this->_modelScope &&
@@ -665,7 +701,7 @@ class Helper extends Object {
  *
  * @param array|string $options If an array, should be an array of attributes that $key needs to be added to.
  *   If a string or null, will be used as the View entity.
- * @param string $field
+ * @param string $field Field name.
  * @param string $key The name of the attribute to be set, defaults to 'name'
  * @return mixed If an array was given for $options, an array with $key set will be returned.
  *   If a string was supplied a string will be returned.
@@ -706,7 +742,7 @@ class Helper extends Object {
  *
  * @param array|string $options If an array, should be an array of attributes that $key needs to be added to.
  *   If a string or null, will be used as the View entity.
- * @param string $field
+ * @param string $field Field name.
  * @param string $key The name of the attribute to be set, defaults to 'value'
  * @return mixed If an array was given for $options, an array with $key set will be returned.
  *   If a string was supplied a string will be returned.
@@ -801,7 +837,7 @@ class Helper extends Object {
  *
  * @param string $str String to be output.
  * @return string
- * @deprecated This method will be removed in future versions.
+ * @deprecated 3.0.0 This method will be removed in future versions.
  */
 	public function output($str) {
 		return $str;
@@ -881,8 +917,8 @@ class Helper extends Object {
  * Transforms a recordset from a hasAndBelongsToMany association to a list of selected
  * options for a multiple select element
  *
- * @param string|array $data
- * @param string $key
+ * @param string|array $data Data array or model name.
+ * @param string $key Field name.
  * @return array
  */
 	protected function _selectedArray($data, $key = 'id') {
diff --git a/web/api/lib/Cake/View/Helper/CacheHelper.php b/web/api/lib/Cake/View/Helper/CacheHelper.php
index e54d6b2cb..ed5560a52 100644
--- a/web/api/lib/Cake/View/Helper/CacheHelper.php
+++ b/web/api/lib/Cake/View/Helper/CacheHelper.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * CacheHelper helps create full page view caching.
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -24,8 +22,10 @@ App::uses('AppHelper', 'View/Helper');
  * When using CacheHelper you don't call any of its methods, they are all automatically
  * called by View, and use the $cacheAction settings set in the controller.
  *
- * @package       Cake.View.Helper
+ * @package Cake.View.Helper
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/cache.html
+ * @deprecated This class will be removed in 3.0. You should use a separate response cache
+ * like Varnish instead.
  */
 class CacheHelper extends AppHelper {
 
@@ -48,14 +48,14 @@ class CacheHelper extends AppHelper {
 /**
  * Counter used for counting nocache section tags.
  *
- * @var integer
+ * @var int
  */
 	protected $_counter = 0;
 
 /**
  * Is CacheHelper enabled? should files + output be parsed.
  *
- * @return boolean
+ * @return bool
  */
 	protected function _enabled() {
 		return $this->_View->cacheAction && (Configure::read('Cache.check') === true);
@@ -64,7 +64,7 @@ class CacheHelper extends AppHelper {
 /**
  * Parses the view file and stores content for cache file building.
  *
- * @param string $viewFile
+ * @param string $viewFile View file name.
  * @param string $output The output for the file.
  * @return string Updated content.
  */
@@ -77,7 +77,7 @@ class CacheHelper extends AppHelper {
 /**
  * Parses the layout file and stores content for cache file building.
  *
- * @param string $layoutFile
+ * @param string $layoutFile Layout file name.
  * @return void
  */
 	public function afterLayout($layoutFile) {
@@ -109,6 +109,7 @@ class CacheHelper extends AppHelper {
  * @param string $out output to cache
  * @return string view output
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/cache.html
+ * @throws Exception If debug mode is enabled and writing to cache file fails.
  */
 	public function cache($file, $out) {
 		$cacheTime = 0;
@@ -120,7 +121,7 @@ class CacheHelper extends AppHelper {
 			$index = null;
 
 			foreach ($keys as $action) {
-				if ($action == $this->request->params['action']) {
+				if ($action === $this->request->params['action']) {
 					$index = $action;
 					break;
 				}
@@ -153,6 +154,10 @@ class CacheHelper extends AppHelper {
 			try {
 				$this->_writeFile($cached, $cacheTime, $useCallbacks);
 			} catch (Exception $e) {
+				if (Configure::read('debug')) {
+					throw $e;
+				}
+
 				$message = __d(
 					'cake_dev',
 					'Unable to write view cache file: "%s" for "%s"',
@@ -266,8 +271,9 @@ class CacheHelper extends AppHelper {
  *
  * @param string $content view content to write to a cache file.
  * @param string $timestamp Duration to set for cache file.
- * @param boolean $useCallbacks
- * @return boolean success of caching view.
+ * @param bool|null $useCallbacks Whether to include statements in cached file which
+ *   run callbacks, otherwise null.
+ * @return bool success of caching view.
  */
 	protected function _writeFile($content, $timestamp, $useCallbacks = false) {
 		$now = time();
@@ -288,7 +294,7 @@ class CacheHelper extends AppHelper {
 		$cache = strtolower(Inflector::slug($path));
 
 		if (empty($cache)) {
-			return;
+			return null;
 		}
 		$cache = $cache . '.php';
 		$file = '<!--cachetime:' . $cacheTime . '--><?php';
diff --git a/web/api/lib/Cake/View/Helper/FlashHelper.php b/web/api/lib/Cake/View/Helper/FlashHelper.php
new file mode 100644
index 000000000..ec26631fa
--- /dev/null
+++ b/web/api/lib/Cake/View/Helper/FlashHelper.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Flash Helper
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       Cake.View.Helper
+ * @since         CakePHP(tm) v 2.7.0-dev
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('AppHelper', 'View/Helper');
+App::uses('CakeSession', 'Model/Datasource');
+
+/**
+ * FlashHelper class to render flash messages.
+ *
+ * After setting messages in your controllers with FlashComponent, you can use
+ * this class to output your flash messages in your views.
+ *
+ * @package       Cake.View.Helper
+ */
+class FlashHelper extends AppHelper {
+
+/**
+ * Used to render the message set in FlashComponent::set()
+ *
+ * In your view: $this->Flash->render('somekey');
+ * Will default to flash if no param is passed
+ *
+ * You can pass additional information into the flash message generation. This allows you
+ * to consolidate all the parameters for a given type of flash message into the view.
+ *
+ * ```
+ * echo $this->Flash->render('flash', array('params' => array('name' => $user['User']['name'])));
+ * ```
+ *
+ * This would pass the current user's name into the flash message, so you could create personalized
+ * messages without the controller needing access to that data.
+ *
+ * Lastly you can choose the element that is used for rendering the flash message. Using
+ * custom elements allows you to fully customize how flash messages are generated.
+ *
+ * ```
+ * echo $this->Flash->render('flash', array('element' => 'my_custom_element'));
+ * ```
+ *
+ * If you want to use an element from a plugin for rendering your flash message
+ * you can use the dot notation for the plugin's element name:
+ *
+ * ```
+ * echo $this->Flash->render('flash', array(
+ *   'element' => 'MyPlugin.my_custom_element',
+ * ));
+ * ```
+ *
+ * @param string $key The [Message.]key you are rendering in the view.
+ * @param array $options Additional options to use for the creation of this flash message.
+ *    Supports the 'params', and 'element' keys that are used in the helper.
+ * @return string|null Rendered flash message or null if flash key does not exist
+ *   in session.
+ * @throws UnexpectedValueException If value for flash settings key is not an array.
+ */
+	public function render($key = 'flash', $options = array()) {
+		if (!CakeSession::check("Message.$key")) {
+			return null;
+		}
+
+		$flash = CakeSession::read("Message.$key");
+
+		if (!is_array($flash)) {
+			throw new UnexpectedValueException(sprintf(
+				'Value for flash setting key "%s" must be an array.',
+				$key
+			));
+		}
+
+		$flash = $options + $flash;
+		CakeSession::delete("Message.$key");
+		$flash['key'] = $key;
+
+		return $this->_View->element($flash['element'], $flash);
+	}
+}
diff --git a/web/api/lib/Cake/View/Helper/FormHelper.php b/web/api/lib/Cake/View/Helper/FormHelper.php
old mode 100755
new mode 100644
index 3f39091ff..05b26d447
--- a/web/api/lib/Cake/View/Helper/FormHelper.php
+++ b/web/api/lib/Cake/View/Helper/FormHelper.php
@@ -117,6 +117,14 @@ class FormHelper extends AppHelper {
  */
 	protected $_domIdSuffixes = array();
 
+/**
+ * The action attribute value of the last created form.
+ * Used to make form/request specific hashes for SecurityComponent.
+ *
+ * @var string
+ */
+	protected $_lastAction = '';
+
 /**
  * Copies the validationErrors variable from the View object into this instance
  *
@@ -132,8 +140,8 @@ class FormHelper extends AppHelper {
  * Guess the location for a model based on its name and tries to create a new instance
  * or get an already created instance of the model
  *
- * @param string $model
- * @return Model model instance
+ * @param string $model Model name.
+ * @return Model|null Model instance
  */
 	protected function _getModel($model) {
 		$object = null;
@@ -195,7 +203,7 @@ class FormHelper extends AppHelper {
 	protected function _introspectModel($model, $key, $field = null) {
 		$object = $this->_getModel($model);
 		if (!$object) {
-			return;
+			return null;
 		}
 
 		if ($key === 'key') {
@@ -226,7 +234,7 @@ class FormHelper extends AppHelper {
 
 		if ($key === 'validates' && !isset($this->fieldset[$model]['validates'])) {
 			$validates = array();
-			foreach ($object->validator() as $validateField => $validateProperties) {
+			foreach (iterator_to_array($object->validator(), true) as $validateField => $validateProperties) {
 				if ($this->_isRequiredField($validateProperties)) {
 					$validates[$validateField] = true;
 				}
@@ -246,8 +254,8 @@ class FormHelper extends AppHelper {
 /**
  * Returns if a field is required to be filled based on validation properties from the validating object.
  *
- * @param CakeValidationSet $validationRules
- * @return boolean true if field is required to be filled, false otherwise
+ * @param CakeValidationSet $validationRules Validation rules set.
+ * @return bool true if field is required to be filled, false otherwise
  */
 	protected function _isRequiredField($validationRules) {
 		if (empty($validationRules) || count($validationRules) === 0) {
@@ -304,24 +312,24 @@ class FormHelper extends AppHelper {
  * ### Options:
  *
  * - `type` Form method defaults to POST
- * - `action`  The controller action the form submits to, (optional).
+ * - `action`  The controller action the form submits to, (optional). Deprecated since 2.8, use `url`.
  * - `url`  The URL the form submits to. Can be a string or a URL array. If you use 'url'
  *    you should leave 'action' undefined.
- * - `default`  Allows for the creation of Ajax forms. Set this to false to prevent the default event handler.
+ * - `default`  Allows for the creation of AJAX forms. Set this to false to prevent the default event handler.
  *   Will create an onsubmit attribute if it doesn't not exist. If it does, default action suppression
  *   will be appended.
- * - `onsubmit` Used in conjunction with 'default' to create ajax forms.
+ * - `onsubmit` Used in conjunction with 'default' to create AJAX forms.
  * - `inputDefaults` set the default $options for FormHelper::input(). Any options that would
  *   be set when using FormHelper::input() can be set here. Options set with `inputDefaults`
  *   can be overridden when calling input()
  * - `encoding` Set the accept-charset encoding for the form. Defaults to `Configure::read('App.encoding')`
  *
- * @param mixed $model The model name for which the form is being defined. Should
+ * @param mixed|null $model The model name for which the form is being defined. Should
  *   include the plugin name for plugin models. e.g. `ContactManager.Contact`.
  *   If an array is passed and $options argument is empty, the array will be used as options.
  *   If `false` no model is used.
  * @param array $options An array of html attributes and options.
- * @return string An formatted opening FORM tag.
+ * @return string A formatted opening FORM tag.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#options-for-create
  */
 	public function create($model = null, $options = array()) {
@@ -371,6 +379,13 @@ class FormHelper extends AppHelper {
 		$this->inputDefaults($options['inputDefaults']);
 		unset($options['inputDefaults']);
 
+		if (isset($options['action'])) {
+			trigger_error('Using key `action` is deprecated, use `url` directly instead.', E_USER_DEPRECATED);
+		}
+		if (is_array($options['url']) && isset($options['url']['action'])) {
+			$options['action'] = $options['url']['action'];
+		}
+
 		if (!isset($options['id'])) {
 			$domId = isset($options['action']) ? $options['action'] : $this->request['action'];
 			$options['id'] = $this->domId($domId . 'Form');
@@ -378,7 +393,7 @@ class FormHelper extends AppHelper {
 
 		if ($options['action'] === null && $options['url'] === null) {
 			$options['action'] = $this->request->here(false);
-		} elseif (empty($options['url']) || is_array($options['url'])) {
+		} elseif (is_array($options['url'])) {
 			if (empty($options['url']['controller'])) {
 				if (!empty($model)) {
 					$options['url']['controller'] = Inflector::underscore(Inflector::pluralize($model));
@@ -400,13 +415,12 @@ class FormHelper extends AppHelper {
 				'action' => $options['action'],
 			);
 			$options['action'] = array_merge($actionDefaults, (array)$options['url']);
-			if (empty($options['action'][0]) && !empty($id)) {
+			if (!isset($options['action'][0]) && !empty($id)) {
 				$options['action'][0] = $id;
 			}
 		} elseif (is_string($options['url'])) {
 			$options['action'] = $options['url'];
 		}
-		unset($options['url']);
 
 		switch (strtolower($options['type'])) {
 			case 'get':
@@ -420,14 +434,20 @@ class FormHelper extends AppHelper {
 			case 'delete':
 				$append .= $this->hidden('_method', array(
 					'name' => '_method', 'value' => strtoupper($options['type']), 'id' => null,
-					'secure' => self::SECURE_SKIP
+					'secure' => static::SECURE_SKIP
 				));
 			default:
 				$htmlAttributes['method'] = 'post';
 		}
 		$this->requestType = strtolower($options['type']);
 
-		$action = $this->url($options['action']);
+		$action = null;
+		if ($options['action'] !== false && $options['url'] !== false) {
+			$action = $this->url($options['action']);
+		}
+		unset($options['url']);
+
+		$this->_lastAction($options['action']);
 		unset($options['type'], $options['action']);
 
 		if (!$options['default']) {
@@ -458,6 +478,11 @@ class FormHelper extends AppHelper {
 			$this->setEntity($model, true);
 			$this->_introspectModel($model, 'fields');
 		}
+
+		if ($action === null) {
+			return $this->Html->useTag('formwithoutaction', $htmlAttributes) . $append;
+		}
+
 		return $this->Html->useTag('form', $action, $htmlAttributes) . $append;
 	}
 
@@ -478,7 +503,7 @@ class FormHelper extends AppHelper {
 		}
 		return $this->hidden('_Token.key', array(
 			'value' => $this->request->params['_Token']['key'], 'id' => 'Token' . mt_rand(),
-			'secure' => self::SECURE_SKIP
+			'secure' => static::SECURE_SKIP
 		));
 	}
 
@@ -488,7 +513,7 @@ class FormHelper extends AppHelper {
  *
  * If $options is set a form submit button will be created. Options can be either a string or an array.
  *
- * {{{
+ * ```
  * array usage:
  *
  * array('label' => 'save'); value="save"
@@ -496,7 +521,7 @@ class FormHelper extends AppHelper {
  * array('name' => 'Whatever'); value="Submit" name="Whatever"
  * array('label' => 'save', 'name' => 'Whatever', 'div' => 'good') <div class="good"> value="save" name="Whatever"
  * array('label' => 'save', 'name' => 'Whatever', 'div' => array('class' => 'good')); <div class="good"> value="save" name="Whatever"
- * }}}
+ * ```
  *
  * If $secureAttributes is set, these html attributes will be merged into the hidden input tags generated for the
  * Security Component. This is especially useful to set HTML5 attributes like 'form'
@@ -524,8 +549,7 @@ class FormHelper extends AppHelper {
 			}
 			$out .= $this->submit($submit, $submitOptions);
 		}
-		if (
-			$this->requestType !== 'get' &&
+		if ($this->requestType !== 'get' &&
 			isset($this->request['_Token']) &&
 			!empty($this->request['_Token'])
 		) {
@@ -552,12 +576,12 @@ class FormHelper extends AppHelper {
  *    generating the hash, else $this->fields is being used.
  * @param array $secureAttributes will be passed as html attributes into the hidden
  *    input elements generated for the Security Component.
- * @return string A hidden input field with a security hash
+ * @return string|null A hidden input field with a security hash, otherwise null.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::secure
  */
 	public function secure($fields = array(), $secureAttributes = array()) {
 		if (!isset($this->request['_Token']) || empty($this->request['_Token'])) {
-			return;
+			return null;
 		}
 		$locked = array();
 		$unlockedFields = $this->_unlockedFields;
@@ -576,7 +600,13 @@ class FormHelper extends AppHelper {
 
 		$locked = implode(array_keys($locked), '|');
 		$unlocked = implode($unlockedFields, '|');
-		$fields = Security::hash(serialize($fields) . $unlocked . Configure::read('Security.salt'), 'sha1');
+		$hashParts = array(
+			$this->_lastAction,
+			serialize($fields),
+			$unlocked,
+			Configure::read('Security.salt')
+		);
+		$fields = Security::hash(implode('', $hashParts), 'sha1');
 
 		$tokenFields = array_merge($secureAttributes, array(
 			'value' => urlencode($fields . ':' . $locked),
@@ -619,7 +649,7 @@ class FormHelper extends AppHelper {
  * Determine which fields of a form should be used for hash.
  * Populates $this->fields
  *
- * @param boolean $lock Whether this field should be part of the validation
+ * @param bool $lock Whether this field should be part of the validation
  *     or excluded as part of the unlockedFields.
  * @param string|array $field Reference to field to be secured. Should be dot separated to indicate nesting.
  * @param mixed $value Field value, if value should not be tampered with.
@@ -646,6 +676,8 @@ class FormHelper extends AppHelper {
 			if (!in_array($field, $this->fields)) {
 				if ($value !== null) {
 					return $this->fields[$field] = $value;
+				} elseif (isset($this->fields[$field]) && $value === null) {
+					unset($this->fields[$field]);
 				}
 				$this->fields[] = $field;
 			}
@@ -658,7 +690,7 @@ class FormHelper extends AppHelper {
  * Returns true if there is an error for the given field, otherwise false
  *
  * @param string $field This should be "Modelname.fieldname"
- * @return boolean If there are errors this method returns true, else false.
+ * @return bool If there are errors this method returns true, else false.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::isFieldError
  */
 	public function isFieldError($field) {
@@ -680,7 +712,7 @@ class FormHelper extends AppHelper {
  * @param string|array $text Error message as string or array of messages.
  *   If array contains `attributes` key it will be used as options for error container
  * @param array $options Rendering options for <div /> wrapper tag
- * @return string If there are errors this method returns an error message, otherwise null.
+ * @return string|null If there are errors this method returns an error message, otherwise null.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::error
  */
 	public function error($field, $text = null, $options = array()) {
@@ -771,33 +803,37 @@ class FormHelper extends AppHelper {
  *
  * The text and for attribute are generated off of the fieldname
  *
- * {{{
+ * ```
  * echo $this->Form->label('Post.published');
  * <label for="PostPublished">Published</label>
- * }}}
+ * ```
  *
  * Custom text:
  *
- * {{{
+ * ```
  * echo $this->Form->label('Post.published', 'Publish');
  * <label for="PostPublished">Publish</label>
- * }}}
+ * ```
  *
  * Custom class name:
  *
- * {{{
+ * ```
  * echo $this->Form->label('Post.published', 'Publish', 'required');
  * <label for="PostPublished" class="required">Publish</label>
- * }}}
+ * ```
  *
  * Custom attributes:
  *
- * {{{
+ * ```
  * echo $this->Form->label('Post.published', 'Publish', array(
  *		'for' => 'post-publish'
  * ));
  * <label for="post-publish">Publish</label>
- * }}}
+ * ```
+ *
+ * *Warning* Unlike most FormHelper methods, this method does not automatically
+ * escape the $text parameter. You must escape the $text parameter yourself if you
+ * are using user supplied data.
  *
  * @param string $fieldName This should be "Modelname.fieldname"
  * @param string $text Text that will appear in the label field. If
@@ -844,11 +880,11 @@ class FormHelper extends AppHelper {
  * will be used.
  *
  * You can customize individual inputs through `$fields`.
- * {{{
+ * ```
  *	$this->Form->inputs(array(
  *		'name' => array('label' => 'custom label')
  *	));
- * }}}
+ * ```
  *
  * In addition to controller fields output, `$fields` can be used to control legend
  * and fieldset rendering.
@@ -1071,13 +1107,13 @@ class FormHelper extends AppHelper {
 				unset($options['options']);
 				return $this->select($fieldName, $list, $options);
 			case 'time':
-				$options['value'] = $selected;
+				$options += array('value' => $selected);
 				return $this->dateTime($fieldName, null, $timeFormat, $options);
 			case 'date':
-				$options['value'] = $selected;
+				$options += array('value' => $selected);
 				return $this->dateTime($fieldName, $dateFormat, null, $options);
 			case 'datetime':
-				$options['value'] = $selected;
+				$options += array('value' => $selected);
 				return $this->dateTime($fieldName, $dateFormat, $timeFormat, $options);
 			case 'textarea':
 				return $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '6'));
@@ -1091,7 +1127,7 @@ class FormHelper extends AppHelper {
 /**
  * Generates input options array
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array Options
  */
 	protected function _parseOptions($options) {
@@ -1109,6 +1145,8 @@ class FormHelper extends AppHelper {
 			$options = $this->_optionsOptions($options);
 		}
 
+		$options = $this->_maxLength($options);
+
 		if (isset($options['rows']) || isset($options['cols'])) {
 			$options['type'] = 'textarea';
 		}
@@ -1122,7 +1160,7 @@ class FormHelper extends AppHelper {
 /**
  * Generates list of options for multiple select
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array
  */
 	protected function _optionsOptions($options) {
@@ -1146,7 +1184,7 @@ class FormHelper extends AppHelper {
 /**
  * Magically set option type and corresponding options
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array
  */
 	protected function _magicOptions($options) {
@@ -1180,17 +1218,16 @@ class FormHelper extends AppHelper {
 			} elseif (isset($map[$type])) {
 				$options['type'] = $map[$type];
 			}
-			if ($fieldKey == $primaryKey) {
+			if ($fieldKey === $primaryKey) {
 				$options['type'] = 'hidden';
 			}
-			if (
-				$options['type'] === 'number' &&
+			if ($options['type'] === 'number' &&
 				!isset($options['step'])
 			) {
-				if ($type === 'decimal') {
+				if ($type === 'decimal' && isset($fieldDef['length'])) {
 					$decimalPlaces = substr($fieldDef['length'], strpos($fieldDef['length'], ',') + 1);
 					$options['step'] = sprintf('%.' . $decimalPlaces . 'F', pow(10, -1 * $decimalPlaces));
-				} elseif ($type === 'float') {
+				} elseif ($type === 'float' || $type === 'decimal') {
 					$options['step'] = 'any';
 				}
 			}
@@ -1212,14 +1249,14 @@ class FormHelper extends AppHelper {
 		if ($options['type'] === 'select' && array_key_exists('step', $options)) {
 			unset($options['step']);
 		}
-		$options = $this->_maxLength($options);
+
 		return $options;
 	}
 
 /**
  * Generate format options
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array
  */
 	protected function _getFormat($options) {
@@ -1238,9 +1275,9 @@ class FormHelper extends AppHelper {
 /**
  * Generate label for input
  *
- * @param string $fieldName
- * @param array $options
- * @return boolean|string false or Generated label element
+ * @param string $fieldName Field name.
+ * @param array $options Options list.
+ * @return bool|string false or Generated label element
  */
 	protected function _getLabel($fieldName, $options) {
 		if ($options['type'] === 'radio') {
@@ -1261,7 +1298,7 @@ class FormHelper extends AppHelper {
 /**
  * Calculates maxlength option
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array
  */
 	protected function _maxLength($options) {
@@ -1270,12 +1307,14 @@ class FormHelper extends AppHelper {
 			!array_key_exists('maxlength', $options) &&
 			isset($fieldDef['length']) &&
 			is_scalar($fieldDef['length']) &&
+			$fieldDef['length'] < 1000000 &&
+			$fieldDef['type'] !== 'decimal' &&
 			$options['type'] !== 'select'
 		);
 		if ($autoLength &&
-			in_array($options['type'], array('text', 'email', 'tel', 'url', 'search'))
+			in_array($options['type'], array('text', 'textarea', 'email', 'tel', 'url', 'search'))
 		) {
-			$options['maxlength'] = $fieldDef['length'];
+			$options['maxlength'] = (int)$fieldDef['length'];
 		}
 		return $options;
 	}
@@ -1283,7 +1322,7 @@ class FormHelper extends AppHelper {
 /**
  * Generate div options for input
  *
- * @param array $options
+ * @param array $options Options list.
  * @return array
  */
 	protected function _divOptions($options) {
@@ -1302,8 +1341,7 @@ class FormHelper extends AppHelper {
 		} elseif (is_array($div)) {
 			$divOptions = array_merge($divOptions, $div);
 		}
-		if (
-			$this->_extractOption('required', $options) !== false &&
+		if ($this->_extractOption('required', $options) !== false &&
 			$this->_introspectModel($this->model(), 'validates', $this->field())
 		) {
 			$divOptions = $this->addClass($divOptions, 'required');
@@ -1335,9 +1373,10 @@ class FormHelper extends AppHelper {
  * $options can contain a hash of id overrides. These overrides will be
  * used instead of the generated values if present.
  *
- * @param string $fieldName
- * @param string $label
- * @param array $options Options for the label element. 'NONE' option is deprecated and will be removed in 3.0
+ * @param string $fieldName Field name.
+ * @param string|array $label Label text or array with text and options.
+ * @param array $options Options for the label element. 'NONE' option is
+ *   deprecated and will be removed in 3.0
  * @return string Generated label element
  */
 	protected function _inputLabel($fieldName, $label, $options) {
@@ -1345,8 +1384,7 @@ class FormHelper extends AppHelper {
 		$idKey = null;
 		if ($options['type'] === 'date' || $options['type'] === 'datetime') {
 			$firstInput = 'M';
-			if (
-				array_key_exists('dateFormat', $options) &&
+			if (array_key_exists('dateFormat', $options) &&
 				($options['dateFormat'] === null || $options['dateFormat'] === 'NONE')
 			) {
 				$firstInput = 'H';
@@ -1427,8 +1465,7 @@ class FormHelper extends AppHelper {
 		$value = current($this->value($valueOptions));
 		$output = '';
 
-		if (
-			(!isset($options['checked']) && !empty($value) && $value == $options['value']) ||
+		if ((!isset($options['checked']) && !empty($value) && $value == $options['value']) ||
 			!empty($options['checked'])
 		) {
 			$options['checked'] = 'checked';
@@ -1455,6 +1492,15 @@ class FormHelper extends AppHelper {
  * Creates a set of radio widgets. Will create a legend and fieldset
  * by default. Use $options to control this
  *
+ * You can also customize each radio input element using an array of arrays:
+ *
+ * ```
+ * $options = array(
+ *  array('name' => 'United states', 'value' => 'US', 'title' => 'My title'),
+ *  array('name' => 'Germany', 'value' => 'DE', 'class' => 'de-de', 'title' => 'Another title'),
+ * );
+ * ```
+ *
  * ### Attributes:
  *
  * - `separator` - define the string in between the radio buttons
@@ -1466,7 +1512,7 @@ class FormHelper extends AppHelper {
  * - `hiddenField` - boolean to indicate if you want the results of radio() to include
  *    a hidden input with a value of ''. This is useful for creating radio sets that non-continuous
  * - `disabled` - Set to `true` or `disabled` to disable all the radio buttons.
- * - `empty` - Set to `true` to create a input with the value '' as the first option. When `true`
+ * - `empty` - Set to `true` to create an input with the value '' as the first option. When `true`
  *   the radio label will be 'empty'. Set this option to a string to control the label value.
  *
  * @param string $fieldName Name of a field, like this "Modelname.fieldname"
@@ -1476,7 +1522,9 @@ class FormHelper extends AppHelper {
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#options-for-select-checkbox-and-radio-inputs
  */
 	public function radio($fieldName, $options = array(), $attributes = array()) {
+		$attributes['options'] = $options;
 		$attributes = $this->_initInputField($fieldName, $attributes);
+		unset($attributes['options']);
 
 		$showEmpty = $this->_extractOption('empty', $attributes);
 		if ($showEmpty) {
@@ -1535,6 +1583,15 @@ class FormHelper extends AppHelper {
 		$this->_domIdSuffixes = array();
 		foreach ($options as $optValue => $optTitle) {
 			$optionsHere = array('value' => $optValue, 'disabled' => false);
+			if (is_array($optTitle)) {
+				if (isset($optTitle['value'])) {
+					$optionsHere['value'] = $optTitle['value'];
+				}
+
+				$optionsHere += $optTitle;
+				$optTitle = $optionsHere['name'];
+				unset($optionsHere['name']);
+			}
 
 			if (isset($value) && strval($optValue) === strval($value)) {
 				$optionsHere['checked'] = 'checked';
@@ -1554,7 +1611,7 @@ class FormHelper extends AppHelper {
 			if (is_array($between)) {
 				$optTitle .= array_shift($between);
 			}
-			$allOptions = array_merge($attributes, $optionsHere);
+			$allOptions = $optionsHere + $attributes;
 			$out[] = $this->Html->useTag('radio', $attributes['name'], $tagName,
 				array_diff_key($allOptions, array('name' => null, 'type' => null, 'id' => null)),
 				$optTitle
@@ -1660,7 +1717,7 @@ class FormHelper extends AppHelper {
 		unset($options['secure']);
 
 		$options = $this->_initInputField($fieldName, array_merge(
-			$options, array('secure' => self::SECURE_SKIP)
+			$options, array('secure' => static::SECURE_SKIP)
 		));
 
 		if ($secure === true) {
@@ -1681,7 +1738,7 @@ class FormHelper extends AppHelper {
 	public function file($fieldName, $options = array()) {
 		$options += array('secure' => true);
 		$secure = $options['secure'];
-		$options['secure'] = self::SECURE_SKIP;
+		$options['secure'] = static::SECURE_SKIP;
 
 		$options = $this->_initInputField($fieldName, $options);
 		$field = $this->entity();
@@ -1753,8 +1810,12 @@ class FormHelper extends AppHelper {
  * Creates an HTML link, but access the URL using the method you specify (defaults to POST).
  * Requires javascript to be enabled in browser.
  *
- * This method creates a `<form>` element. So do not use this method inside an existing form.
- * Instead you should add a submit button using FormHelper::submit()
+ * This method creates a `<form>` element. If you want to use this method inside of an
+ * existing form, you must use the `inline` or `block` options so that the new form is
+ * being set to a view block that can be rendered outside of the main form.
+ *
+ * If all you are looking for is a button to submit your form, then you should use
+ * `FormHelper::submit()` instead.
  *
  * ### Options:
  *
@@ -1772,12 +1833,13 @@ class FormHelper extends AppHelper {
  * @param string $title The content to be wrapped by <a> tags.
  * @param string|array $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
  * @param array $options Array of HTML attributes.
- * @param boolean|string $confirmMessage JavaScript confirmation message.
+ * @param bool|string $confirmMessage JavaScript confirmation message. This
+ *   argument is deprecated as of 2.6. Use `confirm` key in $options instead.
  * @return string An `<a />` element.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::postLink
  */
 	public function postLink($title, $url = null, $options = array(), $confirmMessage = false) {
-		$options += array('inline' => true, 'block' => null);
+		$options = (array)$options + array('inline' => true, 'block' => null);
 		if (!$options['inline'] && empty($options['block'])) {
 			$options['block'] = __FUNCTION__;
 		}
@@ -1806,6 +1868,8 @@ class FormHelper extends AppHelper {
 			unset($options['target']);
 		}
 
+		$this->_lastAction($url);
+
 		$out = $this->Html->useTag('form', $formUrl, $formOptions);
 		$out .= $this->Html->useTag('hidden', '_method', array(
 			'value' => $requestMethod
@@ -1968,13 +2032,13 @@ class FormHelper extends AppHelper {
  *
  * A simple array will create normal options:
  *
- * {{{
+ * ```
  * $options = array(1 => 'one', 2 => 'two);
  * $this->Form->select('Model.field', $options));
- * }}}
+ * ```
  *
  * While a nested options array will create optgroups with options inside them.
- * {{{
+ * ```
  * $options = array(
  *  1 => 'bill',
  *  'fred' => array(
@@ -1983,7 +2047,7 @@ class FormHelper extends AppHelper {
  *  )
  * );
  * $this->Form->select('Model.field', $options);
- * }}}
+ * ```
  *
  * In the above `2 => 'fred'` will not generate an option element. You should enable the `showParents`
  * attribute to show the fred option.
@@ -1991,12 +2055,12 @@ class FormHelper extends AppHelper {
  * If you have multiple options that need to have the same value attribute, you can
  * use an array of arrays to express this:
  *
- * {{{
+ * ```
  * $options = array(
  *  array('name' => 'United states', 'value' => 'USA'),
  *  array('name' => 'USA', 'value' => 'USA'),
  * );
- * }}}
+ * ```
  *
  * @param string $fieldName Name attribute of the SELECT
  * @param array $options Array of the OPTION elements (as 'value'=>'Text' pairs) to be used in the
@@ -2028,7 +2092,7 @@ class FormHelper extends AppHelper {
 		$id = $this->_extractOption('id', $attributes);
 
 		$attributes = $this->_initInputField($fieldName, array_merge(
-			(array)$attributes, array('secure' => self::SECURE_SKIP)
+			(array)$attributes, array('secure' => static::SECURE_SKIP)
 		));
 
 		if (is_string($options) && isset($this->_options[$options])) {
@@ -2050,7 +2114,8 @@ class FormHelper extends AppHelper {
 					'id' => $attributes['id'] . ($style ? '' : '_'),
 					'secure' => false,
 					'form' => isset($attributes['form']) ? $attributes['form'] : null,
-					'name' => $attributes['name']
+					'name' => $attributes['name'],
+					'disabled' => $attributes['disabled'] === true || $attributes['disabled'] === 'disabled'
 				);
 				$select[] = $this->hidden(null, $hiddenAttributes);
 			}
@@ -2066,14 +2131,17 @@ class FormHelper extends AppHelper {
 			$hasOptions = (count($options) > 0 || $showEmpty);
 			// Secure the field if there are options, or its a multi select.
 			// Single selects with no options don't submit, but multiselects do.
-			if (
-				(!isset($secure) || $secure) &&
+			if ((!isset($secure) || $secure) &&
 				empty($attributes['disabled']) &&
 				(!empty($attributes['multiple']) || $hasOptions)
 			) {
 				$this->_secure(true, $this->_secureFieldName($attributes));
 			}
-			$select[] = $this->Html->useTag($tag, $attributes['name'], array_diff_key($attributes, array('name' => null, 'value' => null)));
+			$filter = array('name' => null, 'value' => null);
+			if (is_array($attributes['disabled'])) {
+				$filter['disabled'] = null;
+			}
+			$select[] = $this->Html->useTag($tag, $attributes['name'], array_diff_key($attributes, $filter));
 		}
 		$emptyMulti = (
 			$showEmpty !== null && $showEmpty !== false && !(
@@ -2181,13 +2249,18 @@ class FormHelper extends AppHelper {
  * - `value` The selected value of the input.
  *
  * @param string $fieldName Prefix name for the SELECT element
- * @param integer $minYear First year in sequence
- * @param integer $maxYear Last year in sequence
+ * @param int $minYear First year in sequence
+ * @param int $maxYear Last year in sequence
  * @param array $attributes Attribute array for the select elements.
  * @return string Completed year select input
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::year
  */
 	public function year($fieldName, $minYear = null, $maxYear = null, $attributes = array()) {
+		if (is_array($minYear)) {
+			$attributes = $minYear;
+			$minYear = null;
+		}
+
 		$attributes += array('empty' => true, 'value' => null);
 		if ((empty($attributes['value']) || $attributes['value'] === true) && $value = $this->value($fieldName)) {
 			if (is_array($value)) {
@@ -2234,7 +2307,7 @@ class FormHelper extends AppHelper {
  * ### Attributes:
  *
  * - `monthNames` - If false, 2 digit numbers will be used instead of text.
- *   If a array, the given array will be used.
+ *   If an array, the given array will be used.
  * - `empty` - If true, the empty select option is shown. If a string,
  *   that string is displayed as the empty element.
  * - `value` The selected value of the input.
@@ -2279,12 +2352,17 @@ class FormHelper extends AppHelper {
  * - `value` The selected value of the input.
  *
  * @param string $fieldName Prefix name for the SELECT element
- * @param boolean $format24Hours True for 24 hours format
+ * @param bool $format24Hours True for 24 hours format
  * @param array $attributes List of HTML attributes
  * @return string Completed hour select input
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::hour
  */
 	public function hour($fieldName, $format24Hours = false, $attributes = array()) {
+		if (is_array($format24Hours)) {
+			$attributes = $format24Hours;
+			$format24Hours = false;
+		}
+
 		$attributes += array('empty' => true, 'value' => null);
 		$attributes = $this->_dateTimeSelected('hour', $fieldName, $attributes);
 
@@ -2432,7 +2510,7 @@ class FormHelper extends AppHelper {
  * ### Attributes:
  *
  * - `monthNames` If false, 2 digit numbers will be used instead of text.
- *   If a array, the given array will be used.
+ *   If an array, the given array will be used.
  * - `minYear` The lowest year to use in the year select
  * - `maxYear` The maximum year to use in the year select
  * - `interval` The interval for the minutes select. Defaults to 1
@@ -2600,7 +2678,7 @@ class FormHelper extends AppHelper {
  * Parse the value for a datetime selected value
  *
  * @param string|array $value The selected value.
- * @param integer $timeFormat The time format
+ * @param int $timeFormat The time format
  * @return array Array of selected value.
  */
 	protected function _getDateTimeValue($value, $timeFormat) {
@@ -2646,9 +2724,9 @@ class FormHelper extends AppHelper {
 /**
  * Gets the input field name for the current tag
  *
- * @param array $options
- * @param string $field
- * @param string $key
+ * @param array $options Options list.
+ * @param string $field Field name.
+ * @param string $key Key name.
  * @return array
  */
 	protected function _name($options = array(), $field = null, $key = 'name') {
@@ -2688,10 +2766,10 @@ class FormHelper extends AppHelper {
 /**
  * Returns an array of formatted OPTION/OPTGROUP elements
  *
- * @param array $elements
- * @param array $parents
- * @param boolean $showParents
- * @param array $attributes
+ * @param array $elements Elements to format.
+ * @param array $parents Parents for OPTGROUP.
+ * @param bool $showParents Whether to show parents.
+ * @param array $attributes HTML attributes.
  * @return array
  */
 	protected function _selectOptions($elements = array(), $parents = array(), $showParents = null, $attributes = array()) {
@@ -2737,8 +2815,7 @@ class FormHelper extends AppHelper {
 
 			if ($name !== null) {
 				$isNumeric = is_numeric($name);
-				if (
-					(!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
+				if ((!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
 					($selectedIsArray && in_array((string)$name, $attributes['value'], !$isNumeric))
 				) {
 					if ($attributes['style'] === 'checkbox') {
@@ -2758,8 +2835,7 @@ class FormHelper extends AppHelper {
 							$disabledIsNumeric = is_numeric($name);
 						}
 					}
-					if (
-						$hasDisabled &&
+					if ($hasDisabled &&
 						$disabledIsArray &&
 						in_array((string)$name, $attributes['disabled'], !$disabledIsNumeric)
 					) {
@@ -2806,8 +2882,8 @@ class FormHelper extends AppHelper {
 /**
  * Generates option lists for common <select /> menus
  *
- * @param string $name
- * @param array $options
+ * @param string $name List type name.
+ * @param array $options Options list.
  * @return array
  */
 	protected function _generateOptions($name, $options = array()) {
@@ -2843,17 +2919,7 @@ class FormHelper extends AppHelper {
 				$data = array('am' => 'am', 'pm' => 'pm');
 				break;
 			case 'day':
-				$min = 1;
-				$max = 31;
-
-				if (isset($options['min'])) {
-					$min = $options['min'];
-				}
-				if (isset($options['max'])) {
-					$max = $options['max'];
-				}
-
-				for ($i = $min; $i <= $max; $i++) {
+				for ($i = 1; $i <= 31; $i++) {
 					$data[sprintf('%02d', $i)] = $i;
 				}
 				break;
@@ -2880,7 +2946,7 @@ class FormHelper extends AppHelper {
 				}
 				break;
 			case 'year':
-				$current = intval(date('Y'));
+				$current = (int)date('Y');
 
 				$min = !isset($options['min']) ? $current - 20 : (int)$options['min'];
 				$max = !isset($options['max']) ? $current + 20 : (int)$options['max'];
@@ -2888,8 +2954,7 @@ class FormHelper extends AppHelper {
 				if ($min > $max) {
 					list($min, $max) = array($max, $min);
 				}
-				if (
-					!empty($options['value']) &&
+				if (!empty($options['value']) &&
 					(int)$options['value'] < $min &&
 					(int)$options['value'] > 0
 				) {
@@ -2920,7 +2985,7 @@ class FormHelper extends AppHelper {
  *   Disabling the field using the `disabled` option, will also omit the field from being
  *   part of the hashed key.
  *
- * This method will convert a numerically indexed 'disabled' into a associative
+ * This method will convert a numerically indexed 'disabled' into an associative
  * value. FormHelper's internals expect associative options.
  *
  * @param string $field Name of the field to initialize options for.
@@ -2946,7 +3011,18 @@ class FormHelper extends AppHelper {
 			$result = $this->addClass($result, 'form-error');
 		}
 
-		if (!empty($result['disabled'])) {
+		$isDisabled = false;
+		if (isset($result['disabled'])) {
+			$isDisabled = (
+				$result['disabled'] === true ||
+				$result['disabled'] === 'disabled' ||
+				(is_array($result['disabled']) &&
+					!empty($result['options']) &&
+					array_diff($result['options'], $result['disabled']) === array()
+				)
+			);
+		}
+		if ($isDisabled) {
 			return $result;
 		}
 
@@ -2956,7 +3032,7 @@ class FormHelper extends AppHelper {
 			$result['required'] = true;
 		}
 
-		if ($secure === self::SECURE_SKIP) {
+		if ($secure === static::SECURE_SKIP) {
 			return $result;
 		}
 
@@ -2983,11 +3059,24 @@ class FormHelper extends AppHelper {
 		return null;
 	}
 
+/**
+ * Sets the last created form action.
+ *
+ * @param string|array $url URL.
+ * @return void
+ */
+	protected function _lastAction($url) {
+		$action = Router::url($url, true);
+		$query = parse_url($action, PHP_URL_QUERY);
+		$query = $query ? '?' . $query : '';
+		$this->_lastAction = parse_url($action, PHP_URL_PATH) . $query;
+	}
+
 /**
  * Set/Get inputDefaults for form elements
  *
  * @param array $defaults New default values
- * @param boolean Merge with current defaults
+ * @param bool $merge Merge with current defaults
  * @return array inputDefaults
  */
 	public function inputDefaults($defaults = null, $merge = false) {
diff --git a/web/api/lib/Cake/View/Helper/HtmlHelper.php b/web/api/lib/Cake/View/Helper/HtmlHelper.php
index d14d1ac2e..103511660 100644
--- a/web/api/lib/Cake/View/Helper/HtmlHelper.php
+++ b/web/api/lib/Cake/View/Helper/HtmlHelper.php
@@ -47,13 +47,14 @@ class HtmlHelper extends AppHelper {
 		'meta' => '<meta%s/>',
 		'metalink' => '<link href="%s"%s/>',
 		'link' => '<a href="%s"%s>%s</a>',
-		'mailto' => '<a href="mailto:%s" %s>%s</a>',
+		'mailto' => '<a href="mailto:%s"%s>%s</a>',
 		'form' => '<form action="%s"%s>',
+		'formwithoutaction' => '<form%s>',
 		'formend' => '</form>',
 		'input' => '<input name="%s"%s/>',
 		'textarea' => '<textarea name="%s"%s>%s</textarea>',
 		'hidden' => '<input type="hidden" name="%s"%s/>',
-		'checkbox' => '<input type="checkbox" name="%s" %s/>',
+		'checkbox' => '<input type="checkbox" name="%s"%s/>',
 		'checkboxmultiple' => '<input type="checkbox" name="%s[]"%s />',
 		'radio' => '<input type="radio" name="%s" id="%s"%s />%s',
 		'selectstart' => '<select name="%s"%s>',
@@ -65,13 +66,13 @@ class HtmlHelper extends AppHelper {
 		'optiongroupend' => '</optgroup>',
 		'checkboxmultiplestart' => '',
 		'checkboxmultipleend' => '',
-		'password' => '<input type="password" name="%s" %s/>',
-		'file' => '<input type="file" name="%s" %s/>',
-		'file_no_model' => '<input type="file" name="%s" %s/>',
-		'submit' => '<input %s/>',
-		'submitimage' => '<input type="image" src="%s" %s/>',
+		'password' => '<input type="password" name="%s"%s/>',
+		'file' => '<input type="file" name="%s"%s/>',
+		'file_no_model' => '<input type="file" name="%s"%s/>',
+		'submit' => '<input%s/>',
+		'submitimage' => '<input type="image" src="%s"%s/>',
 		'button' => '<button%s>%s</button>',
-		'image' => '<img src="%s" %s/>',
+		'image' => '<img src="%s"%s/>',
 		'tableheader' => '<th%s>%s</th>',
 		'tableheaderrow' => '<tr%s>%s</tr>',
 		'tablecell' => '<td%s>%s</td>',
@@ -91,7 +92,7 @@ class HtmlHelper extends AppHelper {
 		'fieldsetstart' => '<fieldset><legend>%s</legend>',
 		'fieldsetend' => '</fieldset>',
 		'legend' => '<legend>%s</legend>',
-		'css' => '<link rel="%s" type="text/css" href="%s" %s/>',
+		'css' => '<link rel="%s" type="text/css" href="%s"%s/>',
 		'style' => '<style type="text/css"%s>%s</style>',
 		'charset' => '<meta http-equiv="Content-Type" content="text/html; charset=%s" />',
 		'ul' => '<ul%s>%s</ul>',
@@ -112,11 +113,11 @@ class HtmlHelper extends AppHelper {
 	protected $_crumbs = array();
 
 /**
- * Names of script files that have been included once
+ * Names of script & css files that have been included once
  *
  * @var array
  */
-	protected $_includedScripts = array();
+	protected $_includedAssets = array();
 
 /**
  * Options for the currently opened script block buffer if any.
@@ -174,7 +175,7 @@ class HtmlHelper extends AppHelper {
  * @param string $name Text for link
  * @param string $link URL for link (if empty it won't be a link)
  * @param string|array $options Link attributes e.g. array('id' => 'selected')
- * @return this HtmlHelper
+ * @return self
  * @see HtmlHelper::link() for details on $options that can be used.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#creating-breadcrumb-trails-with-htmlhelper
  */
@@ -198,7 +199,7 @@ class HtmlHelper extends AppHelper {
  *  - xhtml11: XHTML1.1.
  *
  * @param string $type Doctype to use.
- * @return string Doctype string
+ * @return string|null Doctype string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::docType
  */
 	public function docType($type = 'html5') {
@@ -279,12 +280,12 @@ class HtmlHelper extends AppHelper {
 		if (isset($options['link'])) {
 			$options['link'] = $this->assetUrl($options['link']);
 			if (isset($options['rel']) && $options['rel'] === 'icon') {
-				$out = sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('block', 'link'), ' ', ' '));
+				$out = sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('block', 'link')));
 				$options['rel'] = 'shortcut icon';
 			}
-			$out .= sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('block', 'link'), ' ', ' '));
+			$out .= sprintf($this->_tags['metalink'], $options['link'], $this->_parseAttributes($options, array('block', 'link')));
 		} else {
-			$out = sprintf($this->_tags['meta'], $this->_parseAttributes($options, array('block', 'type'), ' ', ' '));
+			$out = sprintf($this->_tags['meta'], $this->_parseAttributes($options, array('block', 'type')));
 		}
 
 		if (empty($options['block'])) {
@@ -326,7 +327,8 @@ class HtmlHelper extends AppHelper {
  * @param string $title The content to be wrapped by <a> tags.
  * @param string|array $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
  * @param array $options Array of options and HTML attributes.
- * @param string $confirmMessage JavaScript confirmation message.
+ * @param string $confirmMessage JavaScript confirmation message. This
+ *   argument is deprecated as of 2.6. Use `confirm` key in $options instead.
  * @return string An `<a />` element.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::link
  */
@@ -397,6 +399,9 @@ class HtmlHelper extends AppHelper {
  *
  * - `inline` If set to false, the generated tag will be appended to the 'css' block,
  *   and included in the `$scripts_for_layout` layout variable. Defaults to true.
+ * - `once` Whether or not the css file should be checked for uniqueness. If true css
+ *   files  will only be included once, use false to allow the same
+ *   css to be included more than once per request.
  * - `block` Set the name of the block link/style tag will be appended to.
  *   This overrides the `inline` option.
  * - `plugin` False value will prevent parsing path as a plugin
@@ -423,7 +428,12 @@ class HtmlHelper extends AppHelper {
 			unset($rel);
 		}
 
-		$options += array('block' => null, 'inline' => true, 'rel' => 'stylesheet');
+		$options += array(
+			'block' => null,
+			'inline' => true,
+			'once' => false,
+			'rel' => 'stylesheet'
+		);
 		if (!$options['inline'] && empty($options['block'])) {
 			$options['block'] = __FUNCTION__;
 		}
@@ -437,9 +447,15 @@ class HtmlHelper extends AppHelper {
 			if (empty($options['block'])) {
 				return $out . "\n";
 			}
-			return;
+			return '';
 		}
 
+		if ($options['once'] && isset($this->_includedAssets[__METHOD__][$path])) {
+			return '';
+		}
+		unset($options['once']);
+		$this->_includedAssets[__METHOD__][$path] = true;
+
 		if (strpos($path, '//') !== false) {
 			$url = $path;
 		} else {
@@ -454,10 +470,10 @@ class HtmlHelper extends AppHelper {
 			}
 		}
 
-		if ($options['rel'] == 'import') {
+		if ($options['rel'] === 'import') {
 			$out = sprintf(
 				$this->_tags['style'],
-				$this->_parseAttributes($options, array('rel', 'block'), '', ' '),
+				$this->_parseAttributes($options, array('rel', 'block')),
 				'@import url(' . $url . ');'
 			);
 		} else {
@@ -465,7 +481,7 @@ class HtmlHelper extends AppHelper {
 				$this->_tags['css'],
 				$options['rel'],
 				$url,
-				$this->_parseAttributes($options, array('rel', 'block'), '', ' ')
+				$this->_parseAttributes($options, array('rel', 'block'))
 			);
 		}
 
@@ -481,7 +497,6 @@ class HtmlHelper extends AppHelper {
  * If the filename is prefixed with "/", the path will be relative to the base path of your
  * application. Otherwise, the path will be relative to your JavaScript path, usually webroot/js.
  *
- *
  * ### Usage
  *
  * Include one script file:
@@ -498,7 +513,7 @@ class HtmlHelper extends AppHelper {
  *
  * Add the script file to a custom block:
  *
- * `$this->Html->script('styles.js', null, array('block' => 'bodyScript'));`
+ * `$this->Html->script('styles.js', array('block' => 'bodyScript'));`
  *
  * ### Options
  *
@@ -512,7 +527,7 @@ class HtmlHelper extends AppHelper {
  * - `fullBase` If true the url will get a full address for the script file.
  *
  * @param string|array $url String or array of javascript files to include
- * @param array|boolean $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
+ * @param array|bool $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
  * @return mixed String of `<script />` tags or null if $inline is false or if $once is true and the file has been
  *   included before.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::script
@@ -538,10 +553,10 @@ class HtmlHelper extends AppHelper {
 			}
 			return null;
 		}
-		if ($options['once'] && isset($this->_includedScripts[$url])) {
+		if ($options['once'] && isset($this->_includedAssets[__METHOD__][$url])) {
 			return null;
 		}
-		$this->_includedScripts[$url] = true;
+		$this->_includedAssets[__METHOD__][$url] = true;
 
 		if (strpos($url, '//') === false) {
 			$url = $this->assetUrl($url, $options + array('pathPrefix' => Configure::read('App.jsBaseUrl'), 'ext' => '.js'));
@@ -551,7 +566,7 @@ class HtmlHelper extends AppHelper {
 				$url = str_replace(Configure::read('App.jsBaseUrl'), 'cjs/', $url);
 			}
 		}
-		$attributes = $this->_parseAttributes($options, array('block', 'once'), ' ');
+		$attributes = $this->_parseAttributes($options, array('block', 'once'));
 		$out = sprintf($this->_tags['javascriptlink'], $url, $attributes);
 
 		if (empty($options['block'])) {
@@ -587,7 +602,7 @@ class HtmlHelper extends AppHelper {
 		}
 		unset($options['inline'], $options['safe']);
 
-		$attributes = $this->_parseAttributes($options, array('block'), ' ');
+		$attributes = $this->_parseAttributes($options, array('block'));
 		$out = sprintf($this->_tags['javascriptblock'], $attributes, $script);
 
 		if (empty($options['block'])) {
@@ -614,7 +629,6 @@ class HtmlHelper extends AppHelper {
 		$options += array('safe' => true, 'inline' => true);
 		$this->_scriptBlockOptions = $options;
 		ob_start();
-		return null;
 	}
 
 /**
@@ -637,15 +651,15 @@ class HtmlHelper extends AppHelper {
  *
  * ### Usage:
  *
- * {{{
+ * ```
  * echo $this->Html->style(array('margin' => '10px', 'padding' => '10px'), true);
  *
  * // creates
  * 'margin:10px;padding:10px;'
- * }}}
+ * ```
  *
  * @param array $data Style data array, keys will be used as property names, values as property values.
- * @param boolean $oneline Whether or not the style block should be displayed on one line.
+ * @param bool $oneline Whether or not the style block should be displayed on one line.
  * @return string CSS styling data
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::style
  */
@@ -674,9 +688,9 @@ class HtmlHelper extends AppHelper {
  * All other keys will be passed to HtmlHelper::link() as the `$options` parameter.
  *
  * @param string $separator Text to separate crumbs.
- * @param string|array|boolean $startText This will be the first crumb, if false it defaults to first crumb in array. Can
+ * @param string|array|bool $startText This will be the first crumb, if false it defaults to first crumb in array. Can
  *   also be an array, see above for details.
- * @return string Composed bread crumbs
+ * @return string|null Composed bread crumbs
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#creating-breadcrumb-trails-with-htmlhelper
  */
 	public function getCrumbs($separator = '&raquo;', $startText = false) {
@@ -708,9 +722,9 @@ class HtmlHelper extends AppHelper {
  * - `lastClass` Class for wrapper tag on current active page, defaults to 'last'
  *
  * @param array $options Array of html attributes to apply to the generated list elements.
- * @param string|array|boolean $startText This will be the first crumb, if false it defaults to first crumb in array. Can
+ * @param string|array|bool $startText This will be the first crumb, if false it defaults to first crumb in array. Can
  *   also be an array, see `HtmlHelper::getCrumbs` for details.
- * @return string breadcrumbs html list
+ * @return string|null breadcrumbs html list
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#creating-breadcrumb-trails-with-htmlhelper
  */
 	public function getCrumbList($options = array(), $startText = false) {
@@ -754,7 +768,7 @@ class HtmlHelper extends AppHelper {
  * Prepends startText to crumbs array if set
  *
  * @param string $startText Text to prepend
- * @param boolean $escape If the output should be escaped or not
+ * @param bool $escape If the output should be escaped or not
  * @return array Crumb list including startText (if provided)
  */
 	protected function _prepareCrumbs($startText, $escape = true) {
@@ -815,7 +829,7 @@ class HtmlHelper extends AppHelper {
 			unset($options['url']);
 		}
 
-		$image = sprintf($this->_tags['image'], $path, $this->_parseAttributes($options, null, '', ' '));
+		$image = sprintf($this->_tags['image'], $path, $this->_parseAttributes($options));
 
 		if ($url) {
 			return sprintf($this->_tags['link'], $this->url($url), null, $image);
@@ -851,8 +865,8 @@ class HtmlHelper extends AppHelper {
  * @param array $data Array of table data
  * @param array $oddTrOptions HTML options for odd TR elements if true useCount is used
  * @param array $evenTrOptions HTML options for even TR elements
- * @param boolean $useCount adds class "column-$i"
- * @param boolean $continueOddEven If false, will use a non-static $count variable,
+ * @param bool $useCount adds class "column-$i"
+ * @param bool $continueOddEven If false, will use a non-static $count variable,
  *    so that the odd/even count is reset to zero just for that call.
  * @return string Formatted HTML
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::tableCells
@@ -888,9 +902,16 @@ class HtmlHelper extends AppHelper {
 				if (is_array($cell)) {
 					$cellOptions = $cell[1];
 					$cell = $cell[0];
-				} elseif ($useCount) {
-					$cellOptions['class'] = 'column-' . ++$i;
 				}
+
+				if ($useCount) {
+					if (isset($cellOptions['class'])) {
+						$cellOptions['class'] .= ' column-' . ++$i;
+					} else {
+						$cellOptions['class'] = 'column-' . ++$i;
+					}
+				}
+
 				$cellsOut[] = sprintf($this->_tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
 			}
 			$options = $this->_parseAttributes($count % 2 ? $oddTrOptions : $evenTrOptions);
@@ -926,7 +947,7 @@ class HtmlHelper extends AppHelper {
 		} else {
 			$tag = 'tag';
 		}
-		return sprintf($this->_tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name);
+		return sprintf($this->_tags[$tag], $name, $this->_parseAttributes($options), $text, $name);
 	}
 
 /**
@@ -944,7 +965,7 @@ class HtmlHelper extends AppHelper {
 		array_shift($args);
 		foreach ($args as &$arg) {
 			if (is_array($arg)) {
-				$arg = $this->_parseAttributes($arg, null, ' ', '');
+				$arg = $this->_parseAttributes($arg);
 			}
 		}
 		return vsprintf($this->_tags[$tag], $args);
@@ -995,7 +1016,7 @@ class HtmlHelper extends AppHelper {
 		if ($text === null) {
 			$tag = 'parastart';
 		}
-		return sprintf($this->_tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text);
+		return sprintf($this->_tags[$tag], $this->_parseAttributes($options), $text);
 	}
 
 /**
@@ -1021,21 +1042,21 @@ class HtmlHelper extends AppHelper {
  *
  * Using multiple video files:
  *
- * {{{
+ * ```
  * echo $this->Html->media(
  * 		array('video.mp4', array('src' => 'video.ogv', 'type' => "video/ogg; codecs='theora, vorbis'")),
  * 		array('tag' => 'video', 'autoplay')
  * );
- * }}}
+ * ```
  *
  * Outputs:
  *
- * {{{
+ * ```
  * <video autoplay="autoplay">
  * 		<source src="/files/video.mp4" type="video/mp4"/>
  * 		<source src="/files/video.ogv" type="video/ogv; codecs='theora, vorbis'"/>
  * </video>
- * }}}
+ * ```
  *
  * ### Options
  *
@@ -1131,7 +1152,7 @@ class HtmlHelper extends AppHelper {
 			$options = array();
 		}
 		$items = $this->_nestedListItem($list, $options, $itemOptions, $tag);
-		return sprintf($this->_tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $items);
+		return sprintf($this->_tags[$tag], $this->_parseAttributes($options), $items);
 	}
 
 /**
@@ -1157,7 +1178,7 @@ class HtmlHelper extends AppHelper {
 			} elseif (isset($itemOptions['odd']) && $index % 2 !== 0) {
 				$itemOptions['class'] = $itemOptions['odd'];
 			}
-			$out .= sprintf($this->_tags['li'], $this->_parseAttributes($itemOptions, array('even', 'odd'), ' ', ''), $item);
+			$out .= sprintf($this->_tags['li'], $this->_parseAttributes($itemOptions, array('even', 'odd')), $item);
 			$index++;
 		}
 		return $out;
@@ -1173,11 +1194,11 @@ class HtmlHelper extends AppHelper {
  *
  * tags.php could look like:
  *
- * {{{
+ * ```
  * $tags = array(
- *		'meta' => '<meta %s>'
+ *		'meta' => '<meta%s>'
  * );
- * }}}
+ * ```
  *
  * If you wish to store tag definitions in another format you can give an array
  * containing the file name, and reader class name:
diff --git a/web/api/lib/Cake/View/Helper/JqueryEngineHelper.php b/web/api/lib/Cake/View/Helper/JqueryEngineHelper.php
index 953c2a849..300926a9b 100644
--- a/web/api/lib/Cake/View/Helper/JqueryEngineHelper.php
+++ b/web/api/lib/Cake/View/Helper/JqueryEngineHelper.php
@@ -145,7 +145,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * Create javascript selector for a CSS rule
  *
  * @param string $selector The selector that is targeted
- * @return JqueryEngineHelper instance of $this. Allows chained methods.
+ * @return self
  */
 	public function get($selector) {
 		if ($selector === 'window' || $selector === 'document') {
@@ -243,7 +243,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  *
  * If the 'update' key is set, success callback will be overridden.
  *
- * @param string|array $url
+ * @param string|array $url URL
  * @param array $options See JsHelper::request() for options.
  * @return string The completed ajax call.
  * @see JsBaseEngineHelper::request() for options list.
diff --git a/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php b/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
index 3f4e4a523..22d0bb01a 100644
--- a/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
+++ b/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
@@ -137,7 +137,8 @@ abstract class JsBaseEngineHelper extends AppHelper {
  * Converts a PHP-native variable of any type to a JSON-equivalent representation
  *
  * @param mixed $val A PHP variable to be converted to JSON
- * @param boolean $quoteString If false, leaves string values unquoted
+ * @param bool $quoteString If false, leaves string values unquoted
+ * @param string $key Key name.
  * @return string a JavaScript-safe/JSON representation of $val
  */
 	public function value($val = array(), $quoteString = null, $key = 'value') {
@@ -284,7 +285,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
  * Create javascript selector for a CSS rule
  *
  * @param string $selector The selector that is targeted
- * @return JsBaseEngineHelper instance of $this. Allows chained methods.
+ * @return self instance of $this. Allows chained methods.
  */
 	abstract public function get($selector);
 
@@ -475,7 +476,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 	abstract public function serializeForm($options = array());
 
 /**
- * Parse an options assoc array into an JavaScript object literal.
+ * Parse an options assoc array into a JavaScript object literal.
  * Similar to object() but treats any non-integer value as a string,
  * does not include `{ }`
  *
diff --git a/web/api/lib/Cake/View/Helper/JsHelper.php b/web/api/lib/Cake/View/Helper/JsHelper.php
index 3d67d48bf..e534b28ca 100644
--- a/web/api/lib/Cake/View/Helper/JsHelper.php
+++ b/web/api/lib/Cake/View/Helper/JsHelper.php
@@ -35,7 +35,7 @@ class JsHelper extends AppHelper {
 /**
  * Whether or not you want scripts to be buffered or output.
  *
- * @var boolean
+ * @var bool
  */
 	public $bufferScripts = true;
 
@@ -157,7 +157,8 @@ class JsHelper extends AppHelper {
  * See JsBaseEngineHelper::value() for more information on this method.
  *
  * @param mixed $val A PHP variable to be converted to JSON
- * @param boolean $quoteString If false, leaves string values unquoted
+ * @param bool $quoteString If false, leaves string values unquoted
+ * @param string $key Key name.
  * @return string a JavaScript-safe/JSON representation of $val
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::value
  */
@@ -228,7 +229,7 @@ class JsHelper extends AppHelper {
  * Write a script to the buffered scripts.
  *
  * @param string $script Script string to add to the buffer.
- * @param boolean $top If true the script will be added to the top of the
+ * @param bool $top If true the script will be added to the top of the
  *   buffered scripts array. If false the bottom.
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::buffer
@@ -244,7 +245,7 @@ class JsHelper extends AppHelper {
 /**
  * Get all the buffered scripts
  *
- * @param boolean $clear Whether or not to clear the script caches (default true)
+ * @param bool $clear Whether or not to clear the script caches (default true)
  * @return array Array of scripts added to the request.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/js.html#JsHelper::getBuffer
  */
@@ -291,7 +292,7 @@ class JsHelper extends AppHelper {
  */
 	public function link($title, $url = null, $options = array()) {
 		if (!isset($options['id'])) {
-			$options['id'] = 'link-' . intval(mt_rand());
+			$options['id'] = 'link-' . (int)mt_rand();
 		}
 		list($options, $htmlOptions) = $this->_getHtmlOptions($options);
 		$out = $this->Html->link($title, $url, $htmlOptions);
@@ -367,7 +368,7 @@ class JsHelper extends AppHelper {
  */
 	public function submit($caption = null, $options = array()) {
 		if (!isset($options['id'])) {
-			$options['id'] = 'submit-' . intval(mt_rand());
+			$options['id'] = 'submit-' . (int)mt_rand();
 		}
 		$formOptions = array('div');
 		list($options, $htmlOptions) = $this->_getHtmlOptions($options, $formOptions);
diff --git a/web/api/lib/Cake/View/Helper/MootoolsEngineHelper.php b/web/api/lib/Cake/View/Helper/MootoolsEngineHelper.php
index 571d205fa..77cbef437 100644
--- a/web/api/lib/Cake/View/Helper/MootoolsEngineHelper.php
+++ b/web/api/lib/Cake/View/Helper/MootoolsEngineHelper.php
@@ -118,7 +118,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * Create javascript selector for a CSS rule
  *
  * @param string $selector The selector that is targeted
- * @return MootoolsEngineHelper instance of $this. Allows chained methods.
+ * @return self
  */
 	public function get($selector) {
 		$this->_multipleSelection = false;
@@ -225,13 +225,13 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
 	}
 
 /**
- * Create an new Request.
+ * Create a new Request.
  *
  * Requires `Request`. If you wish to use 'update' key you must have ```Request.HTML```
  * if you wish to do Json requests you will need ```JSON``` and ```Request.JSON```.
  *
- * @param string|array $url
- * @param array $options
+ * @param string|array $url URL
+ * @param array $options Options list.
  * @return string The completed ajax call.
  */
 	public function request($url, $options = array()) {
diff --git a/web/api/lib/Cake/View/Helper/NumberHelper.php b/web/api/lib/Cake/View/Helper/NumberHelper.php
index 8295efccb..ce15ad217 100644
--- a/web/api/lib/Cake/View/Helper/NumberHelper.php
+++ b/web/api/lib/Cake/View/Helper/NumberHelper.php
@@ -67,6 +67,8 @@ class NumberHelper extends AppHelper {
 /**
  * Call methods from CakeNumber utility class
  *
+ * @param string $method Method to call.
+ * @param array $params Parameters to pass to method.
  * @return mixed Whatever is returned by called method, or false on failure
  */
 	public function __call($method, $params) {
@@ -76,11 +78,10 @@ class NumberHelper extends AppHelper {
 /**
  * Formats a number with a level of precision.
  *
- * @see CakeNumber::precision()
- *
  * @param float $number A floating point number.
- * @param integer $precision The precision of the returned number.
+ * @param int $precision The precision of the returned number.
  * @return float Formatted float.
+ * @see CakeNumber::precision()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::precision
  */
 	public function precision($number, $precision = 3) {
@@ -90,10 +91,9 @@ class NumberHelper extends AppHelper {
 /**
  * Returns a formatted-for-humans file size.
  *
- * @see CakeNumber::toReadableSize()
- *
- * @param integer $size Size in bytes
+ * @param int $size Size in bytes
  * @return string Human readable size
+ * @see CakeNumber::toReadableSize()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::toReadableSize
  */
 	public function toReadableSize($size) {
@@ -107,12 +107,11 @@ class NumberHelper extends AppHelper {
  *
  * - `multiply`: Multiply the input value by 100 for decimal percentages.
  *
- * @see CakeNumber::toPercentage()
- *
  * @param float $number A floating point number
- * @param integer $precision The precision of the returned number
+ * @param int $precision The precision of the returned number
  * @param array $options Options
  * @return string Percentage string
+ * @see CakeNumber::toPercentage()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::toPercentage
  */
 	public function toPercentage($number, $precision = 2, $options = array()) {
@@ -122,12 +121,11 @@ class NumberHelper extends AppHelper {
 /**
  * Formats a number into a currency format.
  *
- * @see CakeNumber::format()
- *
  * @param float $number A floating point number
- * @param integer $options If integer then places, if string then before, if (,.-) then use it
+ * @param int $options If integer then places, if string then before, if (,.-) then use it
  *   or array with places and before keys
  * @return string formatted number
+ * @see CakeNumber::format()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::format
  */
 	public function format($number, $options = false) {
@@ -137,14 +135,13 @@ class NumberHelper extends AppHelper {
 /**
  * Formats a number into a currency format.
  *
- * @see CakeNumber::currency()
- *
- * @param float $number
+ * @param float $number Number to format.
  * @param string $currency Shortcut to default options. Valid values are 'USD', 'EUR', 'GBP', otherwise
  *   set at least 'before' and 'after' options.
  * 'USD' is the default currency, use CakeNumber::defaultCurrency() to change this default.
- * @param array $options
+ * @param array $options Options list.
  * @return string Number formatted as a currency.
+ * @see CakeNumber::currency()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::currency
  */
 	public function currency($number, $currency = null, $options = array()) {
@@ -155,20 +152,19 @@ class NumberHelper extends AppHelper {
  * Add a currency format to the Number helper. Makes reusing
  * currency formats easier.
  *
- * {{{ $this->Number->addFormat('NOK', array('before' => 'Kr. ')); }}}
+ * ``` $this->Number->addFormat('NOK', array('before' => 'Kr. ')); ```
  *
  * You can now use `NOK` as a shortform when formatting currency amounts.
  *
- * {{{ $this->Number->currency($value, 'NOK'); }}}
+ * ``` $this->Number->currency($value, 'NOK'); ```
  *
  * Added formats are merged with the defaults defined in Cake\Utility\Number::$_currencyDefaults
  * See Cake\Utility\Number::currency() for more information on the various options and their function.
  *
- * @see CakeNumber::addFormat()
- *
  * @param string $formatName The format name to be used in the future.
  * @param array $options The array of options for this format.
  * @return void
+ * @see CakeNumber::addFormat()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::addFormat
  */
 	public function addFormat($formatName, $options) {
@@ -178,10 +174,9 @@ class NumberHelper extends AppHelper {
 /**
  * Getter/setter for default currency
  *
- * @see CakeNumber::defaultCurrency()
- *
  * @param string $currency The currency to be used in the future.
  * @return string Currency
+ * @see CakeNumber::defaultCurrency()
  */
 	public function defaultCurrency($currency) {
 		return $this->_engine->defaultCurrency($currency);
diff --git a/web/api/lib/Cake/View/Helper/PaginatorHelper.php b/web/api/lib/Cake/View/Helper/PaginatorHelper.php
index fca9ae26e..5744d83b1 100644
--- a/web/api/lib/Cake/View/Helper/PaginatorHelper.php
+++ b/web/api/lib/Cake/View/Helper/PaginatorHelper.php
@@ -105,7 +105,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Before render callback. Overridden to merge passed args with URL options.
  *
- * @param string $viewFile
+ * @param string $viewFile View file name.
  * @return void
  */
 	public function beforeRender($viewFile) {
@@ -128,7 +128,14 @@ class PaginatorHelper extends AppHelper {
 			$model = $this->defaultModel();
 		}
 		if (!isset($this->request->params['paging']) || empty($this->request->params['paging'][$model])) {
-			return null;
+			return array(
+				'prevPage' => false,
+				'nextPage' => true,
+				'paramType' => 'named',
+				'pageCount' => 1,
+				'options' => array(),
+				'page' => 1
+			);
 		}
 		return $this->request->params['paging'][$model];
 	}
@@ -207,7 +214,7 @@ class PaginatorHelper extends AppHelper {
  *
  * @param string $model Optional model name. Uses the default if none is specified.
  * @param array $options Options for pagination links. See #options for list of keys.
- * @return string The name of the key by which the recordset is being sorted, or
+ * @return string|null The name of the key by which the recordset is being sorted, or
  *  null if the results are not currently sorted.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::sortKey
  */
@@ -344,7 +351,7 @@ class PaginatorHelper extends AppHelper {
 
 			$title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
 		}
-		$defaultDir = isset($options['direction']) ? $options['direction'] : 'asc';
+		$defaultDir = isset($options['direction']) ? strtolower($options['direction']) : 'asc';
 		unset($options['direction']);
 
 		$locked = isset($options['lock']) ? $options['lock'] : false;
@@ -420,7 +427,7 @@ class PaginatorHelper extends AppHelper {
  * Merges passed URL options with current pagination state to generate a pagination URL.
  *
  * @param array $options Pagination/URL options array
- * @param boolean $asArray Return the URL as an array, or a URI string
+ * @param bool $asArray Return the URL as an array, or a URI string
  * @param string $model Which model to paginate on
  * @return mixed By default, returns a full pagination URL string for use in non-standard contexts (i.e. JavaScript)
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::url
@@ -454,7 +461,7 @@ class PaginatorHelper extends AppHelper {
  * Converts the keys being used into the format set by options.paramType
  *
  * @param array $url Array of URL params to convert
- * @param string $type
+ * @param string $type Keys type.
  * @return array converted URL params.
  */
 	protected function _convertUrlKeys($url, $type) {
@@ -476,11 +483,11 @@ class PaginatorHelper extends AppHelper {
 /**
  * Protected method for generating prev/next links
  *
- * @param string $which
- * @param string $title
- * @param array $options
- * @param string $disabledTitle
- * @param array $disabledOptions
+ * @param string $which Link type: 'Prev', 'Next'.
+ * @param string $title Link title.
+ * @param array $options Options list.
+ * @param string $disabledTitle Disabled link title.
+ * @param array $disabledOptions Disabled link options.
  * @return string
  */
 	protected function _pagingLink($which, $title = null, $options = array(), $disabledTitle = null, $disabledOptions = array()) {
@@ -499,9 +506,9 @@ class PaginatorHelper extends AppHelper {
 			if (!empty($disabledTitle) && $disabledTitle !== true) {
 				$title = $disabledTitle;
 			}
-			$options = (array)$disabledOptions + $_defaults;
+			$options = (array)$disabledOptions + array_intersect_key($options, $_defaults) + $_defaults;
 		} elseif (!$this->{$check}($options['model'])) {
-			return null;
+			return '';
 		}
 
 		foreach (array_keys($_defaults) as $key) {
@@ -544,7 +551,7 @@ class PaginatorHelper extends AppHelper {
  * Returns true if the given result set is not at the first page
  *
  * @param string $model Optional model name. Uses the default if none is specified.
- * @return boolean True if the result set is not at the first page.
+ * @return bool True if the result set is not at the first page.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::hasPrev
  */
 	public function hasPrev($model = null) {
@@ -555,7 +562,7 @@ class PaginatorHelper extends AppHelper {
  * Returns true if the given result set is not at the last page
  *
  * @param string $model Optional model name. Uses the default if none is specified.
- * @return boolean True if the result set is not at the last page.
+ * @return bool True if the result set is not at the last page.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::hasNext
  */
 	public function hasNext($model = null) {
@@ -566,8 +573,8 @@ class PaginatorHelper extends AppHelper {
  * Returns true if the given result set has the page number given by $page
  *
  * @param string $model Optional model name. Uses the default if none is specified.
- * @param integer $page The page number - if not set defaults to 1.
- * @return boolean True if the given result set has the specified page number.
+ * @param int $page The page number - if not set defaults to 1.
+ * @return bool True if the given result set has the specified page number.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::hasPage
  */
 	public function hasPage($model = null, $page = 1) {
@@ -583,8 +590,8 @@ class PaginatorHelper extends AppHelper {
  * Does $model have $page in its range?
  *
  * @param string $model Model name to get parameters for.
- * @param integer $page Page number you are checking.
- * @return boolean Whether model has $page
+ * @param int $page Page number you are checking.
+ * @return bool Whether model has $page
  */
 	protected function _hasPage($model, $page) {
 		$params = $this->params($model);
@@ -594,7 +601,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the default model of the paged sets
  *
- * @return string Model name or null if the pagination isn't initialized.
+ * @return string|null Model name or null if the pagination isn't initialized.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::defaultModel
  */
 	public function defaultModel() {
@@ -621,9 +628,9 @@ class PaginatorHelper extends AppHelper {
  * - `separator` The separator string to use, default to ' of '
  *
  * The `%page%` style placeholders also work, but are deprecated and will be removed in a future version.
+ *
  * @param array $options Options for the counter string. See #options for list of keys.
  * @return string Counter string.
- * @deprecated The %page% style placeholders are deprecated.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::counter
  */
 	public function counter($options = array()) {
@@ -698,16 +705,18 @@ class PaginatorHelper extends AppHelper {
  * - `separator` Separator content defaults to ' | '
  * - `tag` The tag to wrap links in, defaults to 'span'
  * - `first` Whether you want first links generated, set to an integer to define the number of 'first'
- *    links to generate.
+ *    links to generate. If a string is set a link to the first page will be generated with the value
+ *    as the title.
  * - `last` Whether you want last links generated, set to an integer to define the number of 'last'
- *    links to generate.
+ *    links to generate. If a string is set a link to the last page will be generated with the value
+ *    as the title.
  * - `ellipsis` Ellipsis content, defaults to '...'
  * - `class` Class for wrapper tag
  * - `currentClass` Class for wrapper tag on current active page, defaults to 'current'
  * - `currentTag` Tag to use for current page number, defaults to null
  *
- * @param array $options Options for the numbers, (before, after, model, modulus, separator)
- * @return string numbers string.
+ * @param array|bool $options Options for the numbers, (before, after, model, modulus, separator)
+ * @return string Numbers string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::numbers
  */
 	public function numbers($options = array()) {
@@ -727,8 +736,8 @@ class PaginatorHelper extends AppHelper {
 		$params = (array)$this->params($options['model']) + array('page' => 1);
 		unset($options['model']);
 
-		if ($params['pageCount'] <= 1) {
-			return false;
+		if (empty($params['pageCount']) || $params['pageCount'] <= 1) {
+			return '';
 		}
 
 		extract($options);
@@ -736,11 +745,10 @@ class PaginatorHelper extends AppHelper {
 			$options['modulus'], $options['separator'], $options['first'], $options['last'],
 			$options['ellipsis'], $options['class'], $options['currentClass'], $options['currentTag']
 		);
-
 		$out = '';
 
 		if ($modulus && $params['pageCount'] > $modulus) {
-			$half = intval($modulus / 2);
+			$half = (int)($modulus / 2);
 			$end = $params['page'] + $half;
 
 			if ($end > $params['pageCount']) {
@@ -752,9 +760,10 @@ class PaginatorHelper extends AppHelper {
 				$end = $params['page'] + ($modulus - $params['page']) + 1;
 			}
 
+			$firstPage = is_int($first) ? $first : 0;
 			if ($first && $start > 1) {
-				$offset = ($start <= (int)$first) ? $start - 1 : $first;
-				if ($offset < $start - 1) {
+				$offset = ($start <= $firstPage) ? $start - 1 : $first;
+				if ($firstPage < $start - 1) {
 					$out .= $this->first($offset, compact('tag', 'separator', 'ellipsis', 'class'));
 				} else {
 					$out .= $this->first($offset, compact('tag', 'separator', 'class', 'ellipsis') + array('after' => $separator));
@@ -791,8 +800,9 @@ class PaginatorHelper extends AppHelper {
 			$out .= $after;
 
 			if ($last && $end < $params['pageCount']) {
-				$offset = ($params['pageCount'] < $end + (int)$last) ? $params['pageCount'] - $end : $last;
-				if ($offset <= $last && $params['pageCount'] - $end > $offset) {
+				$lastPage = is_int($last) ? $last : 0;
+				$offset = ($params['pageCount'] < $end + $lastPage) ? $params['pageCount'] - $end : $last;
+				if ($offset <= $lastPage && $params['pageCount'] - $end > $lastPage) {
 					$out .= $this->last($offset, compact('tag', 'separator', 'ellipsis', 'class'));
 				} else {
 					$out .= $this->last($offset, compact('tag', 'separator', 'class', 'ellipsis') + array('before' => $separator));
@@ -846,10 +856,10 @@ class PaginatorHelper extends AppHelper {
  * - `separator` Content between the generated links, defaults to ' | '
  * - `ellipsis` Content for ellipsis, defaults to '...'
  *
- * @param string|integer $first if string use as label for the link. If numeric, the number of page links
+ * @param string|int $first if string use as label for the link. If numeric, the number of page links
  *   you want at the beginning of the range.
  * @param array $options An array of options.
- * @return string numbers string.
+ * @return string Numbers string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::first
  */
 	public function first($first = '<< first', $options = array()) {
@@ -866,14 +876,14 @@ class PaginatorHelper extends AppHelper {
 		unset($options['model']);
 
 		if ($params['pageCount'] <= 1) {
-			return false;
+			return '';
 		}
 		extract($options);
 		unset($options['tag'], $options['after'], $options['model'], $options['separator'], $options['ellipsis'], $options['class']);
 
 		$out = '';
 
-		if (is_int($first) && $params['page'] >= $first) {
+		if ((is_int($first) || ctype_digit($first)) && $params['page'] >= $first) {
 			if ($after === null) {
 				$after = $ellipsis;
 			}
@@ -910,9 +920,9 @@ class PaginatorHelper extends AppHelper {
  * - `separator` Content between the generated links, defaults to ' | '
  * - `ellipsis` Content for ellipsis, defaults to '...'
  *
- * @param string|integer $last if string use as label for the link, if numeric print page numbers
+ * @param string|int $last if string use as label for the link, if numeric print page numbers
  * @param array $options Array of options
- * @return string numbers string.
+ * @return string Numbers string.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::last
  */
 	public function last($last = 'last >>', $options = array()) {
@@ -929,7 +939,7 @@ class PaginatorHelper extends AppHelper {
 		unset($options['model']);
 
 		if ($params['pageCount'] <= 1) {
-			return false;
+			return '';
 		}
 
 		extract($options);
@@ -938,7 +948,7 @@ class PaginatorHelper extends AppHelper {
 		$out = '';
 		$lower = $params['pageCount'] - $last + 1;
 
-		if (is_int($last) && $params['page'] <= $lower) {
+		if ((is_int($last) || ctype_digit($last)) && $params['page'] <= $lower) {
 			if ($before === null) {
 				$before = $ellipsis;
 			}
@@ -958,4 +968,51 @@ class PaginatorHelper extends AppHelper {
 		return $out;
 	}
 
+/**
+ * Returns the meta-links for a paginated result set.
+ *
+ * `echo $this->Paginator->meta();`
+ *
+ * Echos the links directly, will output nothing if there is neither a previous nor next page.
+ *
+ * `$this->Paginator->meta(array('block' => true));`
+ *
+ * Will append the output of the meta function to the named block - if true is passed the "meta"
+ * block is used.
+ *
+ * ### Options:
+ *
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `block` The block name to append the output to, or false/absent to return as a string
+ *
+ * @param array $options Array of options.
+ * @return string|null Meta links.
+ */
+	public function meta($options = array()) {
+		$model = isset($options['model']) ? $options['model'] : null;
+		$params = $this->params($model);
+		$urlOptions = isset($this->options['url']) ? $this->options['url'] : array();
+		$links = array();
+		if ($this->hasPrev()) {
+			$links[] = $this->Html->meta(array(
+				'rel' => 'prev',
+				'link' => $this->url(array_merge($urlOptions, array('page' => $params['page'] - 1)), true)
+			));
+		}
+		if ($this->hasNext()) {
+			$links[] = $this->Html->meta(array(
+				'rel' => 'next',
+				'link' => $this->url(array_merge($urlOptions, array('page' => $params['page'] + 1)), true)
+			));
+		}
+		$out = implode($links);
+		if (empty($options['block'])) {
+			return $out;
+		}
+		if ($options['block'] === true) {
+			$options['block'] = __FUNCTION__;
+		}
+		$this->_View->append($options['block'], $out);
+	}
+
 }
diff --git a/web/api/lib/Cake/View/Helper/PrototypeEngineHelper.php b/web/api/lib/Cake/View/Helper/PrototypeEngineHelper.php
index 833ef5d6a..2096137e7 100644
--- a/web/api/lib/Cake/View/Helper/PrototypeEngineHelper.php
+++ b/web/api/lib/Cake/View/Helper/PrototypeEngineHelper.php
@@ -34,7 +34,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
 /**
  * Is the current selection a multiple selection? or is it just a single element.
  *
- * @var boolean
+ * @var bool
  */
 	protected $_multiple = false;
 
@@ -114,7 +114,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * Create javascript selector for a CSS rule
  *
  * @param string $selector The selector that is targeted
- * @return PrototypeEngineHelper instance of $this. Allows chained methods.
+ * @return self
  */
 	public function get($selector) {
 		$this->_multiple = false;
@@ -228,8 +228,8 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
 /**
  * Create an Ajax or Ajax.Updater call.
  *
- * @param string|array $url
- * @param array $options
+ * @param string|array $url URL.
+ * @param array $options Options list.
  * @return string The completed ajax call.
  */
 	public function request($url, $options = array()) {
diff --git a/web/api/lib/Cake/View/Helper/RssHelper.php b/web/api/lib/Cake/View/Helper/RssHelper.php
index 348b9ace5..a98bdb858 100644
--- a/web/api/lib/Cake/View/Helper/RssHelper.php
+++ b/web/api/lib/Cake/View/Helper/RssHelper.php
@@ -97,7 +97,7 @@ class RssHelper extends AppHelper {
  * Returns an RSS document wrapped in `<rss />` tags
  *
  * @param array $attrib `<rss />` tag attributes
- * @param string $content
+ * @param string $content Tag content.
  * @return string An RSS document
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/rss.html#RssHelper::document
  */
@@ -274,7 +274,7 @@ class RssHelper extends AppHelper {
 /**
  * Converts a time in any format to an RSS time
  *
- * @param integer|string|DateTime $time
+ * @param int|string|DateTime $time UNIX timestamp or valid time string or DateTime object.
  * @return string An RSS-formatted timestamp
  * @see TimeHelper::toRSS
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/rss.html#RssHelper::time
@@ -289,7 +289,7 @@ class RssHelper extends AppHelper {
  * @param string $name The name of the XML element
  * @param array $attrib The attributes of the XML element
  * @param string|array $content XML element content
- * @param boolean $endTag Whether the end tag of the element should be printed
+ * @param bool $endTag Whether the end tag of the element should be printed
  * @return string XML
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/rss.html#RssHelper::elem
  */
diff --git a/web/api/lib/Cake/View/Helper/SessionHelper.php b/web/api/lib/Cake/View/Helper/SessionHelper.php
index 9125193f5..1670c84e9 100644
--- a/web/api/lib/Cake/View/Helper/SessionHelper.php
+++ b/web/api/lib/Cake/View/Helper/SessionHelper.php
@@ -30,7 +30,7 @@ App::uses('CakeSession', 'Model/Datasource');
 class SessionHelper extends AppHelper {
 
 /**
- * Used to read a session values set in a controller for a key or return values for all keys.
+ * Reads a session value for a key or returns values for all keys.
  *
  * In your view: `$this->Session->read('Controller.sessKey');`
  * Calling the method without a param will return all session vars
@@ -44,12 +44,24 @@ class SessionHelper extends AppHelper {
 	}
 
 /**
- * Used to check is a session key has been set
+ * Reads and deletes a session value for a key.
+ *
+ * In your view: `$this->Session->consume('Controller.sessKey');`
+ *
+ * @param string $name the name of the session key you want to read
+ * @return mixed values from the session vars
+ */
+	public function consume($name) {
+		return CakeSession::consume($name);
+	}
+
+/**
+ * Checks if a session key has been set.
  *
  * In your view: `$this->Session->check('Controller.sessKey');`
  *
- * @param string $name
- * @return boolean
+ * @param string $name Session key to check.
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/session.html#SessionHelper::check
  */
 	public function check($name) {
@@ -77,17 +89,17 @@ class SessionHelper extends AppHelper {
  * You can pass additional information into the flash message generation. This allows you
  * to consolidate all the parameters for a given type of flash message into the view.
  *
- * {{{
+ * ```
  * echo $this->Session->flash('flash', array('params' => array('class' => 'new-flash')));
- * }}}
+ * ```
  *
  * The above would generate a flash message with a custom class name. Using $attrs['params'] you
  * can pass additional data into the element rendering that will be made available as local variables
  * when the element is rendered:
  *
- * {{{
+ * ```
  * echo $this->Session->flash('flash', array('params' => array('name' => $user['User']['name'])));
- * }}}
+ * ```
  *
  * This would pass the current user's name into the flash message, so you could create personalized
  * messages without the controller needing access to that data.
@@ -95,31 +107,33 @@ class SessionHelper extends AppHelper {
  * Lastly you can choose the element that is rendered when creating the flash message. Using
  * custom elements allows you to fully customize how flash messages are generated.
  *
- * {{{
+ * ```
  * echo $this->Session->flash('flash', array('element' => 'my_custom_element'));
- * }}}
+ * ```
  *
  * If you want to use an element from a plugin for rendering your flash message you can do that using the
  * plugin param:
  *
- * {{{
+ * ```
  * echo $this->Session->flash('flash', array(
  *		'element' => 'my_custom_element',
  *		'params' => array('plugin' => 'my_plugin')
  * ));
- * }}}
+ * ```
  *
  * @param string $key The [Message.]key you are rendering in the view.
  * @param array $attrs Additional attributes to use for the creation of this flash message.
  *    Supports the 'params', and 'element' keys that are used in the helper.
  * @return string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/session.html#SessionHelper::flash
+ * @deprecated 3.0.0 Since 2.7, use FlashHelper::render() instead.
  */
 	public function flash($key = 'flash', $attrs = array()) {
 		$out = false;
 
 		if (CakeSession::check('Message.' . $key)) {
 			$flash = CakeSession::read('Message.' . $key);
+			CakeSession::delete('Message.' . $key);
 			$message = $flash['message'];
 			unset($flash['message']);
 
@@ -142,9 +156,9 @@ class SessionHelper extends AppHelper {
 				}
 				$tmpVars = $flash['params'];
 				$tmpVars['message'] = $message;
+				$tmpVars['key'] = $key;
 				$out = $this->_View->element($flash['element'], $tmpVars, $options);
 			}
-			CakeSession::delete('Message.' . $key);
 		}
 		return $out;
 	}
@@ -152,7 +166,7 @@ class SessionHelper extends AppHelper {
 /**
  * Used to check is a session is valid in a view
  *
- * @return boolean
+ * @return bool
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/session.html#SessionHelper::valid
  */
 	public function valid() {
diff --git a/web/api/lib/Cake/View/Helper/TextHelper.php b/web/api/lib/Cake/View/Helper/TextHelper.php
index 451aa17b6..c7a515b5b 100644
--- a/web/api/lib/Cake/View/Helper/TextHelper.php
+++ b/web/api/lib/Cake/View/Helper/TextHelper.php
@@ -49,7 +49,7 @@ class TextHelper extends AppHelper {
 	protected $_placeholders = array();
 
 /**
- * String utility instance
+ * CakeText utility instance
  *
  * @var stdClass
  */
@@ -60,7 +60,7 @@ class TextHelper extends AppHelper {
  *
  * ### Settings:
  *
- * - `engine` Class name to use to replace String functionality.
+ * - `engine` Class name to use to replace CakeText functionality.
  *            The class needs to be placed in the `Utility` directory.
  *
  * @param View $View the view object the helper is attached to.
@@ -68,7 +68,7 @@ class TextHelper extends AppHelper {
  * @throws CakeException when the engine class could not be found.
  */
 	public function __construct(View $View, $settings = array()) {
-		$settings = Hash::merge(array('engine' => 'String'), $settings);
+		$settings = Hash::merge(array('engine' => 'CakeText'), $settings);
 		parent::__construct($View, $settings);
 		list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
 		App::uses($engineClass, $plugin . 'Utility');
@@ -80,7 +80,10 @@ class TextHelper extends AppHelper {
 	}
 
 /**
- * Call methods from String utility class
+ * Call methods from CakeText utility class
+ *
+ * @param string $method Method to call.
+ * @param array $params Parameters to pass to method.
  * @return mixed Whatever is returned by called method, or false on failure
  */
 	public function __call($method, $params) {
@@ -104,14 +107,14 @@ class TextHelper extends AppHelper {
 		$this->_placeholders = array();
 		$options += array('escape' => true);
 
-		$pattern = '#(?<!href="|src="|">)((?:https?|ftp|nntp)://[\p{L}0-9.\-:]+(?:[/?][^\s<]*)?)#ui';
+		$pattern = '#(?<!href="|src="|">)((?:https?|ftp|nntp)://[\p{L}0-9.\-_:]+(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:\'".,<>?«»“”‘’]))#i';
 		$text = preg_replace_callback(
 			$pattern,
 			array(&$this, '_insertPlaceHolder'),
 			$text
 		);
 		$text = preg_replace_callback(
-			'#(?<!href="|">)(?<!\b[[:punct:]])(?<!http://|https://|ftp://|nntp://)www.[^\n\%\ <]+[^<\n\%\,\.\ <](?<!\))#i',
+			'#(?<!href="|">)(?<!\b[[:punct:]])(?<!http://|https://|ftp://|nntp://|//)www\.[^\n\%\ <]+[^<\n\%\,\.\ <](?<!\))#i',
 			array(&$this, '_insertPlaceHolder'),
 			$text
 		);
@@ -187,7 +190,7 @@ class TextHelper extends AppHelper {
 
 		$atom = '[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]';
 		$text = preg_replace_callback(
-			'/(?<=\s|^|\()(' . $atom . '*(?:\.' . $atom . '+)*@[\p{L}0-9-]+(?:\.[\p{L}0-9-]+)+)/ui',
+			'/(?<=\s|^|\(|\>|\;)(' . $atom . '*(?:\.' . $atom . '+)*@[\p{L}0-9-]+(?:\.[\p{L}0-9-]+)+)/ui',
 			array(&$this, '_insertPlaceholder'),
 			$text
 		);
@@ -218,12 +221,11 @@ class TextHelper extends AppHelper {
  * Highlights a given phrase in a text. You can specify any expression in highlighter that
  * may include the \1 expression to include the $phrase found.
  *
- * @see String::highlight()
- *
  * @param string $text Text to search the phrase in
  * @param string $phrase The phrase that will be searched
  * @param array $options An array of html attributes and options.
  * @return string The highlighted text
+ * @see CakeText::highlight()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::highlight
  */
 	public function highlight($text, $phrase, $options = array()) {
@@ -256,16 +258,38 @@ class TextHelper extends AppHelper {
 /**
  * Strips given text of all links (<a href=....)
  *
- * @see String::stripLinks()
- *
  * @param string $text Text
  * @return string The text without links
+ * @see CakeText::stripLinks()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::stripLinks
  */
 	public function stripLinks($text) {
 		return $this->_engine->stripLinks($text);
 	}
 
+/**
+ * Truncates text.
+ *
+ * Cuts a string to the length of $length and replaces the last characters
+ * with the ellipsis if the text is longer than length.
+ *
+ * ### Options:
+ *
+ * - `ellipsis` Will be used as Ending and appended to the trimmed string (`ending` is deprecated)
+ * - `exact` If false, $text will not be cut mid-word
+ * - `html` If true, HTML tags would be handled correctly
+ *
+ * @param string $text String to truncate.
+ * @param int $length Length of returned string, including ellipsis.
+ * @param array $options An array of html attributes and options.
+ * @return string Trimmed string.
+ * @see CakeText::truncate()
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate
+ */
+	public function truncate($text, $length = 100, $options = array()) {
+		return $this->_engine->truncate($text, $length, $options);
+	}
+
 /**
  * Truncates text starting from the end.
  *
@@ -277,29 +301,27 @@ class TextHelper extends AppHelper {
  * - `ellipsis` Will be used as Beginning and prepended to the trimmed string
  * - `exact` If false, $text will not be cut mid-word
  *
- * @see String::truncate()
- *
  * @param string $text String to truncate.
- * @param integer $length Length of returned string, including ellipsis.
+ * @param int $length Length of returned string, including ellipsis.
  * @param array $options An array of html attributes and options.
  * @return string Trimmed string.
- * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::truncate
+ * @see CakeText::tail()
+ * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::tail
  */
-	public function truncate($text, $length = 100, $options = array()) {
-		return $this->_engine->truncate($text, $length, $options);
+	public function tail($text, $length = 100, $options = array()) {
+		return $this->_engine->tail($text, $length, $options);
 	}
 
 /**
  * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side
  * determined by radius.
  *
- * @see String::excerpt()
- *
  * @param string $text String to search the phrase in
  * @param string $phrase Phrase that will be searched for
- * @param integer $radius The amount of characters that will be returned on each side of the founded phrase
+ * @param int $radius The amount of characters that will be returned on each side of the founded phrase
  * @param string $ending Ending that will be appended
  * @return string Modified string
+ * @see CakeText::excerpt()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt
  */
 	public function excerpt($text, $phrase, $radius = 100, $ending = '...') {
@@ -307,17 +329,16 @@ class TextHelper extends AppHelper {
 	}
 
 /**
- * Creates a comma separated list where the last two items are joined with 'and', forming natural English
+ * Creates a comma separated list where the last two items are joined with 'and', forming natural language.
  *
- * @see String::toList()
- *
- * @param array $list The list to be joined
- * @param string $and The word used to join the last and second last items together with. Defaults to 'and'
- * @param string $separator The separator used to join all the other items together. Defaults to ', '
+ * @param array $list The list to be joined.
+ * @param string $and The word used to join the last and second last items together with. Defaults to 'and'.
+ * @param string $separator The separator used to join all the other items together. Defaults to ', '.
  * @return string The glued together string.
+ * @see CakeText::toList()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList
  */
-	public function toList($list, $and = 'and', $separator = ', ') {
+	public function toList($list, $and = null, $separator = ', ') {
 		return $this->_engine->toList($list, $and, $separator);
 	}
 
diff --git a/web/api/lib/Cake/View/Helper/TimeHelper.php b/web/api/lib/Cake/View/Helper/TimeHelper.php
index f9fd2ad17..a8045b281 100644
--- a/web/api/lib/Cake/View/Helper/TimeHelper.php
+++ b/web/api/lib/Cake/View/Helper/TimeHelper.php
@@ -34,7 +34,7 @@ class TimeHelper extends AppHelper {
 /**
  * CakeTime instance
  *
- * @var stdClass
+ * @var CakeTime
  */
 	protected $_engine = null;
 
@@ -83,7 +83,7 @@ class TimeHelper extends AppHelper {
  * Magic isset check for deprecated attributes.
  *
  * @param string $name Name of the attribute to check.
- * @return boolean
+ * @return bool|null
  */
 	public function __isset($name) {
 		if (isset($this->{$name})) {
@@ -115,6 +115,9 @@ class TimeHelper extends AppHelper {
 
 /**
  * Call methods from CakeTime utility class
+ *
+ * @param string $method Method to call.
+ * @param array $params Parameters to pass to method.
  * @return mixed Whatever is returned by called method, or false on failure
  */
 	public function __call($method, $params) {
@@ -123,14 +126,13 @@ class TimeHelper extends AppHelper {
 
 /**
  * Converts a string representing the format for the function strftime and returns a
- * windows safe and i18n aware format.
- *
- * @see CakeTime::convertSpecifiers()
+ * Windows safe and i18n aware format.
  *
  * @param string $format Format with specifiers for strftime function.
  *    Accepts the special specifier %S which mimics the modifier S for date()
  * @param string $time UNIX timestamp
- * @return string windows safe and date() function compatible format for strftime
+ * @return string Windows safe and date() function compatible format for strftime
+ * @see CakeTime::convertSpecifiers()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function convertSpecifiers($format, $time = null) {
@@ -140,11 +142,10 @@ class TimeHelper extends AppHelper {
 /**
  * Converts given time (in server's time zone) to user's local time, given his/her timezone.
  *
- * @see CakeTime::convert()
- *
  * @param string $serverTime UNIX timestamp
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return integer UNIX timestamp
+ * @return int UNIX timestamp
+ * @see CakeTime::convert()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function convert($serverTime, $timezone) {
@@ -154,9 +155,8 @@ class TimeHelper extends AppHelper {
 /**
  * Returns server's offset
  *
+ * @return int Offset
  * @see CakeTime::serverOffset()
- *
- * @return integer Offset
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function serverOffset() {
@@ -166,11 +166,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
- * @see CakeTime::fromString()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Parsed timestamp
+ * @see CakeTime::fromString()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function fromString($dateString, $timezone = null) {
@@ -180,12 +179,11 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a nicely formatted date string for given Datetime string.
  *
- * @see CakeTime::nice()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @param string $format The format to use. If null, `CakeTime::$niceFormat` is used
  * @return string Formatted date string
+ * @see CakeTime::nice()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function nice($dateString = null, $timezone = null, $format = null) {
@@ -195,11 +193,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a formatted descriptive date string for given datetime string.
  *
- * @see CakeTime::niceShort()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime objectp
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object.
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Described, relative date string
+ * @see CakeTime::niceShort()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function niceShort($dateString = null, $timezone = null) {
@@ -209,13 +206,12 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a partial SQL string to search for all records between two dates.
  *
- * @see CakeTime::daysAsSql()
- *
- * @param integer|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
- * @param integer|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $begin UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $end UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Partial SQL string.
+ * @see CakeTime::daysAsSql()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function daysAsSql($begin, $end, $fieldName, $timezone = null) {
@@ -226,12 +222,11 @@ class TimeHelper extends AppHelper {
  * Returns a partial SQL string to search for all records between two times
  * occurring on the same day.
  *
- * @see CakeTime::dayAsSql()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $fieldName Name of database field to compare with
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Partial SQL string.
+ * @see CakeTime::dayAsSql()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function dayAsSql($dateString, $fieldName, $timezone = null) {
@@ -241,11 +236,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string is today.
  *
- * @see CakeTime::isToday()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string is today
+ * @return bool True if datetime string is today
+ * @see CakeTime::isToday()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isToday($dateString, $timezone = null) {
@@ -255,11 +249,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string is within this week.
  *
- * @see CakeTime::isThisWeek()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current week
+ * @return bool True if datetime string is within current week
+ * @see CakeTime::isThisWeek()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isThisWeek($dateString, $timezone = null) {
@@ -269,11 +262,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string is within this month
  *
- * @see CakeTime::isThisMonth()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current month
+ * @return bool True if datetime string is within current month
+ * @see CakeTime::isThisMonth()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isThisMonth($dateString, $timezone = null) {
@@ -283,11 +275,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string is within current year.
  *
- * @see CakeTime::isThisYear()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string is within current year
+ * @return bool True if datetime string is within current year
+ * @see CakeTime::isThisYear()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isThisYear($dateString, $timezone = null) {
@@ -297,13 +288,11 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string was yesterday.
  *
- * @see CakeTime::wasYesterday()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string was yesterday
+ * @return bool True if datetime string was yesterday
+ * @see CakeTime::wasYesterday()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
- *
  */
 	public function wasYesterday($dateString, $timezone = null) {
 		return $this->_engine->wasYesterday($dateString, $timezone);
@@ -312,11 +301,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if given datetime string is tomorrow.
  *
- * @see CakeTime::isTomorrow()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean True if datetime string was yesterday
+ * @return bool True if datetime string was yesterday
+ * @see CakeTime::isTomorrow()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isTomorrow($dateString, $timezone = null) {
@@ -326,11 +314,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns the quarter
  *
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param bool $range if true returns a range in Y-m-d format
+ * @return int|array 1, 2, 3, or 4 quarter of year or array if $range true
  * @see CakeTime::toQuarter()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
- * @param boolean $range if true returns a range in Y-m-d format
- * @return mixed 1, 2, 3, or 4 quarter of year or array if $range true
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function toQuarter($dateString, $range = false) {
@@ -340,11 +327,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime().
  *
- * @see CakeTime::toUnix()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return integer Unix timestamp
+ * @return int Unix timestamp
+ * @see CakeTime::toUnix()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function toUnix($dateString, $timezone = null) {
@@ -354,11 +340,10 @@ class TimeHelper extends AppHelper {
 /**
  * Returns a date formatted for Atom RSS feeds.
  *
- * @see CakeTime::toAtom()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
+ * @see CakeTime::toAtom()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function toAtom($dateString, $timezone = null) {
@@ -368,11 +353,10 @@ class TimeHelper extends AppHelper {
 /**
  * Formats date for RSS feeds
  *
- * @see CakeTime::toRSS()
- *
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
+ * @see CakeTime::toRSS()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function toRSS($dateString, $timezone = null) {
@@ -380,9 +364,7 @@ class TimeHelper extends AppHelper {
 	}
 
 /**
- * Formats date for RSS feeds
- *
- * @see CakeTime::timeAgoInWords()
+ * Formats a date into a phrase expressing the relative time.
  *
  * ## Addition options
  *
@@ -392,9 +374,10 @@ class TimeHelper extends AppHelper {
  *   - `class` - The class name to use, defaults to `time-ago-in-words`.
  *   - `title` - Defaults to the $dateTime input.
  *
- * @param integer|string|DateTime $dateTime UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateTime UNIX timestamp, strtotime() valid string or DateTime object
  * @param array $options Default format if timestamp is used in $dateString
  * @return string Relative time string.
+ * @see CakeTime::timeAgoInWords()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function timeAgoInWords($dateTime, $options = array()) {
@@ -431,13 +414,12 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if specified datetime was within the interval specified, else false.
  *
- * @see CakeTime::wasWithinLast()
- *
- * @param string|integer $timeInterval the numeric value with space then time type.
+ * @param string|int $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean
+ * @return bool
+ * @see CakeTime::wasWithinLast()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function wasWithinLast($timeInterval, $dateString, $timezone = null) {
@@ -447,13 +429,12 @@ class TimeHelper extends AppHelper {
 /**
  * Returns true if specified datetime is within the interval specified, else false.
  *
- * @see CakeTime::isWithinLast()
- *
- * @param string|integer $timeInterval the numeric value with space then time type.
+ * @param string|int $timeInterval the numeric value with space then time type.
  *    Example of valid types: 6 hours, 2 days, 1 minute.
- * @param integer|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return boolean
+ * @return bool
+ * @see CakeTime::isWithinLast()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#testing-time
  */
 	public function isWithinNext($timeInterval, $dateString, $timezone = null) {
@@ -463,10 +444,9 @@ class TimeHelper extends AppHelper {
 /**
  * Returns gmt as a UNIX timestamp.
  *
+ * @param int|string|DateTime $string UNIX timestamp, strtotime() valid string or DateTime object
+ * @return int UNIX timestamp
  * @see CakeTime::gmt()
- *
- * @param integer|string|DateTime $string UNIX timestamp, strtotime() valid string or DateTime object
- * @return integer UNIX timestamp
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function gmt($string = null) {
@@ -482,20 +462,19 @@ class TimeHelper extends AppHelper {
  *
  * Create localized & formatted time:
  *
- * {{{
+ * ```
  *   $this->Time->format('2012-02-15', '%m-%d-%Y'); // returns 02-15-2012
  *   $this->Time->format('2012-02-15 23:01:01', '%c'); // returns preferred date and time based on configured locale
- *   $this->Time->format('0000-00-00', '%d-%m-%Y', 'N/A'); // return N/A becuase an invalid date was passed
+ *   $this->Time->format('0000-00-00', '%d-%m-%Y', 'N/A'); // return N/A because an invalid date was passed
  *   $this->Time->format('2012-02-15 23:01:01', '%c', 'N/A', 'America/New_York'); // converts passed date to timezone
- * }}}
+ * ```
  *
- * @see CakeTime::format()
- *
- * @param integer|string|DateTime $format date format string (or a UNIX timestamp, strtotime() valid string or DateTime object)
- * @param integer|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
- * @param boolean $invalid flag to ignore results of fromString == false
+ * @param int|string|DateTime $format date format string (or a UNIX timestamp, strtotime() valid string or DateTime object)
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object (or a date format string)
+ * @param bool $invalid flag to ignore results of fromString == false
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted date string
+ * @see CakeTime::format()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function format($format, $date = null, $invalid = false, $timezone = null) {
@@ -506,13 +485,12 @@ class TimeHelper extends AppHelper {
  * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
  * It takes into account the default date format for the current language if a LC_TIME file is used.
  *
- * @see CakeTime::i18nFormat()
- *
- * @param integer|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string $format strftime format string.
- * @param boolean $invalid flag to ignore results of fromString == false
+ * @param bool $invalid flag to ignore results of fromString == false
  * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
  * @return string Formatted and translated date string
+ * @see CakeTime::i18nFormat()
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#formatting
  */
 	public function i18nFormat($date, $format = null, $invalid = false, $timezone = null) {
diff --git a/web/api/lib/Cake/View/HelperCollection.php b/web/api/lib/Cake/View/HelperCollection.php
index b2657d736..d30e84062 100644
--- a/web/api/lib/Cake/View/HelperCollection.php
+++ b/web/api/lib/Cake/View/HelperCollection.php
@@ -38,7 +38,7 @@ class HelperCollection extends ObjectCollection implements CakeEventListener {
 /**
  * Constructor
  *
- * @param View $view
+ * @param View $view View instance.
  */
 	public function __construct(View $view) {
 		$this->_View = $view;
@@ -50,7 +50,7 @@ class HelperCollection extends ObjectCollection implements CakeEventListener {
  * if any
  *
  * @param string $helper The helper name to be loaded
- * @return boolean whether the helper could be loaded or not
+ * @return bool whether the helper could be loaded or not
  * @throws MissingHelperException When a helper could not be found.
  *    App helpers are searched, and then plugin helpers.
  */
@@ -98,13 +98,13 @@ class HelperCollection extends ObjectCollection implements CakeEventListener {
  * declaring $helpers arrays you can disable callbacks on helpers.
  *
  * You can alias your helper as an existing helper by setting the 'className' key, i.e.,
- * {{{
+ * ```
  * public $helpers = array(
  *   'Html' => array(
  *     'className' => 'AliasedHtml'
  *   );
  * );
- * }}}
+ * ```
  * All calls to the `Html` helper would use `AliasedHtml` instead.
  *
  * @param string $helper Helper name to load
@@ -184,8 +184,7 @@ class HelperCollection extends ObjectCollection implements CakeEventListener {
  *    Any non-null value will modify the parameter index indicated.
  *    Defaults to false.
  *
- *
- * @param string $callback|CakeEvent Method to fire on all the objects. Its assumed all the objects implement
+ * @param string|CakeEvent $callback Method to fire on all the objects. Its assumed all the objects implement
  *   the method you are calling. If an instance of CakeEvent is provided, then then Event name will parsed to
  *   get the callback name. This is done by getting the last word after any dot in the event name
  *   (eg. `Model.afterSave` event will trigger the `afterSave` callback)
diff --git a/web/api/lib/Cake/View/JsonView.php b/web/api/lib/Cake/View/JsonView.php
index 2fc34976b..26d7e0049 100644
--- a/web/api/lib/Cake/View/JsonView.php
+++ b/web/api/lib/Cake/View/JsonView.php
@@ -32,10 +32,10 @@ App::uses('View', 'View');
  * You can also define `'_serialize'` as an array. This will create a top level object containing
  * all the named view variables:
  *
- * {{{
+ * ```
  * $this->set(compact('posts', 'users', 'stuff'));
  * $this->set('_serialize', array('posts', 'users'));
- * }}}
+ * ```
  *
  * The above would generate a JSON object that looks like:
  *
@@ -63,7 +63,7 @@ class JsonView extends View {
 /**
  * Constructor
  *
- * @param Controller $controller
+ * @param Controller $controller Controller instance.
  */
 	public function __construct(Controller $controller = null) {
 		parent::__construct($controller);
@@ -125,7 +125,12 @@ class JsonView extends View {
 /**
  * Serialize view vars
  *
+ * ### Special parameters
+ * `_jsonOptions` You can set custom options for json_encode() this way,
+ *   e.g. `JSON_HEX_TAG | JSON_HEX_APOS`.
+ *
  * @param array $serialize The viewVars that need to be serialized
+ * @throws CakeException
  * @return string The serialized data
  */
 	protected function _serialize($serialize) {
@@ -144,11 +149,27 @@ class JsonView extends View {
 			$data = isset($this->viewVars[$serialize]) ? $this->viewVars[$serialize] : null;
 		}
 
+		$jsonOptions = 0;
+		if (isset($this->viewVars['_jsonOptions'])) {
+			if ($this->viewVars['_jsonOptions'] === false) {
+				$jsonOptions = 0;
+			} else {
+				$jsonOptions = $this->viewVars['_jsonOptions'];
+			}
+		}
 		if (version_compare(PHP_VERSION, '5.4.0', '>=') && Configure::read('debug')) {
-			return json_encode($data, JSON_PRETTY_PRINT);
+			$jsonOptions = $jsonOptions | JSON_PRETTY_PRINT;
 		}
 
-		return json_encode($data);
+		$json = json_encode($data, $jsonOptions);
+
+		if (function_exists('json_last_error') && json_last_error() !== JSON_ERROR_NONE) {
+			throw new CakeException(json_last_error_msg());
+		}
+		if ($json === false) {
+			throw new CakeException('Failed to parse JSON');
+		}
+		return $json;
 	}
 
 }
diff --git a/web/api/lib/Cake/View/MediaView.php b/web/api/lib/Cake/View/MediaView.php
index 4a7985086..4cc4c131f 100644
--- a/web/api/lib/Cake/View/MediaView.php
+++ b/web/api/lib/Cake/View/MediaView.php
@@ -36,7 +36,7 @@ App::uses('CakeRequest', 'Network');
  *
  * ### Usage
  *
- * {{{
+ * ```
  * class ExampleController extends AppController {
  *		public function download() {
  *			$this->viewClass = 'Media';
@@ -50,10 +50,10 @@ App::uses('CakeRequest', 'Network');
  *			$this->set($params);
  *		}
  * }
- * }}}
+ * ```
  *
  * @package       Cake.View
- * @deprecated Deprecated since version 2.3, use CakeResponse::file() instead
+ * @deprecated 3.0.0 Deprecated since version 2.3, use CakeResponse::file() instead
  */
 class MediaView extends View {
 
@@ -65,7 +65,7 @@ class MediaView extends View {
  * @return void
  */
 	public function render($view = null, $layout = null) {
-		$name = $download = $id = $modified = $path = $cache = $mimeType = $compress = null;
+		$name = $extension = $download = $id = $modified = $path = $cache = $mimeType = $compress = null;
 		extract($this->viewVars, EXTR_OVERWRITE);
 
 		$path = $path . $id;
@@ -86,14 +86,18 @@ class MediaView extends View {
 		}
 
 		if ($name !== null) {
-			$name .= '.' . pathinfo($id, PATHINFO_EXTENSION);
+			if (empty($extension)) {
+				$extension = pathinfo($id, PATHINFO_EXTENSION);
+			}
+			if (!empty($extension)) {
+				$name .= '.' . $extension;
+			}
 		}
 		$this->response->file($path, compact('name', 'download'));
 
 		if ($compress) {
 			$this->response->compress();
 		}
-		$this->response->send();
 	}
 
 }
diff --git a/web/api/lib/Cake/View/ScaffoldView.php b/web/api/lib/Cake/View/ScaffoldView.php
index 8bcefcc4f..f3e05e542 100644
--- a/web/api/lib/Cake/View/ScaffoldView.php
+++ b/web/api/lib/Cake/View/ScaffoldView.php
@@ -24,7 +24,7 @@ App::uses('View', 'View');
  * ScaffoldView provides specific view file loading features for scaffolded views.
  *
  * @package Cake.View
- * @deprecated Dynamic scaffolding will be removed and replaced in 3.0
+ * @deprecated 3.0.0 Dynamic scaffolding will be removed and replaced in 3.0
  */
 class ScaffoldView extends View {
 
diff --git a/web/api/lib/Cake/View/Scaffolds/form.ctp b/web/api/lib/Cake/View/Scaffolds/form.ctp
index 5c6a8f1e1..0a6b5ddea 100644
--- a/web/api/lib/Cake/View/Scaffolds/form.ctp
+++ b/web/api/lib/Cake/View/Scaffolds/form.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -37,9 +35,9 @@
 		<li><?php echo $this->Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index')); ?></li>
 <?php
 		$done = array();
-		foreach ($associations as $_type => $_data) {
-			foreach ($_data as $_alias => $_details) {
-				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+		foreach ($associations as $_type => $_data):
+			foreach ($_data as $_alias => $_details):
+				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)):
 					echo "\t\t<li>" . $this->Html->link(
 						__d('cake', 'List %s', Inflector::humanize($_details['controller'])),
 						array('plugin' => $_details['plugin'], 'controller' => $_details['controller'], 'action' => 'index')
@@ -49,9 +47,9 @@
 						array('plugin' => $_details['plugin'], 'controller' => $_details['controller'], 'action' => 'add')
 					) . "</li>\n";
 					$done[] = $_details['controller'];
-				}
-			}
-		}
+				endif;
+			endforeach;
+		endforeach;
 ?>
 	</ul>
 </div>
diff --git a/web/api/lib/Cake/View/Scaffolds/index.ctp b/web/api/lib/Cake/View/Scaffolds/index.ctp
index 1f8c2c808..e0219f4f0 100644
--- a/web/api/lib/Cake/View/Scaffolds/index.ctp
+++ b/web/api/lib/Cake/View/Scaffolds/index.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -28,21 +26,21 @@
 <?php
 foreach (${$pluralVar} as ${$singularVar}):
 	echo '<tr>';
-		foreach ($scaffoldFields as $_field) {
+		foreach ($scaffoldFields as $_field):
 			$isKey = false;
-			if (!empty($associations['belongsTo'])) {
-				foreach ($associations['belongsTo'] as $_alias => $_details) {
-					if ($_field === $_details['foreignKey']) {
+			if (!empty($associations['belongsTo'])):
+				foreach ($associations['belongsTo'] as $_alias => $_details):
+					if ($_field === $_details['foreignKey']):
 						$isKey = true;
 						echo '<td>' . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . '</td>';
 						break;
-					}
-				}
-			}
-			if ($isKey !== true) {
+					endif;
+				endforeach;
+			endif;
+			if ($isKey !== true):
 				echo '<td>' . h(${$singularVar}[$modelClass][$_field]) . '</td>';
-			}
-		}
+			endif;
+		endforeach;
 
 		echo '<td class="actions">';
 		echo $this->Html->link(__d('cake', 'View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey]));
@@ -69,7 +67,7 @@ endforeach;
 	<?php
 		echo $this->Paginator->prev('< ' . __d('cake', 'previous'), array(), null, array('class' => 'prev disabled'));
 		echo $this->Paginator->numbers(array('separator' => ''));
-		echo $this->Paginator->next(__d('cake', 'next') .' >', array(), null, array('class' => 'next disabled'));
+		echo $this->Paginator->next(__d('cake', 'next') . ' >', array(), null, array('class' => 'next disabled'));
 	?>
 	</div>
 </div>
diff --git a/web/api/lib/Cake/View/Scaffolds/view.ctp b/web/api/lib/Cake/View/Scaffolds/view.ctp
index 42cc307be..64a3e31f1 100644
--- a/web/api/lib/Cake/View/Scaffolds/view.ctp
+++ b/web/api/lib/Cake/View/Scaffolds/view.ctp
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -97,10 +95,10 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
 	<dl>
 <?php
 		$otherFields = array_keys(${$singularVar}[$_alias]);
-		foreach ($otherFields as $_field) {
+		foreach ($otherFields as $_field):
 			echo "\t\t<dt>" . Inflector::humanize($_field) . "</dt>\n";
 			echo "\t\t<dd>\n\t" . ${$singularVar}[$_alias][$_field] . "\n&nbsp;</dd>\n";
-		}
+		endforeach;
 ?>
 	</dl>
 <?php endif; ?>
diff --git a/web/api/lib/Cake/View/ThemeView.php b/web/api/lib/Cake/View/ThemeView.php
index 8b36429fe..8e201a4f1 100644
--- a/web/api/lib/Cake/View/ThemeView.php
+++ b/web/api/lib/Cake/View/ThemeView.php
@@ -24,7 +24,7 @@ App::uses('View', 'View');
  * Stub class for 2.1 Compatibility
  *
  * @package       Cake.View
- * @deprecated Deprecated since 2.1, use View class instead
+ * @deprecated 3.0.0 Deprecated since 2.1, use View class instead
  */
 class ThemeView extends View {
 
diff --git a/web/api/lib/Cake/View/View.php b/web/api/lib/Cake/View/View.php
index 6ccefbe72..f68db4e22 100644
--- a/web/api/lib/Cake/View/View.php
+++ b/web/api/lib/Cake/View/View.php
@@ -80,7 +80,7 @@ class View extends Object {
 /**
  * Name of the controller.
  *
- * @var string Name of controller
+ * @var string
  */
 	public $name = null;
 
@@ -94,14 +94,14 @@ class View extends Object {
 /**
  * An array of names of built-in helpers to include.
  *
- * @var mixed A single name as a string or a list of names as an array.
+ * @var mixed
  */
 	public $helpers = array();
 
 /**
  * Path to View.
  *
- * @var string Path to View
+ * @var string
  */
 	public $viewPath = null;
 
@@ -129,7 +129,7 @@ class View extends Object {
 /**
  * Path to Layout.
  *
- * @var string Path to Layout
+ * @var string
  */
 	public $layoutPath = null;
 
@@ -137,7 +137,7 @@ class View extends Object {
  * Turns on or off CakePHP's conventional mode of applying layout files. On by default.
  * Setting to off means that layouts will not be automatically applied to rendered views.
  *
- * @var boolean
+ * @var bool
  */
 	public $autoLayout = true;
 
@@ -181,7 +181,7 @@ class View extends Object {
 /**
  * True when the view has been rendered.
  *
- * @var boolean
+ * @var bool
  */
 	public $hasRendered = false;
 
@@ -251,6 +251,13 @@ class View extends Object {
  */
 	protected $_paths = array();
 
+/**
+ * Holds an array of plugin paths.
+ *
+ * @var array
+ */
+	protected $_pathsForPlugin = array();
+
 /**
  * The names of views and their parents used with View::extend();
  *
@@ -293,7 +300,7 @@ class View extends Object {
 /**
  * Whether the event manager was already configured for this object
  *
- * @var boolean
+ * @var bool
  */
 	protected $_eventManagerConfigured = false;
 
@@ -381,13 +388,12 @@ class View extends Object {
  *   If an array, the following keys can be used:
  *   - `config` - Used to store the cached element in a custom cache configuration.
  *   - `key` - Used to define the key used in the Cache::write(). It will be prefixed with `element_`
- * - `plugin` - Load an element from a specific plugin. This option is deprecated, see below.
+ * - `plugin` - (deprecated!) Load an element from a specific plugin. This option is deprecated, and
+ *              will be removed in CakePHP 3.0. Use `Plugin.element_name` instead.
  * - `callbacks` - Set to true to fire beforeRender and afterRender helper callbacks for this element.
  *   Defaults to false.
  * - `ignoreMissing` - Used to allow missing elements. Set to true to not trigger notices.
  * @return string Rendered Element
- * @deprecated The `$options['plugin']` is deprecated and will be removed in CakePHP 3.0. Use
- *   `Plugin.element_name` instead.
  */
 	public function element($name, $data = array(), $options = array()) {
 		$file = $plugin = null;
@@ -426,7 +432,7 @@ class View extends Object {
  * @param string $name Name of template file in the /app/View/Elements/ folder,
  *   or `MyPlugin.template` to check the template element from MyPlugin. If the element
  *   is not found in the plugin, the normal view path cascade will be searched.
- * @return boolean Success
+ * @return bool Success
  */
 	public function elementExists($name) {
 		return (bool)$this->_getElementFilename($name);
@@ -452,15 +458,17 @@ class View extends Object {
  * @param string $view Name of view file to use
  * @param string $layout Layout to use.
  * @return string|null Rendered content or null if content already rendered and returned earlier.
+ * @triggers View.beforeRender $this, array($viewFileName)
+ * @triggers View.afterRender $this, array($viewFileName)
  * @throws CakeException If there is an error in the view.
  */
 	public function render($view = null, $layout = null) {
 		if ($this->hasRendered) {
-			return;
+			return null;
 		}
 
 		if ($view !== false && $viewFileName = $this->_getViewFileName($view)) {
-			$this->_currentType = self::TYPE_VIEW;
+			$this->_currentType = static::TYPE_VIEW;
 			$this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($viewFileName)));
 			$this->Blocks->set('content', $this->_render($viewFileName));
 			$this->getEventManager()->dispatch(new CakeEvent('View.afterRender', $this, array($viewFileName)));
@@ -498,6 +506,8 @@ class View extends Object {
  * @param string $content Content to render in a view, wrapped by the surrounding layout.
  * @param string $layout Layout name
  * @return mixed Rendered output, or false on error
+ * @triggers View.beforeLayout $this, array($layoutFileName)
+ * @triggers View.afterLayout $this, array($layoutFileName)
  * @throws CakeException if there is an error in the view.
  */
 	public function renderLayout($content, $layout = null) {
@@ -532,7 +542,7 @@ class View extends Object {
 		$this->viewVars['title_for_layout'] = $title;
 		$this->Blocks->set('title', $title);
 
-		$this->_currentType = self::TYPE_LAYOUT;
+		$this->_currentType = static::TYPE_LAYOUT;
 		$this->Blocks->set('content', $this->_render($layoutFileName));
 
 		$this->getEventManager()->dispatch(new CakeEvent('View.afterLayout', $this, array($layoutFileName)));
@@ -545,7 +555,7 @@ class View extends Object {
  *
  * @param string $filename the cache file to include
  * @param string $timeStart the page render start time
- * @return boolean Success of rendering the cached file.
+ * @return bool Success of rendering the cached file.
  */
 	public function renderCache($filename, $timeStart) {
 		$response = $this->response;
@@ -584,15 +594,14 @@ class View extends Object {
  *
  * @param string $var The view var you want the contents of.
  * @return mixed The content of the named var if its set, otherwise null.
- * @deprecated Will be removed in 3.0. Use View::get() instead.
+ * @deprecated 3.0.0 Will be removed in 3.0. Use View::get() instead.
  */
 	public function getVar($var) {
 		return $this->get($var);
 	}
 
 /**
- * Returns the contents of the given View variable or a block.
- * Blocks are checked before view variables.
+ * Returns the contents of the given View variable.
  *
  * @param string $var The view var you want the contents of.
  * @param mixed $default The default/fallback content of $var.
@@ -682,13 +691,23 @@ class View extends Object {
  *
  * @param string $name Name of the block
  * @param string $default Default text
- * @return string $default The block content or $default if the block does not exist.
+ * @return string default The block content or $default if the block does not exist.
  * @see ViewBlock::get()
  */
 	public function fetch($name, $default = '') {
 		return $this->Blocks->get($name, $default);
 	}
 
+/**
+ * Check if a block exists
+ *
+ * @param string $name Name of the block
+ * @return bool
+ */
+	public function exists($name) {
+		return $this->Blocks->exists($name);
+	}
+
 /**
  * End a capturing block. The compliment to View::start()
  *
@@ -709,11 +728,11 @@ class View extends Object {
  * @throws LogicException when you extend an element which doesn't exist
  */
 	public function extend($name) {
-		if ($name[0] === '/' || $this->_currentType === self::TYPE_VIEW) {
+		if ($name[0] === '/' || $this->_currentType === static::TYPE_VIEW) {
 			$parent = $this->_getViewFileName($name);
 		} else {
 			switch ($this->_currentType) {
-				case self::TYPE_ELEMENT:
+				case static::TYPE_ELEMENT:
 					$parent = $this->_getElementFileName($name);
 					if (!$parent) {
 						list($plugin, $name) = $this->pluginSplit($name);
@@ -726,7 +745,7 @@ class View extends Object {
 						));
 					}
 					break;
-				case self::TYPE_LAYOUT:
+				case static::TYPE_LAYOUT:
 					$parent = $this->_getLayoutFileName($name);
 					break;
 				default:
@@ -751,7 +770,7 @@ class View extends Object {
  *   update/replace a script element.
  * @param string $content The content of the script being added, optional.
  * @return void
- * @deprecated Will be removed in 3.0. Superseded by blocks functionality.
+ * @deprecated 3.0.0 Will be removed in 3.0. Superseded by blocks functionality.
  * @see View::start()
  */
 	public function addScript($name, $content = null) {
@@ -808,7 +827,14 @@ class View extends Object {
 		}
 		$this->viewVars = $data + $this->viewVars;
 	}
-
+/**
+ * Retrieve the current view type
+ *
+ * @return string
+ */
+	public function getCurrentType() {
+		return $this->_currentType;
+	}
 /**
  * Magic accessor for helpers. Provides access to attributes that were deprecated.
  *
@@ -856,7 +882,7 @@ class View extends Object {
  * Magic isset check for deprecated attributes.
  *
  * @param string $name Name of the attribute to check.
- * @return boolean
+ * @return bool
  */
 	public function __isset($name) {
 		if (isset($this->{$name})) {
@@ -889,6 +915,8 @@ class View extends Object {
  * @param string $viewFile Filename of the view
  * @param array $data Data to include in rendered view. If empty the current View::$viewVars will be used.
  * @return string Rendered output
+ * @triggers View.beforeRenderFile $this, array($viewFile)
+ * @triggers View.afterRenderFile $this, array($viewFile, $content)
  * @throws CakeException when a block is left open.
  */
 	protected function _render($viewFile, $data = array()) {
@@ -930,7 +958,7 @@ class View extends Object {
 /**
  * Sandbox method to evaluate a template / view script in.
  *
- * @param string $viewFn Filename of the view
+ * @param string $viewFile Filename of the view
  * @param array $dataForView Data to include in rendered view.
  *    If empty the current View::$viewVars will be used.
  * @return string Rendered output
@@ -984,9 +1012,6 @@ class View extends Object {
 			$name = $this->viewPath . DS . $subDir . Inflector::underscore($name);
 		} elseif (strpos($name, DS) !== false) {
 			if ($name[0] === DS || $name[1] === ':') {
-				if (is_file($name)) {
-					return $name;
-				}
 				$name = trim($name, DS);
 			} elseif ($name[0] === '.') {
 				$name = substr($name, 3);
@@ -1003,18 +1028,7 @@ class View extends Object {
 				}
 			}
 		}
-		$defaultPath = $paths[0];
-
-		if ($this->plugin) {
-			$pluginPaths = App::path('plugins');
-			foreach ($paths as $path) {
-				if (strpos($path, $pluginPaths[0]) === 0) {
-					$defaultPath = $path;
-					break;
-				}
-			}
-		}
-		throw new MissingViewException(array('file' => $defaultPath . $name . $this->ext));
+		throw new MissingViewException(array('file' => $name . $this->ext));
 	}
 
 /**
@@ -1023,7 +1037,7 @@ class View extends Object {
  * It checks if the plugin is loaded, else filename will stay unchanged for filenames containing dot
  *
  * @param string $name The name you want to plugin split.
- * @param boolean $fallback If true uses the plugin set in the current CakeRequest when parsed plugin is not loaded
+ * @param bool $fallback If true uses the plugin set in the current CakeRequest when parsed plugin is not loaded
  * @return array Array with 2 indexes. 0 => plugin name, 1 => filename
  */
 	public function pluginSplit($name, $fallback = true) {
@@ -1067,7 +1081,7 @@ class View extends Object {
 				}
 			}
 		}
-		throw new MissingLayoutException(array('file' => $paths[0] . $file . $this->ext));
+		throw new MissingLayoutException(array('file' => $file . $this->ext));
 	}
 
 /**
@@ -1108,12 +1122,17 @@ class View extends Object {
  * Return all possible paths to find view files in order
  *
  * @param string $plugin Optional plugin name to scan for view files.
- * @param boolean $cached Set to false to force a refresh of view paths. Default true.
+ * @param bool $cached Set to false to force a refresh of view paths. Default true.
  * @return array paths
  */
 	protected function _paths($plugin = null, $cached = true) {
-		if ($plugin === null && $cached === true && !empty($this->_paths)) {
-			return $this->_paths;
+		if ($cached === true) {
+			if ($plugin === null && !empty($this->_paths)) {
+				return $this->_paths;
+			}
+			if ($plugin !== null && isset($this->_pathsForPlugin[$plugin])) {
+				return $this->_pathsForPlugin[$plugin];
+			}
 		}
 		$paths = array();
 		$viewPaths = App::path('View');
@@ -1145,7 +1164,7 @@ class View extends Object {
 		}
 		$paths = array_merge($paths, $corePaths);
 		if ($plugin !== null) {
-			return $paths;
+			return $this->_pathsForPlugin[$plugin] = $paths;
 		}
 		return $this->_paths = $paths;
 	}
@@ -1190,24 +1209,27 @@ class View extends Object {
  * @param array $data Data to render
  * @param array $options Element options
  * @return string
+ * @triggers View.beforeRender $this, array($file)
+ * @triggers View.afterRender $this, array($file, $element)
  */
 	protected function _renderElement($file, $data, $options) {
+		$current = $this->_current;
+		$restore = $this->_currentType;
+		$this->_currentType = static::TYPE_ELEMENT;
+
 		if ($options['callbacks']) {
 			$this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($file)));
 		}
 
-		$current = $this->_current;
-		$restore = $this->_currentType;
-
-		$this->_currentType = self::TYPE_ELEMENT;
 		$element = $this->_render($file, array_merge($this->viewVars, $data));
 
-		$this->_currentType = $restore;
-		$this->_current = $current;
-
 		if ($options['callbacks']) {
 			$this->getEventManager()->dispatch(new CakeEvent('View.afterRender', $this, array($file, $element)));
 		}
+
+		$this->_currentType = $restore;
+		$this->_current = $current;
+
 		if (isset($options['cache'])) {
 			Cache::write($this->elementCacheSettings['key'], $element, $this->elementCacheSettings['config']);
 		}
diff --git a/web/api/lib/Cake/View/ViewBlock.php b/web/api/lib/Cake/View/ViewBlock.php
index 28667c8c3..2d4908a28 100644
--- a/web/api/lib/Cake/View/ViewBlock.php
+++ b/web/api/lib/Cake/View/ViewBlock.php
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -56,7 +54,7 @@ class ViewBlock {
 /**
  * Should the currently captured content be discarded on ViewBlock::end()
  *
- * @var boolean
+ * @var bool
  * @see ViewBlock::end()
  * @see ViewBlock::startIfEmpty()
  */
@@ -77,7 +75,7 @@ class ViewBlock {
  */
 	public function start($name) {
 		if (in_array($name, $this->_active)) {
-			throw new CakeException(__("A view block with the name '%s' is already/still open.", $name));
+			throw new CakeException(__d('cake', "A view block with the name '%s' is already/still open.", $name));
 		}
 		$this->_active[] = $name;
 		ob_start();
@@ -166,7 +164,7 @@ class ViewBlock {
  * @param string $name Name of the block
  * @param string $value The content for the block.
  * @return void
- * @deprecated As of 2.3 use ViewBlock::concat() instead.
+ * @deprecated 3.0.0 As of 2.3 use ViewBlock::concat() instead.
  */
 	public function append($name, $value = null) {
 		$this->concat($name, $value);
@@ -198,6 +196,16 @@ class ViewBlock {
 		return $this->_blocks[$name];
 	}
 
+/**
+ * Check if a block exists
+ *
+ * @param string $name Name of the block
+ * @return bool
+ */
+	public function exists($name) {
+		return isset($this->_blocks[$name]);
+	}
+
 /**
  * Get the names of all the existing blocks.
  *
diff --git a/web/api/lib/Cake/View/XmlView.php b/web/api/lib/Cake/View/XmlView.php
index 1bf5419ed..7d7610836 100644
--- a/web/api/lib/Cake/View/XmlView.php
+++ b/web/api/lib/Cake/View/XmlView.php
@@ -36,10 +36,10 @@ App::uses('Hash', 'Utility');
  * You can also define `'_serialize'` as an array. This will create an additional
  * top level element named `<response>` containing all the named view variables:
  *
- * {{{
+ * ```
  * $this->set(compact('posts', 'users', 'stuff'));
  * $this->set('_serialize', array('posts', 'users'));
- * }}}
+ * ```
  *
  * The above would generate a XML object that looks like:
  *
@@ -63,7 +63,7 @@ class XmlView extends View {
 /**
  * Constructor
  *
- * @param Controller $controller
+ * @param Controller $controller Controller instance.
  */
 	public function __construct(Controller $controller = null) {
 		parent::__construct($controller);
@@ -109,6 +109,10 @@ class XmlView extends View {
 /**
  * Serialize view vars.
  *
+ * ### Special parameters
+ * `_xmlOptions` You can set an array of custom options for Xml::fromArray() this way, e.g.
+ *   'format' as 'attributes' instead of 'tags'.
+ *
  * @param array $serialize The viewVars that need to be serialized.
  * @return string The serialized data
  */
@@ -131,10 +135,16 @@ class XmlView extends View {
 		}
 
 		$options = array();
+		if (isset($this->viewVars['_xmlOptions'])) {
+			$options = $this->viewVars['_xmlOptions'];
+		}
 		if (Configure::read('debug')) {
 			$options['pretty'] = true;
 		}
 
+		if (isset($options['return']) && strtolower($options['return']) === 'domdocument') {
+			return Xml::fromArray($data, $options)->saveXML();
+		}
 		return Xml::fromArray($data, $options)->asXML();
 	}
 
diff --git a/web/api/lib/Cake/basics.php b/web/api/lib/Cake/basics.php
index 60deced1c..e1edb6ea1 100644
--- a/web/api/lib/Cake/basics.php
+++ b/web/api/lib/Cake/basics.php
@@ -38,7 +38,7 @@ if (!function_exists('config')) {
  *
  * `config('config1', 'config2');`
  *
- * @return boolean Success
+ * @return bool Success
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#config
  */
 	function config() {
@@ -64,24 +64,27 @@ if (!function_exists('debug')) {
  * Only runs if debug level is greater than zero.
  *
  * @param mixed $var Variable to show debug information for.
- * @param boolean $showHtml If set to true, the method prints the debug data in a browser-friendly way.
- * @param boolean $showFrom If set to true, the method prints from where the function was called.
+ * @param bool $showHtml If set to true, the method prints the debug data in a browser-friendly way.
+ * @param bool $showFrom If set to true, the method prints from where the function was called.
  * @return void
  * @link http://book.cakephp.org/2.0/en/development/debugging.html#basic-debugging
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#debug
  */
 	function debug($var, $showHtml = null, $showFrom = true) {
-		if (Configure::read('debug') > 0) {
-			App::uses('Debugger', 'Utility');
-			$file = '';
-			$line = '';
-			$lineInfo = '';
-			if ($showFrom) {
-				$trace = Debugger::trace(array('start' => 1, 'depth' => 2, 'format' => 'array'));
-				$file = str_replace(array(CAKE_CORE_INCLUDE_PATH, ROOT), '', $trace[0]['file']);
-				$line = $trace[0]['line'];
-			}
-			$html = <<<HTML
+		if (!Configure::read('debug')) {
+			return;
+		}
+		App::uses('Debugger', 'Utility');
+
+		$file = '';
+		$line = '';
+		$lineInfo = '';
+		if ($showFrom) {
+			$trace = Debugger::trace(array('start' => 1, 'depth' => 2, 'format' => 'array'));
+			$file = str_replace(array(CAKE_CORE_INCLUDE_PATH, ROOT), '', $trace[0]['file']);
+			$line = $trace[0]['line'];
+		}
+		$html = <<<HTML
 <div class="cake-debug-output">
 %s
 <pre class="cake-debug">
@@ -89,33 +92,61 @@ if (!function_exists('debug')) {
 </pre>
 </div>
 HTML;
-			$text = <<<TEXT
+		$text = <<<TEXT
 %s
 ########## DEBUG ##########
 %s
 ###########################
 
 TEXT;
-			$template = $html;
-			if (php_sapi_name() === 'cli' || $showHtml === false) {
-				$template = $text;
-				if ($showFrom) {
-					$lineInfo = sprintf('%s (line %s)', $file, $line);
-				}
+		$template = $html;
+		if (PHP_SAPI === 'cli' || $showHtml === false) {
+			$template = $text;
+			if ($showFrom) {
+				$lineInfo = sprintf('%s (line %s)', $file, $line);
 			}
-			if ($showHtml === null && $template !== $text) {
-				$showHtml = true;
-			}
-			$var = Debugger::exportVar($var, 25);
-			if ($showHtml) {
-				$template = $html;
-				$var = h($var);
-				if ($showFrom) {
-					$lineInfo = sprintf('<span><strong>%s</strong> (line <strong>%s</strong>)</span>', $file, $line);
-				}
-			}
-			printf($template, $lineInfo, $var);
 		}
+		if ($showHtml === null && $template !== $text) {
+			$showHtml = true;
+		}
+		$var = Debugger::exportVar($var, 25);
+		if ($showHtml) {
+			$template = $html;
+			$var = h($var);
+			if ($showFrom) {
+				$lineInfo = sprintf('<span><strong>%s</strong> (line <strong>%s</strong>)</span>', $file, $line);
+			}
+		}
+		printf($template, $lineInfo, $var);
+	}
+
+}
+
+if (!function_exists('stackTrace')) {
+
+/**
+ * Outputs a stack trace based on the supplied options.
+ *
+ * ### Options
+ *
+ * - `depth` - The number of stack frames to return. Defaults to 999
+ * - `args` - Should arguments for functions be shown? If true, the arguments for each method call
+ *   will be displayed.
+ * - `start` - The stack frame to start generating a trace from. Defaults to 1
+ *
+ * @param array $options Format for outputting stack trace
+ * @return mixed Formatted stack trace
+ * @see Debugger::trace()
+ */
+	function stackTrace(array $options = array()) {
+		if (!Configure::read('debug')) {
+			return;
+		}
+		App::uses('Debugger', 'Utility');
+
+		$options += array('start' => 0);
+		$options['start']++;
+		echo Debugger::trace($options);
 	}
 
 }
@@ -125,11 +156,11 @@ if (!function_exists('sortByKey')) {
 /**
  * Sorts given $array by key $sortBy.
  *
- * @param array $array Array to sort
+ * @param array &$array Array to sort
  * @param string $sortBy Sort by this key
  * @param string $order Sort order asc/desc (ascending or descending).
- * @param integer $type Type of sorting to perform
- * @return mixed Sorted array
+ * @param int $type Type of sorting to perform
+ * @return array|null Sorted array, or null if not an array.
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#sortByKey
  */
 	function sortByKey(&$array, $sortBy, $order = 'asc', $type = SORT_NUMERIC) {
@@ -163,13 +194,15 @@ if (!function_exists('h')) {
  * @param string|array|object $text Text to wrap through htmlspecialchars. Also works with arrays, and objects.
  *    Arrays will be mapped and have all their elements escaped. Objects will be string cast if they
  *    implement a `__toString` method. Otherwise the class name will be used.
- * @param boolean $double Encode existing html entities
+ * @param bool $double Encode existing html entities
  * @param string $charset Character set to use when escaping. Defaults to config value in 'App.encoding' or 'UTF-8'
  * @return string Wrapped text
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#h
  */
 	function h($text, $double = true, $charset = null) {
-		if (is_array($text)) {
+		if (is_string($text)) {
+			//optimize for strings
+		} elseif (is_array($text)) {
 			$texts = array();
 			foreach ($text as $k => $t) {
 				$texts[$k] = h($t, $double, $charset);
@@ -209,7 +242,7 @@ if (!function_exists('pluginSplit')) {
  * Commonly used like `list($plugin, $name) = pluginSplit($name);`
  *
  * @param string $name The name you want to plugin split.
- * @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it.
+ * @param bool $dotAppend Set to true if you want the plugin to have a '.' appended to it.
  * @param string $plugin Optional default plugin to use if no plugin is found. Defaults to null.
  * @return array Array with 2 indexes. 0 => plugin name, 1 => class name
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pluginSplit
@@ -235,14 +268,14 @@ if (!function_exists('pr')) {
  * In terminals this will act the same as using print_r() directly, when not run on cli
  * print_r() will wrap <PRE> tags around the output of given array. Similar to debug().
  *
- * @see debug()
  * @param mixed $var Variable to print out
  * @return void
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pr
+ * @see debug()
  */
 	function pr($var) {
 		if (Configure::read('debug') > 0) {
-			$template = php_sapi_name() !== 'cli' ? '<pre>%s</pre>' : "\n%s\n";
+			$template = PHP_SAPI !== 'cli' ? '<pre>%s</pre>' : "\n%s\n";
 			printf($template, print_r($var, true));
 		}
 	}
@@ -254,10 +287,8 @@ if (!function_exists('am')) {
 /**
  * Merge a group of arrays
  *
- * @param array First array
- * @param array Second array
- * @param array Third array
- * @param array Etc...
+ * Accepts variable arguments. Each argument will be converted into an array and then merged.
+ *
  * @return array All array parameters merged into one
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#am
  */
@@ -284,7 +315,7 @@ if (!function_exists('env')) {
  * environment information.
  *
  * @param string $key Environment variable name.
- * @return string Environment variable setting.
+ * @return string|bool|null Environment variable setting.
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#env
  */
 	function env($key) {
@@ -389,7 +420,7 @@ if (!function_exists('cache')) {
  * @param mixed $expires A valid strtotime string when the data expires.
  * @param string $target The target of the cached data; either 'cache' or 'public'.
  * @return mixed The contents of the temporary file.
- * @deprecated Will be removed in 3.0. Please use Cache::write() instead.
+ * @deprecated 3.0.0 Will be removed in 3.0. Please use Cache::write() instead.
  */
 	function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {
 		if (Configure::read('Cache.disable')) {
@@ -549,19 +580,13 @@ if (!function_exists('__')) {
  */
 	function __($singular, $args = null) {
 		if (!$singular) {
-			return;
+			return null;
 		}
 
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 1);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 1));
 	}
 
 }
@@ -574,26 +599,20 @@ if (!function_exists('__n')) {
  *
  * @param string $singular Singular text to translate
  * @param string $plural Plural text
- * @param integer $count Count
- * @param mixed $args Array with arguments or multiple arguments in function
+ * @param int $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
  * @return mixed plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
  */
 	function __n($singular, $plural, $count, $args = null) {
 		if (!$singular) {
-			return;
+			return null;
 		}
 
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, null, I18n::LC_MESSAGES, $count);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 3);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 3));
 	}
 
 }
@@ -605,24 +624,18 @@ if (!function_exists('__d')) {
  *
  * @param string $domain Domain
  * @param string $msg String to translate
- * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
  */
 	function __d($domain, $msg, $args = null) {
 		if (!$msg) {
-			return;
+			return null;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 2);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 2));
 	}
 
 }
@@ -637,25 +650,19 @@ if (!function_exists('__dn')) {
  * @param string $domain Domain
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param integer $count Count
- * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @param int $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
  */
 	function __dn($domain, $singular, $plural, $count, $args = null) {
 		if (!$singular) {
-			return;
+			return null;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, I18n::LC_MESSAGES, $count);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 4);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 4));
 	}
 
 }
@@ -681,25 +688,19 @@ if (!function_exists('__dc')) {
  *
  * @param string $domain Domain
  * @param string $msg Message to translate
- * @param integer $category Category
- * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
  */
 	function __dc($domain, $msg, $category, $args = null) {
 		if (!$msg) {
-			return;
+			return null;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain, $category);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 3);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 3));
 	}
 
 }
@@ -728,26 +729,20 @@ if (!function_exists('__dcn')) {
  * @param string $domain Domain
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param integer $count Count
- * @param integer $category Category
- * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @param int $count Count
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
  */
 	function __dcn($domain, $singular, $plural, $count, $category, $args = null) {
 		if (!$singular) {
-			return;
+			return null;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, $category, $count);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 5);
-		}
-
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 5));
 	}
 
 }
@@ -769,25 +764,239 @@ if (!function_exists('__c')) {
  * - LC_MESSAGES  I18n::LC_MESSAGES
  *
  * @param string $msg String to translate
- * @param integer $category Category
- * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
  */
 	function __c($msg, $category, $args = null) {
 		if (!$msg) {
-			return;
+			return null;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, null, $category);
-		if ($args === null) {
-			return $translated;
-		} elseif (!is_array($args)) {
-			$args = array_slice(func_get_args(), 2);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 2));
+	}
+
+}
+
+if (!function_exists('__x')) {
+
+/**
+ * Returns a translated string if one is found; Otherwise, the submitted message.
+ *
+ * @param string $context Context of the text
+ * @param string $singular Text to translate
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return mixed translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__
+ */
+	function __x($context, $singular, $args = null) {
+		if (!$singular) {
+			return null;
 		}
 
-		$translated = preg_replace('/(?<!%)%(?![%\'\-+bcdeEfFgGosuxX\d\.])/', '%%', $translated);
-		return vsprintf($translated, $args);
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($singular, null, null, null, null, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 2));
+	}
+
+}
+
+if (!function_exists('__xn')) {
+
+/**
+ * Returns correct plural form of message identified by $singular and $plural for count $count.
+ * Some languages have more than one form for plural messages dependent on the count.
+ *
+ * @param string $context Context of the text
+ * @param string $singular Singular text to translate
+ * @param string $plural Plural text
+ * @param int $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return mixed plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
+ */
+	function __xn($context, $singular, $plural, $count, $args = null) {
+		if (!$singular) {
+			return null;
+		}
+
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($singular, $plural, null, I18n::LC_MESSAGES, $count, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 4));
+	}
+
+}
+
+if (!function_exists('__dx')) {
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $msg String to translate
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
+ */
+	function __dx($domain, $context, $msg, $args = null) {
+		if (!$msg) {
+			return null;
+		}
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($msg, null, $domain, null, null, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 3));
+	}
+
+}
+
+if (!function_exists('__dxn')) {
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param int $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
+ */
+	function __dxn($domain, $context, $singular, $plural, $count, $args = null) {
+		if (!$singular) {
+			return null;
+		}
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($singular, $plural, $domain, I18n::LC_MESSAGES, $count, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 5));
+	}
+
+}
+
+if (!function_exists('__dxc')) {
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ * It also allows you to specify a category.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL       I18n::LC_ALL
+ * - LC_COLLATE   I18n::LC_COLLATE
+ * - LC_CTYPE     I18n::LC_CTYPE
+ * - LC_MONETARY  I18n::LC_MONETARY
+ * - LC_NUMERIC   I18n::LC_NUMERIC
+ * - LC_TIME      I18n::LC_TIME
+ * - LC_MESSAGES  I18n::LC_MESSAGES
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $msg Message to translate
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
+ */
+	function __dxc($domain, $context, $msg, $category, $args = null) {
+		if (!$msg) {
+			return null;
+		}
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($msg, null, $domain, $category, null, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 4));
+	}
+
+}
+
+if (!function_exists('__dxcn')) {
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * It also allows you to specify a category.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL       I18n::LC_ALL
+ * - LC_COLLATE   I18n::LC_COLLATE
+ * - LC_CTYPE     I18n::LC_CTYPE
+ * - LC_MONETARY  I18n::LC_MONETARY
+ * - LC_NUMERIC   I18n::LC_NUMERIC
+ * - LC_TIME      I18n::LC_TIME
+ * - LC_MESSAGES  I18n::LC_MESSAGES
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param int $count Count
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
+ */
+	function __dxcn($domain, $context, $singular, $plural, $count, $category, $args = null) {
+		if (!$singular) {
+			return null;
+		}
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($singular, $plural, $domain, $category, $count, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 6));
+	}
+
+}
+
+if (!function_exists('__xc')) {
+
+/**
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL       I18n::LC_ALL
+ * - LC_COLLATE   I18n::LC_COLLATE
+ * - LC_CTYPE     I18n::LC_CTYPE
+ * - LC_MONETARY  I18n::LC_MONETARY
+ * - LC_NUMERIC   I18n::LC_NUMERIC
+ * - LC_TIME      I18n::LC_TIME
+ * - LC_MESSAGES  I18n::LC_MESSAGES
+ *
+ * @param string $context Context of the text
+ * @param string $msg String to translate
+ * @param int $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function, otherwise null.
+ * @return string translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
+ */
+	function __xc($context, $msg, $category, $args = null) {
+		if (!$msg) {
+			return null;
+		}
+		App::uses('I18n', 'I18n');
+		$translated = I18n::translate($msg, null, null, $category, null, null, $context);
+		$arguments = func_get_args();
+		return I18n::insertArgs($translated, array_slice($arguments, 3));
 	}
 
 }
@@ -816,7 +1025,7 @@ if (!function_exists('fileExistsInPath')) {
  * Searches include path for files.
  *
  * @param string $file File to look for
- * @return Full path to file if exists, otherwise false
+ * @return string Full path to file if exists, otherwise false
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#fileExistsInPath
  */
 	function fileExistsInPath($file) {
@@ -840,7 +1049,7 @@ if (!function_exists('convertSlash')) {
 /**
  * Convert forward slashes to underscores and removes first and last underscores in a string
  *
- * @param string String to convert
+ * @param string $string String to convert
  * @return string with underscore remove from start and end of string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#convertSlash
  */
@@ -852,3 +1061,25 @@ if (!function_exists('convertSlash')) {
 	}
 
 }
+
+if (!function_exists('json_last_error_msg')) {
+
+/**
+ * Provides the fallback implementation of json_last_error_msg() available in PHP 5.5 and above.
+ *
+ * @return string Error message.
+ */
+	function json_last_error_msg() {
+		static $errors = array(
+			JSON_ERROR_NONE => '',
+			JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+			JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
+			JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded',
+			JSON_ERROR_SYNTAX => 'Syntax error',
+			JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded'
+		);
+		$error = json_last_error();
+		return array_key_exists($error, $errors) ? $errors[$error] : "Unknown error ({$error})";
+	}
+
+}
diff --git a/web/api/lib/Cake/bootstrap.php b/web/api/lib/Cake/bootstrap.php
index e1bd899eb..b17c9f68f 100644
--- a/web/api/lib/Cake/bootstrap.php
+++ b/web/api/lib/Cake/bootstrap.php
@@ -148,6 +148,8 @@ App::uses('Cache', 'Cache');
 App::uses('Object', 'Core');
 App::uses('Multibyte', 'I18n');
 
+App::$bootstrapping = true;
+
 /**
  * Full URL prefix
  */
@@ -170,19 +172,6 @@ Configure::write('App.imageBaseUrl', IMAGES_URL);
 Configure::write('App.cssBaseUrl', CSS_URL);
 Configure::write('App.jsBaseUrl', JS_URL);
 
-App::$bootstrapping = true;
-
-Configure::bootstrap(isset($boot) ? $boot : true);
-
-if (function_exists('mb_internal_encoding')) {
-	$encoding = Configure::read('App.encoding');
-	if (!empty($encoding)) {
-		mb_internal_encoding($encoding);
-	}
-	if (!empty($encoding) && function_exists('mb_regex_encoding')) {
-		mb_regex_encoding($encoding);
-	}
-}
 
 if (!function_exists('mb_stripos')) {
 
@@ -191,9 +180,9 @@ if (!function_exists('mb_stripos')) {
  *
  * @param string $haystack The string from which to get the position of the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
+ * @param int $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false
+ * @return int|bool The numeric position of the first occurrence of $needle in the $haystack string, or false
  *    if $needle is not found.
  */
 	function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -209,12 +198,12 @@ if (!function_exists('mb_stristr')) {
  *
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or false if $needle is not found.
+ * @return string|bool The portion of $haystack, or false if $needle is not found.
  */
 	function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::stristr($haystack, $needle, $part);
@@ -229,7 +218,7 @@ if (!function_exists('mb_strlen')) {
  *
  * @param string $string The string being checked for length.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer The number of characters in string $string having character encoding encoding.
+ * @return int The number of characters in string $string having character encoding encoding.
  *    A multi-byte character is counted as 1.
  */
 	function mb_strlen($string, $encoding = null) {
@@ -245,9 +234,9 @@ if (!function_exists('mb_strpos')) {
  *
  * @param string $haystack The string being checked.
  * @param string $needle The position counted from the beginning of haystack.
- * @param integer $offset The search offset. If it is not specified, 0 is used.
+ * @param int $offset The search offset. If it is not specified, 0 is used.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
+ * @return int|bool The numeric position of the first occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  */
 	function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -263,12 +252,12 @@ if (!function_exists('mb_strrchr')) {
  *
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|bool The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrchr($haystack, $needle, $part);
@@ -283,12 +272,12 @@ if (!function_exists('mb_strrichr')) {
  *
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|bool The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrichr($haystack, $needle, $part);
@@ -303,9 +292,9 @@ if (!function_exists('mb_strripos')) {
  *
  * @param string $haystack The string from which to get the position of the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset The position in $haystack to start searching.
+ * @param int $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
+ * @return int|bool The numeric position of the last occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  */
 	function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -321,10 +310,10 @@ if (!function_exists('mb_strrpos')) {
  *
  * @param string $haystack The string being checked, for the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
- * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
+ * @param int $offset May be specified to begin searching an arbitrary number of characters into the string.
  *    Negative values will stop searching at an arbitrary point prior to the end of the string.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
+ * @return int|bool The numeric position of the last occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  */
 	function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -340,12 +329,12 @@ if (!function_exists('mb_strstr')) {
  *
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack
- * @param boolean $part Determines which portion of $haystack this function returns.
+ * @param bool $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|bool The portion of $haystack, or true if $needle is not found.
  */
 	function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strstr($haystack, $needle, $part);
@@ -391,7 +380,7 @@ if (!function_exists('mb_substr_count')) {
  * @param string $haystack The string being checked.
  * @param string $needle The string being found.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer The number of times the $needle substring occurs in the $haystack string.
+ * @return int The number of times the $needle substring occurs in the $haystack string.
  */
 	function mb_substr_count($haystack, $needle, $encoding = null) {
 		return Multibyte::substrCount($haystack, $needle);
@@ -405,8 +394,8 @@ if (!function_exists('mb_substr')) {
  * Get part of string
  *
  * @param string $string The string being checked.
- * @param integer $start The first position used in $string.
- * @param integer $length The maximum length of the returned string.
+ * @param int $start The first position used in $string.
+ * @param int $length The maximum length of the returned string.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string The portion of $string specified by the $string and $length parameters.
  */
@@ -424,13 +413,13 @@ if (!function_exists('mb_encode_mimeheader')) {
  * @param string $str The string being encoded
  * @param string $charset specifies the name of the character set in which str is represented in.
  *    The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding.
+ * @param string $transferEncoding specifies the scheme of MIME encoding.
  *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
  * @param string $linefeed specifies the EOL (end-of-line) marker with which
  *    mb_encode_mimeheader() performs line-folding
  *    (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
  *    The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
- * @param integer $indent [definition unknown and appears to have no affect]
+ * @param int $indent [definition unknown and appears to have no affect]
  * @return string A converted version of the string represented in ASCII.
  */
 	function mb_encode_mimeheader($str, $charset = 'UTF-8', $transferEncoding = 'B', $linefeed = "\r\n", $indent = 1) {
@@ -438,3 +427,15 @@ if (!function_exists('mb_encode_mimeheader')) {
 	}
 
 }
+
+Configure::bootstrap(isset($boot) ? $boot : true);
+
+if (function_exists('mb_internal_encoding')) {
+	$encoding = Configure::read('App.encoding');
+	if (!empty($encoding)) {
+		mb_internal_encoding($encoding);
+	}
+	if (!empty($encoding) && function_exists('mb_regex_encoding')) {
+		mb_regex_encoding($encoding);
+	}
+}

From 5ff427d9e9d90417852908c574415f9873af7265 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 01:05:40 +1100
Subject: [PATCH 269/362] Removed Autotools Makefile.am

Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
---
 Makefile.am                                   |  40 ------
 db/Makefile.am                                |  14 --
 misc/Makefile.am                              |  17 ---
 onvif/Makefile.am                             |  26 ----
 onvif/scripts/Makefile.am                     |   5 -
 scripts/Makefile.am                           |  75 ----------
 src/Makefile.am                               | 135 ------------------
 web/Makefile.am                               |  35 -----
 web/ajax/Makefile.am                          |  12 --
 web/css/Makefile.am                           |   8 --
 web/graphics/Makefile.am                      |   8 --
 web/includes/Makefile.am                      |  19 ---
 web/js/Makefile.am                            |   8 --
 web/lang/Makefile.am                          |  25 ----
 web/skins/Makefile.am                         |   6 -
 web/skins/classic/Makefile.am                 |  15 --
 web/skins/classic/ajax/Makefile.am            |   5 -
 web/skins/classic/css/Makefile.am             |   7 -
 web/skins/classic/css/classic/Makefile.am     |  10 --
 .../classic/css/classic/views/Makefile.am     |  31 ----
 web/skins/classic/css/dark/Makefile.am        |  10 --
 web/skins/classic/css/dark/views/Makefile.am  |  31 ----
 web/skins/classic/css/flat/Makefile.am        |  10 --
 web/skins/classic/css/flat/views/Makefile.am  |  31 ----
 web/skins/classic/graphics/Makefile.am        |  23 ---
 web/skins/classic/includes/Makefile.am        |  11 --
 web/skins/classic/js/Makefile.am              |  10 --
 web/skins/classic/lang/Makefile.am            |   5 -
 web/skins/classic/views/Makefile.am           |  57 --------
 web/skins/classic/views/js/Makefile.am        |  50 -------
 web/skins/mobile/Makefile.am                  |  14 --
 web/skins/mobile/ajax/Makefile.am             |   5 -
 web/skins/mobile/css/Makefile.am              |   6 -
 web/skins/mobile/graphics/Makefile.am         |   5 -
 web/skins/mobile/includes/Makefile.am         |   9 --
 web/skins/mobile/lang/Makefile.am             |   5 -
 web/skins/mobile/views/Makefile.am            |  22 ---
 web/skins/mobile/views/css/Makefile.am        |   6 -
 web/skins/xml/Makefile.am                     |  10 --
 web/skins/xml/includes/Makefile.am            |   8 --
 web/skins/xml/views/Makefile.am               |  11 --
 web/tools/Makefile.am                         |   4 -
 web/tools/mootools/Makefile.am                |  16 ---
 web/views/Makefile.am                         |   6 -
 44 files changed, 866 deletions(-)
 delete mode 100644 Makefile.am
 delete mode 100644 db/Makefile.am
 delete mode 100644 misc/Makefile.am
 delete mode 100644 onvif/Makefile.am
 delete mode 100644 onvif/scripts/Makefile.am
 delete mode 100644 scripts/Makefile.am
 delete mode 100644 src/Makefile.am
 delete mode 100644 web/Makefile.am
 delete mode 100644 web/ajax/Makefile.am
 delete mode 100644 web/css/Makefile.am
 delete mode 100644 web/graphics/Makefile.am
 delete mode 100644 web/includes/Makefile.am
 delete mode 100644 web/js/Makefile.am
 delete mode 100644 web/lang/Makefile.am
 delete mode 100644 web/skins/Makefile.am
 delete mode 100644 web/skins/classic/Makefile.am
 delete mode 100644 web/skins/classic/ajax/Makefile.am
 delete mode 100644 web/skins/classic/css/Makefile.am
 delete mode 100644 web/skins/classic/css/classic/Makefile.am
 delete mode 100644 web/skins/classic/css/classic/views/Makefile.am
 delete mode 100644 web/skins/classic/css/dark/Makefile.am
 delete mode 100644 web/skins/classic/css/dark/views/Makefile.am
 delete mode 100644 web/skins/classic/css/flat/Makefile.am
 delete mode 100644 web/skins/classic/css/flat/views/Makefile.am
 delete mode 100644 web/skins/classic/graphics/Makefile.am
 delete mode 100644 web/skins/classic/includes/Makefile.am
 delete mode 100644 web/skins/classic/js/Makefile.am
 delete mode 100644 web/skins/classic/lang/Makefile.am
 delete mode 100644 web/skins/classic/views/Makefile.am
 delete mode 100644 web/skins/classic/views/js/Makefile.am
 delete mode 100644 web/skins/mobile/Makefile.am
 delete mode 100644 web/skins/mobile/ajax/Makefile.am
 delete mode 100644 web/skins/mobile/css/Makefile.am
 delete mode 100644 web/skins/mobile/graphics/Makefile.am
 delete mode 100644 web/skins/mobile/includes/Makefile.am
 delete mode 100644 web/skins/mobile/lang/Makefile.am
 delete mode 100644 web/skins/mobile/views/Makefile.am
 delete mode 100644 web/skins/mobile/views/css/Makefile.am
 delete mode 100644 web/skins/xml/Makefile.am
 delete mode 100644 web/skins/xml/includes/Makefile.am
 delete mode 100644 web/skins/xml/views/Makefile.am
 delete mode 100644 web/tools/Makefile.am
 delete mode 100644 web/tools/mootools/Makefile.am
 delete mode 100644 web/views/Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 62f767e75..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-zmconfigdir = @ZM_CONFIG_DIR@
-
-zmconfig_DATA = \
-	zm.conf
-
-if COND_ONVIF
-   MAYBE_ONVIF = onvif
-endif
-
-SUBDIRS = \
-	src \
-	web \
-	scripts \
-	db \
-	misc \
- 	$(MAYBE_ONVIF)
-
-EXTRA_DIST = \
-	zm.conf.in \
-	zmconfgen.pl.in
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_DATA) )
-	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
-	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_SOCKDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/db/Makefile.am b/db/Makefile.am
deleted file mode 100644
index 9cb4e197c..000000000
--- a/db/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-zmdbdatadir = $(pkgdatadir)/db
-
-EXTRA_DIST = \
-	zm_create.sql.in \
-	$(dbupgrade_scripts)
-
-dist_zmdbdata_DATA = \
-	zm_create.sql \
-	$(dbupgrade_scripts)
-
-dbupgrade_scripts = $(wildcard zm_update-*.sql)
-
diff --git a/misc/Makefile.am b/misc/Makefile.am
deleted file mode 100644
index 5578e4373..000000000
--- a/misc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-EXTRA_DIST = \
-	apache.conf.in \
-	logrotate.conf.in \
-	syslog.conf.in \
-	zoneminder-tmpfiles.conf.in \
-	zoneminder.service.in \
-        com.zoneminder.systemctl.policy.in \
-        com.zoneminder.systemctl.rules.in
-
-polkit_actiondir = @POLKIT_PREFIX@/share/polkit-1/actions
-dist_polkit_action_DATA = com.zoneminder.systemctl.policy
-
-polkit_rulesdir = @POLKIT_PREFIX@/share/polkit-1/rules.d
-dist_polkit_rules_DATA = com.zoneminder.systemctl.rules
-
diff --git a/onvif/Makefile.am b/onvif/Makefile.am
deleted file mode 100644
index 8cc9d700a..000000000
--- a/onvif/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: proxy/Makefile modules/Makefile
-
-proxy/Makefile: proxy/Makefile.PL
-	( cd proxy; perl Makefile.PL )
-
-modules/Makefile: modules/Makefile.PL
-	( cd modules; perl Makefile.PL )
-
-SUBDIRS = \
- 	. \
-  proxy \
-  modules \
-  scripts 
-   
-   
-EXTRA_DIST = \
-  proxy/Makefile.PL \
-  proxy/lib \
-  modules/Makefile.PL \
-  modules/lib \
-  wsdl \
-  doc \
-  patches
diff --git a/onvif/scripts/Makefile.am b/onvif/scripts/Makefile.am
deleted file mode 100644
index 80db9755c..000000000
--- a/onvif/scripts/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-bin_SCRIPTS = \
-  zmonvif-probe.pl
-
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 5eacd8203..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: ZoneMinder/Makefile
-
-ZoneMinder/Makefile: ZoneMinder/Makefile.PL
-	( cd ZoneMinder; perl Makefile.PL )
-
-bin_SCRIPTS = \
-	zmdc.pl \
-	zmaudit.pl \
-	zmfilter.pl \
-	zmtrigger.pl \
-	zmx10.pl \
-	zmwatch.pl \
-	zmpkg.pl \
-	zmupdate.pl \
-	zmvideo.pl \
-	zmcontrol.pl \
-	zmtrack.pl \
-	zmcamtool.pl \
-	zmsystemctl.pl
-
-SUBDIRS = \
-	. \
-    ZoneMinder
-
-EXTRA_DIST = \
-	zmdc.pl.in \
-	zmaudit.pl.in \
-	zmfilter.pl.in \
-	zmtrigger.pl.in \
-	zmx10.pl.in \
-	zmwatch.pl.in \
-	zmpkg.pl.in \
-	zmupdate.pl.in \
-	zmvideo.pl.in \
-	zmcontrol.pl.in \
-	zmtrack.pl.in \
-	zmcamtool.pl.in \
-	zmsystemctl.pl.in \
-	ZoneMinder/Makefile.PL \
-	ZoneMinder/README \
-	ZoneMinder/Changes \
-	ZoneMinder/META.yml \
-	ZoneMinder/MANIFEST \
-	ZoneMinder/t/ZoneMinder.t \
-	ZoneMinder/lib/ZoneMinder.pm \
-	ZoneMinder/lib/ZoneMinder/Base.pm.in \
-	ZoneMinder/lib/ZoneMinder/Config.pm.in \
-	ZoneMinder/lib/ZoneMinder/Logger.pm \
-	ZoneMinder/lib/ZoneMinder/General.pm \
-	ZoneMinder/lib/ZoneMinder/Database.pm \
-	ZoneMinder/lib/ZoneMinder/Memory.pm.in \
-	ZoneMinder/lib/ZoneMinder/Memory/Shared.pm \
-	ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigData.pm.in \
-	ZoneMinder/lib/ZoneMinder/Control.pm \
-	ZoneMinder/lib/ZoneMinder/Control \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm \
-	zm.in \
-	zmdbbackup.in \
-	zmdbrestore.in \
-	zmeventdump.in \
-	zmlogrotate.conf.in
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 9314daac0..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @MARIADB_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer
-#AM_CXXFLAGS = -frepo
-
-CLEANFILES = *.rpo
-
-# This should be set to your CGI directory
-cgidir = @CGI_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-bin_PROGRAMS = \
-	zmc \
-	zma \
-	zmu \
-	zms \
-	zmf \
-	zmstreamer
-
-zm_SOURCES = \
-	zm_box.cpp \
-	zm_buffer.cpp \
-	zm_camera.cpp \
-	zm_comms.cpp \
-	zm_config.cpp \
-	zm_coord.cpp \
-	zm_curl_camera.cpp \
-	zm.cpp \
-	zm_db.cpp \
-	zm_logger.cpp \
-	zm_event.cpp \
-	zm_exception.cpp \
-	zm_file_camera.cpp \
-	zm_ffmpeg_camera.cpp \
-	zm_image.cpp \
-	zm_jpeg.cpp \
-    zm_libvlc_camera.cpp \
-	zm_local_camera.cpp \
-	zm_monitor.cpp \
-	zm_ffmpeg.cpp \
-	zm_mpeg.cpp \
-	zm_poly.cpp \
-	zm_regexp.cpp \
-	zm_remote_camera.cpp \
-	zm_remote_camera_http.cpp \
-	zm_remote_camera_rtsp.cpp \
-	zm_rtp.cpp \
-	zm_rtp_ctrl.cpp \
-	zm_rtp_data.cpp \
-	zm_rtp_source.cpp \
-	zm_rtsp.cpp \
-	zm_rtsp_auth.cpp \
-	zm_sdp.cpp \
-	zm_signal.cpp \
-	zm_stream.cpp \
-	zm_thread.cpp \
-	zm_time.cpp \
-	zm_timer.cpp \
-	zm_user.cpp \
-	zm_utils.cpp \
-	zm_zone.cpp
-
-zmc_SOURCES = zmc.cpp $(zm_SOURCES)
-zma_SOURCES = zma.cpp $(zm_SOURCES)
-zms_SOURCES = zms.cpp $(zm_SOURCES)
-zmu_SOURCES = zmu.cpp $(zm_SOURCES)
-zmf_SOURCES = zmf.cpp $(zm_SOURCES)
-zmstreamer_SOURCES = zmstreamer.cpp $(zm_SOURCES)
-
-noinst_HEADERS = \
-	jinclude.h \
-	zm_box.h \
-	zm_buffer.h \
-	zm_camera.h \
-	zm_comms.h \
-	zm_config_defines.h \
-	zm_config.h \
-	zm_coord.h \
-	zm_curl_camera.h \
-	zm_db.h \
-	zm_logger.h \
-	zm_event.h \
-	zm_exception.h \
-	zmf.h \
-	zm_file_camera.h \
-	zm_ffmpeg_camera.h \
-	zm_font.h \
-	zm_font.h \
-	zm.h \
-	zm_image.h \
-	zm_jpeg.h \
-    zm_libvlc_camera.h \
-	zm_local_camera.h \
-	zm_mem_utils.h \
-	zm_monitor.h \
-	zm_ffmpeg.h \
-	zm_mpeg.h \
-	zm_poly.h \
-	zm_regexp.h \
-	zm_remote_camera.h \
-	zm_remote_camera_http.h \
-	zm_remote_camera_rtsp.h \
-	zm_rgb.h \
-	zm_rtp_ctrl.h \
-	zm_rtp_data.h \
-	zm_rtp.h \
-	zm_rtp_source.h \
-	zm_rtsp.h \
-	zm_sdp.h \
-	zm_signal.h \
-	zm_stream.h \
-	zm_thread.h \
-	zm_time.h \
-	zm_timer.h \
-	zm_user.h \
-	zm_utils.h \
-	zm_zone.h
-
-EXTRA_DIST = \
-	zm_config.h.in \
-	zm_threaddata.cpp
-
-dist-hook:
-	@( rm $(distdir)/zm_config.h )
-
-# Yes, you are correct. This is a HACK!
-install-exec-hook:
-	( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
-	( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
-
-uninstall-hook:
-	( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )
-
diff --git a/web/Makefile.am b/web/Makefile.am
deleted file mode 100644
index 077a4ff91..000000000
--- a/web/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# This should be set to your web directory
-webdir = @WEB_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	skins \
-	tools \
-	views
-
-dist_web_DATA = \
-	index.php
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); chown $(webuser):$(webgroup) $(dist_web_DATA) )
-	( cd $(DESTDIR)$(webdir); chown -R $(webuser):$(webgroup) $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e events; then mkdir events; fi; chown $(webuser):$(webgroup) events; chmod u+w events )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e images; then mkdir images; fi; chown $(webuser):$(webgroup) images; chmod u+w images )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e sounds; then mkdir sounds; fi; chown $(webuser):$(webgroup) sounds; chmod u+w sounds )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e tools; then mkdir tools; fi; chown $(webuser):$(webgroup) tools; chmod u+w tools )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e temp; then mkdir temp; fi; chown $(webuser):$(webgroup) temp; chmod u+w temp )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); rm -rf events images sounds tools temp )
diff --git a/web/ajax/Makefile.am b/web/ajax/Makefile.am
deleted file mode 100644
index ef79e6cae..000000000
--- a/web/ajax/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/ajax
-
-dist_web_DATA = \
-	alarm.php \
-	control.php \
-	event.php \
-	log.php \
-	status.php \
-	stream.php \
-	zone.php
diff --git a/web/css/Makefile.am b/web/css/Makefile.am
deleted file mode 100644
index 917b8f389..000000000
--- a/web/css/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/css
-
-dist_web_DATA = \
-	reset.css \
-	spinner.css \
-	overlay.css
diff --git a/web/graphics/Makefile.am b/web/graphics/Makefile.am
deleted file mode 100644
index ec252c82e..000000000
--- a/web/graphics/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/graphics
-
-dist_web_DATA = \
-	favicon.ico \
-    spinner.gif \
-	transparent.gif
diff --git a/web/includes/Makefile.am b/web/includes/Makefile.am
deleted file mode 100644
index d4a1ece9b..000000000
--- a/web/includes/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/includes
-
-web_DATA = \
-	config.php
-
-dist_web_DATA = \
-	Monitor.php \
-	Server.php \
-	actions.php \
-	database.php \
-	functions.php \
-	control_functions.php \
-	lang.php \
-	logger.php
-
-EXTRA_DIST = \
-	config.php.in
diff --git a/web/js/Makefile.am b/web/js/Makefile.am
deleted file mode 100644
index 21c10613e..000000000
--- a/web/js/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/js
-
-dist_web_DATA = \
-    logger.js \
-    overlay.js \
-    mootools.ext.js
diff --git a/web/lang/Makefile.am b/web/lang/Makefile.am
deleted file mode 100644
index 22d256a2e..000000000
--- a/web/lang/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/lang
-
-dist_web_DATA = \
-	big5_big5.php \
-	cn_zh.php \
-	cs_cz.php \
-	de_de.php \
-	dk_dk.php \
-	et_ee.php \
-	en_gb.php \
-	en_us.php \
-	es_ar.php \
-	fr_fr.php \
-	he_il.php \
-	hu_hu.php \
-	it_it.php \
-	ja_jp.php \
-	nl_nl.php \
-	pl_pl.php \
-	pt_br.php \
-	ro_ro.php \
-	ru_ru.php \
-	se_se.php
diff --git a/web/skins/Makefile.am b/web/skins/Makefile.am
deleted file mode 100644
index ae0abd8e8..000000000
--- a/web/skins/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	classic \
-	mobile \
-	xml
diff --git a/web/skins/classic/Makefile.am b/web/skins/classic/Makefile.am
deleted file mode 100644
index 986beae0d..000000000
--- a/web/skins/classic/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/classic/ajax/Makefile.am b/web/skins/classic/ajax/Makefile.am
deleted file mode 100644
index f910cbc5c..000000000
--- a/web/skins/classic/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/css/Makefile.am b/web/skins/classic/css/Makefile.am
deleted file mode 100644
index 2c43d2e47..000000000
--- a/web/skins/classic/css/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css
-
-SUBDIRS = dark \
-		flat \
-		classic
diff --git a/web/skins/classic/css/classic/Makefile.am b/web/skins/classic/css/classic/Makefile.am
deleted file mode 100644
index 48dc58ab7..000000000
--- a/web/skins/classic/css/classic/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/classic/views/Makefile.am b/web/skins/classic/css/classic/views/Makefile.am
deleted file mode 100644
index d07eaac4f..000000000
--- a/web/skins/classic/css/classic/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/dark/Makefile.am b/web/skins/classic/css/dark/Makefile.am
deleted file mode 100644
index 6961860eb..000000000
--- a/web/skins/classic/css/dark/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/dark/views/Makefile.am b/web/skins/classic/css/dark/views/Makefile.am
deleted file mode 100644
index 2180d6432..000000000
--- a/web/skins/classic/css/dark/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/flat/Makefile.am b/web/skins/classic/css/flat/Makefile.am
deleted file mode 100644
index 297982929..000000000
--- a/web/skins/classic/css/flat/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/flat/views/Makefile.am b/web/skins/classic/css/flat/views/Makefile.am
deleted file mode 100644
index dff0aa29b..000000000
--- a/web/skins/classic/css/flat/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/graphics/Makefile.am b/web/skins/classic/graphics/Makefile.am
deleted file mode 100644
index c5c7b6bba..000000000
--- a/web/skins/classic/graphics/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/graphics
-
-dist_web_DATA =  \
-	arrow-d.gif \
-	arrow-dl.gif \
-	arrow-dr.gif \
-	arrow-l-d.gif \
-	arrow-l.gif \
-	arrow-l-u.gif \
-	arrow-r.gif \
-	arrow-s-d.gif \
-	arrow-s-u.gif \
-	arrow-u.gif \
-	arrow-ul.gif \
-	arrow-ur.gif \
-	center.gif \
-	point-g.gif \
-	point-o.gif \
-	point-r.gif \
-	seq-d.gif \
-	seq-u.gif
diff --git a/web/skins/classic/includes/Makefile.am b/web/skins/classic/includes/Makefile.am
deleted file mode 100644
index 690df231a..000000000
--- a/web/skins/classic/includes/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php \
-	export_functions.php \
-	timeline_functions.php
diff --git a/web/skins/classic/js/Makefile.am b/web/skins/classic/js/Makefile.am
deleted file mode 100644
index 3f5ffdda2..000000000
--- a/web/skins/classic/js/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/js
-
-dist_web_DATA = \
-	skin.js \
-	classic.js \
-	dark.js \
-	flat.js \
-	skin.js.php
diff --git a/web/skins/classic/lang/Makefile.am b/web/skins/classic/lang/Makefile.am
deleted file mode 100644
index 6a089b4fa..000000000
--- a/web/skins/classic/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/views/Makefile.am b/web/skins/classic/views/Makefile.am
deleted file mode 100644
index 4167a886b..000000000
--- a/web/skins/classic/views/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	js
-
-webdir = @WEB_PREFIX@/skins/classic/views
-
-dist_web_DATA = \
-	bandwidth.php \
-	blank.php \
-	console.php \
-	controlcap.php \
-	controlcaps.php \
-	control.php \
-	controlpreset.php \
-	cycle.php \
-	device.php \
-	devices.php \
-	donate.php \
-	error.php \
-	eventdetail.php \
-	event.php \
-	events.php \
-	export.php \
-	filter.php \
-	filtersave.php \
-	frame.php \
-	frames.php \
-	function.php \
-	group.php \
-	groups.php \
-	log.php \
-	login.php \
-	logout.php \
-	Makefile.am \
-	monitor.php \
-	monitorpreset.php \
-	monitorprobe.php \
-	montage.php \
-    montagereview.php \
-	none.php \
-  onvifprobe.php \
-	optionhelp.php \
-	options.php \
-	postlogin.php \
-	server.php \
-	settings.php \
-	state.php \
-	stats.php \
-	status.php \
-	timeline.php \
-	user.php \
-	version.php \
-	video.php \
-	watch.php \
-	zone.php \
-	zones.php
diff --git a/web/skins/classic/views/js/Makefile.am b/web/skins/classic/views/js/Makefile.am
deleted file mode 100644
index 73c74fafe..000000000
--- a/web/skins/classic/views/js/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/views/js
-
-dist_web_DATA = \
-	console.js \
-	console.js.php \
-	control.js \
-	controlpreset.js \
-	controlpreset.js.php \
-	cycle.js \
-	cycle.js.php \
-	devices.js \
-	donate.js \
-	donate.js.php \
-	event.js \
-	event.js.php \
-	events.js \
-	events.js.php \
-	export.js \
-	export.js.php \
-	filter.js \
-	filter.js.php \
-	group.js \
-	groups.js \
-	log.js \
-	login.js \
-	Makefile.am \
-	monitor.js \
-	monitor.js.php \
-	monitorpreset.js \
-	monitorprobe.js \
-	montage.js \
-	montage.js.php \
-  onvifprobe.js \
-	options.js.php \
-	postlogin.js.php \
-	state.js \
-	state.js.php \
-	timeline.js \
-	timeline.js.php \
-	user.js \
-	version.js \
-	version.js.php \
-	video.js \
-	video.js.php \
-	watch.js \
-	watch.js.php \
-	zone.js \
-	zone.js.php
diff --git a/web/skins/mobile/Makefile.am b/web/skins/mobile/Makefile.am
deleted file mode 100644
index 35051fade..000000000
--- a/web/skins/mobile/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/mobile/ajax/Makefile.am b/web/skins/mobile/ajax/Makefile.am
deleted file mode 100644
index 0558929c0..000000000
--- a/web/skins/mobile/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/css/Makefile.am b/web/skins/mobile/css/Makefile.am
deleted file mode 100644
index 6353e163e..000000000
--- a/web/skins/mobile/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/css
-
-dist_web_DATA = \
-	skin.css
diff --git a/web/skins/mobile/graphics/Makefile.am b/web/skins/mobile/graphics/Makefile.am
deleted file mode 100644
index dfd43bef7..000000000
--- a/web/skins/mobile/graphics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/graphics
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/includes/Makefile.am b/web/skins/mobile/includes/Makefile.am
deleted file mode 100644
index c88ad435a..000000000
--- a/web/skins/mobile/includes/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php
diff --git a/web/skins/mobile/lang/Makefile.am b/web/skins/mobile/lang/Makefile.am
deleted file mode 100644
index 5084203fb..000000000
--- a/web/skins/mobile/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/views/Makefile.am b/web/skins/mobile/views/Makefile.am
deleted file mode 100644
index c7d175ca3..000000000
--- a/web/skins/mobile/views/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	css
-
-webdir = @WEB_PREFIX@/skins/mobile/views
-
-dist_web_DATA = \
-	console.php \
-	devices.php \
-	error.php \
-	eventdetails.php \
-	event.php \
-	events.php \
-	filter.php \
-	frame.php \
-	function.php \
-	login.php \
-	montage.php \
-	state.php \
-	video.php \
-	watch.php
diff --git a/web/skins/mobile/views/css/Makefile.am b/web/skins/mobile/views/css/Makefile.am
deleted file mode 100644
index 86e0ff0a3..000000000
--- a/web/skins/mobile/views/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/views/css
-
-dist_web_DATA = \
-	console.css
diff --git a/web/skins/xml/Makefile.am b/web/skins/xml/Makefile.am
deleted file mode 100644
index 2c30d19a3..000000000
--- a/web/skins/xml/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml
-
-SUBDIRS = \
-	includes \
-	views
-
-dist_web_DATA = \
-	skin.php
diff --git a/web/skins/xml/includes/Makefile.am b/web/skins/xml/includes/Makefile.am
deleted file mode 100644
index c6128f8a2..000000000
--- a/web/skins/xml/includes/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php
diff --git a/web/skins/xml/views/Makefile.am b/web/skins/xml/views/Makefile.am
deleted file mode 100644
index ab9147ae4..000000000
--- a/web/skins/xml/views/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = 
-
-webdir = @WEB_PREFIX@/skins/xml/views
-
-dist_web_DATA = \
-	console.php \
-	actions.php \
-	none.php \
-	notfound.png
diff --git a/web/tools/Makefile.am b/web/tools/Makefile.am
deleted file mode 100644
index 29c91bc02..000000000
--- a/web/tools/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	mootools
diff --git a/web/tools/mootools/Makefile.am b/web/tools/mootools/Makefile.am
deleted file mode 100644
index 89b17ab8d..000000000
--- a/web/tools/mootools/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/tools/mootools
-
-dist_web_DATA = \
-	mootools-core-1.4.5-compat.js \
-	mootools-more-1.5.1.js
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); rm -f mootools-core.js mootools-more.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-core-1.4.5-compat.js mootools-core.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-more-1.5.1.js mootools-more.js )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -f mootools-* )
diff --git a/web/views/Makefile.am b/web/views/Makefile.am
deleted file mode 100644
index 6ecec9d8b..000000000
--- a/web/views/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/views
-
-dist_web_DATA = file.php \
-	image.php

From e4a72f7653925ac2ffaf9969fb53d00990732238 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 01:25:37 +1100
Subject: [PATCH 270/362] Remove more Autotools files and edit travis to no
 longer build Autotools

Conflicts:
	.travis.yml
	bootstrap.sh
	configure.ac
---
 .travis.yml             |   7 -
 acinclude.m4            |  74 ------
 bootstrap.sh            |   5 -
 configure.ac            | 509 ----------------------------------------
 m4/ac_check_sendfile.m4 |  63 -----
 5 files changed, 658 deletions(-)
 delete mode 100644 acinclude.m4
 delete mode 100755 bootstrap.sh
 delete mode 100644 configure.ac
 delete mode 100644 m4/ac_check_sendfile.m4

diff --git a/.travis.yml b/.travis.yml
index d44973e2e..835f267f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ env:
     - CXXFLAGS="$CFLAGS"
   matrix:
     - ZM_BUILDMETHOD=cmake
-    - ZM_BUILDMETHOD=autotools
 compiler:
   - gcc
 before_install:
@@ -32,16 +31,10 @@ install:
   - sudo make install-libs
 before_script:
   - cd $TRAVIS_BUILD_DIR
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize -v --force; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal -I m4; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
   - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
   - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
   - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
   - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
   - make
   - sudo make install
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 605842149..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
-
-AC_DEFUN([AC_PROG_PERL_VERSION],[dnl
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-# Check if version of Perl is sufficient
-ac_perl_version="$1"
-
-if test "x$PERL" != "x"; then
-  AC_MSG_CHECKING(for perl version greater than or equal to $ac_perl_version)
-  # NB: It would be nice to log the error if there is one, but we cannot rely
-  # on autoconf internals
-  $PERL -e "use $ac_perl_version;" > /dev/null 2>&1
-  if test $? -ne 0; then
-    AC_MSG_RESULT(no);
-    $3
-  else
-    AC_MSG_RESULT(ok);
-    $2
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi
-])dnl
-
-AC_DEFUN([AC_PROG_PERL_MODULES],[dnl
-ac_perl_modules="$1"
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-if test "x$PERL" != x; then
-  ac_perl_modules_failed=0
-  for ac_perl_module in $ac_perl_modules; do
-    AC_MSG_CHECKING(for perl module $ac_perl_module)
-
-    # Would be nice to log result here, but can't rely on autoconf internals
-    $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1
-    if test $? -ne 0; then
-      AC_MSG_RESULT(no);
-      ac_perl_modules_failed=1
-   else
-      AC_MSG_RESULT(ok);
-    fi
-  done
-
-  # Run optional shell commands
-  if test "$ac_perl_modules_failed" = 0; then
-    :
-    $2
-  else
-    :
-    $3
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi])dnl
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 0bc041f18..000000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index b10dd44d5..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,509 +0,0 @@
-#
-# Building ZoneMinder via Autotools will be depreciated soon
-# For instructions on building with cmake, please see INSTALL
-#
-AC_PREREQ(2.59)
-AC_INIT(zm,1.29.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR(src/zm.h)
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
-
-AC_SUBST(VERSION)
-#
-# Platform specific setup
-#
-#############################
-AC_CANONICAL_HOST
-# Check for which host we are on and setup a few things
-# specifically based on the host
-case $host_os in
-  darwin* )
-        # Do something specific for mac
-		HOST_OS='darwin'
-        ;;
-  linux*)
-        # Do something specific for linux
-		HOST_OS='linux'
-        ;;
-   *BSD*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-   *bsd*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-    *solaris*)
-        # Do something specific for Solaris
-		HOST_OS='solaris'
-		AC_DEFINE(SOLARIS,1,"We are running a Solaroid OS [tested on OmniOS]")
-        ;;
-    *)
-        #Default Case
-        AC_MSG_ERROR([Your platform is not currently supported])
-        ;;
-esac
-
-AC_SUBST(HOST_OS)
-
-AC_ARG_VAR(ZM_DB_TYPE,[Type of the ZoneMinder database, default mysql])
-AC_ARG_VAR(ZM_DB_HOST,[Hostname where ZoneMinder database located, default localhost])
-AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
-AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
-AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
-AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
-AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
-AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
-AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
-AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
-
-if test "$ZM_DB_TYPE" == ""; then
-	AC_SUBST(ZM_DB_TYPE,[mysql])
-fi
-if test "$ZM_DB_HOST" == ""; then
-	AC_SUBST(ZM_DB_HOST,[localhost])
-fi
-if test "$ZM_DB_NAME" == ""; then
-	AC_SUBST(ZM_DB_NAME,[zm])
-fi
-if test "$ZM_DB_USER" == ""; then
-	AC_SUBST(ZM_DB_USER,[zmuser])
-fi
-if test "$ZM_DB_PASS" == ""; then
-	AC_SUBST(ZM_DB_PASS,[zmpass])
-fi
-if test "$ZM_SSL_LIB" == ""; then
-	AC_SUBST(ZM_SSL_LIB,gnutls)
-fi
-if test "$ZM_MYSQL_ENGINE" == ""; then
-	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
-fi
-if test "$ZM_RUNDIR" == ""; then
-	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
-fi
-if test "$ZM_SOCKDIR" == ""; then
-	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
-fi
-if test "$ZM_TMPDIR" == ""; then
-	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
-fi
-if test "$ZM_LOGDIR" == ""; then
-	AC_SUBST(ZM_LOGDIR,[/var/log/zm])
-fi
-AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-if test "$ZM_CONFIG_DIR" == ""; then
-	AC_SUBST(ZM_CONFIG_DIR,[$SYSCONFDIR])
-fi
-
-LIB_ARCH=lib
-AC_ARG_WITH(libarch,
-    [  --with-libarch=<lib>       architecture library path to use, default lib],
-    [LIB_ARCH=$with_libarch],
-    AC_MSG_WARN([You can call configure with the --with-libarch option.
-    This tells configure where to find architecture specific libraries.
-    The default of 'lib' is usually ok but 64 bit machines may require lib64.
-    e.g. --with-libarch=lib or --with-libarch=lib64])
-)
-AC_SUBST(LIB_ARCH)
-
-LDFLAGS="-L/usr/lib/${build_alias} ${LDFLAGS}"
-
-MYSQL_PREFIX=/usr
-AC_ARG_WITH(mysql,
-    [  --with-mysql=<path>        prefix of MySQL installation, default /usr],
-    [MYSQL_PREFIX=$with_mysql],
-    AC_MSG_WARN([You can call configure with the --with-mysql option.
-    This tells configure where to find the MySql C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mysql=/usr/local or --with-mysql=/usr])
-)
-AC_SUBST(MYSQL_PREFIX)
-MYSQL_LIBS="-L${MYSQL_PREFIX}/${LIB_ARCH}/mysql"
-MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
-AC_SUBST(MYSQL_LIBS)
-AC_SUBST(MYSQL_CFLAGS)
-LDFLAGS="$LDFLAGS ${MYSQL_LIBS}"
-
-
-MARIADB_PREFIX=/usr
-AC_ARG_WITH(mariadb,
-    [  --with-mariadb=<path>        prefix of MariaDB installation, default /usr],
-    [MYSQL_PREFIX=$with_mariadb],
-    AC_MSG_WARN([You can call configure with the --with-mariadb option.
-    This tells configure where to find the mariaDB C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mariadb=/usr/local or --with-mariadb=/usr])
-)
-AC_SUBST(MARIADB_PREFIX)
-MARIADB_LIBS="-L${MARIADB_PREFIX}/${LIB_ARCH}/mariadb"
-MARIADB_CFLAGS="-I${MARIADB_PREFIX}/include"
-AC_SUBST(MARIADB_LIBS)
-AC_SUBST(MARIADB_CFLAGS)
-LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"
-
-POLKIT_PREFIX=/usr
-AC_ARG_WITH(polkit,
-[ --with-polkit=<path> prefix of polkit root directory, default /usr],
-[POLKIT_PREFIX=$with_polkit],
-AC_MSG_WARN([You can call configure with the --with-polkit option.
-This tells configure where to place the polkit policy files.])
-)
-AC_SUBST(POLKIT_PREFIX)
-PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
-
-FFMPEG_PREFIX=/usr
-AC_ARG_WITH(ffmpeg,
-    [  --with-ffmpeg=<path>       prefix of ffmpeg root directory for libavcodec etc, default /usr],
-    [FFMPEG_PREFIX=$with_ffmpeg],
-    AC_MSG_WARN([You can call configure with the --with-ffmpeg option.
-    This tells configure where to find the ffmpeg root directory within which are the libavcodec 
-    and libavformat files that can be used to build true MPEG streaming into ZoneMinder. Ensure that
-    your copy of ffmpeg has installed libraries as well as binaries (use 'make installlib'). If you
-    are using a local install of ffmpeg you may have to remove or rename a previous real installation
-    as the headers and libraries from that will probably be picked up before your local copy.
-    e.g. --with-ffmpeg=/usr/local])
-)
-AC_SUBST(FFMPEG_PREFIX)
-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include -D__STDC_CONSTANT_MACROS"
-AC_SUBST(FFMPEG_LIBS)
-AC_SUBST(FFMPEG_CFLAGS)
-
-LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
-CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
-
-EXTRA_LIBS=
-AC_ARG_WITH(extralibs,
-    [  --with-extralibs="<libs>"  string containing extra libraries to pass to link, default empty],
-    [EXTRA_LIBS=$with_extralibs],
-    AC_MSG_WARN([You can call configure with the --with-extralibs option.
-    Ordinarily you will need to use this option only when your copy of ffmpeg has been built
-    with support for additional formats and you would use this option to detail which additional
-    libraries ffmpeg was built with so that it is able to link successfully with ZoneMinder.
-    You will need to wrap this option in quotes if it contains any spaces.
-    e.g. --with-extralibs="-lmp3lame"])
-)
-AC_SUBST(EXTRA_LIBS)
-
-LDFLAGS="$LDFLAGS ${EXTRA_LIBS}"
-
-AC_ARG_WITH(webdir,
-    [  --with-webdir=<path>       prefix of web directory],
-    [WEB_PREFIX=$with_webdir],
-    AC_MSG_ERROR([You must call configure with the --with-webdir option.
-    This tells configure where to install PHP and web files and scripts.
-    e.g. --with-webdir=/var/www/html or --with-webdir=/www/vhtdocs/<site>])
-)
-AC_SUBST(WEB_PREFIX)
-
-AC_ARG_WITH(cgidir,
-    [  --with-cgidir=<path>       prefix of cgi directory],
-    [CGI_PREFIX=$with_cgidir],
-    AC_MSG_ERROR([You must call configure with the --with-cgidir option.
-    This tells configure where to install cgi files and scripts.
-    e.g. --with-cgidir=/var/www/cgi-bin or --with-webdir=/www/vhtdocs/<site>/cgi-bin])
-)
-AC_SUBST(CGI_PREFIX)
-
-WEB_USER=apache
-AC_ARG_WITH(webuser,
-    [  --with-webuser=<user>      name of web user, default apache],
-    [WEB_USER=$with_webuser],
-    AC_MSG_WARN([You can call configure with the --with-webuser option.
-    This tells configure what the user name of the web user is if it is not the default of 'apache'.
-    e.g. --with-webuser=apache or --with-webuser=web])
-)
-AC_SUBST(WEB_USER)
-
-WEB_GROUP=apache
-AC_ARG_WITH(webgroup,
-    [  --with-webgroup=<group>    name of web group, default apache],
-    [WEB_GROUP=$with_webgroup],
-    AC_MSG_WARN([You can call configure with the --with-webgroup option.
-    This tells configure what the group name of the web group is if it is not the default of 'apache'.
-    e.g. --with-webgroup=apache or --with-webgroup=web])
-)
-AC_SUBST(WEB_GROUP)
-
-WEB_HOST=zm.local
-AC_ARG_WITH(webhost,
-    [  --with-webhost=<hostname>    name of web hostname, default zm.local],
-    [WEB_HOST=$with_webhost],
-    AC_MSG_WARN([You can call configure with the --with-webhost option.
-    This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file.
-    e.g. --with-webhost=zm.localdomain])
-)
-AC_SUBST(WEB_HOST)
-
-ENABLE_DEBUG=yes
-AC_ARG_ENABLE(debug,
-    [  --enable-debug=<yes|no>    enable or disable debug, default enabled],
-    [ENABLE_DEBUG=$enable_debug],
-    AC_MSG_WARN([You can call configure with the --enable-debug=<yes|no> or --disable-debug option.
-    This tells configure whether to compile ZoneMinder with debug included. Although debug is included
-    by default it is not output unless explicitly switched on elsewhere. These checks may induce a
-    small penalty on performance and if you are after squeezing the maximum possible performance out
-    of ZoneMinder you may use this switch to prevent debug from being compiled in.
-    e.g. --enable-debug=yes or --disable-debug])
-)
-if test "$ENABLE_DEBUG" != "yes"; then
-  AC_DEFINE(ZM_DBG_OFF,1,"Whether debug is switched off and compiled out")
-fi
-
-ENABLE_MMAP=yes
-AC_ARG_ENABLE(mmap,
-    [  --enable-mmap=<yes|no> enable or disabled mapped memory versus shared memory, default mapped],
-    [ENABLE_MMAP=$enable_mmap],
-    AC_MSG_WARN([You can call configure with the --enable-mmap=<yes|no> or --disable-mmap option.
-    This tells configure whether to compile ZoneMinder with mmap support rather than IPC shared
-    memory. This is a feature that uses memory mapped into files which all processes can share.
-    Memory mapping requires less configuration and is more flexible than shared memory but may
-    slow down your system unless the mapped files are configured to reside on a fast or RAM based
-    filesystem which will normally be the case by default.
-    e.g. --enable-mmap=yes or --disable-mmap])
-)
-if test "$ENABLE_MMAP" == "yes"; then
-  AC_DEFINE(ZM_MEM_MAPPED,1,"Whether to use mapped rather than shared memory")
-else
-  AC_DEFINE(ZM_MEM_MAPPED,0,"Whether to use mapped rather than shared memory")
-fi
-AC_SUBST(ENABLE_MMAP)
-
-ENABLE_ONVIF=no
-AC_ARG_ENABLE(onvif,
-    [  --enable-onvif=<yes|no> enable or disable basic onvif support, default disabled],
-    [ENABLE_ONVIF=$enable_onvif],
-    AC_MSG_WARN([You can call configure with the --enable-onvif=<yes|no> or --enable-onvif option.
-    This tells configure whether to compile ZoneMinder with basic ONVIF support. This feature will
-    probe for ONVIF compliant cameras on your network and allow you the option to auto-configure them as
-    monitors in zoneminder. This option is EXPERIMENTAL and may not work with all cameras that claim to 
-    be ONVIF compliant.
-    e.g. --enable-onvif=yes or --disable-onvif])
-)
-AM_CONDITIONAL([COND_ONVIF], [test "$enable_onvif" = yes])
-
-# Compiler
-AC_LANG_CPLUSPLUS
-if test "$ENABLE_ONVIF" == "yes"; then
-  AC_SUBST(ZM_HAS_ONVIF,1)
-else
-  AC_SUBST(ZM_HAS_ONVIF,0)
-fi
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_SIGNAL
-
-AC_CHECK_TYPES(siginfo_t,,,[#include <signal.h>])
-AC_CHECK_TYPES(ucontext_t,,,[#include <signal.h>])
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_STRTOD
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap posix_memalign putenv select sendfile socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strspn strstr strtol strtoull])
-AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
-# this is required for freebsd to compile. Look for it in m4/ac_check_sendfile.m4
-AC_CHECK_SENDFILE
-# Other programs
-AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
-AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
-
-# Checks for libraries.
-AC_CHECK_LIB(rt,clock_gettime,,AC_MSG_ERROR(zm requires librt))
-AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
-AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
-AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
-if test "$BSD" == "0"; then
-AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
-fi
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-else
-AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
-AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
-AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
-fi
-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-fi
-fi
-AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
-AC_CHECK_LIB(z,zlibVersion)
-AC_CHECK_LIB(x264,x264_predict_16x16_init)
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-# Don't bother to warn about this one
-AC_CHECK_LIB(avcore,av_image_copy,,)
-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
-AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
-AC_CHECK_LIB(z,compress,,)
-AC_CHECK_LIB(curl,curl_global_init,,)
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
-AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
-AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(ucontext.h,,,)
-AC_CHECK_HEADERS(sys/syscall.h,,,)
-AC_CHECK_HEADERS(pthread.h,,,)
-
-# Check for Video for Linux 1 Header Files
-ZM_HAS_V4L1=0
-AC_CHECK_HEADERS([libv4l1-videodev.h linux/videodev.h],[ZM_HAS_V4L1=1; break;],,)
-AC_SUBST(ZM_HAS_V4L1)
-
-# Check for Video for Linux 2 Header Files
-ZM_HAS_V4L2=0
-AC_CHECK_HEADERS(linux/videodev2.h,ZM_HAS_V4L2=1,,)
-AC_SUBST(ZM_HAS_V4L2)
-
-# Set global Video for Linux flag
-ZM_HAS_V4L=0
-if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then
-ZM_HAS_V4L=1
-else
-AC_MSG_WARN(zm requires Video4Linux or Video4Linux2 to be installed for analog or USB camera support)
-fi
-AC_SUBST(ZM_HAS_V4L)
-
-AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
-AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
-AC_LANG_PUSH([C])
-AC_CHECK_HEADERS(libavutil/avutil.h,,,)
-AC_CHECK_HEADERS(libavcodec/avcodec.h,,,)
-AC_CHECK_HEADERS(libavformat/avformat.h,,,)
-AC_CHECK_HEADERS(libswscale/swscale.h,,,)
-AC_LANG_POP([C])
-AC_CHECK_HEADERS(pcre/pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-AC_CHECK_HEADERS(pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-if test "$ENABLE_MMAP" == "yes"; then
-AC_CHECK_HEADERS(sys/mman.h,,,)
-AC_CHECK_HEADERS(fcntl.h,,,)
-else
-AC_CHECK_HEADERS(sys/ipc.h,,,)
-AC_CHECK_HEADERS(sys/shm.h,,,)
-fi
-AC_CHECK_HEADERS(zlib.h,,,)
-AC_CHECK_HEADERS(vlc/vlc.h,,,)
-AC_CHECK_HEADERS(curl/curl.h,,,)
-
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
-#include <openssl/md5.h>])
-else
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/openssl.h>])
-else
-AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/gnutls.h>])
-fi
-fi
-AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
-AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
-AC_CHECK_LIB(execinfo,backtrace)
-
-AC_SUBST(LDFLAGS)
-
-AC_PROG_PERL_VERSION(5.6.0)
-
-# Compulsory perl modules
-AC_PROG_PERL_MODULES(Sys::Syslog,,AC_MSG_ERROR(zm requires SYS:Syslog))
-AC_PROG_PERL_MODULES(DBI,,AC_MSG_ERROR(zm requires DBI))
-AC_PROG_PERL_MODULES(DBD::mysql,,AC_MSG_ERROR(zm requires DBD::mysql))
-AC_PROG_PERL_MODULES(Getopt::Long,,AC_MSG_ERROR(zm requires Getopt::Long))
-AC_PROG_PERL_MODULES(Time::HiRes,,AC_MSG_ERROR(zm requires Time::HiRes))
-AC_PROG_PERL_MODULES(Date::Manip,,AC_MSG_ERROR(zm requires Date::Manip))
-AC_PROG_PERL_MODULES(LWP::UserAgent,,AC_MSG_ERROR(zm requires LWP::UserAgent))
-AC_PROG_PERL_MODULES(ExtUtils::MakeMaker,,AC_MSG_ERROR(zm requires ExtUtils::MakeMaker))
-if test "$ENABLE_MMAP" == "yes"; then
-AC_PROG_PERL_MODULES(Sys::Mmap,,AC_MSG_ERROR(zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead))
-fi
-
-# Optional perl modules
-AC_PROG_PERL_MODULES(Module::Load,,AC_MSG_WARN(Module::Load is required for PTZ camera control))
-AC_PROG_PERL_MODULES(Device::SerialPort,,AC_MSG_WARN(Device::SerialPort is required for RS232/RS485 PTZ camera control))
-AC_PROG_PERL_MODULES(Net::FTP,,AC_MSG_WARN(Net::FTP is required for automatic event uploading using ftp))
-AC_PROG_PERL_MODULES(Net::SFTP::Foreign,,AC_MSG_WARN(Net::SFTP::Foreign is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Expect,,AC_MSG_WARN(Expect is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Archive::Tar,,AC_MSG_WARN(Archive::Tar may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Archive::Zip,,AC_MSG_WARN(Archive::Zip may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Net::SMTP,,AC_MSG_WARN(Net::SMTP may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Lite,,AC_MSG_WARN(MIME::Lite may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Entity,,AC_MSG_WARN(MIME::Entity may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(X10::ActiveHome,,AC_MSG_WARN(X10::ActiveHome is required for X.10 support))
-
-AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
-AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
-AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
-#AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-#AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-AC_SUBST(ZM_CONFIG,"$ZM_CONFIG_DIR/zm.conf")
-
-# Slight hack for non-standard perl install paths
-if test "$prefix" != "NONE"; then
-    PERL_SITE_PREFIX=`perl -V:siteprefix | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
-    EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
-    PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
-else
-    EXTRA_PERL_LIB="# Include from system perl paths only"
-    PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
-fi
-AC_SUBST(PERL_MM_PARMS)
-AC_SUBST(EXTRA_PERL_LIB)
-
-AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
-
-# Create the definitions for compilation and defaults for the database
-AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
-# Manually generate the perl Makefile maker
-AC_CONFIG_COMMANDS([scripts/ZoneMinder/Makefile],[(cd scripts/ZoneMinder; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/modules/Makefile],[(cd onvif/modules; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/proxy/Makefile],[(cd onvif/proxy; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-
-AC_OUTPUT
diff --git a/m4/ac_check_sendfile.m4 b/m4/ac_check_sendfile.m4
deleted file mode 100644
index 12605d588..000000000
--- a/m4/ac_check_sendfile.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-AC_DEFUN([AC_CHECK_SENDFILE],[
-AC_MSG_CHECKING([whether sendfile() is supported and what prototype it has])
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-ac_sendfile_supported=no
-AC_TRY_LINK([#include <sys/sendfile.h>
-               #include <stdio.h>],
-       [sendfile(1, 1, NULL, 0);],
-       [
-               AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                       [Define this if Linux/Solaris sendfile() is supported])
-               AC_MSG_RESULT([Linux sendfile()])
-               ac_sendfile_supported=yes
-       ], [])
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we need libsendfile
-       dnl Presumably on Solaris
-       AC_CHECK_LIB(sendfile, sendfile,
-               [
-                       AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                               [Define this if Linux/Solaris sendfile() is supported])
-                       SENDFILE_LIBS="-lsendfile"
-                       AC_SUBST(SENDFILE_LIBS)
-                       AC_MSG_RESULT([Solaris sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have FreeBSD-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>],
-               [sendfile(1, 1, 0, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE7_SUPPORT, 1,
-                               [Define this if FreeBSD sendfile() is supported])
-                       AC_MSG_RESULT([FreeBSD sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have MacOS-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>
-                       #include <sys/uio.h>],
-               [sendfile(1, 1, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE6_SUPPORT, 1,
-                               [Define this if MacOS sendfile() is supported])
-                       AC_MSG_RESULT([MacOS sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-CFLAGS="$saved_CFLAGS"
-
-if test x$ac_sendfile_supported = xno; then
-       AC_MSG_RESULT([no sendfile() support, using read/send])
-fi
-])

From e6d57da0d4f6ddd1e369431ffbc505408b1b4188 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 01:37:16 +1100
Subject: [PATCH 271/362] Remove the mobile skin folder

---
 web/skins/mobile/css/skin.css                 | 311 ------------------
 web/skins/mobile/includes/config.php          |  63 ----
 .../mobile/includes/control_functions.php     | 184 -----------
 web/skins/mobile/includes/functions.php       |  66 ----
 web/skins/mobile/includes/init.php            |  29 --
 web/skins/mobile/skin.php                     |  97 ------
 web/skins/mobile/views/console.php            | 178 ----------
 web/skins/mobile/views/css/console.css        |  16 -
 web/skins/mobile/views/devices.php            |  73 ----
 web/skins/mobile/views/error.php              |  34 --
 web/skins/mobile/views/event.php              | 147 ---------
 web/skins/mobile/views/eventdetails.php       |  86 -----
 web/skins/mobile/views/events.php             | 157 ---------
 web/skins/mobile/views/filter.php             |  71 ----
 web/skins/mobile/views/frame.php              |  73 ----
 web/skins/mobile/views/function.php           |  66 ----
 web/skins/mobile/views/login.php              |  54 ---
 web/skins/mobile/views/montage.php            |  75 -----
 web/skins/mobile/views/state.php              |  77 -----
 web/skins/mobile/views/video.php              | 226 -------------
 web/skins/mobile/views/watch.php              | 154 ---------
 21 files changed, 2237 deletions(-)
 delete mode 100644 web/skins/mobile/css/skin.css
 delete mode 100644 web/skins/mobile/includes/config.php
 delete mode 100644 web/skins/mobile/includes/control_functions.php
 delete mode 100644 web/skins/mobile/includes/functions.php
 delete mode 100644 web/skins/mobile/includes/init.php
 delete mode 100644 web/skins/mobile/skin.php
 delete mode 100644 web/skins/mobile/views/console.php
 delete mode 100644 web/skins/mobile/views/css/console.css
 delete mode 100644 web/skins/mobile/views/devices.php
 delete mode 100644 web/skins/mobile/views/error.php
 delete mode 100644 web/skins/mobile/views/event.php
 delete mode 100644 web/skins/mobile/views/eventdetails.php
 delete mode 100644 web/skins/mobile/views/events.php
 delete mode 100644 web/skins/mobile/views/filter.php
 delete mode 100644 web/skins/mobile/views/frame.php
 delete mode 100644 web/skins/mobile/views/function.php
 delete mode 100644 web/skins/mobile/views/login.php
 delete mode 100644 web/skins/mobile/views/montage.php
 delete mode 100644 web/skins/mobile/views/state.php
 delete mode 100644 web/skins/mobile/views/video.php
 delete mode 100644 web/skins/mobile/views/watch.php

diff --git a/web/skins/mobile/css/skin.css b/web/skins/mobile/css/skin.css
deleted file mode 100644
index b996392a3..000000000
--- a/web/skins/mobile/css/skin.css
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Primary look and feel styles
- */
-
-body {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
-    color: #333333;
-    font-weight: normal;
-    text-align: center;
-}
-
-h1 {
-    font-family: inherit;
-    font-size: 120%;
-    color: #000066;
-    font-weight: bold;
-}
-
-h2 {
-    font-family: inherit;
-    font-size: 110%;
-    color: #000066;
-    font-weight: bold;
-}
-
-h3 {
-    font-family: inherit;
-    font-size: 100%;
-    color: #016A9D;
-    font-weight: bold;
-}
-
-p {
-    font-family: inherit;
-    font-size: 100%;
-    color: #333333;
-    font-weight: normal;
-}
-
-th {
-    font-weight: bold;
-    color: #016A9D;
-}
-
-a:link {
-    color: #7F7FB2;
-    text-decoration: none;
-}
-
-a:visited {
-    color: #7F7FB2;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #666699;
-    text-decoration: underline;
-}
-
-label {
-    margin-right: 4px;
-}
-
-input,textarea,select {
-    border: 1px #7F7FB2 solid;
-    font-family: inherit;
-    font-size: 100%;
-    color: #333333;
-}
-
-input[type=text], input[type=password], textarea {
-    padding: 1px;
-}
-
-input.noborder {
-    border: 0;
-}
-
-input[disabled] {
-    color: #888888;
-}
-
-img.normal {
-    border: white solid 1px;
-}
-
-img.alarm {
-    border: red solid 1px;
-}
-
-hr {
-    height: 1px;
-    width: 100%;
-    border: 0;
-    color: #7f7fb2;
-    background-color: #7f7fb2;
-}
-
-/*
- * Major league table for multiple inputs or presentation
- */
-
-#content table.major {
-    margin: 4px auto;
-    width: 100%;
-    border-collapse: collapse;
-}
-
-#content table.major tr.highlight {
-    background-color: #eeeeee;
-}
-
-#content table.major thead tr th {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major tfoot td {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major th, #content table.major td {
-    border: 1px solid #7f7fb2;
-    padding: 3px;
-    text-align: left;
-}
-
-#content table.major th {
-    vertical-align: bottom;
-}
-
-#content table.major td {
-    vertical-align: middle;
-}
-
-#content table.major th[scope=row] {
-    padding: 4px 3px 3px;
-    vertical-align: top;
-    text-align: right;
-}
-
-#content table.major .colMark, #content table.major .colSelect {
-    text-align: center;
-}
-/*
- * Lesser table for very simple forms
- */
-
-#content table.minor {
-    width: 200px;
-    margin: 0 auto;
-}
-
-#content table.minor td {
-    padding: 4px;
-}
-
-#content table.minor .colLeft {
-    width: 50%;
-    text-align: right;
-}
-
-#content table.minor .colRight {
-    width: 50%;
-    text-align: left;
-}
-
-#content table.minor input[type=submit]
-{
-    margin-top: 4px;
-    padding: 0 2px;
-    font-size: 120%;
-}
-
-/*
- * Behavior classes
- */
-.error {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #DC143C;
-    font-weight: bold;
-}
-
-.warn {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #FF8C00;
-    font-weight: bold;
-}
-
-.info {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #688E23;
-    font-weight: bold;
-}
-
-.errorText {
-    color: #DC143C;
-}
-
-.warnText {
-    color: #FF8C00;
-}
-
-.infoText {
-    color: #688E23;
-}
-
-.disabledText {
-    font-style: italic;
-}
-
-/*
- * Generic useful classes, especially with mootools
- */
-
-.hidden {
-    display: none;
-}
-
-.invisible {
-    visibility: hidden;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-div.clear {
-    clear: both;
-}
-
-/*
- * Primary layout styles
- */
-
-#page {
-    width: 100%;
-}
-
-#header {
-    width: 98%;
-    line-height: 24px;
-    margin: 4px auto 0;
-    clear: both;
-}
-
-#header h2 {
-    left: 0;
-}
-
-#headerControl {
-}
-
-#headerButtons {
-    float: right;
-}
-
-#headerButtons a {
-    margin-left: 8px;
-}
-
-#content {
-    width: 98%;
-    margin: 4px auto;
-    line-height: 130%;
-    text-align: center;
-    clear: both;
-}
-
-#contentTable {
-    width: 100%;
-}
-
-#content p {
-    margin-top: 4px;
-}
-
-#content p.textblock {
-    text-align: justify;
-    padding: 4px;
-}
-
-#content > input[type=submit], #content > input[type=button] {
-    margin-top: 4px;
-}
-
-#content table input[type=submit], #content table input[type=button] {
-    margin-top: 0;
-}
-
-#contentButtons {
-    margin: 4px auto 0;
-}
-
-#contentButtons input, #contentButtons a {
-    margin: 0 4px;
-}
-
-#footer {
-    width: 98%;
-    margin: 4px auto 0;
-    clear: both;
-}
-
diff --git a/web/skins/mobile/includes/config.php b/web/skins/mobile/includes/config.php
deleted file mode 100644
index fc1eba9bb..000000000
--- a/web/skins/mobile/includes/config.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-//
-// ZoneMinder xHTML configuration file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-define( 'DEVICE_WIDTH', 240 );                          // Default device width for phones and handhelds
-define( 'DEVICE_HEIGHT', 320 );                         // Default device height for phones and handhelds
-define( 'DEVICE_LINES', 10 );                           // Default device lines for phones and handhelds
-
-$rates = array(
-    "5000" => "50x",
-    "2000" => "20x",
-    "500" => "5x",
-    "200" => "2x",
-    "100" => translate('Real'),
-    "50" => "1/2x",
-);
-
-$scales = array(
-    "400" => "4x",
-    "300" => "3x",
-    "200" => "2x",
-    "150" => "1.5x",
-    "100" => translate('Actual'),
-    "75" => "3/4x",
-    "50" => "1/2x",
-    "33" => "1/3x",
-    "25" => "1/4x",
-);
-
-switch ( $_COOKIE['zmBandwidth'] )
-{
-    case "phone" : // Very incomplete at present
-    {
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_P_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_P_STREAM_METHOD );       // Which method should be used to send video streams to your brow
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_P_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_P_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_P_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_P_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_P_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_P_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-
-        break;
-    }
-}
-
-?>
diff --git a/web/skins/mobile/includes/control_functions.php b/web/skins/mobile/includes/control_functions.php
deleted file mode 100644
index 3a12cf467..000000000
--- a/web/skins/mobile/includes/control_functions.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-//
-// ZoneMinder web control function library, $Date: 2008-07-25 10:48:16 +0100 (Fri, 25 Jul 2008) $, $Revision: 2612 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-function getControlCommands( $monitor )
-{
-    $cmds = array();
-
-    $cmds['Wake'] = "wake";
-    $cmds['Sleep'] = "sleep";
-    $cmds['Reset'] = "reset";
-
-    $cmds['PresetSet'] = "presetSet";
-    $cmds['PresetGoto'] = "presetGoto";
-    $cmds['PresetHome'] = "presetHome";
-
-    if ( !empty($monitor['CanZoom']) )
-    {
-        if ( $monitor['CanZoomCon'] )
-            $cmds['ZoomRoot'] = "zoomCon";
-        elseif ( $monitor['CanZoomRel'] )
-            $cmds['ZoomRoot'] = "zoomRel";
-        elseif ( $monitor['CanZoomAbs'] )
-            $cmds['ZoomRoot'] = "zoomAbs";
-        $cmds['ZoomTele'] = $cmds['ZoomRoot']."Tele";
-        $cmds['ZoomWide'] = $cmds['ZoomRoot']."Wide";
-        $cmds['ZoomStop'] = "zoomStop";
-        $cmds['ZoomAuto'] = "zoomAuto";
-        $cmds['ZoomMan'] = "zoomMan";
-    }
-
-    if ( !empty($monitor['CanFocus']) )
-    {
-        if ( $monitor['CanFocusCon'] )
-            $cmds['FocusRoot'] = "focusCon";
-        elseif ( $monitor['CanFocusRel'] )
-            $cmds['FocusRoot'] = "focusRel";
-        elseif ( $monitor['CanFocusAbs'] )
-            $cmds['FocusRoot'] = "focusAbs";
-        $cmds['FocusFar'] = $cmds['FocusRoot']."Far";
-        $cmds['FocusNear'] = $cmds['FocusRoot']."Near";
-        $cmds['FocusStop'] = "focusStop";
-        $cmds['FocusAuto'] = "focusAuto";
-        $cmds['FocusMan'] = "focusMan";
-    }
-
-    if ( !empty($monitor['CanIris']) )
-    {
-        if ( $monitor['CanIrisCon'] )
-            $cmds['IrisRoot'] = "irisCon";
-        elseif ( $monitor['CanIrisRel'] )
-            $cmds['IrisRoot'] = "irisRel";
-        elseif ( $monitor['CanIrisAbs'] )
-            $cmds['IrisRoot'] = "irisAbs";
-        $cmds['IrisOpen'] = $cmds['IrisRoot']."Open";
-        $cmds['IrisClose'] = $cmds['IrisRoot']."Close";
-        $cmds['IrisStop'] = "irisStop";
-        $cmds['IrisAuto'] = "irisAuto";
-        $cmds['IrisMan'] = "irisMan";
-    }
-
-    if ( !empty($monitor['CanWhite']) )
-    {
-        if ( $monitor['CanWhiteCon'] )
-            $cmds['WhiteRoot'] = "whiteCon";
-        elseif ( $monitor['CanWhiteRel'] )
-            $cmds['WhiteRoot'] = "whiteRel";
-        elseif ( $monitor['CanWhiteAbs'] )
-            $cmds['WhiteRoot'] = "whiteAbs";
-        $cmds['WhiteIn'] = $cmds['WhiteRoot']."In";
-        $cmds['WhiteOut'] = $cmds['WhiteRoot']."Out";
-        $cmds['WhiteAuto'] = "whiteAuto";
-        $cmds['WhiteMan'] = "whiteMan";
-    }
-
-    if ( !empty($monitor['CanGain']) )
-    {
-        if ( $monitor['CanGainCon'] )
-            $cmds['GainRoot'] = "gainCon";
-        elseif ( $monitor['CanGainRel'] )
-            $cmds['GainRoot'] = "gainRel";
-        elseif ( $monitor['CanGainAbs'] )
-            $cmds['GainRoot'] = "gainAbs";
-        $cmds['GainUp'] = $cmds['GainRoot']."Up";
-        $cmds['GainDown'] = $cmds['GainRoot']."Down";
-        $cmds['GainAuto'] = "gainAuto";
-        $cmds['GainMan'] = "gainMan";
-    }
-
-    if ( !empty($monitor['CanMove']) )
-    {
-        if ( $monitor['CanMoveCon'] )
-        {
-            $cmds['MoveRoot'] = "moveCon";
-            $cmds['Center'] = "moveStop";
-        }
-        elseif ( $monitor['CanMoveRel'] )
-        {
-            $cmds['MoveRoot'] = "moveRel";
-            $cmds['Center'] = $cmds['PresetHome'];
-        }
-        elseif ( $monitor['CanMoveAbs'] )
-        {
-            $cmds['MoveRoot'] = "moveAbs";
-            $cmds['Center'] = $cmds['PresetHome'];
-        }
-
-        $cmds['MoveUp'] = $cmds['MoveRoot']."Up";
-        $cmds['MoveDown'] = $cmds['MoveRoot']."Down";
-        $cmds['MoveLeft'] = $cmds['MoveRoot']."Left";
-        $cmds['MoveRight'] = $cmds['MoveRoot']."Right";
-        $cmds['MoveUpLeft'] = $cmds['MoveRoot']."UpLeft";
-        $cmds['MoveUpRight'] = $cmds['MoveRoot']."UpRight";
-        $cmds['MoveDownLeft'] = $cmds['MoveRoot']."DownLeft";
-        $cmds['MoveDownRight'] = $cmds['MoveRoot']."DownRight";
-    }
-    return( $cmds );
-}
-
-function controlPresets( $monitor, $cmds )
-{
-    define( "MAX_PRESETS", "10" );
-
-    $sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";
-    $labels = array();
-    foreach( dbFetchAll( $sql ) as $row )
-    {
-        $labels[$row['Preset']] = $row['Label'];
-    }
-
-    ob_start();
-?>
-<div class="presetControls">
-  <div>
-    <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-      <div class="hidden">
-        <fieldset>
-          <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
-          <input type="hidden" name="action" value="control"/>
-          <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
-          <input type="hidden" name="control" value="<?php echo $cmds['PresetGoto'] ?>"/>
-        </fieldset>
-      </div>
-      <div>
-<?php
-    for ( $i = 1; $i <= min($monitor['NumPresets'],MAX_PRESETS); $i++ )
-    {
-?>
-        <input type="submit" class="ptzNumBtn" title="<?php echo isset($labels[$i])?$labels[$i]:"" ?>" name="preset" value="<?php echo $i ?>"/>
-<?php
-    }
-?>
-      </div>
-    </form>
-  </div>
-</div>
-<?php
-    return( ob_get_clean() );
-}
-
-function ptzControls( $monitor )
-{
-    $cmds = getControlCommands( $monitor );
-    if ( $monitor['HasPresets'] )
-        echo controlPresets( $monitor, $cmds );
-    return( ob_get_clean() );
-}
-?>
diff --git a/web/skins/mobile/includes/functions.php b/web/skins/mobile/includes/functions.php
deleted file mode 100644
index aadbe435f..000000000
--- a/web/skins/mobile/includes/functions.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-function getDeviceScale( $width, $height, $divisor=1 )
-{
-    global $device;
-
-    $deviceWidth = (isset($device)&&!empty($device['width']))?$device['width']:DEVICE_WIDTH;
-    $deviceHeight = (isset($device)&&!empty($device['height']))?$device['height']:DEVICE_HEIGHT;
-
-    // Allow for margins etc
-    //$deviceWidth -= 4;
-    //$deviceHeight -= 4;
-
-    $widthScale = ($deviceWidth*SCALE_BASE)/$width;
-    $heightScale = ($deviceHeight*SCALE_BASE)/$height;
-    $scale = ($widthScale<$heightScale)?$widthScale:$heightScale;
-    if ( $divisor != 1.0 )
-        $scale = $scale/$divisor;
-    return( intval($scale) );
-}
-
-function xhtmlHeaders( $file, $title )
-{
-    $skinCssFile = getSkinFile( 'css/skin.css' );
-    $skinCssPhpFile = getSkinFile( 'css/skin.css.php' );
-
-    $basename = basename( $file, '.php' );
-    $viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' );
-    $viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' );
-
-    extract( $GLOBALS, EXTR_OVERWRITE );
-
-    noCacheHeaders();
-    header("Content-type: application/xhtml+xml" );
-    echo( '<?xml version="1.0" encoding="iso-8859-1"?>'."\n" );
-?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title><?php echo ZM_WEB_TITLE_PREFIX ?> - <?php echo $title ?></title>
-  <link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
-  <link rel="shortcut icon" href="graphics/favicon.ico"/>
-  <link rel="stylesheet" href="css/reset.css" type="text/css" media="screen"/>
-  <link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/>
-<?php
-    if ( $viewCssFile )
-    {
-?>
-  <link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/>
-<?php
-    }
-    if ( $viewCssPhpFile )
-    {
-?>
-  <style type="text/css">
-<?php
-        require_once( $viewCssPhpFile );
-?>
-  </style>
-<?php
-    }
-?>
-</head>
-<?php
-}
-
-?>
diff --git a/web/skins/mobile/includes/init.php b/web/skins/mobile/includes/init.php
deleted file mode 100644
index ae92bcdee..000000000
--- a/web/skins/mobile/includes/init.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-ini_set( "arg_separator.output", "&amp;" );
-ini_set( "url_rewriter.tags", "a=href,area=href,frame=src,input=src,fieldset=" );
-
-$cookies = false;
-if ( count($_COOKIE) || !empty($_REQUEST['cookies']) )
-    $cookies = true;
-
-if ( $cookies )
-{
-    ini_set( "session.use_cookies", "1" );
-    ini_set( "session.use_trans_sid", "0" );
-    ini_set( "url_rewriter.tags", "" );
-}
-else
-{
-    //ini_set( "session.auto_start", "1" );
-    ini_set( "session.use_cookies", "0" );
-    ini_set( "session.use_trans_sid", "1" );
-}
-
-if ( !isset($_SESSION['cookies']) )
-{
-    $_SESSION['cookies'] = $cookies;
-    if ( $cookies )
-        setcookie( "cookies", $cookies );
-}
-?>
diff --git a/web/skins/mobile/skin.php b/web/skins/mobile/skin.php
deleted file mode 100644
index 51ea63e01..000000000
--- a/web/skins/mobile/skin.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-//
-// ZoneMinder HTML interface file, $Date: 2008-07-08 16:06:45 +0100 (Tue, 08 Jul 2008) $, $Revision: 2484 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-$_COOKIE['zmBandwidth'] = "phone";
-
-//ini_set( "magic_quotes_gpc", "Off" );
-
-// Uncomment if there are language overrides
-//if ( $skinLangFile = loadLanguage( ZM_SKIN_PATH ) )
-    //require_once( $skinLangFile );
-
-if ( isset($_GET['devWidth']) )
-{
-    $device['width'] = $_GET['devWidth'];
-}
-if ( isset($_GET['devHeight']) )
-{
-    $device['height'] = $_GET['devHeight'];
-}
-
-if ( isset($device) )
-    $_SESSION['device'] = $device;
-
-$wurflFile = "wurfl/wurfl_class.php";
-if ( file_exists( $wurflFile ) )
-{
-    require_once( $wurflFile );
-    $wurfl = new wurfl_class( $wurfl, $wurfl_agents );
-    // Set the user agent
-    $wurfl->GetDeviceCapabilitiesFromAgent($_SERVER['HTTP_USER_AGENT']);
-
-    //print_r( $wurfl->wurfl_agent );
-    if ( $wurfl->wurfl_agent )
-    {
-        if ( $wurfl->getDeviceCapability( 'html_wi_oma_xhtmlmp_1_0' ) )
-        {
-            $device['width'] = $wurfl->getDeviceCapability( 'resolution_width' );
-            $device['height'] = $wurfl->getDeviceCapability( 'resolution_height' );
-        }
-    }
-}
-else
-{
-    // This is an example of using fixed device strings to just match your phone etc
-    $devices = array(
-        array( 'name'=>"Motorola V600", 'ua_match'=>"MOT-V600", 'skin'=>"mobile", 'cookies'=>false, 'width'=>176, 'height'=>220 ),
-    );
-
-    foreach ( $devices as $tempDevice )
-    {
-        if ( preg_match( '/'.$tempDevice['ua_match'].'/', $_SERVER['HTTP_USER_AGENT'] ) )
-        {
-            $skin = $tempDevice['skin'];
-            $cookies = $tempDevice['cookies'];
-            break;
-        }
-    }
-}
-
-foreach ( getSkinIncludes( 'includes/config.php' ) as $includeFile )
-    require_once $includeFile;
-
-foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile )
-    require_once $includeFile;
-
-if ( empty($view) )
-    $view = isset($user)?'console':'login';
-
-if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) )
-{
-     $view = "postlogin";
-     $action = "login";
-     $_REQUEST['username'] = $_SERVER['REMOTE_USER'];
-}
-
-// If there are additional actions
-foreach ( getSkinIncludes( 'includes/actions.php' ) as $includeFile )
-    require_once $includeFile; 
-
-?>
diff --git a/web/skins/mobile/views/console.php b/web/skins/mobile/views/console.php
deleted file mode 100644
index 50b5f4775..000000000
--- a/web/skins/mobile/views/console.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-//
-// ZoneMinder web console file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-$eventCounts = array(
-    // Last Hour
-    array(
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
-            )
-        ),
-    ),
-    // Today
-    array(
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "today" ),
-            )
-        ),
-    ),
-);
-
-$running = daemonCheck();
-$status = $running?translate('Running'):translate('Stopped');
-
-if ( $group = dbFetchOne( "select * from Groups where Name = 'Mobile'" ) )
-    $groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
-
-$maxWidth = 0;
-$maxHeight = 0;
-$cycleCount = 0;
-$monitors = dbFetchAll( "select * from Monitors order by Sequence asc" );
-for ( $i = 0; $i < count($monitors); $i++ )
-{
-    if ( !visibleMonitor( $monitors[$i]['Id'] ) )
-    {
-        continue;
-    }
-    if ( $group && !empty($groupIds) && !array_key_exists( $monitors[$i]['Id'], $groupIds ) )
-    {
-        continue;
-    }
-    $monitors[$i]['Show'] = true;
-    $monitors[$i]['zmc'] = zmcStatus( $monitors[$i] );
-    $monitors[$i]['zma'] = zmaStatus( $monitors[$i] );
-    $counts = array();
-    for ( $j = 0; $j < count($eventCounts); $j++ )
-    {
-        $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) );
-        parseFilter( $filter, false, '&amp;' );
-        $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
-        $monitors[$i]['eventCounts'][$j]['filter'] = $filter;
-    }
-    $sql = "select ".join($counts,", ")." from Events as E where MonitorId = '".$monitors[$i]['Id']."'";
-    $counts = dbFetchOne( $sql );
-    if ( $monitors[$i]['Function'] != 'None' )
-    {
-        $cycleCount++;
-        if ( $maxWidth < $monitors[$i]['Width'] ) $maxWidth = $monitors[$i]['Width'];
-        if ( $maxHeight < $monitors[$i]['Height'] ) $maxHeight = $monitors[$i]['Height'];
-    }
-    $monitors[$i] = array_merge( $monitors[$i], $counts );
-}
-
-xhtmlHeaders( __FILE__, translate('Console') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="systemTime"><a href="?view=<?php echo $view ?>"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_SHORT )?strftime( DATE_FMT_CONSOLE_SHORT ):date( DATE_FMT_CONSOLE_SHORT ) ?></a></div>
-      <div id="systemStats"><?php echo getLoad() ?>/<?php echo getDiskPercent() ?>%</div>
-      <div id="systemState"><?php echo makeLink( "?view=state", $status, canEdit( 'System' ) ) ?></div>
-    </div>
-    <div id="content">
-      <table id="contentTable">
-<?php
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-    $eventCounts[$i]['total'] = 0;
-}
-$zoneCount = 0;
-foreach( $monitors as $monitor )
-{
-    if ( empty($monitor['Show']) )
-        continue;
-    for ( $i = 0; $i < count($eventCounts); $i++ )
-    {
-        $eventCounts[$i]['total'] += $monitor['EventCount'.$i];
-    }
-    //$zoneCount += $monitor['ZoneCount'];
-?>
-        <tr>
-<?php
-    if ( !$monitor['zmc'] )
-        $dclass = "errorText";
-    else
-    {
-        if ( !$monitor['zma'] )
-            $dclass = "warnText";
-        else
-            $dclass = "infoText";
-    }
-    if ( $monitor['Function'] == 'None' )
-        $fclass = "errorText";
-    elseif ( $monitor['Function'] == 'Monitor' )
-        $fclass = "warnText";
-    else
-        $fclass = "infoText";
-    if ( !$monitor['Enabled'] )
-        $fclass .= " disabledText";
-?>
-          <td class="colName"><?php echo makeLink( "?view=watch&amp;mid=".$monitor['Id'], substr( $monitor['Name'], 0, 8 ), $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
-          <td class="colFunction"><?php echo makeLink( "?view=function&amp;mid=".$monitor['Id'], "<span class=\"$fclass\">".substr( $monitor['Function'], 0, 4 )."</span>", canEdit( 'Monitors' ) ) ?></td>
-<?php
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-?>
-          <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$monitor['eventCounts'][$i]['filter']['query'], $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
-<?php
-}
-?>
-        </tr>
-<?php
-}
-?>
-        <tr>
-<?php
-if ( ZM_OPT_X10 ) {
-?>
-          <td><?php echo makeLink( "?view=devices", translate('Devices'), canView('Devices' ) ) ?></td>
-<?php
-} else {
-?>
-          <td>&nbsp;</td>
-<?php
-}
-if ( $cycleCount > 1 ) {
-?>
-          <td><?php echo makeLink( "?view=montage", translate('Montage'), $running && canView( 'Stream' ) ) ?></td>
-<?php
-} else {
-?>
-          <td>&nbsp;</td>
-<?php
-}
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-    parseFilter( $eventCounts[$i]['filter'], false, '&amp;' );
-?>
-          <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$eventCounts[$i]['filter']['query'], $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
-<?php
-}
-?>
-        </tr>
-      </table>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/css/console.css b/web/skins/mobile/views/css/console.css
deleted file mode 100644
index 49c711039..000000000
--- a/web/skins/mobile/views/css/console.css
+++ /dev/null
@@ -1,16 +0,0 @@
-#systemTime {
-    float: left;
-}
-
-#systemState {
-    margin: 0 auto;
-    text-align: center;
-}
-
-#systemStats {
-    float: right;
-}
-
-td.colEvents {
-    text-align: right;
-}
diff --git a/web/skins/mobile/views/devices.php b/web/skins/mobile/views/devices.php
deleted file mode 100644
index add0a6bc5..000000000
--- a/web/skins/mobile/views/devices.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-//
-// ZoneMinder web devices file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Devices' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = "select * from Devices where Type = 'X10' order by Name";
-$devices = array();
-foreach ( dbFetchAll( $sql ) as $row )
-{
-    $row['Status'] = getDeviceStatusX10( $row['KeyString'] );
-    $devices[] = $row;
-}
-
-xhtmlHeaders( __FILE__, translate('Devices') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Devices') ?></h2>
-    </div>
-    <div id="content">
-      <table id="contentTable" class="major">
-<?php
-foreach( $devices as $device )
-{
-    if ( $device['Status'] == 'ON' )
-    {
-        $fclass = "infoText";
-    }
-    elseif ( $device['Status'] == 'OFF' )
-    {
-        $fclass = "warnText";
-    }
-    else
-    {
-        $fclass = "errorText";
-    }
-?>
-        <tr>
-          <th scope="row" class="<?php echo $fclass  ?>"><span class="<?php echo $fclass ?>"><?php echo substr( $device['Name'], 0, 16 ) ?></span></th>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", translate('On'), canEdit('Devices') ) ?></td>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", translate('Off'), canEdit('Devices') ) ?></td>
-        </tr>
-<?php
-}
-?>
-      </table>
-      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/error.php b/web/skins/mobile/views/error.php
deleted file mode 100644
index 33e99f09a..000000000
--- a/web/skins/mobile/views/error.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//
-// ZoneMinder web error view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-xhtmlHeaders( __FILE__, translate('Error') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h1>ZoneMinder <?php echo translate('Error') ?></h1>
-    </div>
-    <div id="content">
-      <p><strong><?php echo translate('YouNoPerms') ?></p>
-      <p><?php echo translate('ContactAdmin') ?></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/event.php b/web/skins/mobile/views/event.php
deleted file mode 100644
index ead6b6eae..000000000
--- a/web/skins/mobile/views/event.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-//
-// ZoneMinder web event view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$midSql = '';
-if ( $user['MonitorIds'] )
-{
-    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-}
-
-$sql = 'select E.*,M.Name as MonitorName from Events as E inner join Monitors as M on E.MonitorId = M.Id where E.Id = ?'.$midSql;
-$event = dbFetchOne( $sql, NULL, array($_REQUEST['eid']) );
-
-if ( !empty($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND FrameId = ?', NULL, array($_REQUEST['eid'],$_REQUEST['fid']) );
-}
-elseif ( isset($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND Score = ?', NULL, array($_REQUEST['eid'],$event['MaxScore']) );
-    $_REQUEST['fid'] = $frame['FrameId'];
-}
-
-parseSort( true, '&amp;' );
-parseFilter( $_REQUEST['filter'], true, '&amp;' );
-$filterQuery = $_REQUEST['filter']['query'];
-
-if ( $sortOrder=='asc' ) {
-	$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn <= ?".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn desc";
-} else {
-	$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn >= ?".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn asc";
-} 
-$result = dbQuery( $sql, array( $event[$_REQUEST['sort_field']] ) );
-while ( $row = dbFetchNext( $result ) )
-{
-    if ( $row['Id'] == $_REQUEST['eid'] )
-    {
-        $prevEvent = dbFetchNext( $result );
-        break;
-    }
-}
-
-$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'>=':'<=').' ?'.$_REQUEST['filter']['sql'].$midSql." order by $sortColumn $sortOrder";
-$result = dbQuery( $sql, array($event[$_REQUEST['sort_field']]) );
-while ( $row = dbFetchNext( $result ) )
-{
-    if ( $row['Id'] == $_REQUEST['eid'] )
-    {
-        $nextEvent = dbFetchNext( $result );
-        break;
-    }
-}
-
-$framesPerPage = 15;
-$framesPerLine = 3;
-$maxShortcuts = 3;
-
-$paged = $event['Frames'] > $framesPerPage;
-
-if ( $paged && !empty($_REQUEST['page']) )
-{
-    $loFrameId = (($_REQUEST['page']-1)*$framesPerPage)+1;
-    $hiFrameId = min( $_REQUEST['page']*$framesPerPage, $event['Frames'] );
-}
-else
-{
-    $loFrameId = 1;
-    $hiFrameId = $event['Frames'];
-}
-
-$sql = 'SELECT * FROM Frames WHERE EventID = ?';
-if ( $paged && !empty($_REQUEST['page']) )
-    $sql .= " and FrameId between $loFrameId and $hiFrameId";
-$sql .= " order by FrameId";
-$frames = dbFetchAll( $sql, NULL, array( $_REQUEST['eid'] ) );
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], $framesPerLine+0.3 );
-
-$pages = (int)ceil($event['Frames']/$framesPerPage);
-if ( !empty($_REQUEST['fid']) )
-    $_REQUEST['page'] = ($_REQUEST['fid']/$framesPerPage)+1;
-
-$pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, '&amp;eid='.$_REQUEST['eid'].$filterQuery.$sortQuery, '&amp;' );
-
-xhtmlHeaders( __FILE__, translate('Event').' - '.$event['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-<?php
-if ( canEdit( 'Events' ) )
-{
-?>
-      <div id="headerButtons">
-        <a href="?view=events&amp;action=delete&amp;mark_eid=<?php echo $_REQUEST['eid'] ?><?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $_REQUEST['limit'] ?>&amp;page=<?php echo $_REQUEST['page'] ?>"><?php echo translate('Delete') ?></a>
-      </div>
-<?php
-}
-?>
-      <h2><?php echo makeLink( '?view=eventdetails&amp;eid='.$_REQUEST['eid'], $event['Name'].($event['Archived']?'*':''), canEdit( 'Events' ) ) ?></h2>
-    </div>
-    <div id="content">
-<?php
-if ( $pagination )
-{
-?>
-      <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-      <div id="eventFrames">
-<?php
-foreach ( $frames as $frame )
-{
-    $imageData = getImageSrc( $event, $frame, $scale );
-?>
-       <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>" alt="<?php echo $frame['Type'] ?>/<?php echo $frame['Type']=='Alarm'?$frame['Score']:0 ?>"/></a>
-<?php
-}
-?>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/eventdetails.php b/web/skins/mobile/views/eventdetails.php
deleted file mode 100644
index deee5eef2..000000000
--- a/web/skins/mobile/views/eventdetails.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-//
-// ZoneMinder web event details view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$event = dbFetchOne( 'select E.*,M.Name as MonitorName from Events as E, Monitors as M where E.Id = ? and E.MonitorId = M.Id', NULL, array($_REQUEST['eid']) );
-$frame = dbFetchOne( 'select * from Frames where EventID = ? and Score = ?', NULL, array($_REQUEST['eid'],$event['MaxScore']) );
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], 2.2 );
-
-$image1 = getImageSrc( $event, 1, $scale );
-if ( $frame['Type'] == 'Alarm' )
-    $image2 = getImageSrc( $event, $frame['FrameId'], $scale );
-else
-    $image2 = getImageSrc( $event, intval($event['Frames']/2), $scale );
-
-xhtmlHeaders( __FILE__, translate('Event').' - '.$_REQUEST['eid'] );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <table id="contentTable" class="major">
-        <tr>
-          <th scope="row"><?php echo translate('Name') ?></th>
-          <td><?php echo htmlentities($event['Name']) ?><?php echo $event['Archived']?("(".translate('Archived').")"):"" ?></td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Time') ?></th>
-          <td><?php echo htmlentities(strftime("%b %d, %H:%M",strtotime($event['StartTime']))) ?></td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Duration') ?></th>
-          <td><?php echo htmlentities($event['Length']) ?>s</td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Cause') ?></th>
-          <td><?php echo htmlentities($event['Cause']) ?></td>
-        </tr>
-        <?php if ( !empty($event['Notes']) ) { ?>
-        <tr>
-          <th scope="row"><?php echo translate('Notes') ?></th>
-          <td><?php echo htmlentities($event['Notes']) ?></td>
-        </tr>
-        <?php } ?>
-        <tr>
-          <th scope="row"><?php echo translate('Frames') ?></th>
-          <td><?php echo $event['Frames'] ?> (<?php echo $event['AlarmFrames'] ?>)</td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Score') ?></th>
-          <td><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></td>
-        </tr>
-      </table>
-      <div id="eventImages">
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=1"><img src="<?php echo viewImagePath( $image1['thumbPath'] ) ?>" alt="1"/></a>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $image2['thumbPath'] ) ?>" alt="<?php echo $frame['FrameId'] ?>"/></a>
-      </div>
-      <div id="contenButtons">
-        <a href="?view=event&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;page=1"><?php echo translate('Frames') ?></a>
-        <a href="?view=video&amp;eid=<?php echo $_REQUEST['eid'] ?>"><?php echo translate('Video') ?></a>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/events.php b/web/skins/mobile/views/events.php
deleted file mode 100644
index 40dd6eff8..000000000
--- a/web/skins/mobile/views/events.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-//
-// ZoneMinder web events view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
-}
-
-$sql = "select * from Monitors";
-foreach ( dbFetchAll( $sql ) as $row )
-{
-    $monitors[$row['Id']] = $row;
-}
-
-if ( isset($_REQUEST['filterName']) )
-{
-    $dbFilter = dbFetchOne( 'SELECT * FROM Filters WHERE Name = ?', NULL, array($_REQUEST['filterName']) );
-    $_REQUEST['filter'] = jsonDecode( $dbFilter['Query'] );
-    $_REQUEST['sort_field'] = isset($_REQUEST['filter']['sort_field'])?$_REQUEST['filter']['sort_field']:"DateTime";
-    $_REQUEST['sort_asc'] = isset($_REQUEST['filter']['sort_asc'])?$_REQUEST['filter']['sort_asc']:"1";
-    $_REQUEST['limit'] = isset($_REQUEST['filter']['limit'])?$_REQUEST['filter']['limit']:"";
-    unset( $_REQUEST['filter']['sort_field'] );
-    unset( $_REQUEST['filter']['sort_asc'] );
-    unset( $_REQUEST['filter']['limit'] );
-}
-
-if ( empty($_REQUEST['sort_field']) )
-    $_REQUEST['sort_field'] = "DateTime";
-if ( empty($_REQUEST['sort_asc']) )
-    $_REQUEST['sort_asc'] = "1";
-
-$countSql = "select count(E.Id) as EventCount from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
-$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
-if ( $user['MonitorIds'] )
-{
-    $countSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-    $eventsSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-}
-else
-{
-    $countSql .= " 1";
-    $eventsSql .= " 1";
-}
-
-parseSort( true, '&amp;' );
-parseFilter( $_REQUEST['filter'], true, '&amp;' );
-$filterQuery = $_REQUEST['filter']['query'];
-
-if ( $_REQUEST['filter']['sql'] )
-{
-    $countSql .= $_REQUEST['filter']['sql'];
-    $eventsSql .= $_REQUEST['filter']['sql'];
-}
-$eventsSql .= " order by $sortColumn $sortOrder";
-
-$deviceLines = (isset($device)&&!empty($device['lines']))?$device['lines']:DEVICE_LINES;
-// Allow for headers etc
-$deviceLines -= 2;
-
-if ( !empty($_REQUEST['page']) )
-{
-    $limitStart = (($_REQUEST['page']-1)*$deviceLines);
-    if ( empty($_REQUEST['limit']) )
-    {
-        $limitAmount = $deviceLines;
-    }
-    else
-    {
-        $limitLeft = $_REQUEST['limit'] - $limitStart;
-        $limitAmount = ($limitLeft>$deviceLines)?$deviceLines:$limitLeft;
-    }
-    $eventsSql .= " limit $limitStart, $limitAmount";
-}
-elseif ( !empty( $_REQUEST['limit'] ) )
-{
-    $eventsSql .= " limit 0, ".$_REQUEST['limit'];
-}
-
-$nEvents = dbFetchOne( $countSql, 'EventCount' );
-if ( !empty($limit) && $nEvents > $_REQUEST['limit'] )
-{
-    $nEvents = $_REQUEST['limit'];
-}
-$pages = (int)ceil($nEvents/$deviceLines);
-
-$maxShortcuts = 3;
-$pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, $filterQuery.$sortQuery.'&amp;limit='.$_REQUEST['limit'], '&amp;' );
-
-xhtmlHeaders( __FILE__, translate('Events') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons"><?php echo makeLink( "?view=filter", empty($_REQUEST['filterName'])?translate('ChooseFilter'):$_REQUEST['filterName'], canView( 'Events' ) ) ?></div>
-      <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
-    </div>
-    <div id="content">
-<?php
-if ( $pagination )
-{
-?>
-      <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-      <table id="contentTable" class="major">
-<?php
-    $count = 0;
-    foreach ( dbFetchAll( $eventsSql ) as $event )
-    {
-        if ( ($count++%$deviceLines) == 0 )
-        {
-?>
-        <tr>
-          <th class="colId"><a href="<?php echo sortHeader( 'Id', '&amp;' ) ?>"><?php echo substr( translate('Id'), 0, 3 ) ?><?php echo sortTag( 'Id' ) ?></a></th>
-          <th class="colTime"><a href="<?php echo sortHeader( 'StartTime', '&amp;' ) ?>"><?php echo substr( translate('Time'), 0, 3 ) ?><?php echo sortTag( 'StartTime' ) ?></a></th>
-          <th class="colDuration"><a href="<?php echo sortHeader( 'Length', '&amp;' ) ?>"><?php echo substr( translate('Duration'), 0, 3 ) ?><?php echo sortTag( 'Length' ) ?></a></th>
-          <th class="colFrames"><a href="<?php echo sortHeader( 'Frames', '&amp;' ) ?>"><?php echo substr( translate('Frames'), 0, 3 ) ?><?php echo sortTag( 'Frames' ) ?></a></th>
-          <th class="colScore"><a href="<?php echo sortHeader( 'TotScore', '&amp;' ) ?>"><?php echo substr( translate('Score'), 0, 3 ) ?><?php echo sortTag( 'TotScore' ) ?></a></th>
-        </tr>
-<?php
-        }
-?>
-        <tr>
-          <td class="colId"><a href="?view=eventdetails&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['Id'] ?><?php if ( $event['Archived'] ) echo "*" ?></a></td>
-          <td class="colTime"><?php echo strftime( "%d/%H:%M", strtotime($event['StartTime']) ) ?></td>
-          <td class="colDuration"><?php echo sprintf( "%d", $event['Length'] ) ?></td>
-          <td class="colFrames"><a href="?view=event&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['AlarmFrames'] ?></a></td>
-          <td class="colScore"><a href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=0"><?php echo $event['MaxScore'] ?></a></td>
-        </tr>
-<?php
-    }
-?>
-      </table>
-      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/filter.php b/web/skins/mobile/views/filter.php
deleted file mode 100644
index 4613f3c3c..000000000
--- a/web/skins/mobile/views/filter.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-//
-// ZoneMinder web filter view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$filterNames = array();
-$sql = "select * from Filters order by Name";
-foreach( dbFetchAll( $sql ) as $row )
-{
-    $filterNames[$row['Name']] = $row['Name'];
-}
-
-xhtmlHeaders( __FILE__, translate('EventFilter') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="events"/>
-            <input type="hidden" name="page" value="1"/>
-          </fieldset>
-        </div>
-<?php
-if ( count($filterNames) > 0 )
-{
-?>
-        <div>
-          <label for="filterName"><?php echo translate('UseFilter') ?></label><?php echo buildSelect( "filterName", $filterNames ); ?>
-        </div>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Submit') ?>"/>
-        </div>
-<?php
-}
-else
-{
-?>
-        <p><?php echo translate('NoSavedFilters') ?></p>
-<?php
-}
-?>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/frame.php b/web/skins/mobile/views/frame.php
deleted file mode 100644
index f9bb41633..000000000
--- a/web/skins/mobile/views/frame.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-//
-// ZoneMinder web frame view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
-$event = dbFetchOne( $sql, NULL, array( $_REQUEST['eid'] ) );
-
-if ( !empty($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND FrameId = ?', NULL, array( $_REQUEST['eid'], $_REQUEST['fid'] ) );
-}
-else
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND Score = ?', NULL, array( $_REQUEST['eid'], $event['MaxScore'] ) );
-}
-
-$maxFid = $event['Frames'];
-
-$firstFid = 1;
-$prevFid = $frame['FrameId']-1;
-$nextFid = $frame['FrameId']+1;
-$lastFid = $maxFid;
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], 1.1 );
-
-$imageData = getImageSrc( $event, $frame, $scale, (isset($_REQUEST['show'])&&$_REQUEST['show']=="capt") );
-
-xhtmlHeaders( __FILE__, translate('Frame').' - '.$_REQUEST['eid'].'-'.$frame['FrameId'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Frame') ?> <?php echo $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
-    </div>
-    <div id="content">
-      <?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
-      <div id="contentButtons">
-<?php if ( $frame['FrameId'] > 1 ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $firstFid ?>">&lt;&lt;</a>
-<?php } if ( $frame['FrameId'] > 1 ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $prevFid ?>">&lt;</a>
-<?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $nextFid ?>">&gt;</a>
-<?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $lastFid ?>">&gt;&gt;</a>
-<?php } ?>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/function.php b/web/skins/mobile/views/function.php
deleted file mode 100644
index 421d91063..000000000
--- a/web/skins/mobile/views/function.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-//
-// ZoneMinder web function view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canEdit( 'Monitors' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-$monitor = dbFetchMonitor( $_REQUEST['mid'] );
-
-xhtmlHeaders( __FILE__, translate('Function').' - '.$monitor['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo sprintf( $CLANG['MonitorFunction'], $monitor['Name'] ) ?></h2>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="console"/>
-            <input type="hidden" name="action" value="function"/>
-            <input type="hidden" name="mid" value="<?php echo $_REQUEST['mid'] ?>"/>
-          </fieldset>
-        </div>
-        <div>
-          <select name="newFunction">
-<?php
-foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
-{
-?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $optFunction ?></option>
-<?php
-}
-?>
-          </select>
-        </div>
-        <div>
-          <label for="newEnabled"><?php echo translate('Enabled') ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
-        </div>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/login.php b/web/skins/mobile/views/login.php
deleted file mode 100644
index 6eb0b7db9..000000000
--- a/web/skins/mobile/views/login.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-//
-// ZoneMinder web login view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-
-xhtmlHeaders( __FILE__, translate('Login') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h1>ZoneMinder <?php echo translate('Login') ?></h1>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="action" value="login"/>
-            <input type="hidden" name="view" value="console"/>
-          </fieldset>
-        </div>
-        <table id="contentTable" class="minor">
-          <tr>
-            <th scope="row" class="colLeft"><?php echo translate('Username') ?></th>
-            <td class="colRight"><input type="text" name="username" value="<?php echo isset($username)?$username:"" ?>" size="12"/></td>
-          </tr>
-          <tr>
-            <th scope="row" class="colLeft"><?php echo translate('Password') ?></th>
-            <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
-          </tr>
-        </table>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Login') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/montage.php b/web/skins/mobile/views/montage.php
deleted file mode 100644
index 8311fe6f4..000000000
--- a/web/skins/mobile/views/montage.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-//
-// ZoneMinder web montage view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Stream' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$imagesPerLine = 2;
-
-$sql = "select * from Groups where Name = 'Mobile'";
-$group = dbFetchOne( $sql );
-
-$sql = "select * from Monitors where Function != 'None' order by Sequence";
-$monitors = array();
-$maxWidth = 0;
-$maxHeight = 0;
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-        continue;
-
-    if ( $group && $group['MonitorIds'] && !in_array( $row['Id'], explode( ',', $group['MonitorIds'] ) ) )
-        continue;
-
-    if ( $maxWidth < $row['Width'] ) $maxWidth = $row['Width'];
-    if ( $maxHeight < $row['Height'] ) $maxHeight = $row['Height'];
-    $monitors[] = $row;
-}
-
-xhtmlHeaders( __FILE__, translate('Montage') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>"><?php echo translate('Refresh') ?></a>
-      </div>
-    </div>
-    <div id="content">
-      <div id="monitorImages">
-<?php
-foreach( $monitors as $monitor )
-{
-    $scale = getDeviceScale( $monitor['Width'], $monitor['Height'], $imagesPerLine*1.1 );
-    $imagePath = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' );
-?>
-        <a href="?view=watch&amp;mid=<?php echo $monitor['Id'] ?>"><img src="<?php echo $imagePath ?>" alt="<?php echo $monitor['Name'] ?>"/></a>
-<?php
-}
-?>
-      </div>
-      <div id="contentButtons"><a href="?view=console"><?php echo translate('Console') ?></a></div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/state.php b/web/skins/mobile/views/state.php
deleted file mode 100644
index 51cf71624..000000000
--- a/web/skins/mobile/views/state.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-//
-// ZoneMinder web run state view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canEdit( 'System' ) )
-{
-    $view = "error";
-    return;
-}
-$running = daemonCheck();
-
-$states = dbFetchAll( "select * from States" );
-
-xhtmlHeaders( __FILE__, translate('State') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('RunState') ?></h2>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="console"/>
-            <input type="hidden" name="action" value="state"/>
-          </fieldset>
-        </div>
-        <select name="runState">
-<?php
-if ( $running )
-{
-?>
-          <option value="stop" selected="selected"><?php echo translate('Stop') ?></option>
-          <option value="restart"><?php echo translate('Restart') ?></option>
-<?php
-}
-else
-{
-?>
-          <option value="start" selected="selected"><?php echo translate('Start') ?></option>
-<?php
-}
-?>
-<?php
-foreach ( $states as $state )
-{
-?>
-          <option value="<?php echo $state['Name'] ?>"><?php echo $state['Name'] ?></option>
-<?php
-}
-?>
-        </select>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Apply') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/video.php b/web/skins/mobile/views/video.php
deleted file mode 100644
index 8f7ac8654..000000000
--- a/web/skins/mobile/views/video.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-//
-// ZoneMinder web video view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-if ( $user['MonitorIds'] )
-    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-else
-    $midSql = '';
-
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?'.$midSql;
-$event = dbFetchOne( $sql, NULL, array($_REQUEST['eid']) );
-
-$deviceWidth = (isset($device)&&!empty($device['width']))?$device['width']:DEVICE_WIDTH;
-$deviceHeight = (isset($device)&&!empty($device['height']))?$device['height']:DEVICE_HEIGHT;
-
-if ( $deviceWidth >= 352 && $deviceHeight >= 288 )
-    $videoSize = "352x288";
-elseif ( $deviceWidth >= 176 && $deviceHeight >= 144 )
-    $videoSize = "176x144";
-else
-    $videoSize = "128x96";
-
-$eventWidth = $event['Width'];
-$eventHeight = $event['Height'];
-
-if ( !isset( $rate ) )
-    $_REQUEST['rate'] = reScale( RATE_BASE, $event['DefaultRate'], ZM_WEB_DEFAULT_RATE );
-
-$eventPath = ZM_DIR_EVENTS.'/'.getEventPath( $event );
-
-$videoFormats = array();
-$ffmpegFormats = preg_split( '/\s+/', ZM_FFMPEG_FORMATS );
-foreach ( $ffmpegFormats as $ffmpegFormat )
-{
-    preg_match( '/^([^*]+)(\**)$/', $ffmpegFormat, $matches );
-    $videoFormats[$matches[1]] = $matches[1];
-    if ( $matches[2] == '*' )
-        $defaultVideoFormat = $matches[1];
-    elseif ( $matches[2] == '**' )
-        $defaultPhoneFormat = $matches[1];
-}
-if ( !isset($_REQUEST['videoFormat']) )
-{
-    if ( isset($defaultPhoneFormat) )
-        $_REQUEST['videoFormat'] = $defaultPhoneFormat;
-    elseif ( isset($defaultVideoFormat) )
-        $_REQUEST['videoFormat'] = $defaultVideoFormat;
-    else
-        $videoFormat = $ffmpegFormats[0];
-}
-
-if ( !empty($_REQUEST['generate']) )
-{
-    $videoFile = createVideo( $event, $_REQUEST['videoFormat'], $_REQUEST['rate'], $videoSize, !empty($_REQUEST['overwrite']) );
-}
-
-$videoFiles = array();
-if ( $dir = opendir( $eventPath ) )
-{
-    while ( ($file = readdir( $dir )) !== false )
-    {
-        $file = $eventPath.'/'.$file;
-        if ( is_file( $file ) )
-        {
-            if ( preg_match( '/-S([\da-z]+)\.(?:'.join( '|', $videoFormats ).')$/', $file, $matches ) )
-            {
-                if ( $matches[1] == $videoSize )
-                {
-                    $videoFiles[] = $file;
-                }
-            }
-        }
-    }
-    closedir( $dir );
-}
-
-if ( isset($_REQUEST['download']) )
-{
-    header( "Content-type: ".getMimeType($videoFiles[$_REQUEST['download']]));
-    header( "Content-length: ".filesize($videoFiles[$_REQUEST['download']]));
-    header( "Content-disposition: attachment; filename=".preg_replace( "/^.*\//", "", $videoFiles[$_REQUEST['download']] )."; size=".filesize($videoFiles[$_REQUEST['download']]) );
-    readfile( $videoFiles[$_REQUEST['download']] );
-    exit;
-}
-
-xhtmlHeaders( __FILE__, translate('Video').' - '.$event['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
-            <input type="hidden" name="eid" value="<?php echo $_REQUEST['eid'] ?>"/>
-            <input type="hidden" name="generate" value="1"/>
-          </fieldset>
-        </div>
-        <table id="contentTable" class="minor">
-          <tr>
-            <th scope="row"><?php echo translate('VideoFormat') ?></th>
-            <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('FrameRate') ?></th>
-            <td><?php echo buildSelect( "rate", $rates ) ?></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('OverwriteExisting') ?></th>
-            <td><input type="checkbox" name="overwrite" value="1"<?php if ( isset($overwrite) ) { ?> checked="checked"<?php } ?>/></td>
-          </tr>
-        </table>
-        <div id="contentButtons"><input type="submit" value="<?php echo translate('GenerateVideo') ?>"/></div>
-      </form>
-<?php
-    if ( isset($videoFile) )
-    {
-        if ( $videoFile )
-        {
-?>
-      <p class="infoText"><?php echo translate('VideoGenSucceeded') ?></p>
-<?php
-        }
-        else
-        {
-?>
-      <p class="errorText"><?php echo translate('VideoGenFailed') ?></p>
-<?php
-        }
-    }
-?>
-<?php
-    if ( count($videoFiles) )
-    {
-        if ( isset($_REQUEST['delete']) )
-        {
-            unlink( $videoFiles[$_REQUEST['delete']] );
-            unset( $videoFiles[$_REQUEST['delete']] );
-        }
-    }
-    if ( count($videoFiles) )
-    {
-?>
-      <h3><?php echo translate('VideoGenFiles') ?></h3>
-      <table class="major">
-        <tr>
-          <th><?php echo translate('Format') ?></th>
-          <th><?php echo translate('Size') ?></th>
-          <th><?php echo translate('Rate') ?></th>
-          <th><?php echo translate('Scale') ?></th>
-          <th><?php echo translate('Action') ?></th>
-        </tr>
-<?php
-        if ( count($videoFiles) > 0 )
-        {
-            $index = 0;
-            foreach ( $videoFiles as $file )
-            {
-                preg_match( '/^(.+)-((?:r[_\d]+)|(?:F[_\d]+))-((?:s[_\d]+)|(?:S[0-9a-z]+))\.([^.]+)$/', $file, $matches );
-                if ( preg_match( '/^r(.+)$/', $matches[2], $temp_matches ) )
-                {
-                    $rate = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
-                    $rateText = isset($rates[$rate])?$rates[$rate]:($rate."x");
-                }
-                elseif ( preg_match( '/^F(.+)$/', $matches[2], $temp_matches ) )
-                {
-                    $rateText = $temp_matches[1]."fps";
-                }
-                if ( preg_match( '/^s(.+)$/', $matches[3], $temp_matches ) )
-                {
-                    $scale = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
-                    $scaleText = isset($scales[$scale])?$scales[$scale]:($scale."x");
-                }
-                elseif ( preg_match( '/^S(.+)$/', $matches[3], $temp_matches ) )
-                {
-                    $scaleText = $temp_matches[1];
-                }
-?>
-        <tr>
-          <td><?php echo $matches[4] ?></td>
-          <td><?php echo filesize( $file ) ?></td>
-          <td><?php echo $rateText ?></td>
-          <td><?php echo $scaleText ?></td>
-          <td><a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;download=<?php echo $index ?>"><?php echo translate('View') ?></a>&nbsp;/&nbsp;<a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;delete=<?php echo $index ?>"><?php echo translate('Delete') ?></a></td>
-        </tr>
-<?php
-                $index++;
-            }
-        }
-?>
-      </table>
-<?php
-    }
-    else
-    {
-?>
-      <p class="warnText"><?php echo translate('VideoGenNoFiles') ?></p>
-<?php
-    }
-?>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/watch.php b/web/skins/mobile/views/watch.php
deleted file mode 100644
index b61001db9..000000000
--- a/web/skins/mobile/views/watch.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-//
-// ZoneMinder web watch view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Stream' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = 'select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id = ?';
-$monitor = dbFetchOne( $sql, NULL, array($_REQUEST['mid']) );
-
-$showPtzControls = ( ZM_OPT_CONTROL && $monitor['Controllable'] && canView( 'Control' ) );
-
-$zmuCommand = getZmuCommand( " -m ".$_REQUEST['mid']." -s -f" );
-$zmuOutput = exec( escapeshellcmd( $zmuCommand ) );
-list( $status, $fps ) = explode( ' ', $zmuOutput );
-$statusString = translate('Unknown');
-$fpsString = "--.--";
-$class = "infoText";
-if ( $status <= STATE_PREALARM )
-{
-    $statusString = translate('Idle');
-}
-elseif ( $status == STATE_ALARM )
-{
-    $statusString = translate('Alarm');
-    $class = "errorText";
-}
-elseif ( $status == STATE_ALERT )
-{
-    $statusString = translate('Alert');
-    $class = "warnText";
-}
-elseif ( $status == STATE_TAPE )
-{
-    $statusString = translate('Record');
-}
-$fpsString = sprintf( "%.2f", $fps );
-
-$sql = "select * from Monitors where Function != 'None' order by Sequence";
-$monitors = array();
-$monIdx = 0;
-$maxWidth = 0;
-$maxHeight = 0;
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-    {
-        continue;
-    }
-    if ( isset($monitor['Id']) && $row['Id'] == $monitor['Id'] )
-        $monIdx = count($monitors);
-    if ( $maxWidth < $row['Width'] ) $maxWidth = $row['Width'];
-    if ( $maxHeight < $row['Height'] ) $maxHeight = $row['Height'];
-    $monitors[] = $row;
-}
-
-//$monitor = $monitors[$monIdx];
-$nextMid = $monIdx==(count($monitors)-1)?$monitors[0]['Id']:$monitors[$monIdx+1]['Id'];
-$prevMid = $monIdx==0?$monitors[(count($monitors)-1)]['Id']:$monitors[$monIdx-1]['Id'];
-
-if ( isset( $_REQUEST['scale'] ) )
-    $scale = validInt($_REQUEST['scale']);
-else
-    $scale = getDeviceScale( $monitor['Width'], $monitor['Height'] );
-$imageSrc = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' );
-
-if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
-{
-    $streamMode = "mpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
-}
-elseif ( canStream() )
-{
-    $streamMode = "jpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
-}
-else
-{
-    $streamMode = "single";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
-}
-
-xhtmlHeaders( __FILE__, $monitor['Name'].' - '.translate('Watch') );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <p class="<?php echo $class ?>"><?php echo makeLink( "?view=events&amp;page=1&amp;view=events&amp;page=1&amp;filter%5Bterms%5D%5B0%5D%5Battr%5D%3DMonitorId&amp;filter%5Bterms%5D%5B0%5D%5Bop%5D%3D%3D&amp;filter%5Bterms%5D%5B0%5D%5Bval%5D%3D".$monitor['Id']."&amp;sort_field=Id&amp;sort_desc=1", $monitor['Name'], canView( 'Events' ) ) ?>:&nbsp;<?php echo $statusString ?>&nbsp;-&nbsp;<?php echo $fpsString ?>&nbsp;fps</p>
-      <p>
-<?php
-if ( $streamMode == "mpeg" )
-{
-    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), ZM_MPEG_LIVE_FORMAT, $monitor['Name'] );
-}
-elseif ( $streamMode == "jpeg" )
-{
-    if ( canStreamNative() )
-        outputImageStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
-    elseif ( canStreamApplet() )
-        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
-}
-else
-{
-?>
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ); ?></a>
-<?php
-}
-?>
-      </p>
-<?php
-if ( $showPtzControls )
-{
-    foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
-        require_once $includeFile;
-?>
-      <div id="ptzControls">
-        <?php echo ptzControls( $monitor ) ?>
-      </div>
-<?php
-}
-if ( $nextMid != $monitor['Id'] || $prevMid != $monitor['Id'] )
-{
-?>
-      <div id="contentButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $prevMid ?>"><?php echo translate('Prev') ?></a>
-        <a href="?view=console"><?php echo translate('Console') ?></a>
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $nextMid ?>"><?php echo translate('Next') ?></a>
-      </div>
-<?php
-}
-?>
-    </div>
-  </div>
-</body>
-</html>

From 7c7d7b245c09e31c5bd362b10422d672259ddd93 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 01:38:16 +1100
Subject: [PATCH 272/362] Remove the XML skin folder

---
 web/skins/xml/includes/config.php    | 155 ----------
 web/skins/xml/includes/functions.php | 447 ---------------------------
 web/skins/xml/includes/init.php      |   2 -
 web/skins/xml/skin.php               |  47 ---
 web/skins/xml/views/actions.php      | 392 -----------------------
 web/skins/xml/views/console.php      | 259 ----------------
 web/skins/xml/views/none.php         |   0
 web/skins/xml/views/notfound.png     | Bin 7332 -> 0 bytes
 8 files changed, 1302 deletions(-)
 delete mode 100644 web/skins/xml/includes/config.php
 delete mode 100644 web/skins/xml/includes/functions.php
 delete mode 100644 web/skins/xml/includes/init.php
 delete mode 100644 web/skins/xml/skin.php
 delete mode 100644 web/skins/xml/views/actions.php
 delete mode 100644 web/skins/xml/views/console.php
 delete mode 100644 web/skins/xml/views/none.php
 delete mode 100644 web/skins/xml/views/notfound.png

diff --git a/web/skins/xml/includes/config.php b/web/skins/xml/includes/config.php
deleted file mode 100644
index 66d3af5ee..000000000
--- a/web/skins/xml/includes/config.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/* 
- * config.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email jdhar@eyezm.com (http://www.eyezm.com)
- *
- */
-
-/* Static defines, these shouldn't change */
-define ( "ZM_EYEZM_PROTOCOL_VERSION", "2");
-define ( "ZM_EYEZM_FEATURE_SET", "3");
-
-/* Dynamic defines, check if they are already defined.
- * To change a particular parameter default value, without using the
- * Options Console, change the 2nd parameter of the define() block. */
-
-/* Parm: ZM_EYEZM_EVENT_FPS: Sets the default FPS of the output videos for events */
-if (!defined("ZM_EYEZM_EVENT_FPS")) define ( "ZM_EYEZM_EVENT_FPS", "10");
-/* Parm: ZM_EYEZM_EVENT_VCODEC: Default video codec for generating event video. Can be mpeg4 or h264 */
-if (!defined("ZM_EYEZM_EVENT_VCODEC")) define ( "ZM_EYEZM_EVENT_VCODEC", "mpeg4");
-/* Parm: ZM_EYEZM_FEED_VCODEC: Default video codec of live feeds. Can be mjpeg or h264 */
-if (!defined("ZM_EYEZM_FEED_VCODEC")) define ( "ZM_EYEZM_FEED_VCODEC", "mjpeg");
-/* Parm: ZM_EYEZM_SEG_DURATION: H264 Live-streaming segment duration in seconds.
- * Increase to improve feed smooth-ness, but will increase feed latency */
-if (!defined("ZM_EYEZM_SEG_DURATION")) define ( "ZM_EYEZM_SEG_DURATION", "3");
-/* Parm: ZM_EYEZM_DEBUG: Set to 1 to enable XML Debugging */
-if (!defined("ZM_EYEZM_DEBUG")) define ( "ZM_EYEZM_DEBUG", "0" );
-/* Parm: ZM_EYEZM_H264_MAX_DURATION: Maximum duration in seconds allowed for viewing H264 Streams.
- * This is useful for systems that crash or stall when viewing H264 streams. After the timeout
- * expires, the H264 stream will be killed if it has not by the user already */
-if (!defined("ZM_EYEZM_H264_MAX_DURATION")) define ( "ZM_EYEZM_H264_MAX_DURATION", "120" );
-/* Parm: ZM_EYEZM_DEFAULT_BR: Default bitrate of H264 live-feed (when selected).
- * This parameter can be changed to anything FFMPEG supports. 64k is a good lower bound, and 392k
- * a good upper */
-if (!defined("ZM_EYEZM_H264_DEFAULT_BR")) define ( "ZM_EYEZM_H264_DEFAULT_BR", "96k" );
-/* Parm: ZM_EYEZM_H264_TIMEOUT: How long to wait for H264 stream to be created. Increase
- * this value for streams that take a while to create, or for slow systems that time-out frequently */
-if (!defined("ZM_EYEZM_H264_TIMEOUT")) define ( "ZM_EYEZM_H264_TIMEOUT", "20" );
-/* Parm: ZM_EYEZM_H264_DEFAULT_EVBR: Default bit-rate when creasing H264 Event videos */
-if (!defined("ZM_EYEZM_H264_DEFAULT_EVBR")) define ( "ZM_EYEZM_H264_DEFAULT_EVBR", "128k" );
-/* Logging defines */
-/* Parm: ZM_EYEZM_LOG_TO_FILE: Set to 1 to log XML Debug output to a separate file, when
- * ZM_EYEZM_DEBUG is set to 1. If set to 0, XML Logging will be directed to Apache error log */
-if (!defined("ZM_EYEZM_LOG_TO_FILE")) define ( "ZM_EYEZM_LOG_TO_FILE", "1" );
-/* Parm: ZM_EYEZM_LOG_FILE: Path to filename when LOG_TO_FILE is enabled */
-if (!defined("ZM_EYEZM_LOG_FILE")) define ( "ZM_EYEZM_LOG_FILE", "/tmp/zm_xml.log" );
-/* Parm: How many lines to display when viewing log from eyeZm */
-if (!defined("ZM_EYEZM_LOG_LINES")) define ( "ZM_EYEZM_LOG_LINES", "50" );
-
-$rates = array(
-    "10000" => "100x",
-    "5000" => "50x",
-    "2500" => "25x",
-    "1000" => "10x",
-    "400" => "4x",
-    "200" => "2x",
-    "100" => translate('Real'),
-    "50" => "1/2x",
-    "25" => "1/4x",
-);
-
-$scales = array(
-    "400" => "4x",
-    "300" => "3x",
-    "200" => "2x",
-    "150" => "1.5x",
-    "100" => translate('Actual'),
-    "75" => "3/4x",
-    "50" => "1/2x",
-    "33" => "1/3x",
-    "25" => "1/4x",
-);
-
-$bwArray = array(
-    "high" => translate('High'),
-    "medium" => translate('Medium'),
-    "low" => translate('Low')
-);
-
-/* Check if ZM_WEB_L_CAN_STREAM and ZM_WEB_L_STREAM_METHOD are defined */
-if (!defined("ZM_WEB_L_CAN_STREAM")) {
-	define ("ZM_WEB_L_CAN_STREAM", 1);
-	define ("ZM_WEB_M_CAN_STREAM", 1);
-	define ("ZM_WEB_H_CAN_STREAM", 1);
-}
-if (!defined("ZM_WEB_L_STREAM_METHOD")) {
-	define ("ZM_WEB_L_STREAM_METHOD", "jpeg");
-	define ("ZM_WEB_M_STREAM_METHOD", "jpeg");
-	define ("ZM_WEB_H_STREAM_METHOD", "jpeg");
-}
-
-switch ( $_COOKIE['zmBandwidth'] )
-{
-    case "high" :
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_H_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_H_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_H_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_H_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-        define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_H_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_H_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_H_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_H_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_H_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_H_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_H_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_H_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_H_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_H_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_H_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-    case "medium" : 
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_M_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_M_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_M_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_M_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-        define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_M_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_M_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_M_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_M_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_M_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_M_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_M_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_M_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_M_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_M_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_M_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-    case "low" :
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_L_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_L_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_L_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_L_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-	define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_L_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_L_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_L_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_L_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_L_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_L_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_L_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_L_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_L_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_L_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_L_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-}
-
-?>
diff --git a/web/skins/xml/includes/functions.php b/web/skins/xml/includes/functions.php
deleted file mode 100644
index b84e65464..000000000
--- a/web/skins/xml/includes/functions.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/* 
- * functions.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email support@eyezm.com (http://www.eyezm.com)
- *
- */
-/* These functions are taken from functions.php */
-function validInteger( $input )
-{
-    return( preg_replace( '/\D/', '', $input ) );
-}
-
-function validString( $input )
-{
-    return( strip_tags( $input ) );
-}
-/* There appears to be some discrepancy btw. 1.24.1/2 and .3 for EventPaths, to escape them here */
-function getEventPathSafe($event)
-{
-	if (ZM_USE_DEEP_STORAGE) {
-		$ret = ZM_DIR_EVENTS."/".$event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
-	} else {
-		$ret = ZM_DIR_EVENTS."/".$event['MonitorId']."/".$event['Id'];
-	}
-	return $ret;
-}
-function updateClientVer()
-{
-	$str = $_SERVER['HTTP_USER_AGENT'];
-	/* Check if it starts with eyeZm */
-	if (!strcmp(substr($str, 0, 5),"eyeZm")) {
-		/* Found eyeZm */
-		$ver = substr($str, 6);
-		$verarray = explode(".", $ver);
-		$_SESSION['vermaj']=$verarray[0];
-		$_SESSION['vermin']=$verarray[1];
-		$_SESSION['verbuild']=$verarray[2];
-	}
-	logXml("(".$_SERVER['REMOTE_ADDR'].") GET: ".$_SERVER['REQUEST_URI']." - eyeZm ".getClientVerMaj().".".getClientVerMin());
-}
-function getClientVerMaj()
-{
-	if (isset($_SESSION['vermaj'])) return $_SESSION['vermaj'];
-	return "0";
-}
-function getClientVerMin()
-{
-	if (isset($_SESSION['vermin'])) return $_SESSION['vermin'];
-	return "0";
-}
-function requireVer($maj, $min)
-{
-	if (getClientVerMaj() > $maj) return 1;
-	if ((getClientVerMaj() == $maj) && (getClientVerMin() >= $min)) return 1;
-	return 0;
-}
-function logXmlErr($str)
-{
-	logXml($str, 1);
-}
-function logXml($str, $err = 0)
-{
-	if (!defined("ZM_EYEZM_DEBUG")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_debug'])) define("ZM_EYEZM_DEBUG", $_SESSION['xml_debug']);
-		else define ("ZM_EYEZM_DEBUG", "0");
-	}
-	if (!defined("ZM_EYEZM_LOG_TO_FILE")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_log_to_file'])) define("ZM_EYEZM_LOG_TO_FILE", $_SESSION['xml_log_to_file']);
-		else define ("ZM_EYEZM_LOG_TO_FILE", "1");
-	}
-	if (!defined("ZM_EYEZM_LOG_FILE")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_log_file'])) define("ZM_EYEZM_LOG_FILE", $_SESSION['xml_log_file']);
-		else define ("ZM_EYEZM_LOG_FILE", "/tmp/zm_xml.log");
-	}
-	/* Only log if debug is enabled */
-	if (ZM_EYEZM_DEBUG == 0) return;
-	/* Logging is enabled, set log string */
-	$logstr = "XML_LOG (".($err?"ERROR":"NOTICE")."): ".$str.(ZM_EYEZM_LOG_TO_FILE?"\n":"");
-	if (ZM_EYEZM_LOG_TO_FILE) {
-		error_log("[".date("r")."] ".$logstr, 3, ZM_EYEZM_LOG_FILE);
-	} else {
-		error_log($logstr);
-	}
-}
-/* Returns defval if varname is not set, otherwise return varname */
-function getset($varname, $defval)
-{
-	if (isset($_GET[$varname])) return $_GET[$varname];
-	return $defval;
-}
-function xml_header()
-{
-	header ("content-type: text/xml");
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-}
-function xml_tag_val($tag, $val)
-{
-	echo "<".$tag.">".$val."</".$tag.">";
-}
-function xml_tag_sec($tag, $open)
-{
-	if ($open) $tok = "<";
-	else $tok = "</";
-	echo $tok.$tag.">";
-}
-function xhtmlHeaders( $file, $title )
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<style type="text/css">
-body {
-	border: 0px solid;
-	margin: 0px;
-	padding: 0px;
-}
-</style>
-	<script type="text/javascript">
-	</script>
-</head>
-<?php
-}
-/** Returns whether necessary components for H264 streaming
- * are present */
-function canStream264($sup = 0) {
-	if (!ffmpegSupportsCodec("libx264")) {
-		if (!$sup) logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support libx264");
-		return FALSE;
-	}
-	/* Make sure segmenter exists */
-	if (!exeExists(shell_exec("which segmenter"))) {
-		if (!$sup) logXmlErr("HTTP segmenter not installed or not accessible in path");
-		return FALSE;
-	}
-	/* Check for zmstreamer */
-	if (!exeExists(shell_exec("which zmstreamer"))) {
-		if (!$sup) logXmlErr("ZMSTREAMER not installed or not accessible in path");
-		return FALSE;
-	}
-	return TRUE;
-}
-/* Returns the path of ffmpeg by using define */
-function getFfmpegPath()
-{
-	if (defined("ZM_PATH_FFMPEG")) {
-		return ZM_PATH_FFMPEG;
-	} else {
-		/* Not defined, get it from using 'which' */
-		return shell_exec("which ffmpeg");
-	}
-}
-/* Returns whether ffmpeg supports a given codec. Takes into account
- * whether FFMPEG exists or not */
-function ffmpegSupportsCodec($codec)
-{
-	if (!ffmpegExists()) return FALSE;
-	/* FFMPEG exists */
-	if (preg_match("/\b".$codec."\b/", shell_exec(getFfmpegPath()." -codecs 2> /dev/null")) > 0) {
-		/* More than one match */
-		return TRUE;
-	} else {
-		/* Check -formats tag also if we fail -codecs */
-		if (preg_match("/\b".$codec."\b/", shell_exec(getFfmpegPath()." -formats 2> /dev/null")) > 0) return TRUE;
-		return FALSE;
-	}
-}
-function exeExists($exepath)
-{
-	$path = trim($exepath);
-	return (file_exists($path) && is_readable($path) && ($path != ""));
-}
-/* Returns whether ffmpeg exists or not */
-function ffmpegExists()
-{
-	return exeExists(getFfmpegPath());
-}
-/* Returns with PHP-GD exists */
-function gdExists()
-{
-	if (extension_loaded('gd') && function_exists('gd_info')) {
-		return TRUE;
-	}
-	return FALSE;
-}
-	
-function getFfmpeg264FoutParms($br, $fout)
-{
-	$ffparms = "-analyzeduration 0 -acodec copy";
-	$ffparms .= " -vcodec libx264 -b ".$br;
-	$ffparms .= " -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8";
-        $ffparms .= " -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25";
-        $ffparms .= " -sc_threshold 40 -i_qfactor 0.71 -bt 16k";
-	$ffparms .= " -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6";
-	$ffparms .= " -qmin 10 -qmax 51 -qdiff 4 -level 30";
-	$ffparms .= " -g 30 -analyzeduration 0 -async 2 ".$fout." 2> /dev/null";
-	return $ffparms;
-}
-/** Return FFMPEG parameters for H264 streaming */
-function getFfmpeg264Str($width, $height, $br, $fin, $fout)
-{
-	$ffparms = getFfmpeg264FoutParms($br, $fout);
-	$ffstr = getFfmpegPath()." -t ".ZM_EYEZM_H264_MAX_DURATION." -analyzeduration 0 -i ";
-	$ffstr .= $fin." -f mpegts ".$ffparms;
-	return $ffstr;
-}
-/** Returns true when monitor exists */
-function isMonitor($monitor)
-{
-	$query = "select Id from Monitors where Id = ?";
-	$res = dbFetchOne($query, NULL, array($monitor));
-	if ($res) return TRUE;
-	logXml("Monitor ID ".$monitor." does not exist");	
-	return FALSE;
-}
-/** Returns the width and height of a monitor */
-function getMonitorDims($monitor)
-{
-	$query = "select Width,Height from Monitors where Id = ?";
-	$res = dbFetchOne($query, NULL, array( $monitor ) );
-	return $res;
-}
-/** Returns the temp directory for H264 encoding */
-function getTempDir()
-{
-	/* Assume that the directory structure is <base>/skins/xml/views */
-	return dirname(__FILE__)."/../../../temp";
-}
-/** Returns the name of the m3u8 playlist based on monitor */
-function m3u8fname($monitor) {
-	return "stream_".$monitor.".m3u8";
-}
-
-/** Erases the M3u8 and TS file names for a given monitor */
-function eraseH264Files($monitor) {
-	/** NOTE: This command executes an 'rm' command, so $monitor parameter
-	 * should be properly validated before executing */
-	/* Remove wdir/.m3u8 and wdir/sample_<mon>*.ts */
-	shell_exec("rm -f ".getTempDir()."/".m3u8fname($monitor)." ".getTempDir()."/sample_".$monitor."*.ts");
-}
-function kill264proc($monitor) {
-	/** NOTE: This command executes an 'kill' command, so $monitor parameter
-	 * should be properly validated before executing */
-	$pid = trim(shell_exec("pgrep -f -x \"zmstreamer -m ".$monitor."\""));
-	if ($pid == "") {
-		logXml("No PID found for ZMStreamer to kill");
-	} else {
-		shell_exec("kill -9 ".$pid);
-		logXml("Killed process ".$pid." for Monitor ".$monitor);
-	}
-}
-/** Return the command-line shell function to setup H264 stream */
-function stream264fn ($mid, $width, $height, $br) {
-	$cdir = "./temp";
-	$zmstrm = "zmstreamer -m ".$mid." 2> /dev/null";
-	$ffstr = getFfmpeg264Str($width, $height, $br, "-", "-");
-	$seg = "segmenter - ".ZM_EYEZM_SEG_DURATION." ".$cdir."/sample_".$mid." ".$cdir."/".m3u8fname($mid)." ../ 2> /dev/null";
-	$url = $zmstrm . " | ".$ffstr." | " . $seg;
-	return "nohup ".$url." & echo $!";
-}
-
-/** Generate the web-page presented to the viewer when using H264 */
-function h264vidHtml($width, $height, $monitor, $br, $thumbsrc) {
-	function printTermLink() {
-		$str = "H264 Streaming Launching...<br>Tap to re-load if stream fails";
-		$str2 = "document.getElementById(\"loaddiv\").innerHTML = \"".$str."\";";
-		echo $str2;
-
-	}
-	$ajaxUrl = "?view=actions&action=spawn264&&monitor=".$monitor."&br=".$br;
-	/* Call these two directly to bypass server blocking issues */
-	$ajax2Url = "./skins/xml/views/actions.php?action=chk264&monitor=".$monitor;
-	$ajax2Url .= "&timeout=".ZM_EYEZM_H264_TIMEOUT;
-	$ajax3Url = "./skins/xml/views/actions.php?action=kill264&monitor=".$monitor;
-?>
-<html>
-<head>
-	<script type="text/javascript">
-	/* Called when paused or done is pressed */
-	function vidAbort() {
-		document.getElementById('viddiv').style.display = 'none';
-		var pElement = document.getElementsByTagName('video')[0];
-		var ajaxKill = new AjaxConnection("<?php echo $ajax3Url;?>");
-		ajaxKill.connect("cbKilled");
-		pElement.stop();
-		pElement.src="";
-		
-	}
-	function reloadStreamImage() {
-		var obj = document.getElementById('liveStream');
-		var src = obj.src;
-		var date = new Date();
-		obj.src = src + '&vrand=' + date.getTime();
-		return false;
-	}
-	/* Callback when spawn264 process is ended */
-	function cbVidLoad()
-	{
-		reloadStreamImage();
-<?php 
-		printTermLink(); 
-?>
-	}
-	function vidLoaded() {
-		window.setTimeout("startVid()", 500);
-	}
-	function bindListeners()
-	{
-		var pElement = document.getElementsByTagName('video')[0];
-		/* Bind abort */
-		pElement.addEventListener('abort', vidAbort, false);
-		pElement.addEventListener('done', vidAbort, false);
-		pElement.addEventListener('ended', vidAbort, false);
-		pElement.addEventListener('pause', vidAbort, false);
-		pElement.addEventListener('loadstart', vidLoaded, false);
-	}
-	/* Callback when kill264 process is ended */
-	function cbKilled()
-	{
-		<?php printTermLink(); ?>
-	}
-	/* Called after an interval from cbFileExists() */
-	function loadVid()
-	{
-		var pElement = document.getElementById("vidcontainer");
-<?php
-		echo "pElement.src=\"./temp/".m3u8fname($monitor)."\"\n";
-?>
-		pElement.load();
-	}
-	function startVid()
-	{
-		document.getElementById('viddiv').style.display = 'block';
-		var pElement = document.getElementById("vidcontainer");
-		pElement.play();
-	}
-	/* Callback when stream is active and ready to be played */
-	function cbFileExists()
-	{
-		window.setTimeout("loadVid()", 500);
-	}
-	/* On-load triggers two requests immediately: spawn264 and chk264 */
-	window.onload = function() {
-		bindListeners();
-		var ajax1 = new AjaxConnection("<?php echo "$ajaxUrl";?>");
-		var ajax2 = new AjaxConnection("<?php echo "$ajax2Url";?>");
-		ajax1.connect("cbVidLoad");
-		/* Don't initiate file-exists since eyeZm will */
-		/*ajax2.connect("cbFileExists");*/
-	}
-	function AjaxConnection(url) {
-		this.connect = connect;
-		this.url = url;
-	}
-	function connect(return_func) {
-		this.x = new XMLHttpRequest();
-		this.x.open("GET", this.url, true);
-		var self = this;
-		this.x.onreadystatechange = function() {
-			if (self.x.readyState != 4)
-				return;
-			eval(return_func + '()');
-			delete self.x;
-		}
-		this.x.send(null);
-	}
-	</script>
-<style type="text/css">
-body {
-	border: 0px solid;
-	margin: 0px;
-	padding: 0px;
-	background-color: black;
-	width: <?php echo $width ?>px;
-	height: <?php echo $height ?>px;
-}
-.textcl {
-	text-align: center;
-	font-family: Arial;
-	font-size: larger;
-	width: 100%;
-<?php echo "padding-top: ".(($height/2)-100)."px;"; ?>
-<?php echo "padding-bottom: ".(($height/2)-100)."px;"; ?>
-	z-index: 2;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	height: 100%;
-}
-.textcl2 {
-	width: auto;
-	height: auto;
-	background-color: black;
-	padding: 5px 5px;
-	margin-left: 10px;
-	margin-right: 10px;
-	opacity: 0.7;
-}
-.textcl3 {
-	width: auto;
-	height: auto;
-	padding: 2px 2px;
-	margin: auto;
-	color: white;
-}
-.imgdiv {
-	position: absolute;
-	padding: 0px;
-	background-color: black;
-	top: 0px;
-	left: 0px;
-	margin: 0px;
-	width: <?php echo $width ?>px;
-	height: <?php echo $height ?>px;
-	z-index: 1;
-	opacity: 0.7;
-}
-
-</style>
-</head>
-<body>
-<div id="viddiv" style="display: none;">
-<?php
-		echo "<video id=\"vidcontainer\" width='".$width."' height='".$height."' />\n";
-?>
-</div>
-<div id="loaddiv2" class="textcl"><div id="loaddiv3" class="textcl2">
-<div id="loaddiv" class="textcl3">
-Initializing H264 Stream (<?php echo($br); ?>)...<br>
-<span style="font-size: small;"><i>This may take a few seconds</i></span>
-</div>
-</div></div>
-
-<div class="imgdiv" id="imagediv">
-<?php outputImageStream("liveStream", $thumbsrc, $width, $height, "stream"); ?>
-</div>
-</body>
-</html>
-<?php
-}
-?>
diff --git a/web/skins/xml/includes/init.php b/web/skins/xml/includes/init.php
deleted file mode 100644
index acb6c3546..000000000
--- a/web/skins/xml/includes/init.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/web/skins/xml/skin.php b/web/skins/xml/skin.php
deleted file mode 100644
index c88718c4e..000000000
--- a/web/skins/xml/skin.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-//
-// ZoneMinder HTML interface file, $Date: 2008-09-26 02:47:20 -0700 (Fri, 26 Sep 2008) $, $Revision: 2632 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-if ( empty($_COOKIE['zmBandwidth']) )
-	    $_COOKIE['zmBandwidth'] = "low";
-
-foreach ( getSkinIncludes( 'includes/config.php' ) as $includeFile )
-    require_once $includeFile;
-
-foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile )
-    require_once $includeFile;
-
-if ( empty($view) )
-     $view = 'console';
-
-if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) )
-{
-     $view = "postlogin";
-     $action = "login";
-     $_REQUEST['username'] = $_SERVER['REMOTE_USER'];
-}
-/* Get version info from client */
-updateClientVer();
-/* Store some logging information in session variables
- * so other processes can access them */
-if (defined("ZM_EYEZM_LOG_TO_FILE")) $_SESSION['xml_log_to_file'] = ZM_EYEZM_LOG_TO_FILE;
-if (defined("ZM_EYEZM_LOG_FILE")) $_SESSION['xml_log_file'] = ZM_EYEZM_LOG_FILE;
-if (defined("ZM_EYEZM_DEBUG")) $_SESSION['xml_debug'] = ZM_EYEZM_DEBUG;
-
-?>
diff --git a/web/skins/xml/views/actions.php b/web/skins/xml/views/actions.php
deleted file mode 100644
index 73e206af6..000000000
--- a/web/skins/xml/views/actions.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/* 
- * actions.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email jdhar@eyezm.com (http://www.eyezm.com)
- *
- */
-/* Parse any specific actions here */
-if (isset($_GET['action'])) {
-	$action = $_GET['action'];
-	if (!strcmp($action, "devent")) {
-		/* ACTION: Delete an Event. Parms: <eid> */
-		if (!canEdit('Events')) {
-			logXmlErr("User ".$user['Username']. " doesn't have edit Events perms");
-			exit;
-		}
-		if (!isset($_REQUEST['eid'])) {
-			logXmlErr("EID not set for action delete-event");
-			exit;
-		}
-		$eid = validInteger($_REQUEST['eid']);
-		$url = "./index.php?view=request&request=event&id=".$eid."&action=delete";
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "spawn264")) {
-		/* ACTION: Spawn 264 streaming process.
-		 * Parms: <monitor>[br|width|height] */
-		if (!canView('Stream')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Stream perms");
-			exit;
-		}
-		if (!isset($_GET['monitor'])) {
-			logXmlErr("Not all parameters specified for spawn264");
-			exit;
-		}
-		$monitor = validInteger($_REQUEST['monitor']);
-		if (!isMonitor($monitor)) exit;
-		$dims = getMonitorDims($monitor);
-		$width = validInteger(getset('width', $dims['Width']));
-		$height = validInteger(getset('height', $dims['Height']));
-		$br = validString(getset('br', ZM_EYEZM_H264_DEFAULT_BR));
-		/* Check that we can stream first */
-		if (!canStream264()) {
-			/* canStream264 will print out error */
-			exit;
-		}
-		$streamUrl = stream264fn($monitor, $width, $height, $br);
-		logXml("Using H264 Pipe Function: ".$streamUrl);
-		$pid = shell_exec($streamUrl);
-		logXml("Streaming Process for monitor ".$monitor." ended, cleaning up files");
-		eraseH264Files($monitor);
-		exit;
-
-	} else if (!strcmp($action, "kill264")) {
-		/* ACTION: Kill existing H264 stream process and cleanup files.
-		 * Parms: <monitor>.
-		 * NOTE: This will be called directly by path, so include files
-		 * may not be available */
-		session_start();
-		require_once(dirname(__FILE__)."/../includes/functions.php");
-		if (!isset($_GET['monitor'])) {
-			logXmlErr("Not all parameters specified for kill264");
-			exit;
-		}
-		$monitor = validInteger($_GET['monitor']);
-		kill264proc($monitor);
-		logXml("Killed Segmenter process for monitor ".$monitor);
-		exit;
-
-	} else if (!strcmp($action, "chk264")) {
-		/* ACTION: Simply stalls while checking for 264 file.
-		 * Parms: <monitor><timeout> 
-		 * NOTE: This will be called directly by path, so include files
-		 * may not be available */
-		session_start();
-		require_once(dirname(__FILE__)."/../includes/functions.php");
-		if (!isset($_GET['monitor']) || !isset($_GET['timeout'])) {
-			logXmlErr("Monitor not specified for chk264");
-			exit;
-		}
-		$monitor = validInteger($_GET['monitor']);
-		$path = getTempDir()."/".m3u8fname($monitor);
-		/* Wait for the second sample to become available */
-		$tsfile = getTempDir()."/sample_".$monitor."-2.ts";
-		/* Setup timeout */
-		$startTime = time();
-		$timeout = validInteger($_GET['timeout']);
-		while (!file_exists($path) || !file_exists($tsfile)) {
-			if (time() > $startTime + $timeout) {
-				logXmlErr("Timed out waiting for stream to start, exiting...");
-				kill264proc($monitor);
-				exit;
-			}
-			usleep(10000);
-		}
-		logXml("File exists, stream created after ".(time()-$startTime)." sec");
-		exit;
-
-	} else if (!strcmp($action, "feed")) {
-		/* ACTION: View a feed. Parms: <monitor> [height|width|fps|scale|vcodec|br] */
-		if (!canView('Stream')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Stream perms");
-			exit;
-		}
-		/* Check that required variables are set */
-		if (!isset($_REQUEST['monitor'])) {
-			logXmlErr("Not all parameters set for action view-feed");
-			exit;
-		}
-		$monitor = validInteger($_REQUEST['monitor']);
-		if (!isMonitor($monitor)) exit;
-		$dims = getMonitorDims($monitor);
-		$width = validInteger(getset('width', $dims['Width']));
-		$height = validInteger(getset('height', $dims['Height']));
-		$fps = validInteger(getset('fps', ZM_WEB_VIDEO_MAXFPS));
-		$scale = validInteger(getset('scale', 100));
-		$vcodec = validString(getset('vcodec', ZM_EYEZM_FEED_VCODEC));
-		/* Select which codec we want */
-		if (!strcmp($vcodec, "h264")) {
-			/* Validate that we can in fact stream H264 */
-			if (!canStream264()) {
-				/* canStream264 will print out error if
-				 * there is one */
-				echo "Server cannot stream H264. Check eyeZm log for details";
-				exit;
-			}
-			if (!requireVer("1", "2")) {
-				echo "H264 Streaming requires eyeZm v1.2 or above";
-				logXmlErr("H264 Streaming requires eyeZm v1.2 or above");
-				exit;
-			}
-			$br = validString(getset('br', ZM_EYEZM_H264_DEFAULT_BR));
-			/* H264 processing */
-			noCacheHeaders();
-			/* Kill any existing processes and files */
-			kill264proc($monitor);
-			eraseH264Files($monitor);
-			logXml("Streaming H264 on Monitor ".$monitor.", ".$width."x".$height." @".$br);
-			/* Get thumbnail source */
-			$thumbsrc = 
-				getStreamSrc( array( 
-					"mode=single", 
-					"monitor=".$monitor, 
-					"scale=".$scale,	
-					"maxfps=".$fps,
-					"buffer=1000" 
-				) );
-			logXml("Using thumbnail image from ".$thumbsrc);
-			/* Generate H264 Web-page */
-			echo "<meta name=\"viewport\" content=\"width=".$width."\" />\n";
-			h264vidHtml($width, $height, $monitor, $br, $thumbsrc);
-		} else if (!strcmp($vcodec, "mjpeg")) {
-			/* MJPEG streaming */
-			/* If $fps=0, get a single-shot */
-			if (!$fps) {
-				/* single-shot */
-				$streamSrc = 
-					getStreamSrc( array( 
-						"mode=single", 
-						"monitor=".$monitor, 
-						"scale=".$scale,	
-						"maxfps=0",
-						"buffer=1000" 
-					) );
-			} else {
-				$streamSrc = 
-					getStreamSrc( array( 
-						"mode=jpeg", 
-						"monitor=".$monitor, 
-						"scale=".$scale,	
-						"maxfps=".$fps,
-						"buffer=1000" 
-					) );
-			}
-			noCacheHeaders();
-			xhtmlHeaders( __FILE__, "Stream" );
-			logXml("Streaming MJPEG on Monitor ".$monitor.", ".$width."x".$height." @".$fps."fps");
-			echo "<meta name=\"viewport\" content=\"width=".$width."\" />\n";
-			echo "<body>\n";
-			echo "<div style=\"border: 0px solid; padding: 0px; background-color: black; position: absolute; top: 0px; left; 0px; margin: 0px; width: ".$width."px; height: ".$height."px;\">\n";
-			logXml("Using stream source: ".$streamSrc);
-			outputImageStream("liveStream", $streamSrc, $width, $height, "stream");
-			echo "</div></body></html>";
-		} else {
-			logXmlErr("Unsupported codec ".$vcodec." selected for streaming");
-			echo("Unsupported codec ".$vcodec." selected for streaming");
-		}
-		exit;
-
-	} else if (!strcmp($action, "vevent")) {
-		/* ACTION: View an event. Parms: <eid> [fps|vcodec|br] */
-		if (!canView('Events')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Events perms");
-			exit;
-		}
-		if (!isset($_GET['eid'])) {
-			logXmlErr("Not all parameters set for Action View-event");
-			exit;
-		}
-		/* Grab event from the database */
-		$eid = validInteger($_GET['eid']);
-		$eventsSql = "select E.Id, E.MonitorId, E.Name, E.StartTime, E.Length, E.Frames from Events as E where E.Id = ?";
-		$event = dbFetchOne($eventsSql, NULL, array( $eid ) );
-		/* Check if exists */
-		if (!$event) {
-			logxmlErr("Requested event ID ".$eid." does not exist");
-			exit;
-		}
-		/* Calculate FPS */
-		$fps = validInteger(getset('fps',ceil($event['Frames'] / $event['Length'])));
-		$vcodec = validString(getset('vcodec', ZM_EYEZM_EVENT_VCODEC));
-		$baseURL = ZM_PATH_WEB."/".getEventPathSafe($event);
-		/* Here we validate the codec.
-		 * Check that FFMPEG exists and supports codecs */
-		if (!strcmp($vcodec, "mpeg4")) {
-			if (!ffmpegSupportsCodec("mpeg4")) {
-				logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support mpeg4");
-				exit;
-			}
-			/* Can generate, we are good to go */
-			$fname = "capture.mov";
-			$ffparms = "-vcodec mpeg4 -r ".ZM_EYEZM_EVENT_FPS." ".$baseURL."/".$fname." 2> /dev/null";
-
-		} else if (!strcmp($vcodec, "h264")) {
-			if (!ffmpegSupportsCodec("libx264")) {
-				logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support H264");
-				exit;
-			}
-			if (!requireVer("1","2")) {
-				logXmlErr("H264 Event viewing requires eyeZm v1.2 or greater");
-				exit;
-			}
-			/* Good to go */
-			$fname = "capture.mp4";
-			$ffparms = getFfmpeg264FoutParms(
-				validString(getset('br',ZM_EYEZM_H264_DEFAULT_EVBR)),
-				$baseURL."/".$fname);
-
-		} else {
-			logXmlErr("Unknown codec ".$vcodec." selected for event viewing");
-			exit;
-		}
-		logXml("Selected ".$vcodec." for viewing event ".$event['Id']);
-		$fnameOut = $baseURL."/".$fname;
-		$shellCmd = getFfmpegPath()." -y -r ".$fps." -i ".$baseURL."/%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg";
-		$shellCmd .= " ".$ffparms;
-		logXml("Encoding event with command: ".$shellCmd);
-		$shellOutput = shell_exec($shellCmd);
-		/* Check that file exists */
-		if (!file_exists(trim($fnameOut))) {
-			logXmlErr("Generate Event ".$event['Id']." file ".$fnameOut." does not exist");
-			exit;
-		}
-		$url = "./".getEventPathSafe($event)."/".$fname;
-		logXml("Loading Event URL ".$url);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "vframe")) {
-		/* ACTION: View a frame given by an event and frame-id. Parms: <eid> <frame> [alarm | analyze | qty | scale]
-		 * If 'alarm' is set, the returned frame will be the <frame>-th alarm frame. If 'analyze' is set,
-		 * the returned frame will be the %03d-analyse frame instead of %03d-capture, if ZM_CREATE_ANALYSIS_IMAGES
-		 * is set. Otherwise it just returns the captured frame.
-		 * If qty is set, it will apply a quality factor from 0-100, and if width is set, it will scale the jpeg accordingly
-		 */
-		if (!isset($_GET['eid']) || !isset($_GET['frame'])) {
-			logXmlErr("Not all parameters set for action view-frame");
-			exit;
-		}
-		$eid = validInteger($_GET['eid']);
-		$frame = validInteger($_GET['frame']);
-		$eventsSql = "select E.Id, E.MonitorId, E.Name, E.StartTime, E.Length, E.Frames from Events as E where E.Id = ?";
-		$event = dbFetchOne($eventsSql, NULL, array( $eid ) );
-		$qty = validInteger(getset('qty', 100));
-		if ($qty > 100) $qty = 100;
-		$scale = validInteger(getset('scale', 100));
-		if (!$event) {
-			logxmlErr("Requested event ID ".$eid." does not exist");
-			exit;
-		}
-		/* Figure out the frame number. If 'alarm' is not set, this is just equal to the <frame> parameter.
-		 * If 'alarm' is set, need to query DB and grab the <frame>-th item */
-		if (isset($_GET['alarm'])) {
-			$frameSql = "select * from Frames as F where F.EventId=? and (F.Type = 'Alarm') order by F.FrameId";
-			$i=0;
-			foreach (dbFetchAll($frameSql, NULL, array($eid) ) as $dbframe) {
-				if ($i == $frame) {
-					$frame = $dbframe['FrameId'];
-					break;
-				}
-				$i++;
-			}
-		}
-		if (isset($_GET['analyze']) && ZM_CREATE_ANALYSIS_IMAGES) {
-			$suffix = "analyse";
-		} else {
-			$suffix = "capture";
-		}
-		/* A frame index of 0 is invalid, so if we see this, just use frame 1 */
-		if (!$frame) $frame = 1;
-		/* Suffix based on 'analyze' */
-		$fname = sprintf("%0".ZM_EVENT_IMAGE_DIGITS."d-%s.jpg", $frame, $suffix);
-		$url = "./".getEventPathSafe($event)."/".$fname;
-		if (!file_exists($url)) {
-			logXmlErr("Invalid frame image requested: ".$url);
-			$url = "./skins/xml/views/notfound.png";
-		}
-		/* Check if the image needs any processing - check for GD if requested */
-		if (($scale != 100) || ($qty < 100)) {
-			if (!gdExists()) {
-				logXmlErr("Lib GD is not loaded, but required for image scaling functions");
-				$url = "./skins/xml/views/notfound.png";
-			} else if (!$img = imagecreatefromjpeg($url)) {
-				logXmlErr("Could not load JPEG from ".$url);
-				$url = "./skins/xml/views/notfound.png";
-			} else {
-				/* GD exists and we read the file ok */
-				header('Content-type: image/jpeg');
-				/* Check if resizing is needed */
-				if ($scale != 100) {
-					list($width_orig, $height_orig) = getimagesize($url);
-					$width_new = $width_orig * ($scale/100);
-					$height_new = $height_orig * ($scale/100);
-					$img_new = imagecreatetruecolor($width_new, $height_new);
-					imagecopyresampled($img_new, $img, 0, 0, 0, 0, $width_new, $height_new, $width_orig, $height_orig);
-					imagejpeg($img_new, NULL, $qty);
-				} else {
-					imagejpeg($img, NULL, $qty);
-				}
-				exit;
-			}
-		} 
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "state")) {
-		/* ACTION: Change the state of the system. Parms: <state> */
-		if (!canEdit('System')) {
-			logXmlErr("User ".$user['Username']. " doesn't have edit System perms");
-			exit;
-		}
-		if (!isset($_GET['state'])) {
-			logXmlErr("Server state not specified for action");
-			exit;
-		}
-		$url = "./index.php?view=none&action=state&runState=".validString($_GET['state']);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "func")) {
-		/* ACTION: Change state of the monitor. Parms: <mid><func><en> */
-		if (!canEdit('Monitors')) {
-			logXmlErr("User ".$user['Username']. " doesn't have monitors Edit perms");
-			exit;
-		}
-		if (!isset($_GET['mid']) || !isset($_GET['func']) || !isset($_GET['en'])) {
-			logXmlErr("Not all parameters specified for action Monitor state");
-			exit;
-		}
-		$mid = validInteger($_GET['mid']);
-		if (!isMonitor($mid)) exit;
-		$url = "./index.php?view=none&action=function&mid=".$mid."&newFunction=".validString($_GET['func'])."&newEnabled=".validString($_GET['en']);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "vlog")) {
-		/* ACTION: View log file. Must have debug and log to file enabled, and sufficient perms 
-		 * Parms: [lines] */
-		if (!canEdit('System')) {
-			logXmlErr("Insufficient permissions to view log file");
-			echo "Insufficient permissions to view log file";
-			exit;
-		}
-		if (!ZM_EYEZM_DEBUG || !ZM_EYEZM_LOG_TO_FILE) {
-			echo "eyeZm Debug (EYEZM_DEBUG) or log-to-file (EYEZM_LOG_TO_FILE) not enabled. Please enable first";
-			exit;
-		}
-		if (!file_exists(ZM_EYEZM_LOG_FILE)) {
-			echo "Log file ".ZM_EYEZM_LOG_FILE." doesn't exist";
-			exit;
-		}
-		$lines = validInteger(getset('lines',ZM_EYEZM_LOG_LINES));
-		logXml("Returning last ".$lines." lines of eyeZm Log from ".ZM_EYEZM_LOG_FILE);
-		echo shell_exec("tail -n ".$lines." ".ZM_EYEZM_LOG_FILE);
-		echo "\n\n--- Showing last ".$lines." lines ---\n";
-		echo "--- End of Log ---\n\n";
-	}
-}
-?>
diff --git a/web/skins/xml/views/console.php b/web/skins/xml/views/console.php
deleted file mode 100644
index b512bc13a..000000000
--- a/web/skins/xml/views/console.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-//
-// ZoneMinder web console file, $Date: 2009-02-19 10:05:31 +0000 (Thu, 19 Feb 2009) $, $Revision: 2780 $
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-/* 
- * console.php is updated by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email support@eyezm.com (http://www.eyezm.com)
- *
- */
-$eventCounts = array(
-    array(
-        "title" => translate('Events'),
-        "filter" => array(
-            "terms" => array(
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Hour'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Day'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Week'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Month'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Archived'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "1" ),
-            )
-        ),
-    ),
-);
-
-$running = daemonCheck();
-$status = $running?translate('Running'):translate('Stopped');
-
-if ( $group = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array(empty($_COOKIE['zmGroup'])?0:$_COOKIE['zmGroup']) ) ) 
-    $groupIds = array_flip(split( ',', $group['MonitorIds'] ));
-
-$maxWidth = 0;
-$maxHeight = 0;
-$cycleCount = 0;
-$minSequence = 0;
-$maxSequence = 1;
-$seqIdList = array();
-$monitors = dbFetchAll( "select * from Monitors order by Sequence asc" );
-$displayMonitors = array();
-for ( $i = 0; $i < count($monitors); $i++ )
-{
-    if ( !visibleMonitor( $monitors[$i]['Id'] ) )
-    {
-        continue;
-    }
-    if ( $group && !empty($groupIds) && !array_key_exists( $monitors[$i]['Id'], $groupIds ) )
-    {
-        continue;
-    }
-    $monitors[$i]['Show'] = true;
-    if ( empty($minSequence) || ($monitors[$i]['Sequence'] < $minSequence) )
-    {
-        $minSequence = $monitors[$i]['Sequence'];
-    }
-    if ( $monitors[$i]['Sequence'] > $maxSequence )
-    {
-        $maxSequence = $monitors[$i]['Sequence'];
-    }
-    if (isset($_GET['nostatus'])) {
-	    $monitors[$i]['zmc'] = 1;
-	    $monitors[$i]['zma'] = 1;
-    } else {
-	    $monitors[$i]['zmc'] = zmcStatus( $monitors[$i] );
-	    $monitors[$i]['zma'] = zmaStatus( $monitors[$i] );
-    }
-    $monitors[$i]['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitors[$i]['Id']) );
-    $counts = array();
-    for ( $j = 0; $j < count($eventCounts); $j++ )
-    {
-        $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) );
-        parseFilter( $filter );
-        $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
-        $monitors[$i]['eventCounts'][$j]['filter'] = $filter;
-    }
-    $sql = 'SELECT '.join($counts,", ").' from Events as E where MonitorId = ?';
-    $counts = dbFetchOne( $sql, NULL, array( $monitors[$i]['Id'] ) );
-    if ( $monitors[$i]['Function'] != 'None' )
-    {
-        $cycleCount++;
-        $scaleWidth = reScale( $monitors[$i]['Width'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-        $scaleHeight = reScale( $monitors[$i]['Height'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-        if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth;
-        if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight;
-    }
-    $monitors[$i] = array_merge( $monitors[$i], $counts );
-    $seqIdList[] = $monitors[$i]['Id'];
-    $displayMonitors[] = $monitors[$i];
-}
-$states = dbFetchAll("select * from States");
-/* XML Dump Starts here */
-xml_header();
-/* Print out the general section */
-xml_tag_sec("ZM_XML", 1);
-xml_tag_sec("GENERAL", 1);
-xml_tag_val("RUNNING", $running);
-xml_tag_val("PROTOVER", ZM_EYEZM_PROTOCOL_VERSION);
-xml_tag_val("FEATURESET", ZM_EYEZM_FEATURE_SET);
-xml_tag_val("VERSION", ZM_VERSION);
-xml_tag_val("CANSTR264", canStream264(1));
-xml_tag_val("GD", gdExists());
-xml_tag_val("FVCODEC", ZM_EYEZM_FEED_VCODEC);
-xml_tag_val("FVTMT", ZM_EYEZM_H264_TIMEOUT);
-xml_tag_val("USER", $user['Username']);
-xml_tag_val("UID", $user['Id']);
-/* Permissions block */
-xml_tag_sec("PERMS", 1);
-xml_tag_val("STREAM", $user['Stream']);
-xml_tag_val("EVENTS", $user['Events']);
-xml_tag_val("CONTROL", $user['Control']);
-xml_tag_val("MONITORS", $user['Monitors']);
-xml_tag_val("DEVICES", $user['Devices']);
-xml_tag_val("SYSTEM", $user['System']);
-xml_tag_sec("PERMS", 0);
-/* End permissions block */
-if (canEdit('System')) {
-	if ($running) {
-		xml_tag_val("STATE", "stop");
-		xml_tag_val("STATE", "restart");
-	} else {
-		xml_tag_val("STATE", "start");
-	}
-	foreach ($states as $state) {
-		xml_tag_val("STATE", $state['Name']);
-	}
-}
-/* End general section */
-xml_tag_sec("GENERAL", 0);
-/* Print out the monitors section */
-xml_tag_sec("MONITOR_LIST", 1);
-foreach( $displayMonitors as $monitor )
-{
-	if (!canView('Monitors')) continue;
-	xml_tag_sec("MONITOR", 1);
-	xml_tag_val("ID", $monitor['Id']);
-	xml_tag_val("NAME", $monitor['Name']);
-	xml_tag_val("FUNCTION", $monitor['Function']);
-	xml_tag_val("NUMEVENTS", $monitor['EventCount0']);
-	xml_tag_val("ENABLED", $monitor['Enabled']);
-	xml_tag_val("ZMC", $monitor['zmc']);
-	xml_tag_val("ZMA", $monitor['zma']);
-	xml_tag_val("STATE", ($monitor['zmc']!=1)?"ERROR":(
-		($monitor['zma']==1)?"OK":"WARN"));
-	xml_tag_val("WIDTH", $monitor['Width']);
-	xml_tag_val("HEIGHT", $monitor['Height']);
-
-	/* Form the data-base query for this monitor */
-	$pageOffset = 0;
-	$offset = 0;
-	if (isset($_GET['numEvents'])) {
-		$numEvents = validInteger($_GET['numEvents']);
-		$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Cause,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) and ( E.MonitorId = ? ) order by E.StartTime desc";
-		$eventsSql .= " limit ".$numEvents;
-		/* If there is an pageOff<x> tag for this monitor, then retrieve the offset. Otherwise, don't specify offset */
-		if (isset($_GET['pageOff'.$monitor['Id']])) {
-			/* If pageOffset is greater than we actually have,
-			 * we need to adjust it */
-			$pageOffset = validInteger($_GET['pageOff'.$monitor['Id']]); 
-			if ($pageOffset >= ceil($monitor['EventCount0']/$numEvents)) {
-				$pageOffset = 0;
-			}
-			$offset = $pageOffset * $numEvents;
-		}
-		$eventsSql .= " offset ".$offset;
-	} else {
-		unset($eventsSql);
-	}
-	xml_tag_val("PAGEOFF", $pageOffset);
-	xml_tag_sec("EVENTS",1);
-	if (canView('Events') && isset($eventsSql)) {
-		foreach ( dbFetchAll( $eventsSql, NULL, array($monitor['Id']) ) as $event )
-		{
-			xml_tag_sec("EVENT",1);
-			xml_tag_val("ID",$event['Id']);
-			xml_tag_val("NAME",$event['Name']);
-			xml_tag_val("TIME", strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime'])));
-			xml_tag_val("DURATION", $event['Length']);
-			xml_tag_val("FRAMES", $event['Frames']);
-			xml_tag_val("FPS", ($event['Length'] > 0)?ceil($event['Frames']/$event['Length']):0);
-			xml_tag_val("TOTSCORE", $event['TotScore']);
-			xml_tag_val("AVGSCORE", $event['AvgScore']);
-			xml_tag_val("MAXSCORE", $event['MaxScore']);
-			/* Grab the max frame-id from Frames table. If AlarmFrames = 0, don't try
-			 * to grab any frames, and just signal the max frame index as index 0 */
-			$fridx = 1;
-			$alarmFrames = 1;
-			if ($event['AlarmFrames']) {
-				$framesSql = "SELECT FrameId FROM Frames WHERE (Type = 'Alarm') and (EventId = ?) ORDER BY Score DESC LIMIT 1";
-				$fr = dbFetchOne($framesSql, NULL, array( $event['Id'] ) );
-				$fridx = $fr['FrameId'];
-				$alarmFrames = $event['AlarmFrames'];
-			}
-			xml_tag_val("ALARMFRAMES", $alarmFrames);
-			xml_tag_val("MAXFRAMEID", $fridx);
-			xml_tag_sec("EVENT",0);
-		}
-	}
-	xml_tag_sec("EVENTS",0);
-	xml_tag_sec("MONITOR", 0);
-}
-xml_tag_sec("MONITOR_LIST", 0);
-xml_tag_sec("ZM_XML", 0);
-?>
diff --git a/web/skins/xml/views/none.php b/web/skins/xml/views/none.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/skins/xml/views/notfound.png b/web/skins/xml/views/notfound.png
deleted file mode 100644
index 219706897647c72375b90298de2d8a6622b7093d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7332
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
R>Js3hJyX?HsZ+9j^?#`>R7U^+


From 6b169af655fcdd3a5f93f7723b440e76d2479e66 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 02:00:33 +1100
Subject: [PATCH 273/362] Remove eyezm configdata

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
---
 .../lib/ZoneMinder/ConfigData.pm.in           | 135 ------------------
 1 file changed, 135 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 703d47c30..c9d48f52f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -3942,141 +3942,6 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         readonly    => 1,
         category    => "dynamic",
     },
-    {
-        name        => "ZM_EYEZM_DEBUG",
-        default     => "no",
-        description => "Switch additional debugging on for eyeZm Plugin",
-        help        => qqq("
-            Enable or Disable extra debugging from the eyeZm Plugin. Extra
-            debugging information will be displayed in it's own file
-            (EYEZM_LOG_TO_FILE is set), or your Apache error log
-        "),
-        type        => $types{boolean},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_LOG_TO_FILE",
-        default     => "yes",
-        description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
-        help        => qqq("
-            When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output
-            generated from the eyeZm Plugin will go to it's own file.
-            Otherwise it will go to the apache error log.
-        "),
-        type        => $types{boolean},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_LOG_FILE",
-        default     => "@ZM_LOGDIR@/zm_xml.log",
-        description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
-        help        => qqq("
-            This file will contain it's own output from the eyeZm Plugin
-            when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_EVENT_VCODEC",
-        default     => "mpeg4",
-        description => "Default video-codec to use for encoding events",
-        help        => qqq("
-            The eyeZm Plugin calls FFMPEG externally to encode the captured
-            images. If your FFMPEG is not built with support for H264,
-            change this to MPEG-4. If using H264, please check
-            http://www.eyezm.com for H264 requirements and that your eyeZm
-            version supports H264 (v1.2+).
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mpeg4|h264",
-            pattern     =>qr|^([mh])|i,
-            format      =>q( $1 =~ /^m/ ? "mpeg4" : "h264" )
-        },
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_FEED_VCODEC",
-        default     => "mjpeg",
-        description => "Default video-codec to use for streaming the live feed",
-        help        => qqq("
-            Determines whether the live stream is generated using native
-            MJPEG streaming with ZoneMinder, or H264 using FFMPEG and
-            HTML-5 streaming. If using H264, please check
-            http://www.eyezm.com for H264 requirements and that your eyeZm
-            version supports H264 (v1.2+). This is just a default
-            parameter, and can be overridden with eyeZm.
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mjpeg|h264",
-            pattern     =>qr|^([mh])|i,
-            format      =>q( $1 =~ /^m/ ? "mjpeg" : "h264" )
-        },
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_DEFAULT_BR",
-        default     => "96k",
-        description => "Default bit-rate to use with FFMPEG for H264 streaming",
-        help        => qqq("
-            When using the eyeZm Plugin to stream H264 data, FFMPEG
-            requires a bitrate to control the quality and bandwidth of the
-            video. This should be specified in a format acceptable to
-            FFMPEG. The default value is sufficient for most installations.
-            This is just a default parameter, and can be overridden with
-            eyeZm.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_DEFAULT_EVBR",
-        default     => "128k",
-        description => "Default bit-rate to use with FFMPEG for H264 event viewing",
-        help        => qqq("
-            When using the eyeZm Plugin to view events in H264, FFMPEG
-            requires a bitrate to control the quality and bandwidth of the
-            video. This should be specified in a format acceptable to
-            FFMPEG. The default value is sufficient for most installations.
-            This is just a default parameter, and can be overridden with
-            eyeZm.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_TIMEOUT",
-        default     => "20",
-        description => "Timeout (sec) to wait for H264 stream to start before terminating",
-        help        => qqq("
-            The eyeZm Plugin will attempt to spawn an H264 stream when
-            requested, and require that it complete within the timeout
-            specified. If you have a slow system or find through the logs
-            that the H264 stream is not starting because the timeout is
-            expiring, even though FFMPEG is running, try increasing this
-            value. If you have a fast system, decreasing this value can
-            improve the responsiveness when there are issues starting H264
-            streams
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_SEG_DURATION",
-        default     => "3",
-        description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
-        help        => qqq("
-            The HTTP-5 Live Streaming Protocol segments the input video
-            stream into small chunks of a duration specified by this
-            parameter. Increasing the segment duration will help with
-            choppy connections on the other end, but will increase the
-            latency in starting a stream.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
 );
 
 our %options_hash = map { ( $_->{name}, $_ ) } @options;

From 4837585601abd50da8fc89e6737aedf6836a5dc0 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 02:35:43 +1100
Subject: [PATCH 274/362] Deleted eyezm options documentation and references to
 it in other areas of documentation. Removed zmstreamer.cpp.

Conflicts:
	src/zmstreamer.cpp
---
 docs/userguide/components.rst            |   9 +-
 docs/userguide/options.rst               |   1 -
 docs/userguide/options/options_eyezm.rst |  26 ---
 src/zmstreamer.cpp                       | 252 -----------------------
 web/skins/classic/views/options.php      |   1 -
 5 files changed, 3 insertions(+), 286 deletions(-)
 delete mode 100644 docs/userguide/options/options_eyezm.rst
 delete mode 100644 src/zmstreamer.cpp

diff --git a/docs/userguide/components.rst b/docs/userguide/components.rst
index ebedc8c7e..48aff0be4 100644
--- a/docs/userguide/components.rst
+++ b/docs/userguide/components.rst
@@ -26,16 +26,13 @@ Binaries
 
 PHP
 ---
-As well as this there are the web PHP files in the web directory. Currently these consist of 4 possible skins.
+As well as this there are the web PHP files in the web directory. Currently these consist of a single skin with Classic and Flat styles.
 
 **Classic**
   Original ZoneMinder skin
 **Flat**
-  An updated version of classic skin, retaining the same layout with a more modern style
-**XML**
-  Displays certain views as XML. Used by eyeZM as an interfacing skin (Note that eyeZM no longer seems to work with later versions of Zoneminder). New developers of 3rd party clients should use the API instead (:doc:`../api`)
-**Mobile**
-  A skin that displays views in a more condensed and single page format, likely suitable for smaller mobile devices, should one choose to access the ZoneMinder console using such devices. Note that there are also third party mobile clients one could use (:doc:`mobile`)
+  An updated version of Classic skin, retaining the same layout with a more modern style. Originally a skin this is now just a CSS style.
+
 
 Perl
 ----
diff --git a/docs/userguide/options.rst b/docs/userguide/options.rst
index 4a0b357f6..8f7fbad30 100644
--- a/docs/userguide/options.rst
+++ b/docs/userguide/options.rst
@@ -20,5 +20,4 @@ If you have changed the value of an option you should then ‘save’ it. A numb
    options/options_x10
    options/options_bw
    options/options_phonebw
-   options/options_eyezm
    options/options_users
diff --git a/docs/userguide/options/options_eyezm.rst b/docs/userguide/options/options_eyezm.rst
deleted file mode 100644
index 21c780bc0..000000000
--- a/docs/userguide/options/options_eyezm.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Options - eyeZM
----------------
-
-.. NOTE:: 
-	eyeZM does not seem to be actively maintained by the developers and does not work with later versions of ZoneMinder.
-
-
-.. image:: images/Options_eyezm.png
-
-EYEZM_DEBUG - Enable or Disable extra debugging from the eyeZm Plugin. Extra debugging information will be displayed in it's own file (EYEZM_LOG_TO_FILE is set), or your Apache error log
-
-EYEZM_LOG_TO_FILE - When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output generated from the eyeZm Plugin will go to it's own file. Otherwise it will go to the apache error log.
-
-EYEZM_LOG_FILE - Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled. This file will contain it's own output from the eyeZm Plugin when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled.
-
-EYEZM_EVENT_VCODEC - The eyeZm Plugin calls FFMPEG externally to encode the captured images. If your FFMPEG is not built with support for H264, change this to MPEG-4. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+).
-
-EYEZM_FEED_VCODEC - Determines whether the live stream is generated using native MJPEG streaming with ZoneMinder, or H264 using FFMPEG and HTML-5 streaming. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+). This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_DEFAULT_BR - Default bit-rate to use with FFMPEG for H264 streaming. When using the eyeZm Plugin to stream H264 data, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_DEFAULT_EVBR - Default bit-rate to use with FFMPEG for H264 event viewing. When using the eyeZm Plugin to view events in H264, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_TIMEOUT - Timeout (sec) to wait for H264 stream to start before terminating. The eyeZm Plugin will attempt to spawn an H264 stream when requested, and require that it complete within the timeout specified. If you have a slow system or find through the logs that the H264 stream is not starting because the timeout is expiring, even though FFMPEG is running, try increasing this value. If you have a fast system, decreasing this value can improve the responsiveness when there are issues starting H264 streams.
-
-EYEZM_SEG_DURATION - Segment duration used for streaming using HTTP-5 Streaming protocol. The HTTP-5 Live Streaming Protocol segments the input video stream into small chunks of a duration specified by this parameter. Increasing the segment duration will help with choppy connections on the other end, but will increase the latency in starting a stream.
diff --git a/src/zmstreamer.cpp b/src/zmstreamer.cpp
deleted file mode 100644
index a16e50704..000000000
--- a/src/zmstreamer.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-//
-// ZoneMinder Streamer, $Date: 2010-10-14 23:21:00 +0200 (Thu, 14 Oct 2010) $
-// Copyright (C) 2001-2010 Philip Coombes, Chris Kistner
-//
-// This program is based on revision 3143 of
-// http://svn.zoneminder.com/svn/zm/trunk/src/zms.cpp 
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-/*
-
-=head1 NAME
-
-zmstreamer - eyeZM video streamer
-
-=head1 SYNOPSIS
-
- zmstreamer -e <mode>
- zmstreamer -o <format>
- zmstreamer -u <buffer size>
- zmstreamer -f <maximum fps>
- zmstreamer -s <scale>
- zmstreamer -b <bitrate in bps>
- zmstreamer -m <monitor id>
- zmstreamer -d <debug mode>
- zmstreamer -i
- zmstreamer -?
- zmstreamer -h
- zmstreamer -v
-
-=head1 DESCRIPTION
-
-*DEPRECIATED* The xml skin and all files associated with the xml skin are now
-depreciated. Please use the ZoneMinder API instead.
-
-This binary works in conjunction with the XML skin to stream video to iPhones
-running the eyeZm app. 
-
-=head1 OPTIONS
-
- -e <mode>                        - Specify output mode: mpeg/jpg/zip/single/raw.
- -o <format>                      - Specify output format.
- -u <buffer size>                 - Specify buffer size in ms.
- -f <maximum fps>                 - Specify maximum framerate.
- -s <scale>                       - Specify scale.
- -b <bitrate in bps>              - Specify bitrate.
- -m <monitor id>                  - Specify monitor id.
- -d <debug mode>                  - 0 = off, 1 = no streaming, 2 = with streaming.
- -i, -?, -h                       - Display usage information
- -v                               - Print the installed version of ZoneMinder
-
-=cut
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_user.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
-#include "zm_stream.h"
-
-// Possible command-line options
-#define OPTIONS "e:o:u:f:s:b:m:d:i:?:h:v"
-
-// Default ZMS values
-#define ZMS_DEFAULT_DEBUG 0
-#define ZMS_DEFAULT_ID 1
-#define ZMS_DEFAULT_BITRATE 100000
-#define ZMS_DEFAULT_SCALE 100
-#define ZMS_DEFAULT_MODE "mpeg"
-#define ZMS_DEFAULT_FORMAT "asf"
-#define ZMS_DEFAULT_FPS 25.0
-#define ZMS_DEFAULT_BUFFER 1000
-
-int main(int argc, char** argv) {
-    self = argv[0];
-    // Set initial values to the default values
-    int debug = ZMS_DEFAULT_DEBUG;
-    int id = ZMS_DEFAULT_ID;
-    int bitrate = ZMS_DEFAULT_BITRATE;
-    int scale = ZMS_DEFAULT_SCALE;
-    char mode[32];
-    sprintf(mode, "%s", ZMS_DEFAULT_MODE);
-    char format[32];
-    sprintf(format, "%s", ZMS_DEFAULT_FORMAT);
-    double maxfps = ZMS_DEFAULT_FPS;
-    int buffer = ZMS_DEFAULT_BUFFER;
-
-    // Parse command-line options
-    int arg;
-    while ((arg = getopt(argc, argv, OPTIONS)) != -1) {
-        switch (arg) {
-            case 'e':
-                sprintf(mode, "%s", optarg);
-                break;
-            case 'o':
-                sprintf(format, "%s", optarg);
-                break;
-            case 'u':
-                buffer = atoi(optarg);
-                break;
-            case 'f':
-                maxfps = atof(optarg);
-                break;
-            case 's':
-                scale = atoi(optarg);
-                break;
-            case 'b':
-                bitrate = atoi(optarg);
-                break;
-            case 'm':
-                id = atoi(optarg);
-                break;
-            case 'd':
-                debug = atoi(optarg);
-                break;
-            case 'h':
-            case 'i':
-            case '?':
-                printf("-e <mode> : Specify output mode: mpeg/jpg/zip/single/raw. Default = %s\n", ZMS_DEFAULT_MODE);
-                printf("-o <format> : Specify output format. Default = %s\n", ZMS_DEFAULT_FORMAT);
-                printf("-u <buffer size> : Specify buffer size in ms. Default = %d\n", ZMS_DEFAULT_BUFFER);
-                printf("-f <maximum fps> : Specify maximum framerate. Default = %lf\n", ZMS_DEFAULT_FPS);
-                printf("-s <scale> : Specify scale. Default = %d\n", ZMS_DEFAULT_SCALE);
-                printf("-b <bitrate in bps> : Specify bitrate. Default = %d\n", ZMS_DEFAULT_BITRATE);
-                printf("-m <monitor id> : Specify monitor id. Default = %d\n", ZMS_DEFAULT_ID);
-                printf("-d <debug mode> : 0 = off, 1 = no streaming, 2 = with streaming. Default = 0\n");
-                printf("-i or -? or -h: This information\n");
-                printf("-v : This installed version of ZoneMinder\n");
-                return EXIT_SUCCESS;
-            case 'v':
-                std::cout << ZM_VERSION << "\n";
-                exit(0);
-        }
-    }
-
-    // Set stream type
-    StreamBase::StreamType streamtype;
-    if (!strcasecmp("raw", mode))
-        streamtype = MonitorStream::STREAM_RAW;
-    else if (!strcasecmp("mpeg", mode))
-        streamtype = MonitorStream::STREAM_MPEG;
-    else if (!strcasecmp("jpg", mode))
-        streamtype = MonitorStream::STREAM_JPEG;
-    else if (!strcasecmp("single", mode))
-        streamtype = MonitorStream::STREAM_SINGLE;
-    else if (!strcasecmp("zip", mode))
-        streamtype = MonitorStream::STREAM_ZIP;
-    else
-        streamtype = MonitorStream::STREAM_MPEG;
-
-    if (debug) {
-        // Show stream parameters
-        printf("Stream parameters:\n");
-        switch (streamtype) {
-            case MonitorStream::STREAM_MPEG:
-                printf("Output mode (-e) = %s\n", "mpeg");
-                printf("Output format (-o) = %s\n", format);
-                break;
-            default:
-                printf("Output mode (-e) = %s\n", mode);
-        }
-        printf("Buffer size (-u) = %d ms\n", buffer);
-        printf("Maximum FPS (-f) = %lf FPS\n", maxfps);
-        printf("Scale (-s) = %d%%\n", scale);
-        printf("Bitrate (-b) = %d bps\n", bitrate);
-        printf("Monitor Id (-m) = %d\n", id);
-    }
-
-    if (debug) {
-        // Set ZM debugger to print to stdout
-        printf("Setting up ZoneMinder debugger to print to stdout...");
-        setenv("ZM_DBG_PRINT", "1", 1);
-        printf("Done.\n");
-    }
-
-    // Loading ZM configurations
-    printf("Loading ZoneMinder configurations...");
-    zmLoadConfig();
-    printf("Done.\n");
-
-    logInit("zmstreamer");
-    
-    ssedetect();
-
-    // Setting stream parameters
-    MonitorStream stream;
-    stream.setStreamScale(scale); // default = 100 (scale)
-    stream.setStreamReplayRate(100); // default = 100 (rate)
-    stream.setStreamMaxFPS(maxfps); // default = 10 (maxfps)
-    if (debug) stream.setStreamTTL(1);
-    else stream.setStreamTTL(0); // default = 0 (ttl)
-    stream.setStreamQueue(0); // default = 0 (connkey)
-    stream.setStreamBuffer(buffer); // default = 0 (buffer)
-    stream.setStreamStart(id); // default = 0 (monitor_id)
-    stream.setStreamType(streamtype);
-    if (streamtype == MonitorStream::STREAM_MPEG) {
-#if HAVE_LIBAVCODEC
-        if (debug) printf("HAVE_LIBAVCODEC is set\n");
-        stream.setStreamFormat(format); // default = "" (format)
-        stream.setStreamBitrate(bitrate); // default = 100000 (bitrate)
-#else
-        fprintf(stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n");
-        logTerm();
-        zmDbClose();
-        return EXIT_FAILURE;
-#endif
-    }
-
-    if (debug != 1) {
-        if (debug) printf("Running stream...");
-
-        // Output headers
-        fprintf(stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION);
-        time_t now = time(0);
-        char date_string[64];
-        strftime(date_string, sizeof (date_string) - 1, "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
-        fprintf(stdout, "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n");
-        fprintf(stdout, "Last-Modified: %s\r\n", date_string);
-        fprintf(stdout, "Cache-Control: no-store, no-cache, must-revalidate\r\n");
-        fprintf(stdout, "Cache-Control: post-check=0, pre-check=0\r\n");
-        fprintf(stdout, "Pragma: no-cache\r\n");
-
-        // Run stream
-        stream.runStream();
-    }
-    if (debug) printf("Done.\n");
-
-    logTerm();
-    zmDbClose();
-
-    return (EXIT_SUCCESS);
-}
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 9c3b4a418..30ea85f43 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -43,7 +43,6 @@ $tabs['highband'] = translate('HighBW');
 $tabs['medband'] = translate('MediumBW');
 $tabs['lowband'] = translate('LowBW');
 $tabs['phoneband'] = translate('PhoneBW');
-$tabs['eyeZm'] = "eyeZm";
 $tabs['users'] = translate('Users');
 
 if ( isset($_REQUEST['tab']) )

From 0277a66700fdaa047a709f26b64a4bf5d4af2213 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 03:03:04 +1100
Subject: [PATCH 275/362] Remove eyezm from distros and Cmake.

Conflicts:
	distros/debian8/control
---
 .gitignore                                    |  1 -
 distros/debian8/control                       | 23 +------------------
 distros/debian8/zoneminder-ui-mobile.install  |  1 -
 distros/debian8/zoneminder-ui-xml.install     |  1 -
 .../fedora/archive/zoneminder.cmake.f19.spec  |  1 -
 distros/fedora/archive/zoneminder.f19.spec    |  1 -
 distros/fedora/archive/zoneminder.f20.spec    |  1 -
 distros/fedora/archive/zoneminder.f21.spec    |  1 -
 distros/fedora/zoneminder.f22.spec            |  1 -
 distros/fedora/zoneminder.f23.spec            |  1 -
 distros/redhat/archive/zoneminder.el6.spec    |  1 -
 distros/redhat/zoneminder.el6.spec            |  1 -
 distros/redhat/zoneminder.el7.spec            |  1 -
 .../ubuntu1504_cmake_split_packages/control   | 23 +------------------
 .../zoneminder-ui-mobile.install              |  1 -
 .../zoneminder-ui-xml.install                 |  1 -
 src/CMakeLists.txt                            |  8 +++----
 17 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 distros/debian8/zoneminder-ui-mobile.install
 delete mode 100644 distros/debian8/zoneminder-ui-xml.install
 delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install
 delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install

diff --git a/.gitignore b/.gitignore
index fa066279c..bd66e684a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,6 @@ src/zma
 src/zmc
 src/zmf
 src/zms
-src/zmstreamer
 src/zmu
 web/includes/config.php
 zm.conf
diff --git a/distros/debian8/control b/distros/debian8/control
index af5ba9ad0..4ab0c07e6 100644
--- a/distros/debian8/control
+++ b/distros/debian8/control
@@ -13,9 +13,7 @@ Depends: ${misc:Depends},
  zoneminder-database (>= ${source:Version}),
  zoneminder-core (>= ${binary:Version}),
  zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
+ zoneminder-ui-classic (>= ${source:Version})
 Description: Video camera security and surveillance solution (metapackage)
  ZoneMinder is intended for use in single or multi-camera video security
  applications, including commercial or home CCTV, theft prevention and child
@@ -101,22 +99,3 @@ Description: Classic web user interface for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.
  .
  This package provides the classic web user interface.
-
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
diff --git a/distros/debian8/zoneminder-ui-mobile.install b/distros/debian8/zoneminder-ui-mobile.install
deleted file mode 100644
index 464bb74eb..000000000
--- a/distros/debian8/zoneminder-ui-mobile.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/mobile
diff --git a/distros/debian8/zoneminder-ui-xml.install b/distros/debian8/zoneminder-ui-xml.install
deleted file mode 100644
index 6617707f8..000000000
--- a/distros/debian8/zoneminder-ui-xml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/xml
diff --git a/distros/fedora/archive/zoneminder.cmake.f19.spec b/distros/fedora/archive/zoneminder.cmake.f19.spec
index 771209247..0af88f41f 100644
--- a/distros/fedora/archive/zoneminder.cmake.f19.spec
+++ b/distros/fedora/archive/zoneminder.cmake.f19.spec
@@ -140,7 +140,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f19.spec b/distros/fedora/archive/zoneminder.f19.spec
index 11a8ba249..d1be12aa2 100644
--- a/distros/fedora/archive/zoneminder.f19.spec
+++ b/distros/fedora/archive/zoneminder.f19.spec
@@ -232,7 +232,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f20.spec b/distros/fedora/archive/zoneminder.f20.spec
index b06db673d..513a9cfee 100644
--- a/distros/fedora/archive/zoneminder.f20.spec
+++ b/distros/fedora/archive/zoneminder.f20.spec
@@ -142,7 +142,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f21.spec b/distros/fedora/archive/zoneminder.f21.spec
index 6dfabceea..35662bf6c 100644
--- a/distros/fedora/archive/zoneminder.f21.spec
+++ b/distros/fedora/archive/zoneminder.f21.spec
@@ -142,7 +142,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
index 9beef6319..40343090f 100644
--- a/distros/fedora/zoneminder.f22.spec
+++ b/distros/fedora/zoneminder.f22.spec
@@ -154,7 +154,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec
index 14b653117..6fabd143d 100644
--- a/distros/fedora/zoneminder.f23.spec
+++ b/distros/fedora/zoneminder.f23.spec
@@ -154,7 +154,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/redhat/archive/zoneminder.el6.spec b/distros/redhat/archive/zoneminder.el6.spec
index d61a153e7..46bce099a 100644
--- a/distros/redhat/archive/zoneminder.el6.spec
+++ b/distros/redhat/archive/zoneminder.el6.spec
@@ -237,7 +237,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 82406d431..1059d5930 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -145,7 +145,6 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index c350553b3..6dd0f5e1d 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -154,7 +154,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control
index 4a152c46b..6b6692414 100644
--- a/distros/ubuntu1504_cmake_split_packages/control
+++ b/distros/ubuntu1504_cmake_split_packages/control
@@ -28,9 +28,7 @@ Depends: ${misc:Depends},
  zoneminder-database (>= ${source:Version}),
  zoneminder-core (>= ${binary:Version}),
  zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
+ zoneminder-ui-classic (>= ${source:Version})
 Description: Video camera security and surveillance solution (metapackage)
  ZoneMinder is intended for use in single or multi-camera video security
  applications, including commercial or home CCTV, theft prevention and child
@@ -117,25 +115,6 @@ Description: Classic web user interface for ZoneMinder
  .
  This package provides the classic web user interface.
 
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
-
 Package: zoneminder-ui-api
 Section: web
 Architecture: all
diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install b/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install
deleted file mode 100644
index 464bb74eb..000000000
--- a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/mobile
diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install b/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install
deleted file mode 100644
index 6617707f8..000000000
--- a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea254ac2f..9876e2a87 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,21 +14,19 @@ add_executable(zma zma.cpp)
 add_executable(zmu zmu.cpp)
 add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
-add_executable(zmstreamer zmstreamer.cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmstreamer zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
 # Generate man files for the binaries destined for the bin folder
-FOREACH(CBINARY zma zmc zmf zmu zmstreamer)
+FOREACH(CBINARY zma zmc zmf zmu)
     POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8)
-ENDFOREACH(CBINARY zma zmc zmf zmu zmstreamer)
+ENDFOREACH(CBINARY zma zmc zmf zmu)
 
-install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zmc zma zmu zmf RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")

From d40bf89b17995af756adb76326c4894e41318530 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Tue, 29 Dec 2015 08:04:02 +1100
Subject: [PATCH 276/362] Remove Phone BW settings used with mobile skin

---
 docs/userguide/options.rst                    |   1 -
 docs/userguide/options/options_phonebw.rst    |  20 ---
 .../lib/ZoneMinder/ConfigData.pm.in           | 155 ------------------
 web/includes/actions.php                      |   1 -
 web/skins/classic/views/options.php           |   1 -
 5 files changed, 178 deletions(-)
 delete mode 100644 docs/userguide/options/options_phonebw.rst

diff --git a/docs/userguide/options.rst b/docs/userguide/options.rst
index 8f7fbad30..8186d8b6a 100644
--- a/docs/userguide/options.rst
+++ b/docs/userguide/options.rst
@@ -19,5 +19,4 @@ If you have changed the value of an option you should then ‘save’ it. A numb
    options/options_upload
    options/options_x10
    options/options_bw
-   options/options_phonebw
    options/options_users
diff --git a/docs/userguide/options/options_phonebw.rst b/docs/userguide/options/options_phonebw.rst
deleted file mode 100644
index e2389bccf..000000000
--- a/docs/userguide/options/options_phonebw.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Options - Phone Bandwidth
--------------------------
-
-.. image:: images/Options_BW_Phone.png
-
-WEB_P_CAN_STREAM - Override the automatic detection of browser streaming capability. If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.
-
-WEB_P_STREAM_METHOD - ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer"
-
-WEB_P_DEFAULT_SCALE - Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.
-
-WEB_P_DEFAULT_RATE - Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.
-
-WEB_P_VIDEO_BITRATE - When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.
-
-WEB_P_VIDEO_MAXFPS - When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.
-
-WEB_P_SCALE_THUMBS - If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.
-
-WEB_P_AJAX_TIMEOUT - The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.
\ No newline at end of file
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index c9d48f52f..0c421fec6 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -3721,161 +3721,6 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         type        => $types{integer},
         category    => "lowband",
     },
-    {
-        name        => "ZM_WEB_P_CAN_STREAM",
-        default     => "auto",
-        description => "Override the automatic detection of browser streaming capability",
-        help        => qqq("
-            If you know that your browser can handle image streams of the
-            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
-            this correctly you can set this option to ensure that the
-            stream is delivered with or without the use of the Cambozola
-            plugin. Selecting 'yes' will tell ZoneMinder that your browser
-            can handle the streams natively, 'no' means that it can't and
-            so the plugin will be used while 'auto' lets ZoneMinder decide.
-        "),
-        type        => $types{tristate},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_STREAM_METHOD",
-        default     => "jpeg",
-        description => "Which method should be used to send video streams to your browser.",
-        help        => qqq("
-            ZoneMinder can be configured to use either mpeg encoded video
-            or a series or still jpeg images when sending video streams.
-            This option defines which is used. If you choose mpeg you
-            should ensure that you have the appropriate plugins available
-            on your browser whereas choosing jpeg will work natively on
-            Mozilla and related browsers and with a Java applet on Internet
-            Explorer
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mpeg|jpeg",
-            pattern     =>qr|^([mj])|i,
-            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_DEFAULT_SCALE",
-        default     => "100",
-        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-        help        => qqq("
-            Normally ZoneMinder will display 'live' or 'event' streams in
-            their native size. However if you have monitors with large
-            dimensions or a slow link you may prefer to reduce this size,
-            alternatively for small monitors you can enlarge it. This
-            options lets you specify what the default scaling factor will
-            be. It is expressed as a percentage so 100 is normal size, 200
-            is double size etc.
-        "),
-        type        => {
-            db_type     =>"integer",
-            hint        =>"25|33|50|75|100|150|200|300|400",
-            pattern     =>qr|^(\d+)$|, format=>q( $1 )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_DEFAULT_RATE",
-        default     => "100",
-        description => "What the default replay rate factor applied to 'event' views is (%)",
-        help        => qqq("
-            Normally ZoneMinder will display 'event' streams at their
-            native rate, i.e. as close to real-time as possible. However if
-            you have long events it is often convenient to replay them at a
-            faster rate for review. This option lets you specify what the
-            default replay rate will be. It is expressed as a percentage so
-            100 is normal rate, 200 is double speed etc.
-        "),
-        type        => {
-            db_type     =>"integer",
-            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
-            pattern     =>qr|^(\d+)$|,
-            format      =>q( $1 )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_VIDEO_BITRATE",
-        default     => "8000",
-        description => "What the bitrate of the video encoded stream should be set to",
-        help        => qqq("
-            When encoding real video via the ffmpeg library a bit rate can
-            be specified which roughly corresponds to the available
-            bandwidth used for the stream. This setting effectively
-            corresponds to a 'quality' setting for the video. A low value
-            will result in a blocky image whereas a high value will produce
-            a clearer view. Note that this setting does not control the
-            frame rate of the video however the quality of the video
-            produced is affected both by this setting and the frame rate
-            that the video is produced at. A higher frame rate at a
-            particular bit rate result in individual frames being at a
-            lower quality.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_VIDEO_MAXFPS",
-        default     => "5",
-        description => "What the maximum frame rate for streamed video should be",
-        help        => qqq("
-            When using streamed video the main control is the bitrate which
-            determines how much data can be transmitted. However a lower
-            bitrate at high frame rates results in a lower quality image.
-            This option allows you to limit the maximum frame rate to
-            ensure that video quality is maintained. An additional
-            advantage is that encoding video at high frame rates is a
-            processor intensive task when for the most part a very high
-            frame rate offers little perceptible improvement over one that
-            has a more manageable resource requirement. Note, this option
-            is implemented as a cap beyond which binary reduction takes
-            place. So if you have a device capturing at 15fps and set this
-            option to 10fps then the video is not produced at 10fps, but
-            rather at 7.5fps (15 divided by 2) as the final frame rate must
-            be the original divided by a power of 2.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_SCALE_THUMBS",
-        default     => "yes",
-        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-        help        => qqq("
-            If unset, this option sends the whole image to the browser
-            which resizes it in the window. If set the image is scaled down
-            on the server before sending a reduced size image to the
-            browser to conserve bandwidth at the cost of cpu on the server.
-            Note that ZM can only perform the resizing if the appropriate
-            PHP graphics functionality is installed. This is usually
-            available in the php-gd package.
-        "),
-        type        => $types{boolean},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_AJAX_TIMEOUT",
-        default     => "10000",
-        description => "How long to wait for Ajax request responses (ms)",
-        help        => qqq("
-            The newer versions of the live feed and event views use Ajax to
-            request information from the server and populate the views
-            dynamically. This option allows you to specify a timeout if
-            required after which requests are abandoned. A timeout may be
-            necessary if requests would overwise hang such as on a slow
-            connection. This would tend to consume a lot of browser memory
-            and make the interface unresponsive. Ordinarily no requests
-            should timeout so this setting should be set to a value greater
-            than the slowest expected response. This value is in
-            milliseconds but if set to zero then no timeout will be used.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
     {
         name        => "ZM_DYN_LAST_VERSION",
         default     => "",
diff --git a/web/includes/actions.php b/web/includes/actions.php
index 7de7a8238..4cd056116 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -921,7 +921,6 @@ if ( !empty($action) )
                     case "highband" :
                     case "medband" :
                     case "lowband" :
-                    case "phoneband" :
                         break;
                 }
             }
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 30ea85f43..1140b7bfd 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -42,7 +42,6 @@ $tabs['x10'] = translate('X10');
 $tabs['highband'] = translate('HighBW');
 $tabs['medband'] = translate('MediumBW');
 $tabs['lowband'] = translate('LowBW');
-$tabs['phoneband'] = translate('PhoneBW');
 $tabs['users'] = translate('Users');
 
 if ( isset($_REQUEST['tab']) )

From 84801fcb86d676ba39c91b2ab23a3bfb8d13cd85 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Sat, 27 Feb 2016 13:06:33 -0500
Subject: [PATCH 277/362] typo in function name

---
 web/views/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/views/image.php b/web/views/image.php
index de8205f76..cbaf2f731 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -132,7 +132,7 @@ else
         }
         if($width==$oldWidth && $height==$oldHeight)  // See if we really need to scale
         {
-            imagejpg($i);
+            imagejpeg($i);
             imagedestroy($i);
         }
         else  // we do need to scale

From 35d013136f79722eed7ed5c4ba06fdafe53792e3 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 28 Feb 2016 12:27:04 -0600
Subject: [PATCH 278/362] add redhat instructions to readthe docs

---
 docs/installationguide/centos.rst |   5 -
 docs/installationguide/fedora.rst |   4 -
 docs/installationguide/index.rst  |   3 +-
 docs/installationguide/redhat.rst | 155 ++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+), 11 deletions(-)
 delete mode 100644 docs/installationguide/centos.rst
 delete mode 100644 docs/installationguide/fedora.rst
 create mode 100644 docs/installationguide/redhat.rst

diff --git a/docs/installationguide/centos.rst b/docs/installationguide/centos.rst
deleted file mode 100644
index 606aaffd5..000000000
--- a/docs/installationguide/centos.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Centos
-======
-
-
-
diff --git a/docs/installationguide/fedora.rst b/docs/installationguide/fedora.rst
deleted file mode 100644
index 09ffe4297..000000000
--- a/docs/installationguide/fedora.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fedora
-======
-
-
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
index be0df2c06..e030ed7cf 100644
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@@ -8,6 +8,5 @@ Contents:
 
    ubuntu
    debian
-   fedora
-   centos
+   redhat
    multiserver
diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
new file mode 100644
index 000000000..d05a85150
--- /dev/null
+++ b/docs/installationguide/redhat.rst
@@ -0,0 +1,155 @@
+Redhat
+======
+
+.. contents::
+
+These instructions apply to all Redhat distros and their clones, including but not limited to: Fedora, RHEL, CentOS, Scientific Linux, and others. While the installation instructions are the same for each distro, the reason why one might use one distro over the other is different. A short description follows, which is intended to help you chose what distro best fits your needs.
+
+Background: RHEL, CentOS, and clones
+------------------------------------
+
+These distributions are classified as enterprise operating systems and have a long operating lifetime of many years. By design, they will not have the latest and greatest versions of any package. Instead, stable packages are the emphasis.
+
+Replacing any core package in these distributions with a newer package from a third party is expressly verboten. The ZoneMinder development team will not do this, and neither should you. If you have the perception that you've got to have a newer version of mysql, gnome, apache, etc. then, rather than upgrade these packages, you should instead consider using a different distribution such as Fedora.
+
+The ZoneMinder team will not provide support for systems which have had any core package replaced with a package from a third party.
+
+Background: Fedora
+------------------------------------
+
+One can think of Fedora as RHEL or CentOS Beta. This is in fact, what it is. Fedora is primarily geared towards development and testing of newer, sometimes bleeding edge, packages. The ZoneMinder team uses this distro to determine the interoperability of ZoneMinder with the latest and greatest versions of packages like mysql, apache, systemd, and others. If a problem is detected, it will be addressed long before it makes it way into RHEL.
+
+Fedora has a short life-cycle of just 6 months. However, Fedora, and consequently ZoneMinder, is available on armv7 architecture. Rejoice, Raspberry Pi users!
+
+If you desire newer packages than what it available in RHEL and CentOS, then you should consider using Fedora.
+
+Zmrepo – A ZoneMinder RPM Repository
+------------------------------------
+
+Zmrepo is a turn key solution. It will install all of ZoneMinder's dependencies for you. This is the easiest and the recommended way to install ZoneMinder on any system running a Redhat based distribution. 
+
+The following notes are based on real problems which have occurred:
+* Zmrepo assumes you have installed the underlying distrubution using the official installation media for that distro. Third party "Spins" are not supported and may not work correctly.
+* ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, but some invariably will not. Astericks is one such example.
+* Be advised that you need to start with a clean system before using zmrepo.
+* IMPORTANT: If you have previously installed ZoneMinder from-source, then your system is NOT clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You WILL have problems if you ignore this step.
+* It is not necessary, and not recommended, to install a LAMP stack ahead of time.
+* Disable other third party repos and uninstall any of ZoneMinder's third party dependencies, which might already be on the system, especially ffmpeg and vlc. Attempting to install dependencies yourself often causes problems.
+* Each ZoneMinder rpm includes a README file under /usr/share/doc. You must follow the all steps in this README file, precisely, each and every time ZoneMinder is installed or upgraded. Failure to do so is guaranteed to result in a non-functional system.
+
+To being the installation of ZoneMinder on your Redhat based distro, please navigate to: http://zmrepo.zoneminder.com
+
+How to Build a (Custom) ZoneMinder Package
+------------------------------------------
+
+If you are looking to do development or the packages in zmrepo just don't suit you, then you should follow these steps to learn how to build your own ZoneMinder RPM.
+
+##### Background
+The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
+
+The method documented below was chosen because:
+- All of ZoneMinder's dependencies are downloaded and installed automatically
+- Cross platform capable. The build host does not have to be the same distro or release version as the target.
+- Once your build environment is set up, few steps are required to run the build again in the future.
+- Troubleshooting becomes easier if we are all building ZoneMinder the same way.
+
+The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
+
+***IMPORTANT***
+Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
+
+##### Set Up Your Environment
+Before you begin, set up an rpmbuild environment by following [this guide](http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment) by the CentOS developers.
+
+Next, navigate to [Zmrepo](http://zmrepo.zoneminder.com/), and follow the instructions to enable zmrepo on your system.  
+
+With zmrepo enabled, issue the following command:
+````bash
+sudo yum install zmrepo-mock-configs mock
+```
+
+Add your user account to the group mock:
+```bash
+sudo gpasswd -a {your account name} mock
+```
+
+Your build environment is now set up.  
+
+##### Build from SRPM
+To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the [Zmrepo](http://zmrepo.zoneminder.com/) site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
+
+For CentOS 7, I have chosen the following SRPM:
+```bash
+wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+Now comes the fun part. To build ZoneMinder, issue the following command:
+```bash
+buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
+```bash
+buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
+```
+Notice that the buildzm.sh tool requires the following parameters:
+```bash
+buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
+```
+The list of available Mock config files are available here:
+```bash
+ls /etc/mock/zmrepo*.cfg
+```
+
+You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
+
+##### Installation
+Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the [Zmrepo](http://zmrepo.zoneminder.com/) website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
+
+Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
+
+##### How to Modify the Source Prior to Build
+
+Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
+
+These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
+
+From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
+```bash
+rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
+
+Make sure you have git installed:
+```bash
+sudo yum install git
+```
+
+Now clone the ZoneMinder git repository:
+```bash
+git clone https://github.com/ZoneMinder/ZoneMinder
+```
+This will create a sub-folder called ZoneMinder, which will contain the latest development.
+
+We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
+```bash
+ls ~/rpmbuild/SOURCES
+```
+The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
+```bash
+mv ZoneMinder ZoneMinder-1.28.1
+tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
+```
+The trailing "/*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
+Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
+
+Now build a new src.rpm:
+```bash
+rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
+```
+This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
+
+You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
+
+

From 72c8ae3735bbf5d8f6f4951d7d1bb38b4e0f1ab1 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 28 Feb 2016 12:32:45 -0600
Subject: [PATCH 279/362] Remove package building instructions from README.md

---
 README.md | 197 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 196 deletions(-)

diff --git a/README.md b/README.md
index fcd96bfd6..5f37cd0b3 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ When building a package, it is best to do this work in a separate environment, d
 
 Lastly, if you desire to build a development snapshot from the master branch, it is recommended you first build your package using an official release of ZoneMinder. This will help identify whether any problems you may encounter are caused by the build process or is a new issue in the master branch.
 
-What follows are instructions for various distros to build ZoneMinder into a package.
+Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
 
 ### Package Maintainers
 Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
@@ -54,201 +54,6 @@ For example, let's say I have created a new ZoneMinder package that contains the
 
 Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
 
-#### Ubuntu
-
-A fresh build based on master branch running Ubuntu 1204 LTS.  Will likely work for other versions as well.
-
-```bash
-root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-root@host:~# cd zoneminder;
-root@host:~# ln -s distros/ubuntu1204 debian;
-root@host:~# dpkg-checkbuilddeps;
-root@host:~# dpkg-buildpackage;
-```
-
-One level above you'll now find a deb package matching the architecture of the build host:
-
-```bash
-root@host:~# ls -1 ~/zoneminder*;
-/root/zoneminder_1.26.4-1_amd64.changes
-/root/zoneminder_1.26.4-1_amd64.deb
-/root/zoneminder_1.26.4-1.dsc
-/root/zoneminder_1.26.4-1.tar.gz
-```
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
-
-```bash
-root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-root@host:~# dpkg-reconfigure zoneminder;
-```
-Alternatively you may also use gdebi to automatically resolve dependencies during installation:
-
-```bash
-root@host:~# aptitude install -y gdebi;
-root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-```
-```bash
-sudo apt-get install apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev \
-libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
-libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 \
-apache2-mpm-prefork libapache2-mod-php5 php5-cli
-```
-
-#### Debian
-
-A fresh build based on master branch running Debian 7 (wheezy):
-
-```bash
-root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-root@host:~# cd zoneminder;
-root@host:~# ln -s distros/debian;
-root@host:~# dpkg-checkbuilddeps;
-root@host:~# dpkg-buildpackage;
-```
-
-One level above you'll now find a deb package matching the architecture of the build host:
-
-```bash
-root@host:~# ls -1 ~/zoneminder*;
-/root/zoneminder_1.26.4-1_amd64.changes
-/root/zoneminder_1.26.4-1_amd64.deb
-/root/zoneminder_1.26.4-1.dsc
-/root/zoneminder_1.26.4-1.tar.gz
-```
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
-
-```bash
-root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-root@host:~# dpkg-reconfigure zoneminder;
-```
-Alternatively you may also use gdebi to automatically resolve dependencies during installation:
-
-```bash
-root@host:~# aptitude install -y gdebi;
-root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-```
-
-#### Fedora / CentOS / RHEL
-
-##### Background
-The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
-
-The method documented below was chosen because:
-- All of ZoneMinder's dependencies are downloaded and installed automatically
-- Cross platform capable. The build host does not have to be the same distro or release version as the target.
-- Once your build environment is set up, few steps are required to run the build again in the future.
-- Troubleshooting becomes easier if we are all building ZoneMinder the same way.
-
-The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
-
-***IMPORTANT***
-Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
-
-##### Set Up Your Environment
-Before you begin, set up an rpmbuild environment by following [this guide](http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment) by the CentOS developers.
-
-Next, navigate to [Zmrepo](http://zmrepo.zoneminder.com/), and follow the instructions to enable zmrepo on your system.  
-
-With zmrepo enabled, issue the following command:
-````bash
-sudo yum install zmrepo-mock-configs mock
-```
-
-Add your user account to the group mock:
-```bash
-sudo gpasswd -a {your account name} mock
-```
-
-Your build environment is now set up.  
-
-##### Build from SRPM
-To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the [Zmrepo](http://zmrepo.zoneminder.com/) site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
-
-For CentOS 7, I have chosen the following SRPM:
-```bash
-wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-Now comes the fun part. To build ZoneMinder, issue the following command:
-```bash
-buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
-```bash
-buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
-```
-Notice that the buildzm.sh tool requires the following parameters:
-```bash
-buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
-```
-The list of available Mock config files are available here:
-```bash
-ls /etc/mock/zmrepo*.cfg
-```
-
-You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
-
-##### Installation
-Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the [Zmrepo](http://zmrepo.zoneminder.com/) website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
-
-Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
-
-##### How to Modify the Source Prior to Build
-** UNFINISHED **
-
-Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
-
-These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
-
-From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
-```bash
-rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
-
-Make sure you have git installed:
-```bash
-sudo yum install git
-```
-
-Now clone the ZoneMinder git repository:
-```bash
-git clone https://github.com/ZoneMinder/ZoneMinder
-```
-This will create a sub-folder called ZoneMinder, which will contain the latest development.
-
-We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
-```bash
-ls ~/rpmbuild/SOURCES
-```
-The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
-```bash
-mv ZoneMinder ZoneMinder-1.28.1
-tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
-```
-The trailing "/*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
-Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
-
-Now build a new src.rpm:
-```bash
-rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
-```
-This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
-
-You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
-
 #### Docker
 
 Docker is a system to run applications inside isolated containers. ZoneMinder, and the ZM webserver, will run using the 

From b7259b973a84dcdc5692f71ed094238eb0a4193d Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 28 Feb 2016 12:54:21 -0600
Subject: [PATCH 280/362] first formatting pass

---
 docs/installationguide/redhat.rst | 162 +++++++++++++++++++-----------
 1 file changed, 103 insertions(+), 59 deletions(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index d05a85150..17157cfb6 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -5,7 +5,7 @@ Redhat
 
 These instructions apply to all Redhat distros and their clones, including but not limited to: Fedora, RHEL, CentOS, Scientific Linux, and others. While the installation instructions are the same for each distro, the reason why one might use one distro over the other is different. A short description follows, which is intended to help you chose what distro best fits your needs.
 
-Background: RHEL, CentOS, and clones
+Background: RHEL, CentOS, and Clones
 ------------------------------------
 
 These distributions are classified as enterprise operating systems and have a long operating lifetime of many years. By design, they will not have the latest and greatest versions of any package. Instead, stable packages are the emphasis.
@@ -28,14 +28,23 @@ Zmrepo – A ZoneMinder RPM Repository
 
 Zmrepo is a turn key solution. It will install all of ZoneMinder's dependencies for you. This is the easiest and the recommended way to install ZoneMinder on any system running a Redhat based distribution. 
 
+Zmrepo supports the two most recent, major, releases of each Redhat based distro.
+
 The following notes are based on real problems which have occurred:
-* Zmrepo assumes you have installed the underlying distrubution using the official installation media for that distro. Third party "Spins" are not supported and may not work correctly.
-* ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, but some invariably will not. Astericks is one such example.
-* Be advised that you need to start with a clean system before using zmrepo.
-* IMPORTANT: If you have previously installed ZoneMinder from-source, then your system is NOT clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You WILL have problems if you ignore this step.
-* It is not necessary, and not recommended, to install a LAMP stack ahead of time.
-* Disable other third party repos and uninstall any of ZoneMinder's third party dependencies, which might already be on the system, especially ffmpeg and vlc. Attempting to install dependencies yourself often causes problems.
-* Each ZoneMinder rpm includes a README file under /usr/share/doc. You must follow the all steps in this README file, precisely, each and every time ZoneMinder is installed or upgraded. Failure to do so is guaranteed to result in a non-functional system.
+
+- Zmrepo assumes you have installed the underlying distrubution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
+
+- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, but some invariably will not. Astericks is one such example.
+
+- Be advised that you need to start with a clean system before using zmrepo.
+
+- If you have previously installed ZoneMinder from-source, then your system is **NOT** clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You WILL have problems if you ignore this step.
+
+- It is not necessary, and not recommended, to install a LAMP stack ahead of time.
+
+- Disable other third party repos and uninstall any of ZoneMinder's third party dependencies, which might already be on the system, especially ffmpeg and vlc. Attempting to install dependencies yourself often causes problems.
+
+- Each ZoneMinder rpm includes a README file under /usr/share/doc. You must follow the all steps in this README file, precisely, each and every time ZoneMinder is installed or upgraded. **Failure to do so is guaranteed to result in a non-functional system.**
 
 To being the installation of ZoneMinder on your Redhat based distro, please navigate to: http://zmrepo.zoneminder.com
 
@@ -44,13 +53,18 @@ How to Build a (Custom) ZoneMinder Package
 
 If you are looking to do development or the packages in zmrepo just don't suit you, then you should follow these steps to learn how to build your own ZoneMinder RPM.
 
-##### Background
+Background
+**********
 The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
 
 The method documented below was chosen because:
+
 - All of ZoneMinder's dependencies are downloaded and installed automatically
+
 - Cross platform capable. The build host does not have to be the same distro or release version as the target.
+
 - Once your build environment is set up, few steps are required to run the build again in the future.
+
 - Troubleshooting becomes easier if we are all building ZoneMinder the same way.
 
 The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
@@ -58,96 +72,126 @@ The build instructions below make use of a custom script called "buildzm.sh". Ad
 ***IMPORTANT***
 Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
 
-##### Set Up Your Environment
-Before you begin, set up an rpmbuild environment by following [this guide](http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment) by the CentOS developers.
+Set Up Your Environment
+***********************
+Before you begin, set up an rpmbuild environment by following `this guide <http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment>`_ by the CentOS developers.
 
-Next, navigate to [Zmrepo](http://zmrepo.zoneminder.com/), and follow the instructions to enable zmrepo on your system.  
+Next, navigate to `Zmrepo <http://zmrepo.zoneminder.com/>`_, and follow the instructions to enable zmrepo on your system.  
 
 With zmrepo enabled, issue the following command:
-````bash
-sudo yum install zmrepo-mock-configs mock
-```
+
+::
+
+    sudo yum install zmrepo-mock-configs mock
+
 
 Add your user account to the group mock:
-```bash
-sudo gpasswd -a {your account name} mock
-```
+
+::
+
+    sudo gpasswd -a {your account name} mock
+
 
 Your build environment is now set up.  
 
-##### Build from SRPM
-To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the [Zmrepo](http://zmrepo.zoneminder.com/) site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
+Build from SRPM
+***************
+To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the `Zmrepo <http://zmrepo.zoneminder.com/>`_ site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
 
 For CentOS 7, I have chosen the following SRPM:
-```bash
-wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
+
+::
+
+    wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
 
 Now comes the fun part. To build ZoneMinder, issue the following command:
-```bash
-buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
+
+::
+
+    buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
 
 Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
-```bash
-buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
-```
+
+::
+
+    buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
+
 Notice that the buildzm.sh tool requires the following parameters:
-```bash
-buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
-```
+
+::
+
+    buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
+
 The list of available Mock config files are available here:
-```bash
-ls /etc/mock/zmrepo*.cfg
-```
+
+::
+
+    ls /etc/mock/zmrepo*.cfg
+
 
 You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
 
-##### Installation
-Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the [Zmrepo](http://zmrepo.zoneminder.com/) website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
+Installation
+************
+Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the `Zmrepo <http://zmrepo.zoneminder.com/>`_
+website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
 
 Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
 
-##### How to Modify the Source Prior to Build
-
+How to Modify the Source Prior to Build
+***************************************
 Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
 
 These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
 
 From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
-```bash
-rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
+
+::
+
+    rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
 
 IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
 
 Make sure you have git installed:
-```bash
-sudo yum install git
-```
+
+::
+
+    sudo yum install git
+
 
 Now clone the ZoneMinder git repository:
-```bash
-git clone https://github.com/ZoneMinder/ZoneMinder
-```
+
+::
+
+    git clone https://github.com/ZoneMinder/ZoneMinder
+
 This will create a sub-folder called ZoneMinder, which will contain the latest development.
 
 We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
-```bash
-ls ~/rpmbuild/SOURCES
-```
+
+::
+
+    ls ~/rpmbuild/SOURCES
+
 The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
-```bash
-mv ZoneMinder ZoneMinder-1.28.1
-tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
-```
-The trailing "/*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
+
+::
+
+    mv ZoneMinder ZoneMinder-1.28.1
+    tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
+
+The trailing "/\*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
 Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
 
 Now build a new src.rpm:
-```bash
-rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
-```
+
+::
+
+    rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
+
 This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
 
 You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.

From 1c9633f1bd68729d56415d213b3a07d8d8608b3e Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 1 Mar 2016 08:43:36 -0600
Subject: [PATCH 281/362] add comment/warning for ZM_SERVER_HOST

---
 zm.conf.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/zm.conf.in b/zm.conf.in
index 9cc3d42de..decca3b19 100644
--- a/zm.conf.in
+++ b/zm.conf.in
@@ -46,5 +46,9 @@ ZM_DB_USER=@ZM_DB_USER@
 # ZoneMinder database password
 ZM_DB_PASS=@ZM_DB_PASS@
 
-# Host of this machine
+# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
+# You have been warned
+#
+# The name specified here must have a corresponding entry
+# in the Servers tab under Options
 ZM_SERVER_HOST=

From 466f2b2ae3d0f83401fbcc54f3d97d6e0941f874 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Tue, 1 Mar 2016 11:12:54 -0600
Subject: [PATCH 282/362] change multi-server error message text

---
 web/includes/config.php.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 466e195f2..2ca819210 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -173,14 +173,14 @@ if ( ! defined('ZM_SERVER_ID') ) {
 	if ( defined('ZM_SERVER_NAME') and ZM_SERVER_NAME ) {
 		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
 		if ( ! $server_id ) {
-			Error("ZM_SERVER_NAME set to " . ZM_SERVER_NAME . " in config, but not found in Servers table.");
+			Error("Invalid Multi-Server configration detected. ZM_SERVER_NAME set to " . ZM_SERVER_NAME . " in zm.conf, but no corresponding entry found in Servers table.");
 		} else {
 			define( 'ZM_SERVER_ID', $server_id );
 		}
 	} else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) {
 		$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
 		if ( ! $server_id ) {
-			Error("ZM_SERVER_HOST set to " . ZM_SERVER_HOST . " in config, but not found in Servers table.");
+			Error("Invalid Multi-Server configration detected. ZM_SERVER_HOST set to " . ZM_SERVER_HOST . " in zm.conf, but no corresponding entry found in Servers table.");
 		} else {
 			define( 'ZM_SERVER_ID', $server_id );
 		}

From 7d346747d6b6e596ff1cc8c3621b27e6fae49f16 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Mar 2016 10:18:58 -0500
Subject: [PATCH 283/362] use Digest::SHA instead of Digest::SHA1.  API appears
 to be the same

---
 onvif/modules/lib/WSSecurity/SecuritySerializer.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
index cbb6ae8f9..11a918af7 100644
--- a/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
+++ b/onvif/modules/lib/WSSecurity/SecuritySerializer.pm
@@ -26,7 +26,7 @@ use strict;
 use warnings;
 use SOAP::WSDL::Factory::Serializer;
 use Time::Local;
-use Digest::SHA1;
+use Digest::SHA;
 use MIME::Base64;
 
 
@@ -94,7 +94,7 @@ sub ws_authen {
     my $nonce = $nonce_generator->();
     my $timestamp = timestamp();
 
-    my $pwDigest =  Digest::SHA1::sha1( $nonce . $timestamp . $password );
+    my $pwDigest =  Digest::SHA::sha1( $nonce . $timestamp . $password );
     my $passwordHash = MIME::Base64::encode_base64($pwDigest,"");
     my $nonceHash = MIME::Base64::encode_base64($nonce,"");
 

From d4ed493333bf42d815c96cb9acbe48076ef504ee Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 2 Mar 2016 10:56:07 -0500
Subject: [PATCH 284/362] add onvif dependencies and cleanup build-depends

---
 distros/ubuntu1504_cmake/control | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control
index 65e11fac9..cb916dd64 100644
--- a/distros/ubuntu1504_cmake/control
+++ b/distros/ubuntu1504_cmake/control
@@ -7,20 +7,15 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,cmake
               ,libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
               ,libbz2-dev
-              ,libdate-manip-perl
-              ,libdbd-mysql-perl
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
               ,libjpeg-dev
               ,libmysqlclient-dev
               ,libpcre3-dev
-              ,libphp-serialization-perl
               ,libpolkit-gobject-1-dev
-              ,libsys-mmap-perl [!hurd-any]
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
               ,libvlc-dev
-              ,libwww-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -35,6 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
         ,libav-tools
         ,libdate-manip-perl
+        ,libdbd-mysql-perl
         ,libmime-lite-perl
         ,libmime-tools-perl
         ,libphp-serialization-perl
@@ -49,6 +45,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
           ,libsys-mmap-perl [!hurd-any]
           ,liburi-encode-perl
           ,libwww-perl
+          ,libdata-dump-perl
+          ,libclass-std-fast-perl
+          ,libsoap-wsdl-perl
+          ,libio-socket-multicast-perl
+          ,libdigest-sha-perl
         ,mysql-client | virtual-mysql-client
         ,perl-modules
         ,php5-mysql

From 61ffae79d1671d2ad16f60bf6ddd5eaf826d60f2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 08:58:53 -0500
Subject: [PATCH 285/362] split into multiple lines and add onvif deps

---
 distros/debian/control | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/distros/debian/control b/distros/debian/control
index 70d03eaa5..a48dd357d 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -2,12 +2,41 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls-dev|libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
+Build-Depends: debhelper (>= 9), autoconf, automake, quilt , libtool, dh-autoreconf
+,libgnutls-dev|libgnutls28-dev
+,libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
+,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
+,libpcre3-dev
+,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+,libv4l-dev (>= 0.8.3), libvlccore-dev, libvlc-dev
+,libbz2-dev
+,libsys-mmap-perl
+,libnetpbm10-dev
+,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+,libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+, apache2, libapache2-mod-php5 | libapache2-mod-fcgid
+, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl
+, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+, mariadb-client|mysql-client
+, libwww-perl, libarchive-tar-perl, libarchive-zip-perl
+, libdevice-serialport-perl, libpcre3
+, ffmpeg | libav-tools
+, rsyslog | system-log-daemon
+, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+, netpbm
+, libavdevice53 | libavdevice55
+, libjpeg8|libjpeg9|libjpeg62-turbo
+, zip
+, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security

From 41db18a8c6d129ec4969cf39c3ebceb93fa7f0de Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 08:59:03 -0500
Subject: [PATCH 286/362] split into multiple lines and add onvif deps

---
 distros/debian8/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/debian8/control b/distros/debian8/control
index af5ba9ad0..dd19f95c5 100644
--- a/distros/debian8/control
+++ b/distros/debian8/control
@@ -63,6 +63,7 @@ Depends: libzoneminder-perl (= ${source:Version}),
  libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
  policykit-1, apache2
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Description: Core binaries and perl scripts for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.
  .

From 3c9173fa5c550e7a7429e28f83362c4e9ae151ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 08:59:11 -0500
Subject: [PATCH 287/362] split into multiple lines and add onvif deps

---
 distros/debian_cmake/control | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control
index 4c4d405e9..6c260bdaf 100644
--- a/distros/debian_cmake/control
+++ b/distros/debian_cmake/control
@@ -2,12 +2,42 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), cmake, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libsys-mmap-perl, libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
+Build-Depends: debhelper (>= 9), cmake
+, libphp-serialization-perl
+, libgnutls-dev
+, libmysqlclient-dev | libmariadbclient-dev
+, libjpeg8-dev
+, libpcre3-dev
+, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+, libv4l-dev (>= 0.8.3)
+, libbz2-dev
+, libav-tools
+, libnetpbm10-dev
+, libavdevice-dev
+, libvlccore-dev, libvlc-dev
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, php5-gd
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm
+, php5-mysqlnd | php5-mysql, libphp-serialization-perl
+, mariadb-client | mysql-client
+, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
+, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libpcre3
+, libav-tools, libavdevice53
+, rsyslog | system-log-daemon
+, netpbm , libjpeg8
+, zip
+, libvlccore5 | libvlccore7, libvlc5
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libpolkit-gobject-1-0, php5-gd
 Recommends: mysql-server | mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From 4f4e65f86cc8a9cbc6702cad58d110fcd5fdc57c Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 09:00:08 -0500
Subject: [PATCH 288/362] split into multiple lines and add onvif deps

---
 distros/ubuntu1204/control | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index 170504b5a..ab6cbce0d 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -2,12 +2,41 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
+Build-Depends: debhelper (>= 9), autoconf, automake, quilt, dh-autoreconf, libtool
+, libgnutls-dev
+, libmysqlclient-dev | libmariadbclient-dev
+, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
+, libpcre3-dev
+, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+, libv4l-dev (>= 0.8.3)
+, libbz2-dev
+, libavdevice-dev
+, libvlccore-dev, libvlc-dev
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
+, mariadb-client|mysql-client|mysql-client-5.6
+, libpcre3
+, ffmpeg | libav-tools
+, rsyslog | system-log-daemon
+, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+, libdbd-mysql-perl
+, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libavdevice53 | libavdevice55
+, libjpeg8|libjpeg9|libjpeg62-turbo
+, zip
+, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libpolkit-gobject-1-0
+, php5-gd
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From 5e617753e599d838ab5603fff1f083a129d19a74 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 09:01:15 -0500
Subject: [PATCH 289/362] split into multiple lines and add onvif deps

---
 distros/ubuntu1204_cmake/control | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/distros/ubuntu1204_cmake/control b/distros/ubuntu1204_cmake/control
index fd7a53049..cdd4b20b7 100644
--- a/distros/ubuntu1204_cmake/control
+++ b/distros/ubuntu1204_cmake/control
@@ -7,20 +7,15 @@ Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh
               ,cmake
 			  ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
               ,libbz2-dev
-              ,libdate-manip-perl
-              ,libdbd-mysql-perl
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
 			  ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
               ,libmysqlclient-dev
               ,libpcre3-dev
-              ,libphp-serialization-perl
               ,libpolkit-gobject-1-dev
-              ,libsys-mmap-perl [!hurd-any]
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
               ,libvlc-dev
-              ,libwww-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -35,6 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
         ,libav-tools|ffmpeg
         ,libdate-manip-perl
+        ,libdbd-mysql-perl
         ,libmime-lite-perl
         ,libmime-tools-perl
         ,libphp-serialization-perl
@@ -55,6 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,policykit-1
         ,rsyslog | system-log-daemon
         ,zip
+        ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | php5-fpm
            ,mysql-server | virtual-mysql-server

From 3340f9e3755822e5d3ec6bbaacb724693c80a8de Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 3 Mar 2016 09:01:26 -0500
Subject: [PATCH 290/362] split into multiple lines and add onvif deps

---
 distros/ubuntu1504/control | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control
index 8fa3f3596..2fd99da1f 100644
--- a/distros/ubuntu1504/control
+++ b/distros/ubuntu1504/control
@@ -3,14 +3,11 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), autoconf, automake, quilt, libtool, dh-autoreconf
-             , libphp-serialization-perl, libgnutls-dev
-             , libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
-             , libdate-manip-perl, libwww-perl
+             , libgnutls-dev
+             , libmysqlclient-dev | libmariadbclient-dev
              , libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev
              , libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
              , libv4l-dev (>= 0.8.3), libbz2-dev
-             , libsys-mmap-perl
-             , libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl
              , libvlccore-dev, libvlc-dev
              , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
              , libgcrypt11-dev, libpolkit-gobject-1-dev
@@ -19,7 +16,23 @@ Homepage: http://www.zoneminder.com/
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
+, mariadb-client|mysql-client|mysql-client-5.6
+, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+, libnet-sftp-foreign-perl , libio-pty-perl, libexpect-perl , liburi-encode-perl , libdbd-mysql-perl
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libpcre3
+, ffmpeg, libavdevice-ffmpeg56
+, rsyslog | system-log-daemon
+, libjpeg8|libjpeg9|libjpeg62-turbo
+, zip
+, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+, libpolkit-gobject-1-0
+, php5-gd
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From de85e188290f16b2c98e203c1d1cd74d6965db35 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 3 Mar 2016 08:33:49 -0600
Subject: [PATCH 291/362] rpm specfile changes for 1.30.0

---
 distros/fedora/CMakeLists.txt      |   2 +-
 distros/fedora/README.Fedora       |  34 +--
 distros/fedora/zonemidner.f22.spec |   1 +
 distros/fedora/zoneminder.f22.spec | 409 -----------------------------
 distros/fedora/zoneminder.f23.spec |  23 +-
 distros/redhat/CMakeLists.txt      |   2 +-
 distros/redhat/README.CentOS       |  25 +-
 distros/redhat/README.Centos7      |  33 ++-
 distros/redhat/zoneminder.el6.spec |  24 +-
 distros/redhat/zoneminder.el7.spec |  22 +-
 10 files changed, 112 insertions(+), 463 deletions(-)
 create mode 120000 distros/fedora/zonemidner.f22.spec
 delete mode 100644 distros/fedora/zoneminder.f22.spec

diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt
index ba1b743ba..e6fc72add 100644
--- a/distros/fedora/CMakeLists.txt
+++ b/distros/fedora/CMakeLists.txt
@@ -10,7 +10,7 @@ configure_file(zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmp
 configure_file(zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 
 # Download jscalendar & move files into position
-file(DOWNLOAD http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip STATUS download_jsc)
+file(DOWNLOAD http://iweb.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip STATUS download_jsc)
 if(download_jsc EQUAL 0)
 message(STATUS "Jscalander successfully downloaded.  Installing...")
 execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ERROR_VARIABLE unzip_jsc)
diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora
index 0f88a9a16..18d091772 100644
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@@ -5,27 +5,19 @@ What's New
    "/cgi-bin-zm/zms". This has been to done to avoid this bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=973067
 
-   IMPORTANT: ZoneMinder will not update this value during an upgrade. You must
-   manually update ZM_PATH_ZMS yourself under Options. This does not affect
-   new installs.
+   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
+   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
+   in a broken system. You have been warned.
 
-2. The ZoneMinder config file, zm.conf, has been moved under /etc/zm.
-
-3. Due to the active state of the ZoneMinder project, we now recommend granting
+2. Due to the active state of the ZoneMinder project, we now recommend granting
    ALL permission to the ZoneMinder mysql account. This change must be done
    manually before ZoneMinder will run. See the installation steps below.
 
-4. A new permission group called "Groups" has been added. This allows the
-   system administrator to assign "view", "edit", or "none" permission to
-   normal users, without giving them access to the rest of the ZoneMinder
-   system. During an upgrade, existing accounts will default to a Groups
-   permission of "none".
-
-5. This package now requires the HTTPS protocol to access the web portal.
+3. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
    
-6. This package ships with the new ZoneMinder API enabled.
+4. This package ships with the new ZoneMinder API enabled.
 
 New installs
 ============
@@ -86,13 +78,22 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
+6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+   needs. This package comes preconfigured for HTTPS using the default self
+   signed certificate on your system. The recommended way to complete this step
+   is to simply install mod_ssl:
 
-6. Now start the web server:
+	sudo yum install mod_ssl
+
+   If this does not meet your needs, then read README.https to
+   learn about alternatives. When in doubt, install mod_ssl.
+
+7. Now start the web server:
 
 	sudo systemctl enable httpd
 	sudo systemctl start httpd
 
-7. Now start zoneminder:
+8. Now start zoneminder:
 
 	sudo systemctl enable zoneminder
 	sudo systemctl start zoneminder
@@ -131,6 +132,7 @@ Upgrades
    /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
+   Verify the SSL REquirements meet your needs. Read README.https if necessary.
 
 4. Upgrade the database before starting ZoneMinder.
 
diff --git a/distros/fedora/zonemidner.f22.spec b/distros/fedora/zonemidner.f22.spec
new file mode 120000
index 000000000..808e7cb9f
--- /dev/null
+++ b/distros/fedora/zonemidner.f22.spec
@@ -0,0 +1 @@
+zoneminder.f23.spec
\ No newline at end of file
diff --git a/distros/fedora/zoneminder.f22.spec b/distros/fedora/zoneminder.f22.spec
deleted file mode 100644
index 9beef6319..000000000
--- a/distros/fedora/zoneminder.f22.spec
+++ /dev/null
@@ -1,409 +0,0 @@
-%define zmuid $(id -un)
-%define zmgid $(id -gn)
-%define zmuid_final apache
-%define zmgid_final apache
-
-%global _hardened_build 1
-
-### Delete the lines below to build with ffmpeg and/or x10
-%define _without_ffmpeg 1
-%define _without_x10 1
-
-Name: zoneminder
-Version: 1.29.0
-Release: 1%{?dist}
-Summary: A camera monitoring and analysis tool
-Group: System Environment/Daemons
-# jscalendar is LGPL (any version): http://www.dynarch.com/projects/calendar/
-# Mootools is inder the MIT license: http://mootools.net/
-License: GPLv2+ and LGPLv2+ and MIT
-URL: http://www.zoneminder.com/
-
-#Source: https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
-Source: ZoneMinder-%{version}.tar.gz
-
-BuildRequires: cmake gnutls-devel systemd-units bzip2-devel
-BuildRequires: mariadb-devel pcre-devel libjpeg-turbo-devel
-BuildRequires: perl(Archive::Tar) perl(Archive::Zip) perl-podlators
-BuildRequires: perl(Date::Manip) perl(DBD::mysql)
-BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
-BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
-BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
-BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
-BuildRequires: perl(Expect) perl(Sys::Syslog)
-BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
-%{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
-# cmake needs the following installed at build time due to the way it auto-detects certain parameters
-BuildRequires:  httpd polkit-devel
-%{!?_without_ffmpeg:BuildRequires: ffmpeg}
-
-Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc
-Requires: libjpeg-turbo vlc-core libcurl
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
-Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
-Requires: perl(LWP::Protocol::https)
-%{!?_without_ffmpeg:Requires: ffmpeg}
-
-Requires(post): systemd-units systemd-sysv
-Requires(post): /usr/bin/gpasswd
-Requires(post): /usr/bin/less
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
-%description
-ZoneMinder is a set of applications which is intended to provide a complete
-solution allowing you to capture, analyse, record and monitor any cameras you
-have attached to a Linux based machine. It is designed to run on kernels which
-support the Video For Linux (V4L) interface and has been tested with cameras
-attached to BTTV cards, various USB cameras and IP network cameras. It is
-designed to support as many cameras as you can attach to your computer without
-too much degradation of performance.
-
-%prep
-%setup -q -n ZoneMinder-%{version}
-
-# Change the following default values
-./utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin-zm/nph-zms
-./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
-./utils/zmeditconfigdata.sh ZM_PATH_SWAP /dev/shm
-./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR /var/spool/zoneminder-upload
-./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
-./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
-./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
-
-%build
-%cmake \
-	-DZM_TARGET_DISTRO="f22" \
-%{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
-%{?_without_x10:-DZM_NO_X10=ON} \
-	.
-
-make %{?_smp_mflags}
-
-%install
-export DESTDIR=%{buildroot}
-make install
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-# Allow zoneminder access to local video sources, serial ports, and x10
-/usr/bin/gpasswd -a %{zmuid_final} video
-/usr/bin/gpasswd -a %{zmuid_final} dialout
-
-# Upgrade from a previous version of zoneminder 
-if [ $1 -eq 2 ] ; then
-    # Freshen the database
-    /usr/bin/zmupdate.pl -f
-
-    # We can't run this automatically when new sql account permissions need to
-    # be manually added first
-    # Run zmupdate non-interactively
-    #/usr/bin/zmupdate.pl --nointeractive
-fi
-
-# Warn the end user to read the README file
-echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.Fedora to finish the\ninstallation or upgrade!\n"
-echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
-    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- zoneminder < 1.25.0-4
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply zoneminder
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
-/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README.md distros/fedora/README.Fedora distros/fedora/README.https distros/fedora/jscalendar-doc
-%config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
-%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
-%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
-%config(noreplace) /etc/logrotate.d/zoneminder
-
-%{_unitdir}/zoneminder.service
-
-%{_bindir}/zma
-%{_bindir}/zmaudit.pl
-%{_bindir}/zmc
-%{_bindir}/zmcontrol.pl
-%{_bindir}/zmdc.pl
-%{_bindir}/zmf
-%{_bindir}/zmfilter.pl
-%{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
-%{_bindir}/zmtrack.pl
-%{_bindir}/zmtrigger.pl
-%{_bindir}/zmu
-%{_bindir}/zmupdate.pl
-%{_bindir}/zmvideo.pl
-%{_bindir}/zmwatch.pl
-%{_bindir}/zmcamtool.pl
-%{_bindir}/zmsystemctl.pl
-%{!?_without_x10:%{_bindir}/zmx10.pl}
-
-%{perl_vendorlib}/ZoneMinder*
-%{_mandir}/man*/*
-%dir %{_libexecdir}/zoneminder
-%{_libexecdir}/zoneminder/cgi-bin
-%dir %{_datadir}/zoneminder
-%{_datadir}/zoneminder/db
-%{_datadir}/zoneminder/www
-
-%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
-%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
-
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
-
-
-%changelog
-* Sat Feb 14 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
-- Bump version for 1.28.1 release on Fedora 21.
-
-* Sun Oct 5 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.0 
-- Bump version for 1.28.0 release.
-
-* Fri Mar 14 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27 
-- Tweak build requirements for cmake
-
-* Sat Feb 01 2014 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.27
-- Add zmcamtool.pl. Bump version for 1.27 release. 
-
-* Mon Dec 16 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.5
-- This is a bug fixe release
-- RTSP fixes, cmake enhancements, couple other misc fixes
-
-* Mon Oct 07 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
-- Initial cmake build.
-
-* Sat Oct 05 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.4
-- Fedora specific path changes have been moved to zoneminder-1.26.0-defaults.patch
-- All files are now part of the zoneminder source tree. Update specfile accordingly.
-
-* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
-- Initial rebuild for ZoneMinder 1.26.3 release.
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Mon Jan 7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
-- fix configuration file for httpd 2.4, #871502
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
-- rebuild against new libjpeg
-
-* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
-- Add patch to work around v4l2 api breakage in 3.5 kernel.
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
-- Perl 5.16 rebuild
-
-* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
-- Fix stupid thinko in sql modifications.
-
-* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
-- Clean up macro usage.
-
-* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
-- Convert to systemd.
-- Add tmpfiles.d configuration since the initscript isn't around to create
-  /run/zoneminder.
-- Remove some pointless executable permissions.
-- Add logrotate file.
-
-* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
-- Update README.Fedora to reference systemctl and mention timezone info in
-  php.ini.
-- Add proper default for EYEZM_LOG_TO_FILE.
-
-
-* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
-- Rebuild for new pcre.
-
-* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
-- Update to 1.25.0
-- Fix gcc4.7 build problems.
-- Drop gcc4.4 build fixes; for whatever reason they now break the build.
-- Clean up old patches.
-- Force setting of ZM_TMPDIR and ZM_RUNDIR.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
-- Re-add the dist-tag that somehow got lost.
-
-* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
-- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
-- Undo that patch, and undo another which was the cause of the whole mess.
-- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
-- Make sure database creation mods actually take.
-- Update Fedora-specific docs with some additional info.
-- Use bundled mootools (javascript, so no guideline violation).
-- Update download location.
-- Update the gcrypt patch to actually work.
-- Upstream changed the tarball without changing the version to patch a
-  vulnerability, so redownload.
-
-* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
-- Initial attempt to upgrade to 1.24.4.
-- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
-  gnutls openssl libs.
-
-* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
-- Perl mass rebuild
-
-* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
-- Perl mass rebuild
-
-* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
-- Bump for gnutls update.
-
-* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
-- Update to latest 1.24.3 subversion. Turns out that what upstream was calling
-  1.24.3 is really just an occasionally updated devel snapshot.
-- Rebase various patches.
-
-* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
-- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
-- Update to latest upstream version.
-- Rebase patches.
-- Initial incomplete attempt to disable v4l1 support.
-
-* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
-- Unbundle cambozola; instead link to the separately pacakged copy.
-- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
-- Git rid of mixed space/tab usage by removing all tabs.
-- Remove unnecessary Conflicts: line.
-- Attempt to force short_open_tag on for the code directories.
-- Move default location of sockets, swaps, logfiles and some temporary files to
-  make more sense and allow things to work better with a future selinux policy.
-- Fix errors in README.Fedora.
-
-* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
-- Mass rebuild with perl-5.12.0
-
-* Fri Dec 4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
-- rebuild against perl 5.10.1
-- use Perl vendorarch and archlib variables correctly
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
-- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
-
-* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
-- Initial update to 1.24.2.
-- Rebase patches.
-- Update mootools download location.
-- Update to mootools 1.2.3.
-- Add additional dependencies for some optional features.
-
-* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
-- Remove unused Sys::Mmap perl dependency RPM is finding
-
-* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
-- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
-- Added noffmpeg patch to make building outside mock easier
-
-* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
-- Patch for gcc 4.4 compilation errors
-- Upgrade to 1.24.1
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
-- rebuild for dependencies
-
-* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
-- Fix permissions on zm.conf
-
-* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
-- Initial attempt at packaging 1.23.
-
-* Tue Jul 1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
-- Add perl module compat dependency, bz #453590
-
-* Tue May 6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
-- Remove default runlevel, bz #441315
-
-* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
-- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
-- Autorebuild for GCC 4.3
-
-* Thu Jan 3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
-- Fix compilation on gcc 4.3
-
-* Thu Dec 6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
-- Rebuild for new openssl
-
-* Thu Aug 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
-- Fix licence tag
-
-* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
-- Fixes from testing by Jitz including missing dependencies and database creation
-
-* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
-- Disable crashtrace on ppc
-
-* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
-- Fix uid for directories in /var/lib/zoneminder
-
-* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
-- Added perl Archive::Tar dependency
-- Disabled web interface due to lack of access control on the event images
-
-* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
-- Changes recommended in review by Jason Tibbitts
-
-* Mon Apr 2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
-- Standardised on package name of zoneminder
-
-* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
-- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec
index 14b653117..435a3ba58 100644
--- a/distros/fedora/zoneminder.f23.spec
+++ b/distros/fedora/zoneminder.f23.spec
@@ -10,7 +10,7 @@
 %define _without_x10 1
 
 Name: zoneminder
-Version: 1.29.0
+Version: 1.30.0
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -38,7 +38,7 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
 BuildRequires:  httpd polkit-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg}
 
-Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc mod_ssl
+Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc
 Requires: libjpeg-turbo vlc-core libcurl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
@@ -72,6 +72,7 @@ too much degradation of performance.
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
 ./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
 %cmake \
@@ -87,6 +88,10 @@ export DESTDIR=%{buildroot}
 make install
 
 %post
+
+# Add any new PTZ control configurations to the database (will not overwrite)
+%{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
+
 if [ $1 -eq 1 ] ; then
     # Initial installation
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -98,8 +103,12 @@ fi
 
 # Upgrade from a previous version of zoneminder 
 if [ $1 -eq 2 ] ; then
+
+    # Add any new PTZ control configurations to the database (will not overwrite)
+    %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
+
     # Freshen the database
-    /usr/bin/zmupdate.pl -f
+    %{_bindir}/zmupdate.pl -f  >/dev/null 2>&1 || :
 
     # We can't run this automatically when new sql account permissions need to
     # be manually added first
@@ -163,9 +172,14 @@ fi
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
 %{_bindir}/zmsystemctl.pl
+%{_bindir}/zmtelemetry.pl
 %{!?_without_x10:%{_bindir}/zmx10.pl}
+%{_bindir}/zmonvif-probe.pl
 
 %{perl_vendorlib}/ZoneMinder*
+%{perl_vendorlib}/ONVIF*
+%{perl_vendorlib}/WSDiscovery*
+%{perl_vendorlib}/WSSecurity*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
 %{_libexecdir}/zoneminder/cgi-bin
@@ -188,6 +202,9 @@ fi
 
 
 %changelog
+* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0 
+- Bump version fo 1.30.0 release.
+
 * Sat Nov 21 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.29.0 
 - Bump version for 1.29.0 release on Fedora 23.
 
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 849ef1073..5de834109 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -16,7 +16,7 @@ else(ZM_TARGET_DISTRO STREQUAL "el7")
 endif(ZM_TARGET_DISTRO STREQUAL "el7")
 
 # Download jscalendar & move files into position
-file(DOWNLOAD http://skylineservers.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
+file(DOWNLOAD http://iweb.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
 #message(STATUS "Log of jscalender script was: ${jsc_log}")
 if(download_jsc EQUAL 0)
 	message(STATUS "Jscalander successfully downloaded.  Installing...")
diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS
index f0e627c90..35718a691 100644
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@@ -5,16 +5,14 @@ What's New
    ALL permission to the ZoneMinder mysql account. This change must be done
    manually before ZoneMinder will run. See the installation steps below.
 
-2. A new permission group called "Groups" has been added. This allows the
-   system administrator to assign "view", "edit", or "none" permission to
-   normal users, without giving them access to the rest of the ZoneMinder
-   system. During an upgrade, existing accounts will default to a Groups
-   permission of "none".
-
-3. This package now requires the HTTPS protocol to access the web portal.
+2. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
 
+3. The php package that ships with CentOS 6 does not support the new ZoneMinder
+   API. If you require API functionality (such as using a mobile app) then you
+   should consider an upgrade to CentOS 7 or use Fedora.
+
 New installs
 ============
 
@@ -40,7 +38,7 @@ New installs
 
 3. If you have chosen to change the zoneminder mysql credentials to something
    other than zmuser/zmpass then you must now edit /etc/zm.conf. Change
-   ZM_DB_USER and ZM_DB_PASS to the values you created in step 2.
+   ZM_DB_USER and ZM_DB_PASS to the values you created in the previous step.
 
    Additionally, you must also edit 
    /usr/share/zoneminder/www/api/app/Config/database.php in a similar manner.
@@ -55,11 +53,15 @@ New installs
    If you are not sure of the proper timezone specification to use, look at
    http://php.net/date.timezone
 
-5. Verify the default ZoneMinder Apache configuration meets your needs:
+5. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+   needs. This package comes preconfigured for HTTPS using the default self
+   signed certificate on your system. The recommended way to complete this step
+   is to simply install mod_ssl:
 
-     /etc/httpd/conf.d/zoneminder.conf
+	sudo yum install mod_ssl
 
-   When in doubt, leave this configuration as it is.
+   If this does not meet your needs, then read README.https to
+   learn about alternatives. When in doubt, install mod_ssl.
 
 6. Configure the web server to start automatically:
 
@@ -122,6 +124,7 @@ New installs
    /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
+   Verify the SSL REquirements meet your needs. Read README.https if necessary.
 
 4. Upgrade the database before starting ZoneMinder.
 
diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7
index f4566b01c..de0bd52d6 100644
--- a/distros/redhat/README.Centos7
+++ b/distros/redhat/README.Centos7
@@ -1,17 +1,19 @@
 What's New
 ==========
 
-1. Due to the active state of the ZoneMinder project, we now recommend granting
+1. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
+   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
+   https://bugzilla.redhat.com/show_bug.cgi?id=973067
+
+   IMPORTANT: You must manually verify the value of PATH_ZMS under Options.
+   Make sure it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
+   in a broken system. You have been warned.
+
+2. Due to the active state of the ZoneMinder project, we now recommend granting
    ALL permission to the ZoneMinder mysql account. This change must be done
    manually before ZoneMinder will run. See the installation steps below.
 
-2. A new permission group called "Groups" has been added. This allows the
-   system administrator to assign "view", "edit", or "none" permission to
-   normal users, without giving them access to the rest of the ZoneMinder
-   system. During an upgrade, existing accounts will default to a Groups
-   permission of "none".
-
-3. This package now requires the HTTPS protocol to access the web portal.
+3. This package uses the HTTPS protocol by default to access the web portal.
    Requests using HTTP will auto-redirect to HTTPS. See README.https for
    more information.
    
@@ -74,12 +76,22 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
-6. Now start the web server:
+6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+   needs. This package comes preconfigured for HTTPS using the default self
+   signed certificate on your system. The recommended way to complete this step
+   is to simply install mod_ssl:
+
+	sudo yum install mod_ssl
+
+   If this does not meet your needs, then read README.https to
+   learn about alternatives. When in doubt, install mod_ssl.
+
+7. Now start the web server:
 
 	sudo systemctl enable httpd
 	sudo systemctl start httpd
 
-7. Now start zoneminder:
+8. Now start zoneminder:
 
 	sudo systemctl enable zoneminder
 	sudo systemctl start zoneminder
@@ -118,6 +130,7 @@ Upgrades
    /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
+   Verify the SSL REquirements meet your needs. Read README.https if necessary.
 
 4. Upgrade the database before starting ZoneMinder.
 
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 82406d431..69e3b972f 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -4,7 +4,7 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.29.0
+Version:    1.30.0
 Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
@@ -30,7 +30,7 @@ BuildRequires:  libcurl-devel vlc-devel ffmpeg-devel polkit-devel
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd ffmpeg
 
-Requires:   httpd php php-gd php-mysql mysql-server libjpeg-turbo cambozola polkit net-tools mod_ssl
+Requires:   httpd php php-gd php-mysql mysql-server libjpeg-turbo cambozola polkit net-tools
 Requires:   psmisc perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
 Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
@@ -69,6 +69,7 @@ too much degradation of performance.
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
 ./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
 # Have to override CMAKE_INSTALL_LIBDIR for cmake < 2.8.7 due to this bug:
@@ -98,8 +99,12 @@ echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wa
 
 # Upgrade from a previous version of zoneminder 
 if [ $1 -eq 2 ] ; then
+
+    # Add any new PTZ control configurations to the database (will not overwrite)
+    %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
+
     # Freshen the database
-    /usr/bin/zmupdate.pl -f
+    %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || :
 
     # We can't run this automatically when new sql account permissions need to
     # be manually added first
@@ -154,14 +159,16 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
 %{_bindir}/zmsystemctl.pl
+%{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
-#%{_bindir}/zmonvif-probe.pl
+%{_bindir}/zmonvif-probe.pl
 
 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorarch}/auto/ZoneMinder/.packlist
-#%{perl_vendorlib}/ONVIF*
-#%{perl_vendorlib}/WSDiscovery*
-#%{perl_vendorlib}/WSSecurity*
+%{perl_vendorarch}/auto/ONVIF/.packlist
+%{perl_vendorlib}/ONVIF*
+%{perl_vendorlib}/WSDiscovery*
+%{perl_vendorlib}/WSSecurity*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/cgi-bin
@@ -182,6 +189,9 @@ rm -rf %{_docdir}/%{name}-%{version}
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
+* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0 
+- Bump version fo 1.30.0 release.
+
 * Tue Sep 8 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
 - Require https, freshen dB on updates.
 
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index c350553b3..485c214c2 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -6,7 +6,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.29.0
+Version: 1.30.0
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -32,7 +32,7 @@ BuildRequires: ffmpeg ffmpeg-devel perl(X10::ActiveHome) perl(Astro::SunTime)
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd polkit-devel
 
-Requires: httpd php php-gd php-mysql mariadb-server cambozola polkit net-tools mod_ssl
+Requires: httpd php php-gd php-mysql mariadb-server cambozola polkit net-tools
 Requires: psmisc libjpeg-turbo vlc-core libcurl
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
@@ -65,6 +65,7 @@ too much degradation of performance.
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
 ./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
 %cmake \
@@ -96,8 +97,12 @@ fi
 
 # Upgrade from a previous version of zoneminder 
 if [ $1 -eq 2 ] ; then
+
+    # Add any new PTZ control configurations to the database (will not overwrite)
+    %{_bindir}/zmcamtool.pl --import >/dev/null 2>&1 || :
+
     # Freshen the database
-    /usr/bin/zmupdate.pl -f
+    %{_bindir}/zmupdate.pl -f >/dev/null 2>&1 || :
 
     # We can't run this automatically when new sql account permissions need to
     # be manually added first
@@ -163,12 +168,16 @@ fi
 %{_bindir}/zmwatch.pl
 %{_bindir}/zmcamtool.pl
 %{_bindir}/zmsystemctl.pl
+%{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
+%{_bindir}/zmonvif-probe.pl
 
 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorarch}/auto/ZoneMinder/.packlist
-#%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
-#%{perl_archlib}/ZoneMinder*
+%{perl_vendorarch}/auto/ONVIF/.packlist
+%{perl_vendorlib}/ONVIF*
+%{perl_vendorlib}/WSDiscovery*
+%{perl_vendorlib}/WSSecurity*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
 %{_libexecdir}/zoneminder/cgi-bin
@@ -191,6 +200,9 @@ fi
 
 
 %changelog
+* Thu Mar 3 2016 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.30.0 
+- Bump version fo 1.30.0 release.
+
 * Mon Sep 7 2015 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.28.1 
 - Require https, disable selinux module, freshen dB on updates.
 

From ab3c35c629266d804c5f0c29839ddcfb9a2cceb7 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Fri, 4 Mar 2016 17:21:32 -0600
Subject: [PATCH 292/362] fix missing Net::SFTP::Foreign::debug warning

---
 scripts/zmfilter.pl.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 1db114d9d..2bf32b528 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -935,10 +935,12 @@ sub uploadArchFile
                 if $Config{ZM_UPLOAD_PORT};
             $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
                 if $Config{ZM_UPLOAD_TIMEOUT};
-            $sftpOptions{more} = [ '-o'=>'StrictHostKeyChecking=no' ]
+            my @more_ssh_args;
+            push @more_ssh_args, ['-o'=>'StrictHostKeyChecking=no']
 				if ! $Config{ZM_UPLOAD_STRICT};
-            $Net::SFTP::Foreign::debug = -1
+            push @more_ssh_args, ['-v']
                 if $Config{ZM_UPLOAD_DEBUG};
+            $sftpOptions{more} = [@more_ssh_args];
             my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );
             if ( $sftp->error )
             {

From 97249110a4f45c987bb89ec8faaab8c954b70196 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 7 Mar 2016 22:18:22 -0500
Subject: [PATCH 293/362] must still support libgnutls28 for raspbian

---
 distros/debian_cmake/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control
index 6c260bdaf..e8c5ea1b7 100644
--- a/distros/debian_cmake/control
+++ b/distros/debian_cmake/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), cmake
 , libphp-serialization-perl
-, libgnutls-dev
+, libgnutls28-dev | libgnutls-dev
 , libmysqlclient-dev | libmariadbclient-dev
 , libjpeg8-dev
 , libpcre3-dev
@@ -36,7 +36,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 , netpbm , libjpeg8
 , zip
 , libvlccore5 | libvlccore7, libvlc5
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
 , libpolkit-gobject-1-0, php5-gd
 Recommends: mysql-server | mariadb-server
 Description: Video camera security and surveillance solution

From 455c268a0c5c934eb38232f4fe1e1d5e6adb5486 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:55:11 -0500
Subject: [PATCH 294/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/debian_cmake/control | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control
index e8c5ea1b7..c366c6d15 100644
--- a/distros/debian_cmake/control
+++ b/distros/debian_cmake/control
@@ -23,13 +23,15 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 , apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm
-, php5-mysqlnd | php5-mysql, libphp-serialization-perl
+, php5-mysqlnd | php5-mysql
 , mariadb-client | mysql-client
+, libphp-serialization-perl
 , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
 , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
 , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
 , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libsys-cpu-perl, libsys-meminfo-perl
 , libpcre3
 , libav-tools, libavdevice53
 , rsyslog | system-log-daemon

From cfbf2cced1273aa165a28e2fa515fe5a38a09ad9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:55:29 -0500
Subject: [PATCH 295/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/debian/control b/distros/debian/control
index a48dd357d..538b24770 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -37,6 +37,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
 , libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libsys-cpu-perl, libsys-meminfo-perl
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security

From b9996b4fc0b3769f10ef8d6efc7a2a6eeac7aa11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:55:37 -0500
Subject: [PATCH 296/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/debian8/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/distros/debian8/control b/distros/debian8/control
index dd19f95c5..4839e0033 100644
--- a/distros/debian8/control
+++ b/distros/debian8/control
@@ -60,9 +60,10 @@ Depends: libzoneminder-perl (= ${source:Version}),
  zoneminder-database (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
  ${perl:Depends}, libarchive-tar-perl, libarchive-zip-perl, libdate-manip-perl,
  libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
- libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
+ libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
  policykit-1, apache2
+, libsys-cpu-perl, libsys-meminfo-perl
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Description: Core binaries and perl scripts for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.

From cf1d475dbb7c3c319054c3414d130238e43af0e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:55:56 -0500
Subject: [PATCH 297/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/ubuntu1204_cmake/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu1204_cmake/control b/distros/ubuntu1204_cmake/control
index cdd4b20b7..6368d9417 100644
--- a/distros/ubuntu1204_cmake/control
+++ b/distros/ubuntu1204_cmake/control
@@ -52,6 +52,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,rsyslog | system-log-daemon
         ,zip
         ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+        , libsys-cpu-perl, libsys-meminfo-perl
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php5 | php5-fpm
            ,mysql-server | virtual-mysql-server

From 12a277912e47c9eadba65e7614b69b641c34dafb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:56:01 -0500
Subject: [PATCH 298/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/ubuntu1504/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control
index 2fd99da1f..991b4157c 100644
--- a/distros/ubuntu1504/control
+++ b/distros/ubuntu1504/control
@@ -24,6 +24,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
 , libnet-sftp-foreign-perl , libio-pty-perl, libexpect-perl , liburi-encode-perl , libdbd-mysql-perl
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libsys-cpu-perl, libsys-meminfo-perl
 , libpcre3
 , ffmpeg, libavdevice-ffmpeg56
 , rsyslog | system-log-daemon

From b0835660b1ff11808f773e3a11784a68b5c6ef81 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:56:08 -0500
Subject: [PATCH 299/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/ubuntu1504_cmake/control | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control
index cb916dd64..f049e6460 100644
--- a/distros/ubuntu1504_cmake/control
+++ b/distros/ubuntu1504_cmake/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Dmitry Smirnov <onlyjob@debian.org>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree,
               ,cmake
               ,libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
               ,libbz2-dev
@@ -16,6 +16,11 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libpolkit-gobject-1-dev
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
               ,libvlc-dev
+              ,libdate-manip-perl
+              ,libdbd-mysql-perl
+              ,libphp-serialization-perl
+              ,libsys-mmap-perl [!hurd-any]
+              ,libwww-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -36,7 +41,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
-#       ,libzoneminder-perl (= ${source:Version})
           ,libarchive-zip-perl
           ,libdbd-mysql-perl
           ,libdevice-serialport-perl
@@ -50,6 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
           ,libsoap-wsdl-perl
           ,libio-socket-multicast-perl
           ,libdigest-sha-perl
+          ,libsys-cpu-perl, libsys-meminfo-perl
         ,mysql-client | virtual-mysql-client
         ,perl-modules
         ,php5-mysql

From c27387610c1cfe8c968fc365fa717aec7b3e527a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:56:17 -0500
Subject: [PATCH 300/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/ubuntu1504_cmake_split_packages/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control
index 4a152c46b..d6d318e96 100644
--- a/distros/ubuntu1504_cmake_split_packages/control
+++ b/distros/ubuntu1504_cmake_split_packages/control
@@ -78,6 +78,8 @@ Depends: libzoneminder-perl (= ${source:Version}),
  libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip,
  policykit-1, apache2, libmp4v2-2, libpcre++0
+, libsys-cpu-perl, libsys-meminfo-perl
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Description: Core binaries and perl scripts for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.
  .

From f8582ad9b68824a633af6021ffa092602aed537e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 15:56:26 -0500
Subject: [PATCH 301/362] add libsys-cpu-perl and libsys-meminfo-perl

---
 distros/ubuntu1204/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index ab6cbce0d..f8ea3272e 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -30,6 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
 , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+, libsys-cpu-perl, libsys-meminfo-perl
 , libavdevice53 | libavdevice55
 , libjpeg8|libjpeg9|libjpeg62-turbo
 , zip

From 094b041c43a98c501b1b6b8d275c11e56bb7ea13 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 8 Mar 2016 16:06:16 -0500
Subject: [PATCH 302/362] There must be spaces before the comma

---
 distros/debian_cmake/control | 62 ++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control
index c366c6d15..3b11f37b8 100644
--- a/distros/debian_cmake/control
+++ b/distros/debian_cmake/control
@@ -3,42 +3,42 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), cmake
-, libphp-serialization-perl
-, libgnutls28-dev | libgnutls-dev
-, libmysqlclient-dev | libmariadbclient-dev
-, libjpeg8-dev
-, libpcre3-dev
-, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
-, libv4l-dev (>= 0.8.3)
-, libbz2-dev
-, libav-tools
-, libnetpbm10-dev
-, libavdevice-dev
-, libvlccore-dev, libvlc-dev
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libgcrypt11-dev, libpolkit-gobject-1-dev
+    , libphp-serialization-perl
+    , libgnutls28-dev | libgnutls-dev
+    , libmysqlclient-dev | libmariadbclient-dev
+    , libjpeg8-dev
+    , libpcre3-dev
+    , libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+    , libv4l-dev (>= 0.8.3)
+    , libbz2-dev
+    , libav-tools
+    , libnetpbm10-dev
+    , libavdevice-dev
+    , libvlccore-dev, libvlc-dev
+    , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    , libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm
-, php5-mysqlnd | php5-mysql
-, mariadb-client | mysql-client
-, libphp-serialization-perl
-, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
-, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
-, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
-, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
-, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
-, libsys-cpu-perl, libsys-meminfo-perl
-, libpcre3
-, libav-tools, libavdevice53
-, rsyslog | system-log-daemon
-, netpbm , libjpeg8
-, zip
-, libvlccore5 | libvlccore7, libvlc5
-, libpolkit-gobject-1-0, php5-gd
+    , apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm
+    , php5-mysqlnd | php5-mysql
+    , mariadb-client | mysql-client
+    , libphp-serialization-perl
+    , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
+    , libpcre3
+    , libav-tools, libavdevice53
+    , rsyslog | system-log-daemon
+    , netpbm , libjpeg8
+    , zip
+    , libvlccore5 | libvlccore7, libvlc5
+    , libpolkit-gobject-1-0, php5-gd
 Recommends: mysql-server | mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From 3280aff87683c793109c524d68790938de798bea Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 9 Mar 2016 09:43:44 -0600
Subject: [PATCH 303/362] disable save button when nothing slected. fixes #1322

---
 web/skins/classic/views/group.php   |  4 ++--
 web/skins/classic/views/js/group.js | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index 758b81f9e..1236835b9 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -67,7 +67,7 @@ xhtmlHeaders( __FILE__, translate('Group')." - ".$newGroup['Name'] );
         if ( visibleMonitor( $monitor['Id'] ) )
         {
 ?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
+                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?> onclick="configureButtons( this );"><?php echo validHtmlStr($monitor['Name']) ?></option>
 <?php
         }
     }
@@ -78,7 +78,7 @@ xhtmlHeaders( __FILE__, translate('Group')." - ".$newGroup['Name'] );
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Groups' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" disabled="disabled" />
           <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
index 7a5b0318e..d414c97ff 100644
--- a/web/skins/classic/views/js/group.js
+++ b/web/skins/classic/views/js/group.js
@@ -8,4 +8,16 @@ if ( refreshParent )
     opener.location.reload(true);
 }
 
+function configureButtons( element )
+{
+    if ( canEditGroups )
+    {
+        var form = element.form;
+        if ( element.selected )
+        {
+            form.saveBtn.disabled = (element.value == 0);
+        }
+    }
+}
+
 window.focus();

From 740dc12f7c795df9933e99167f9970522e275516 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Mar 2016 11:17:50 -0500
Subject: [PATCH 304/362] remove extra comma

---
 distros/ubuntu1504_cmake/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control
index f049e6460..50dee74c6 100644
--- a/distros/ubuntu1504_cmake/control
+++ b/distros/ubuntu1504_cmake/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Dmitry Smirnov <onlyjob@debian.org>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree,
+Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
               ,cmake
               ,libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
               ,libbz2-dev

From ee0c134a9b4470e487d02f1959ffbf2b064bedad Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Mar 2016 11:18:27 -0500
Subject: [PATCH 305/362] need spaces at beginning of lien

---
 distros/ubuntu1504/control | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control
index 991b4157c..dddecf61e 100644
--- a/distros/ubuntu1504/control
+++ b/distros/ubuntu1504/control
@@ -17,23 +17,23 @@ Homepage: http://www.zoneminder.com/
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
-, mariadb-client|mysql-client|mysql-client-5.6
-, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
-, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
-, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
-, libnet-sftp-foreign-perl , libio-pty-perl, libexpect-perl , liburi-encode-perl , libdbd-mysql-perl
-, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
-, libsys-cpu-perl, libsys-meminfo-perl
-, libpcre3
-, ffmpeg, libavdevice-ffmpeg56
-, rsyslog | system-log-daemon
-, libjpeg8|libjpeg9|libjpeg62-turbo
-, zip
-, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libpolkit-gobject-1-0
-, php5-gd
+    , apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
+    , mariadb-client|mysql-client|mysql-client-5.6
+    , libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , libnet-sftp-foreign-perl , libio-pty-perl, libexpect-perl , liburi-encode-perl , libdbd-mysql-perl
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
+    , libpcre3
+    , ffmpeg, libavdevice-ffmpeg56
+    , rsyslog | system-log-daemon
+    , libjpeg8|libjpeg9|libjpeg62-turbo
+    , zip
+    , libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+    , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    , libpolkit-gobject-1-0
+    , php5-gd
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From 1c481a3dbff1b2b324e1daedb9de582087067fe4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Mar 2016 11:25:16 -0500
Subject: [PATCH 306/362] add zmtelemetry.pl to autotools build

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b10dd44d5..c71854dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,7 +497,7 @@ fi
 AC_SUBST(PERL_MM_PARMS)
 AC_SUBST(EXTRA_PERL_LIB)
 
-AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
+AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtelemetry.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
 
 # Create the definitions for compilation and defaults for the database
 AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])

From 313f46dceb082e10eabecb943b2c1eb5d2615ac2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 9 Mar 2016 11:26:10 -0500
Subject: [PATCH 307/362] add zmtelemetry.pl to autotools build

---
 scripts/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5eacd8203..1d9de2893 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -10,6 +10,7 @@ bin_SCRIPTS = \
 	zmdc.pl \
 	zmaudit.pl \
 	zmfilter.pl \
+	zmtelemetry.pl \
 	zmtrigger.pl \
 	zmx10.pl \
 	zmwatch.pl \
@@ -29,6 +30,7 @@ EXTRA_DIST = \
 	zmdc.pl.in \
 	zmaudit.pl.in \
 	zmfilter.pl.in \
+	zmtelemetry.pl.in \
 	zmtrigger.pl.in \
 	zmx10.pl.in \
 	zmwatch.pl.in \

From 77f7a3642c1072ba0c384eaeeb7820e90af9eb27 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Wed, 9 Mar 2016 10:34:06 -0600
Subject: [PATCH 308/362] remove check for "selected" property

---
 web/skins/classic/views/js/group.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
index d414c97ff..c1ab79581 100644
--- a/web/skins/classic/views/js/group.js
+++ b/web/skins/classic/views/js/group.js
@@ -8,15 +8,11 @@ if ( refreshParent )
     opener.location.reload(true);
 }
 
-function configureButtons( element )
-{
-    if ( canEditGroups )
-    {
+function configureButtons( element ) {
+
+    if ( canEditGroups ) {
         var form = element.form;
-        if ( element.selected )
-        {
-            form.saveBtn.disabled = (element.value == 0);
-        }
+        form.saveBtn.disabled = (element.value == 0);
     }
 }
 

From 4606d2fbca9a7cca773a3ca12776821776a2ae55 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Thu, 10 Mar 2016 10:13:38 -0600
Subject: [PATCH 309/362] Update zmtrigger.pl.in

mention the %Q placholder when using showtext
---
 scripts/zmtrigger.pl.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 222e42f79..f21982538 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -54,14 +54,15 @@ B<id>|B<action>|B<score>|B<cause>|B<text>|B<showtext>
   Valid actions are 'on', 'off', 'cancel' or 'show' where
   'on' forces an alarm condition on;
   'off' forces an alarm condition off;
-  'cancel' negates the previous 'on' or 'off'.
-
-  The 'show' action merely updates some auxiliary text which can optionally
-  be displayed in the images captured by the monitor. Ordinarily you would
-  use 'on' and 'cancel', 'off' would tend to be used to suppress motion
-  based events. Additionally 'on' and 'off' can take an additional time
-  offset, e.g. on+20 which automatically 'cancel's the previous action
-  after that number of seconds.
+  'cancel' negates the previous 'on' or 'off';
+  'show' updates the auxiliary text represented by the %Q 
+  placeholder, which can optionally be added to the affected monitor's
+  timestamp label format.
+  
+  Ordinarily you would use 'on' and 'cancel', 'off' would tend to be
+  used to suppress motion based events. Additionally 'on' and 'off' can
+  take an additional time offset, e.g. on+20 which automatically
+  cancel's the previous action after that number of seconds.
 
 =item B<score>
 

From facae6cb0df80eff4bab8511601710e8a604ef39 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 10 Mar 2016 13:58:41 -0600
Subject: [PATCH 310/362] use make "-f" parameter instead of "--makefile"

---
 onvif/modules/CMakeLists.txt      | 2 +-
 onvif/proxy/CMakeLists.txt        | 2 +-
 scripts/ZoneMinder/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/onvif/modules/CMakeLists.txt b/onvif/modules/CMakeLists.txt
index 9e46ef9f7..d7ddbf466 100644
--- a/onvif/modules/CMakeLists.txt
+++ b/onvif/modules/CMakeLists.txt
@@ -9,7 +9,7 @@ endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/onvif/proxy/CMakeLists.txt b/onvif/proxy/CMakeLists.txt
index 0051bf2b1..1a40c0ffb 100644
--- a/onvif/proxy/CMakeLists.txt
+++ b/onvif/proxy/CMakeLists.txt
@@ -9,7 +9,7 @@ endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
index 09c02b816..3ed9bf7c6 100644
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -24,7 +24,7 @@ else(CMAKE_VERBOSE_MAKEFILE)
 endif(CMAKE_VERBOSE_MAKEFILE)
 
 # Add build target for the perl modules
-add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")

From 1d478a3b1c51eaf1de41a0044037fe54e33d50d3 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 10 Mar 2016 15:00:21 -0600
Subject: [PATCH 311/362] change linker flag to "-lexecinfo"

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8327045d4..57ea96981 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ if (HAVE_EXECINFO_H)
   if (NOT HAVE_DECL_BACKTRACE)
     find_library (EXECINFO_LIBRARY NAMES execinfo)
     if (EXECINFO_LIBRARY)
-        list(APPEND ZM_BIN_LIBS "-l${EXECINFO_LIBRARY}")
+        list(APPEND ZM_BIN_LIBS "-lexecinfo")
     endif (EXECINFO_LIBRARY)
   endif (NOT HAVE_DECL_BACKTRACE)
   check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)

From b1d3be2cfc0d83d401cabd721d31852cd6bc3ea0 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 11 Mar 2016 07:38:29 -0600
Subject: [PATCH 312/362] add freeBSD cmake target distro

---
 CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57ea96981..6ca6bef4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,16 @@ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_WEB_GROUP "www")
 	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
 	set(ZM_CGIDIR "/srv/www/cgi-bin")
+elseif(ZM_TARGET_DISTRO STREQUAL "freeBSD")
+	set(ZM_RUNDIR "/var/run/zm")
+        set(ZM_SOCKDIR "/var/run/zm")
+	set(ZM_TMPDIR "/var/tmp/zm")
+        set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
+        set(ZM_WEB_USER "www")
+        set(ZM_WEB_GROUP "www")
+        set(ZM_CONFIG_DIR "/usr/local/etc/zm")
+        set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
+        set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
 endif((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
 
 # Required for certain checks to work

From b9085cea641c6a0fb85a086b5d191ecaf39f0162 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Fri, 11 Mar 2016 14:28:16 -0700
Subject: [PATCH 313/362] Fix issue where programs are installed in unexpected
 paths.

For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
---
 scripts/zmaudit.pl.in   | 2 +-
 scripts/zmcontrol.pl.in | 2 +-
 scripts/zmdc.pl.in      | 2 +-
 scripts/zmfilter.pl.in  | 2 +-
 scripts/zmpkg.pl.in     | 2 +-
 scripts/zmtrack.pl.in   | 2 +-
 scripts/zmtrigger.pl.in | 2 +-
 scripts/zmvideo.pl.in   | 2 +-
 scripts/zmwatch.pl.in   | 2 +-
 scripts/zmx10.pl.in     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 1e01628b8..7f2df08b9 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -83,7 +83,7 @@ use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index aba1d1c36..9b34533f7 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -63,7 +63,7 @@ use constant MAX_COMMAND_WAIT => 1800;
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index b120e2846..b068b9a49 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -73,7 +73,7 @@ use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmdc.sock';
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 1db114d9d..6cebad07c 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -127,7 +127,7 @@ if ( $Config{ZM_OPT_MESSAGE} )
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 53e29a8da..57708c62a 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -52,7 +52,7 @@ use Time::HiRes qw/gettimeofday/;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 
 # Detaint our environment
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $store_state=""; # PP - will remember state name passed
diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in
index b1eec2d7e..cd00e809d 100644
--- a/scripts/zmtrack.pl.in
+++ b/scripts/zmtrack.pl.in
@@ -68,7 +68,7 @@ use Time::HiRes qw( usleep );
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index f21982538..2f180e090 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -167,7 +167,7 @@ use Time::HiRes qw( usleep );
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in
index 6a63502ee..fd2005b16 100644
--- a/scripts/zmvideo.pl.in
+++ b/scripts/zmvideo.pl.in
@@ -70,7 +70,7 @@ use autouse 'Pod::Usage'=>qw(pod2usage);
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 5e0767487..4e2ff927c 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -61,7 +61,7 @@ use autouse 'Data::Dumper'=>qw(Dumper);
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmx10.pl.in b/scripts/zmx10.pl.in
index d25e74c8a..8daa63c87 100644
--- a/scripts/zmx10.pl.in
+++ b/scripts/zmx10.pl.in
@@ -71,7 +71,7 @@ use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmx10.sock';
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 

From 4e1af516d7dc88d24f64d798818f33a9d3a1391a Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Fri, 11 Mar 2016 14:29:48 -0700
Subject: [PATCH 314/362] Don't output sudo test cmd to /dev/null.  Other tests
 aren't, and info us useful.

---
 scripts/ZoneMinder/lib/ZoneMinder/General.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index 195bd265f..944781f6b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -107,7 +107,6 @@ sub getCmdFormat
     my $suffix = "";
     my $command = $prefix.$null_command.$suffix;
     Debug( "Testing \"$command\"\n" );
-    $command .= " > /dev/null 2>&1"; 
     my $output = qx($command);
     my $status = $? >> 8;
     if ( !$status )

From 16992a44cbd3625a4548a220ea1112a6b84a8706 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 11 Mar 2016 15:56:29 -0600
Subject: [PATCH 315/362] add ZM_PERL_MM_PARMS

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ca6bef4a..b2014e1c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,7 @@ elseif(ZM_TARGET_DISTRO STREQUAL "freeBSD")
         set(ZM_CONFIG_DIR "/usr/local/etc/zm")
         set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
         set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
+        set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
 endif((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
 
 # Required for certain checks to work

From 8a47241e1862b4aff9b94cb9383bdb7432a8e785 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Sat, 12 Mar 2016 08:07:25 -0500
Subject: [PATCH 316/362] address issue #1335

---
 web/api/app/Controller/MonitorsController.php |  2 +-
 web/api/app/Controller/StatesController.php   | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 9ab7461f9..11857942c 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -97,7 +97,7 @@ public function beforeFilter() {
 
 			if ($this->Session->Read('systemPermission') != 'Edit')
 			{
-				 throw new UnauthotizedException(__('Insufficient privileges'));
+				 throw new UnauthorizedException(__('Insufficient privileges'));
 				return;
 			}
 
diff --git a/web/api/app/Controller/StatesController.php b/web/api/app/Controller/StatesController.php
index 2b007f08f..051837b27 100644
--- a/web/api/app/Controller/StatesController.php
+++ b/web/api/app/Controller/StatesController.php
@@ -11,6 +11,18 @@ class StatesController extends AppController {
 
 public $components = array('RequestHandler');
 
+public function beforeFilter() {
+        parent::beforeFilter();
+        $canView = $this->Session->Read('systemPermission');
+        if ($canView =='None')
+        {
+                throw new UnauthorizedException(__('Insufficient Privileges'));
+                return;
+        }
+
+}
+
+
 /**
  * index method
  *
@@ -46,7 +58,15 @@ public $components = array('RequestHandler');
  * @return void
  */
 	public function add() {
+		
 		if ($this->request->is('post')) {
+
+			if ($this->Session->Read('systemPermission') != 'Edit')
+                        {
+                                 throw new UnauthorizedException(__('Insufficient privileges'));
+                                return;
+                        }
+
 			$this->State->create();
 			if ($this->State->save($this->request->data)) {
 				return $this->flash(__('The state has been saved.'), array('action' => 'index'));
@@ -65,6 +85,13 @@ public $components = array('RequestHandler');
 		if (!$this->State->exists($id)) {
 			throw new NotFoundException(__('Invalid state'));
 		}
+
+		if ($this->Session->Read('systemPermission') != 'Edit')
+                {
+                       throw new UnauthorizedException(__('Insufficient privileges'));
+                       return;
+                }
+
 		if ($this->request->is(array('post', 'put'))) {
 			if ($this->State->save($this->request->data)) {
 				return $this->flash(__('The state has been saved.'), array('action' => 'index'));
@@ -84,6 +111,12 @@ public $components = array('RequestHandler');
  */
 	public function delete($id = null) {
 		$this->State->id = $id;
+		if ($this->Session->Read('systemPermission') != 'Edit')
+		{
+			 throw new UnauthorizedException(__('Insufficient privileges'));
+			return;
+		}
+
 		if (!$this->State->exists()) {
 			throw new NotFoundException(__('Invalid state'));
 		}
@@ -96,6 +129,12 @@ public $components = array('RequestHandler');
 	}
 
 	public function change() {
+		if ($this->Session->Read('systemPermission') != 'Edit')
+                {
+                    throw new UnauthorizedException(__('Insufficient privileges'));
+                    return;
+                }
+
 		$newState = $this->request->params['pass'][0];
 		$blah = $this->packageControl($newState);
 

From 2c0c01453564b5d78e61d9f8f16a6e53f6e804ae Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sun, 13 Mar 2016 10:16:20 +0100
Subject: [PATCH 317/362] Added Proxies for WSNotification and ONVIF-Analytics

---
 .../lib/ONVIF/Analytics/Attributes/actor.pm   |  54 +++
 .../ONVIF/Analytics/Attributes/contentType.pm |  64 +++
 .../Analytics/Attributes/encodingStyle.pm     |  54 +++
 .../Attributes/expectedContentTypes.pm        |  54 +++
 .../Analytics/Attributes/mustUnderstand.pm    |  64 +++
 .../Elements/AudioDecoderConfiguration.pm     |  58 +++
 .../Elements/AudioEncoderConfiguration.pm     |  72 +++
 .../Elements/AudioOutputConfiguration.pm      |  61 +++
 .../Elements/AudioSourceConfiguration.pm      |  59 +++
 .../lib/ONVIF/Analytics/Elements/Body.pm      |  58 +++
 .../ONVIF/Analytics/Elements/Capabilities.pm  |  58 +++
 .../Elements/CreateAnalyticsModules.pm        | 143 ++++++
 .../CreateAnalyticsModulesResponse.pm         |  90 ++++
 .../ONVIF/Analytics/Elements/CreateRules.pm   | 143 ++++++
 .../Analytics/Elements/CreateRulesResponse.pm |  90 ++++
 .../Elements/DeleteAnalyticsModules.pm        | 135 ++++++
 .../DeleteAnalyticsModulesResponse.pm         |  90 ++++
 .../ONVIF/Analytics/Elements/DeleteRules.pm   | 135 ++++++
 .../Analytics/Elements/DeleteRulesResponse.pm |  90 ++++
 .../lib/ONVIF/Analytics/Elements/Envelope.pm  |  62 +++
 .../lib/ONVIF/Analytics/Elements/Fault.pm     |  63 +++
 .../Analytics/Elements/GetAnalyticsModules.pm | 121 +++++
 .../Elements/GetAnalyticsModulesResponse.pm   | 129 ++++++
 .../lib/ONVIF/Analytics/Elements/GetRules.pm  | 121 +++++
 .../Analytics/Elements/GetRulesResponse.pm    | 129 ++++++
 .../Elements/GetServiceCapabilities.pm        | 107 +++++
 .../GetServiceCapabilitiesResponse.pm         | 122 ++++++
 .../Elements/GetSupportedAnalyticsModules.pm  | 121 +++++
 .../GetSupportedAnalyticsModulesResponse.pm   | 138 ++++++
 .../Analytics/Elements/GetSupportedRules.pm   | 121 +++++
 .../Elements/GetSupportedRulesResponse.pm     | 138 ++++++
 .../lib/ONVIF/Analytics/Elements/Header.pm    |  58 +++
 .../lib/ONVIF/Analytics/Elements/Include.pm   |  58 +++
 .../lib/ONVIF/Analytics/Elements/Message.pm   | 207 +++++++++
 .../Elements/MetadataConfiguration.pm         |  89 ++++
 .../Analytics/Elements/MetadataStream.pm      | 192 ++++++++
 .../Elements/ModifyAnalyticsModules.pm        | 143 ++++++
 .../ModifyAnalyticsModulesResponse.pm         |  90 ++++
 .../ONVIF/Analytics/Elements/ModifyRules.pm   | 143 ++++++
 .../Analytics/Elements/ModifyRulesResponse.pm |  90 ++++
 .../Analytics/Elements/PTZConfiguration.pm    | 106 +++++
 .../lib/ONVIF/Analytics/Elements/Polygon.pm   |  59 +++
 .../lib/ONVIF/Analytics/Elements/Polyline.pm  |  59 +++
 .../Elements/VideoAnalyticsConfiguration.pm   |  84 ++++
 .../Elements/VideoEncoderConfiguration.pm     |  88 ++++
 .../Elements/VideoSourceConfiguration.pm      |  70 +++
 .../Analytics/AnalyticsEnginePort.pm          | 338 ++++++++++++++
 .../Interfaces/Analytics/RuleEnginePort.pm    | 301 +++++++++++++
 .../lib/ONVIF/Analytics/Typemaps/Analytics.pm | 154 +++++++
 .../ONVIF/Analytics/Types/AACDecOptions.pm    | 116 +++++
 .../ONVIF/Analytics/Types/AbsoluteFocus.pm    | 112 +++++
 .../Analytics/Types/AbsoluteFocusOptions.pm   | 118 +++++
 .../Types/ActionEngineEventPayload.pm         | 147 +++++++
 .../ActionEngineEventPayloadExtension.pm      |  94 ++++
 .../Analytics/Types/AnalyticsCapabilities.pm  | 121 +++++
 .../Types/AnalyticsDeviceCapabilities.pm      | 122 ++++++
 .../AnalyticsDeviceEngineConfiguration.pm     | 155 +++++++
 ...yticsDeviceEngineConfigurationExtension.pm |  94 ++++
 .../Types/AnalyticsDeviceExtension.pm         |  94 ++++
 .../ONVIF/Analytics/Types/AnalyticsEngine.pm  | 162 +++++++
 .../Types/AnalyticsEngineConfiguration.pm     | 121 +++++
 .../AnalyticsEngineConfigurationExtension.pm  |  94 ++++
 .../Analytics/Types/AnalyticsEngineControl.pm | 187 ++++++++
 .../Analytics/Types/AnalyticsEngineInput.pm   | 182 ++++++++
 .../Types/AnalyticsEngineInputInfo.pm         | 121 +++++
 .../AnalyticsEngineInputInfoExtension.pm      |  94 ++++
 .../ONVIF/Analytics/Types/AnalyticsState.pm   | 112 +++++
 .../Types/AnalyticsStateInformation.pm        | 115 +++++
 .../lib/ONVIF/Analytics/Types/AnyHolder.pm    |  94 ++++
 .../lib/ONVIF/Analytics/Types/Appearance.pm   | 174 ++++++++
 .../Analytics/Types/AppearanceExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/AttachmentData.pm   | 155 +++++++
 .../Analytics/Types/AudioAnalyticsStream.pm   | 114 +++++
 .../Types/AudioAnalyticsStreamExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/AudioAttributes.pm  | 121 +++++
 .../Analytics/Types/AudioClassCandidate.pm    | 112 +++++
 .../Analytics/Types/AudioClassDescriptor.pm   | 116 +++++
 .../Types/AudioClassDescriptorExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/AudioClassType.pm   |  65 +++
 .../Types/AudioDecoderConfiguration.pm        | 107 +++++
 .../Types/AudioDecoderConfigurationOptions.pm | 152 +++++++
 ...dioDecoderConfigurationOptionsExtension.pm |  94 ++++
 .../ONVIF/Analytics/Types/AudioDescriptor.pm  | 139 ++++++
 .../Types/AudioEncoderConfiguration.pm        | 161 +++++++
 .../Types/AudioEncoderConfigurationOption.pm  | 125 ++++++
 .../Types/AudioEncoderConfigurationOptions.pm | 111 +++++
 .../ONVIF/Analytics/Types/AudioEncoding.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/AudioOutput.pm  |  97 ++++
 .../Types/AudioOutputConfiguration.pm         | 134 ++++++
 .../Types/AudioOutputConfigurationOptions.pm  | 124 ++++++
 .../lib/ONVIF/Analytics/Types/AudioSource.pm  | 106 +++++
 .../Types/AudioSourceConfiguration.pm         | 116 +++++
 .../Types/AudioSourceConfigurationOptions.pm  | 113 +++++
 .../Types/AudioSourceOptionsExtension.pm      |  94 ++++
 .../ONVIF/Analytics/Types/AutoFocusMode.pm    |  65 +++
 .../ONVIF/Analytics/Types/AuxiliaryData.pm    |  65 +++
 .../Analytics/Types/BacklightCompensation.pm  | 112 +++++
 .../Types/BacklightCompensation20.pm          | 112 +++++
 .../Types/BacklightCompensationMode.pm        |  65 +++
 .../Types/BacklightCompensationOptions.pm     | 115 +++++
 .../Types/BacklightCompensationOptions20.pm   | 115 +++++
 .../lib/ONVIF/Analytics/Types/BackupFile.pm   | 115 +++++
 .../lib/ONVIF/Analytics/Types/Behaviour.pm    | 212 +++++++++
 .../Analytics/Types/BehaviourExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/BinaryData.pm   | 147 +++++++
 onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm |  94 ++++
 .../lib/ONVIF/Analytics/Types/Capabilities.pm | 167 +++++++
 .../Analytics/Types/CapabilitiesExtension.pm  | 201 +++++++++
 .../Analytics/Types/CapabilitiesExtension2.pm |  94 ++++
 .../Analytics/Types/CapabilityCategory.pm     |  65 +++
 .../lib/ONVIF/Analytics/Types/CellLayout.pm   | 168 +++++++
 .../lib/ONVIF/Analytics/Types/Certificate.pm  | 114 +++++
 .../Types/CertificateGenerationParameters.pm  | 140 ++++++
 ...ertificateGenerationParametersExtension.pm |  94 ++++
 .../Analytics/Types/CertificateInformation.pm | 197 +++++++++
 .../Types/CertificateInformationExtension.pm  |  94 ++++
 .../Analytics/Types/CertificateStatus.pm      | 112 +++++
 .../ONVIF/Analytics/Types/CertificateUsage.pm | 118 +++++
 .../Types/CertificateWithPrivateKey.pm        | 125 ++++++
 .../ONVIF/Analytics/Types/ClassDescriptor.pm  | 176 ++++++++
 .../Types/ClassDescriptorExtension.pm         | 116 +++++
 .../Types/ClassDescriptorExtension2.pm        |  94 ++++
 .../lib/ONVIF/Analytics/Types/ClassType.pm    |  65 +++
 .../Analytics/Types/CodingCapabilities.pm     | 205 +++++++++
 .../proxy/lib/ONVIF/Analytics/Types/Color.pm  | 155 +++++++
 .../ONVIF/Analytics/Types/ColorCovariance.pm  | 188 ++++++++
 .../ONVIF/Analytics/Types/ColorDescriptor.pm  | 176 ++++++++
 .../Types/ColorDescriptorExtension.pm         |  94 ++++
 .../lib/ONVIF/Analytics/Types/ColorOptions.pm | 128 ++++++
 .../ONVIF/Analytics/Types/ColorspaceRange.pm  | 139 ++++++
 .../proxy/lib/ONVIF/Analytics/Types/Config.pm | 169 +++++++
 .../Analytics/Types/ConfigDescription.pm      | 248 +++++++++++
 .../Types/ConfigDescriptionExtension.pm       |  94 ++++
 .../Analytics/Types/ConfigurationEntity.pm    | 159 +++++++
 .../ONVIF/Analytics/Types/ContinuousFocus.pm  | 103 +++++
 .../Analytics/Types/ContinuousFocusOptions.pm | 106 +++++
 .../ONVIF/Analytics/Types/DNSInformation.pm   | 148 +++++++
 .../Types/DNSInformationExtension.pm          |  94 ++++
 .../lib/ONVIF/Analytics/Types/DNSName.pm      |  65 +++
 onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm | 121 +++++
 .../lib/ONVIF/Analytics/Types/DateTime.pm     | 120 +++++
 .../ONVIF/Analytics/Types/DateTimeRange.pm    | 112 +++++
 .../lib/ONVIF/Analytics/Types/Description.pm  |  65 +++
 .../Analytics/Types/DeviceCapabilities.pm     | 204 +++++++++
 .../Types/DeviceCapabilitiesExtension.pm      |  94 ++++
 .../lib/ONVIF/Analytics/Types/DeviceEntity.pm | 124 ++++++
 .../Analytics/Types/DeviceIOCapabilities.pm   | 148 +++++++
 .../lib/ONVIF/Analytics/Types/DigitalInput.pm |  97 ++++
 .../lib/ONVIF/Analytics/Types/Direction.pm    |  65 +++
 .../ONVIF/Analytics/Types/DiscoveryMode.pm    |  65 +++
 .../Analytics/Types/DisplayCapabilities.pm    | 112 +++++
 .../proxy/lib/ONVIF/Analytics/Types/Domain.pm |  65 +++
 .../Types/Dot11AuthAndMangementSuite.pm       |  65 +++
 .../Analytics/Types/Dot11AvailableNetworks.pm | 158 +++++++
 .../Types/Dot11AvailableNetworksExtension.pm  |  94 ++++
 .../Analytics/Types/Dot11Capabilities.pm      | 139 ++++++
 .../lib/ONVIF/Analytics/Types/Dot11Cipher.pm  |  65 +++
 .../Analytics/Types/Dot11Configuration.pm     | 151 +++++++
 .../lib/ONVIF/Analytics/Types/Dot11PSK.pm     |  65 +++
 .../Analytics/Types/Dot11PSKPassphrase.pm     |  65 +++
 .../lib/ONVIF/Analytics/Types/Dot11PSKSet.pm  | 122 ++++++
 .../Analytics/Types/Dot11PSKSetExtension.pm   |  94 ++++
 .../ONVIF/Analytics/Types/Dot11SSIDType.pm    |  65 +++
 .../Types/Dot11SecurityConfiguration.pm       | 145 ++++++
 .../Dot11SecurityConfigurationExtension.pm    |  94 ++++
 .../Analytics/Types/Dot11SecurityMode.pm      |  65 +++
 .../Analytics/Types/Dot11SignalStrength.pm    |  65 +++
 .../ONVIF/Analytics/Types/Dot11StationMode.pm |  65 +++
 .../lib/ONVIF/Analytics/Types/Dot11Status.pm  | 148 +++++++
 .../Analytics/Types/Dot1XConfiguration.pm     | 165 +++++++
 .../Types/Dot1XConfigurationExtension.pm      |  94 ++++
 .../Analytics/Types/Dot3Configuration.pm      |  94 ++++
 .../proxy/lib/ONVIF/Analytics/Types/Duplex.pm |  65 +++
 .../ONVIF/Analytics/Types/DurationRange.pm    | 112 +++++
 .../Analytics/Types/DynamicDNSInformation.pm  | 131 ++++++
 .../Types/DynamicDNSInformationExtension.pm   |  94 ++++
 .../ONVIF/Analytics/Types/DynamicDNSType.pm   |  65 +++
 .../Analytics/Types/EAPMethodConfiguration.pm | 124 ++++++
 .../proxy/lib/ONVIF/Analytics/Types/EFlip.pm  | 103 +++++
 .../lib/ONVIF/Analytics/Types/EFlipMode.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/EFlipOptions.pm | 113 +++++
 .../Analytics/Types/EFlipOptionsExtension.pm  |  94 ++++
 .../Analytics/Types/EapMethodExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/Enabled.pm      |  65 +++
 .../Analytics/Types/EngineConfiguration.pm    | 151 +++++++
 .../lib/ONVIF/Analytics/Types/Envelope.pm     | 128 ++++++
 .../Analytics/Types/EventCapabilities.pm      | 130 ++++++
 .../Analytics/Types/EventStreamExtension.pm   |  94 ++++
 .../Analytics/Types/EventSubscription.pm      | 157 +++++++
 .../lib/ONVIF/Analytics/Types/Exposure.pm     | 202 +++++++++
 .../lib/ONVIF/Analytics/Types/Exposure20.pm   | 202 +++++++++
 .../lib/ONVIF/Analytics/Types/ExposureMode.pm |  65 +++
 .../ONVIF/Analytics/Types/ExposureOptions.pm  | 220 ++++++++++
 .../Analytics/Types/ExposureOptions20.pm      | 220 ++++++++++
 .../ONVIF/Analytics/Types/ExposurePriority.pm |  65 +++
 .../Analytics/Types/FactoryDefaultType.pm     |  65 +++
 .../proxy/lib/ONVIF/Analytics/Types/Fault.pm  | 131 ++++++
 .../ONVIF/Analytics/Types/FindEventResult.pm  | 139 ++++++
 .../Analytics/Types/FindEventResultList.pm    | 118 +++++
 .../Analytics/Types/FindMetadataResult.pm     | 121 +++++
 .../Analytics/Types/FindMetadataResultList.pm | 116 +++++
 .../Analytics/Types/FindPTZPositionResult.pm  | 133 ++++++
 .../Types/FindPTZPositionResultList.pm        | 120 +++++
 .../Types/FindRecordingResultList.pm          | 132 ++++++
 .../ONVIF/Analytics/Types/FloatAttrList.pm    |  75 ++++
 .../lib/ONVIF/Analytics/Types/FloatList.pm    | 103 +++++
 .../lib/ONVIF/Analytics/Types/FloatRange.pm   | 112 +++++
 .../Analytics/Types/FocusConfiguration.pm     | 130 ++++++
 .../Analytics/Types/FocusConfiguration20.pm   | 140 ++++++
 .../Types/FocusConfiguration20Extension.pm    |  94 ++++
 .../lib/ONVIF/Analytics/Types/FocusMove.pm    | 129 ++++++
 .../lib/ONVIF/Analytics/Types/FocusOptions.pm | 139 ++++++
 .../ONVIF/Analytics/Types/FocusOptions20.pm   | 149 +++++++
 .../Types/FocusOptions20Extension.pm          |  94 ++++
 .../lib/ONVIF/Analytics/Types/FocusStatus.pm  | 121 +++++
 .../ONVIF/Analytics/Types/FocusStatus20.pm    | 131 ++++++
 .../Analytics/Types/FocusStatus20Extension.pm |  94 ++++
 .../proxy/lib/ONVIF/Analytics/Types/Frame.pm  | 274 ++++++++++++
 .../ONVIF/Analytics/Types/FrameExtension.pm   | 114 +++++
 .../ONVIF/Analytics/Types/FrameExtension2.pm  |  94 ++++
 .../ONVIF/Analytics/Types/G711DecOptions.pm   | 116 +++++
 .../ONVIF/Analytics/Types/G726DecOptions.pm   | 116 +++++
 .../GenericEapPwdConfigurationExtension.pm    |  94 ++++
 .../Types/GetRecordingJobsResponseItem.pm     | 130 ++++++
 .../Types/GetRecordingsResponseItem.pm        | 139 ++++++
 .../Analytics/Types/GetTracksResponseItem.pm  | 115 +++++
 .../Analytics/Types/GetTracksResponseList.pm  | 109 +++++
 .../Analytics/Types/H264Configuration.pm      | 112 +++++
 .../ONVIF/Analytics/Types/H264DecOptions.pm   | 139 ++++++
 .../lib/ONVIF/Analytics/Types/H264Options.pm  | 151 +++++++
 .../lib/ONVIF/Analytics/Types/H264Options2.pm | 134 ++++++
 .../lib/ONVIF/Analytics/Types/H264Profile.pm  |  65 +++
 .../proxy/lib/ONVIF/Analytics/Types/Header.pm |  94 ++++
 .../Analytics/Types/HostnameInformation.pm    | 122 ++++++
 .../Types/HostnameInformationExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/HwAddress.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/IANA_IfTypes.pm |  65 +++
 .../ONVIF/Analytics/Types/IOCapabilities.pm   | 126 ++++++
 .../Types/IOCapabilitiesExtension.pm          | 122 ++++++
 .../Types/IOCapabilitiesExtension2.pm         |  94 ++++
 .../lib/ONVIF/Analytics/Types/IPAddress.pm    | 121 +++++
 .../ONVIF/Analytics/Types/IPAddressFilter.pm  | 137 ++++++
 .../Types/IPAddressFilterExtension.pm         |  94 ++++
 .../Analytics/Types/IPAddressFilterType.pm    |  65 +++
 .../proxy/lib/ONVIF/Analytics/Types/IPType.pm |  65 +++
 .../lib/ONVIF/Analytics/Types/IPv4Address.pm  |  65 +++
 .../Analytics/Types/IPv4Configuration.pm      | 139 ++++++
 .../Analytics/Types/IPv4NetworkInterface.pm   | 126 ++++++
 .../IPv4NetworkInterfaceSetConfiguration.pm   | 124 ++++++
 .../lib/ONVIF/Analytics/Types/IPv6Address.pm  |  65 +++
 .../Analytics/Types/IPv6Configuration.pm      | 170 +++++++
 .../Types/IPv6ConfigurationExtension.pm       |  94 ++++
 .../Analytics/Types/IPv6DHCPConfiguration.pm  |  65 +++
 .../Analytics/Types/IPv6NetworkInterface.pm   | 133 ++++++
 .../IPv6NetworkInterfaceSetConfiguration.pm   | 133 ++++++
 .../Analytics/Types/ImageStabilization.pm     | 122 ++++++
 .../Types/ImageStabilizationExtension.pm      |  94 ++++
 .../Analytics/Types/ImageStabilizationMode.pm |  65 +++
 .../Types/ImageStabilizationOptions.pm        | 125 ++++++
 .../ImageStabilizationOptionsExtension.pm     |  94 ++++
 .../Analytics/Types/ImagingCapabilities.pm    | 103 +++++
 .../ONVIF/Analytics/Types/ImagingOptions.pm   | 271 ++++++++++++
 .../ONVIF/Analytics/Types/ImagingOptions20.pm | 308 +++++++++++++
 .../Types/ImagingOptions20Extension.pm        | 133 ++++++
 .../Types/ImagingOptions20Extension2.pm       | 122 ++++++
 .../Types/ImagingOptions20Extension3.pm       |  94 ++++
 .../ONVIF/Analytics/Types/ImagingSettings.pm  | 222 ++++++++++
 .../Analytics/Types/ImagingSettings20.pm      | 243 ++++++++++
 .../Types/ImagingSettingsExtension.pm         |  94 ++++
 .../Types/ImagingSettingsExtension20.pm       | 127 ++++++
 .../Types/ImagingSettingsExtension202.pm      | 119 +++++
 .../Types/ImagingSettingsExtension203.pm      |  94 ++++
 .../ONVIF/Analytics/Types/ImagingStatus.pm    | 107 +++++
 .../ONVIF/Analytics/Types/ImagingStatus20.pm  | 119 +++++
 .../Types/ImagingStatus20Extension.pm         |  94 ++++
 .../lib/ONVIF/Analytics/Types/Include.pm      | 139 ++++++
 .../lib/ONVIF/Analytics/Types/IntAttrList.pm  |  75 ++++
 .../lib/ONVIF/Analytics/Types/IntList.pm      | 103 +++++
 .../lib/ONVIF/Analytics/Types/IntRange.pm     | 112 +++++
 .../lib/ONVIF/Analytics/Types/IntRectangle.pm | 155 +++++++
 .../Analytics/Types/IntRectangleRange.pm      | 142 ++++++
 .../Types/IrCutFilterAutoAdjustment.pm        | 131 ++++++
 .../IrCutFilterAutoAdjustmentExtension.pm     |  94 ++++
 .../Types/IrCutFilterAutoAdjustmentOptions.pm | 134 ++++++
 ...CutFilterAutoAdjustmentOptionsExtension.pm |  94 ++++
 .../Types/IrCutFilterAutoBoundaryType.pm      |  65 +++
 .../ONVIF/Analytics/Types/IrCutFilterMode.pm  |  65 +++
 .../lib/ONVIF/Analytics/Types/ItemList.pm     | 240 ++++++++++
 .../Analytics/Types/ItemListDescription.pm    | 228 ++++++++++
 .../Types/ItemListDescriptionExtension.pm     |  94 ++++
 .../Analytics/Types/ItemListExtension.pm      |  94 ++++
 .../lib/ONVIF/Analytics/Types/JobToken.pm     |  65 +++
 .../ONVIF/Analytics/Types/JpegDecOptions.pm   | 130 ++++++
 .../lib/ONVIF/Analytics/Types/JpegOptions.pm  | 130 ++++++
 .../lib/ONVIF/Analytics/Types/JpegOptions2.pm | 124 ++++++
 .../proxy/lib/ONVIF/Analytics/Types/Layout.pm | 116 +++++
 .../ONVIF/Analytics/Types/LayoutExtension.pm  |  94 ++++
 .../ONVIF/Analytics/Types/LayoutOptions.pm    | 117 +++++
 .../Analytics/Types/LayoutOptionsExtension.pm |  94 ++++
 .../Analytics/Types/MaximumNumberOfOSDs.pm    | 177 ++++++++
 .../ONVIF/Analytics/Types/MediaAttributes.pm  | 157 +++++++
 .../Analytics/Types/MediaCapabilities.pm      | 131 ++++++
 .../Types/MediaCapabilitiesExtension.pm       | 105 +++++
 .../lib/ONVIF/Analytics/Types/MediaUri.pm     | 130 ++++++
 .../proxy/lib/ONVIF/Analytics/Types/Merge.pm  | 112 +++++
 .../Analytics/Types/MessageDescription.pm     | 193 ++++++++
 .../Types/MessageDescriptionExtension.pm      |  94 ++++
 .../ONVIF/Analytics/Types/MessageExtension.pm |  94 ++++
 .../Analytics/Types/MetadataAttributes.pm     | 168 +++++++
 .../Analytics/Types/MetadataConfiguration.pm  | 186 ++++++++
 .../Types/MetadataConfigurationExtension.pm   |  94 ++++
 .../Types/MetadataConfigurationOptions.pm     | 110 +++++
 .../ONVIF/Analytics/Types/MetadataFilter.pm   | 103 +++++
 .../ONVIF/Analytics/Types/MetadataInput.pm    | 121 +++++
 .../Analytics/Types/MetadataInputExtension.pm |  94 ++++
 .../ONVIF/Analytics/Types/MetadataStream.pm   | 260 +++++++++++
 .../Types/MetadataStreamExtension.pm          | 118 +++++
 .../Types/MetadataStreamExtension2.pm         |  94 ++++
 .../ONVIF/Analytics/Types/ModeOfOperation.pm  |  65 +++
 .../ONVIF/Analytics/Types/MotionExpression.pm | 148 +++++++
 .../Types/MotionExpressionConfiguration.pm    | 105 +++++
 .../ONVIF/Analytics/Types/MotionInCells.pm    | 167 +++++++
 .../lib/ONVIF/Analytics/Types/MoveOptions.pm  | 144 ++++++
 .../ONVIF/Analytics/Types/MoveOptions20.pm    | 144 ++++++
 .../lib/ONVIF/Analytics/Types/MoveStatus.pm   |  65 +++
 .../Analytics/Types/Mpeg4Configuration.pm     | 112 +++++
 .../ONVIF/Analytics/Types/Mpeg4DecOptions.pm  | 139 ++++++
 .../lib/ONVIF/Analytics/Types/Mpeg4Options.pm | 151 +++++++
 .../ONVIF/Analytics/Types/Mpeg4Options2.pm    | 134 ++++++
 .../lib/ONVIF/Analytics/Types/Mpeg4Profile.pm |  65 +++
 .../Analytics/Types/MulticastConfiguration.pm | 134 ++++++
 .../ONVIF/Analytics/Types/NTPInformation.pm   | 145 ++++++
 .../Types/NTPInformationExtension.pm          |  94 ++++
 onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm |  65 +++
 .../Analytics/Types/NetworkCapabilities.pm    | 143 ++++++
 .../Types/NetworkCapabilitiesExtension.pm     | 113 +++++
 .../Types/NetworkCapabilitiesExtension2.pm    |  94 ++++
 .../ONVIF/Analytics/Types/NetworkGateway.pm   | 112 +++++
 .../lib/ONVIF/Analytics/Types/NetworkHost.pm  | 140 ++++++
 .../Analytics/Types/NetworkHostExtension.pm   |  94 ++++
 .../ONVIF/Analytics/Types/NetworkHostType.pm  |  65 +++
 .../ONVIF/Analytics/Types/NetworkInterface.pm | 233 ++++++++++
 .../Types/NetworkInterfaceConfigPriority.pm   |  65 +++
 .../NetworkInterfaceConnectionSetting.pm      | 121 +++++
 .../Types/NetworkInterfaceExtension.pm        | 150 +++++++
 .../Types/NetworkInterfaceExtension2.pm       |  94 ++++
 .../Analytics/Types/NetworkInterfaceInfo.pm   | 121 +++++
 .../Analytics/Types/NetworkInterfaceLink.pm   | 129 ++++++
 .../Types/NetworkInterfaceSetConfiguration.pm | 191 ++++++++
 ...tworkInterfaceSetConfigurationExtension.pm | 141 ++++++
 ...workInterfaceSetConfigurationExtension2.pm |  94 ++++
 .../ONVIF/Analytics/Types/NetworkProtocol.pm  | 131 ++++++
 .../Types/NetworkProtocolExtension.pm         |  94 ++++
 .../Analytics/Types/NetworkProtocolType.pm    |  65 +++
 .../Types/NetworkZeroConfiguration.pm         | 133 ++++++
 .../NetworkZeroConfigurationExtension.pm      | 104 +++++
 .../NetworkZeroConfigurationExtension2.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/OSDColor.pm     | 148 +++++++
 .../ONVIF/Analytics/Types/OSDColorOptions.pm  | 144 ++++++
 .../Types/OSDColorOptionsExtension.pm         |  94 ++++
 .../ONVIF/Analytics/Types/OSDConfiguration.pm | 175 ++++++++
 .../Types/OSDConfigurationExtension.pm        |  94 ++++
 .../Types/OSDConfigurationOptions.pm          | 219 +++++++++
 .../Types/OSDConfigurationOptionsExtension.pm |  94 ++++
 .../Analytics/Types/OSDImgConfiguration.pm    | 113 +++++
 .../Types/OSDImgConfigurationExtension.pm     |  94 ++++
 .../ONVIF/Analytics/Types/OSDImgOptions.pm    | 113 +++++
 .../Analytics/Types/OSDImgOptionsExtension.pm |  94 ++++
 .../Analytics/Types/OSDPosConfiguration.pm    | 122 ++++++
 .../Types/OSDPosConfigurationExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/OSDReference.pm |  73 +++
 .../Analytics/Types/OSDTextConfiguration.pm   | 171 ++++++++
 .../Types/OSDTextConfigurationExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/OSDTextOptions.pm   | 215 +++++++++
 .../Types/OSDTextOptionsExtension.pm          |  94 ++++
 .../lib/ONVIF/Analytics/Types/OSDType.pm      |  65 +++
 .../proxy/lib/ONVIF/Analytics/Types/Object.pm | 173 ++++++++
 .../ONVIF/Analytics/Types/ObjectExtension.pm  |  94 ++++
 .../lib/ONVIF/Analytics/Types/ObjectId.pm     | 122 ++++++
 .../lib/ONVIF/Analytics/Types/ObjectTree.pm   | 149 +++++++
 .../Analytics/Types/ObjectTreeExtension.pm    |  94 ++++
 .../lib/ONVIF/Analytics/Types/OnvifVersion.pm | 112 +++++
 .../lib/ONVIF/Analytics/Types/OtherType.pm    | 112 +++++
 .../Analytics/Types/PTControlDirection.pm     | 126 ++++++
 .../Types/PTControlDirectionExtension.pm      |  94 ++++
 .../Types/PTControlDirectionOptions.pm        | 130 ++++++
 .../PTControlDirectionOptionsExtension.pm     |  94 ++++
 .../ONVIF/Analytics/Types/PTZCapabilities.pm  | 103 +++++
 .../ONVIF/Analytics/Types/PTZConfiguration.pm | 251 +++++++++++
 .../Types/PTZConfigurationExtension.pm        | 122 ++++++
 .../Types/PTZConfigurationExtension2.pm       |  94 ++++
 .../Types/PTZConfigurationOptions.pm          | 218 +++++++++
 .../Types/PTZConfigurationOptions2.pm         |  94 ++++
 .../lib/ONVIF/Analytics/Types/PTZFilter.pm    | 112 +++++
 .../ONVIF/Analytics/Types/PTZMoveStatus.pm    | 112 +++++
 .../lib/ONVIF/Analytics/Types/PTZNode.pm      | 278 ++++++++++++
 .../ONVIF/Analytics/Types/PTZNodeExtension.pm | 118 +++++
 .../Analytics/Types/PTZNodeExtension2.pm      |  94 ++++
 .../Analytics/Types/PTZPositionFilter.pm      | 127 ++++++
 .../lib/ONVIF/Analytics/Types/PTZPreset.pm    | 162 +++++++
 .../Analytics/Types/PTZPresetTourDirection.pm |  65 +++
 .../Analytics/Types/PTZPresetTourExtension.pm |  94 ++++
 .../Analytics/Types/PTZPresetTourOperation.pm |  65 +++
 .../Analytics/Types/PTZPresetTourOptions.pm   | 162 +++++++
 .../Types/PTZPresetTourPresetDetail.pm        | 136 ++++++
 .../Types/PTZPresetTourPresetDetailOptions.pm | 156 +++++++
 ...ZPresetTourPresetDetailOptionsExtension.pm |  94 ++++
 .../Analytics/Types/PTZPresetTourSpot.pm      | 145 ++++++
 .../Types/PTZPresetTourSpotExtension.pm       |  94 ++++
 .../Types/PTZPresetTourSpotOptions.pm         | 138 ++++++
 .../Types/PTZPresetTourStartingCondition.pm   | 131 ++++++
 ...PTZPresetTourStartingConditionExtension.pm |  94 ++++
 .../PTZPresetTourStartingConditionOptions.pm  | 137 ++++++
 ...etTourStartingConditionOptionsExtension.pm |  94 ++++
 .../Analytics/Types/PTZPresetTourState.pm     |  65 +++
 .../Analytics/Types/PTZPresetTourStatus.pm    | 142 ++++++
 .../Types/PTZPresetTourStatusExtension.pm     |  94 ++++
 .../Analytics/Types/PTZPresetTourSupported.pm | 122 ++++++
 .../Types/PTZPresetTourSupportedExtension.pm  |  94 ++++
 .../Types/PTZPresetTourTypeExtension.pm       |  94 ++++
 .../lib/ONVIF/Analytics/Types/PTZSpaces.pm    | 236 ++++++++++
 .../Analytics/Types/PTZSpacesExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/PTZSpeed.pm     | 112 +++++
 .../lib/ONVIF/Analytics/Types/PTZStatus.pm    | 136 ++++++
 .../Analytics/Types/PTZStatusFilterOptions.pm | 140 ++++++
 .../Types/PTZStatusFilterOptionsExtension.pm  |  94 ++++
 .../lib/ONVIF/Analytics/Types/PTZStream.pm    | 126 ++++++
 .../Analytics/Types/PTZStreamExtension.pm     |  94 ++++
 .../lib/ONVIF/Analytics/Types/PTZVector.pm    | 112 +++++
 .../ONVIF/Analytics/Types/PanTiltLimits.pm    | 113 +++++
 .../Analytics/Types/PaneConfiguration.pm      | 163 +++++++
 .../lib/ONVIF/Analytics/Types/PaneLayout.pm   | 112 +++++
 .../Analytics/Types/PaneLayoutOptions.pm      | 113 +++++
 .../Analytics/Types/PaneOptionExtension.pm    |  94 ++++
 .../lib/ONVIF/Analytics/Types/Polygon.pm      | 103 +++++
 .../Analytics/Types/PolygonConfiguration.pm   | 105 +++++
 .../lib/ONVIF/Analytics/Types/Polyline.pm     | 103 +++++
 .../ONVIF/Analytics/Types/PolylineArray.pm    | 115 +++++
 .../Types/PolylineArrayConfiguration.pm       | 109 +++++
 .../Analytics/Types/PolylineArrayExtension.pm |  94 ++++
 .../Analytics/Types/PrefixedIPv4Address.pm    | 112 +++++
 .../Analytics/Types/PrefixedIPv6Address.pm    | 112 +++++
 .../lib/ONVIF/Analytics/Types/PresetTour.pm   | 247 +++++++++++
 .../lib/ONVIF/Analytics/Types/Profile.pm      | 414 ++++++++++++++++++
 .../Analytics/Types/ProfileCapabilities.pm    | 103 +++++
 .../ONVIF/Analytics/Types/ProfileExtension.pm | 127 ++++++
 .../Analytics/Types/ProfileExtension2.pm      |  94 ++++
 .../Analytics/Types/PropertyOperation.pm      |  65 +++
 .../Types/RealTimeStreamingCapabilities.pm    | 131 ++++++
 .../RealTimeStreamingCapabilitiesExtension.pm |  94 ++++
 .../lib/ONVIF/Analytics/Types/Receiver.pm     | 121 +++++
 .../Analytics/Types/ReceiverCapabilities.pm   | 148 +++++++
 .../Analytics/Types/ReceiverConfiguration.pm  | 126 ++++++
 .../lib/ONVIF/Analytics/Types/ReceiverMode.pm |  65 +++
 .../Analytics/Types/ReceiverReference.pm      |  65 +++
 .../ONVIF/Analytics/Types/ReceiverState.pm    |  65 +++
 .../Types/ReceiverStateInformation.pm         | 112 +++++
 .../Analytics/Types/RecordingCapabilities.pm  | 148 +++++++
 .../Analytics/Types/RecordingConfiguration.pm | 127 ++++++
 .../Analytics/Types/RecordingInformation.pm   | 169 +++++++
 .../Types/RecordingJobConfiguration.pm        | 151 +++++++
 .../RecordingJobConfigurationExtension.pm     |  94 ++++
 .../ONVIF/Analytics/Types/RecordingJobMode.pm |  65 +++
 .../Analytics/Types/RecordingJobReference.pm  |  65 +++
 .../Analytics/Types/RecordingJobSource.pm     | 136 ++++++
 .../Types/RecordingJobSourceExtension.pm      |  94 ++++
 .../Analytics/Types/RecordingJobState.pm      |  65 +++
 .../Types/RecordingJobStateInformation.pm     | 144 ++++++
 .../RecordingJobStateInformationExtension.pm  |  94 ++++
 .../Types/RecordingJobStateSource.pm          | 130 ++++++
 .../Analytics/Types/RecordingJobStateTrack.pm | 130 ++++++
 .../Types/RecordingJobStateTracks.pm          | 108 +++++
 .../Analytics/Types/RecordingJobTrack.pm      | 112 +++++
 .../Analytics/Types/RecordingReference.pm     |  65 +++
 .../Types/RecordingSourceInformation.pm       | 139 ++++++
 .../ONVIF/Analytics/Types/RecordingStatus.pm  |  65 +++
 .../ONVIF/Analytics/Types/RecordingSummary.pm | 121 +++++
 .../lib/ONVIF/Analytics/Types/Rectangle.pm    | 155 +++++++
 .../ONVIF/Analytics/Types/ReferenceToken.pm   |  65 +++
 .../ONVIF/Analytics/Types/RelativeFocus.pm    | 112 +++++
 .../Analytics/Types/RelativeFocusOptions.pm   | 118 +++++
 .../Analytics/Types/RelativeFocusOptions20.pm | 118 +++++
 .../ONVIF/Analytics/Types/RelayIdleState.pm   |  65 +++
 .../Analytics/Types/RelayLogicalState.pm      |  65 +++
 .../lib/ONVIF/Analytics/Types/RelayMode.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/RelayOutput.pm  | 110 +++++
 .../Analytics/Types/RelayOutputSettings.pm    | 121 +++++
 .../lib/ONVIF/Analytics/Types/RemoteUser.pm   | 121 +++++
 .../proxy/lib/ONVIF/Analytics/Types/Rename.pm | 112 +++++
 .../Analytics/Types/ReplayCapabilities.pm     | 103 +++++
 .../Analytics/Types/ReplayConfiguration.pm    | 103 +++++
 .../lib/ONVIF/Analytics/Types/Reverse.pm      | 103 +++++
 .../lib/ONVIF/Analytics/Types/ReverseMode.pm  |  65 +++
 .../ONVIF/Analytics/Types/ReverseOptions.pm   | 113 +++++
 .../Types/ReverseOptionsExtension.pm          |  94 ++++
 .../proxy/lib/ONVIF/Analytics/Types/Rotate.pm | 122 ++++++
 .../ONVIF/Analytics/Types/RotateExtension.pm  |  94 ++++
 .../lib/ONVIF/Analytics/Types/RotateMode.pm   |  65 +++
 .../ONVIF/Analytics/Types/RotateOptions.pm    | 124 ++++++
 .../Analytics/Types/RotateOptionsExtension.pm |  94 ++++
 .../Types/RuleEngineConfiguration.pm          | 121 +++++
 .../Types/RuleEngineConfigurationExtension.pm |  94 ++++
 .../proxy/lib/ONVIF/Analytics/Types/Scope.pm  | 112 +++++
 .../ONVIF/Analytics/Types/ScopeDefinition.pm  |  65 +++
 .../Analytics/Types/SearchCapabilities.pm     | 112 +++++
 .../lib/ONVIF/Analytics/Types/SearchScope.pm  | 133 ++++++
 .../Analytics/Types/SearchScopeExtension.pm   |  94 ++++
 .../lib/ONVIF/Analytics/Types/SearchState.pm  |  65 +++
 .../Analytics/Types/SecurityCapabilities.pm   | 200 +++++++++
 .../Types/SecurityCapabilitiesExtension.pm    | 122 ++++++
 .../Types/SecurityCapabilitiesExtension2.pm   | 121 +++++
 .../ONVIF/Analytics/Types/SetDateTimeType.pm  |  65 +++
 .../ONVIF/Analytics/Types/ShapeDescriptor.pm  | 133 ++++++
 .../Types/ShapeDescriptorExtension.pm         |  94 ++++
 .../Analytics/Types/SourceIdentification.pm   | 122 ++++++
 .../Types/SourceIdentificationExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/SourceReference.pm  | 148 +++++++
 .../Analytics/Types/Space1DDescription.pm     | 115 +++++
 .../Analytics/Types/Space2DDescription.pm     | 127 ++++++
 .../proxy/lib/ONVIF/Analytics/Types/Split.pm  | 112 +++++
 .../lib/ONVIF/Analytics/Types/StreamSetup.pm  | 114 +++++
 .../lib/ONVIF/Analytics/Types/StreamType.pm   |  65 +++
 .../ONVIF/Analytics/Types/StringAttrList.pm   |  75 ++++
 .../Analytics/Types/SupportInformation.pm     | 115 +++++
 .../Types/SupportedAnalyticsModules.pm        | 134 ++++++
 .../SupportedAnalyticsModulesExtension.pm     |  94 ++++
 .../ONVIF/Analytics/Types/SupportedRules.pm   | 134 ++++++
 .../Types/SupportedRulesExtension.pm          |  94 ++++
 .../Analytics/Types/SystemCapabilities.pm     | 176 ++++++++
 .../Types/SystemCapabilitiesExtension.pm      | 140 ++++++
 .../Types/SystemCapabilitiesExtension2.pm     |  94 ++++
 .../ONVIF/Analytics/Types/SystemDateTime.pm   | 173 ++++++++
 .../Types/SystemDateTimeExtension.pm          |  94 ++++
 .../lib/ONVIF/Analytics/Types/SystemLog.pm    | 115 +++++
 .../ONVIF/Analytics/Types/SystemLogType.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/SystemLogUri.pm | 112 +++++
 .../ONVIF/Analytics/Types/SystemLogUriList.pm | 106 +++++
 .../ONVIF/Analytics/Types/TLSConfiguration.pm | 103 +++++
 onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm | 121 +++++
 .../lib/ONVIF/Analytics/Types/TimeZone.pm     | 103 +++++
 .../Analytics/Types/TopicNamespaceLocation.pm |  65 +++
 .../ONVIF/Analytics/Types/TrackAttributes.pm  | 160 +++++++
 .../Types/TrackAttributesExtension.pm         |  94 ++++
 .../Analytics/Types/TrackConfiguration.pm     | 112 +++++
 .../ONVIF/Analytics/Types/TrackInformation.pm | 139 ++++++
 .../ONVIF/Analytics/Types/TrackReference.pm   |  65 +++
 .../lib/ONVIF/Analytics/Types/TrackType.pm    |  65 +++
 .../ONVIF/Analytics/Types/Transformation.pm   | 122 ++++++
 .../Types/TransformationExtension.pm          |  94 ++++
 .../lib/ONVIF/Analytics/Types/Transport.pm    | 103 +++++
 .../Analytics/Types/TransportProtocol.pm      |  65 +++
 onvif/proxy/lib/ONVIF/Analytics/Types/User.pm | 131 ++++++
 .../ONVIF/Analytics/Types/UserExtension.pm    |  94 ++++
 .../lib/ONVIF/Analytics/Types/UserLevel.pm    |  65 +++
 .../proxy/lib/ONVIF/Analytics/Types/Vector.pm | 133 ++++++
 .../lib/ONVIF/Analytics/Types/Vector1D.pm     | 135 ++++++
 .../lib/ONVIF/Analytics/Types/Vector2D.pm     | 146 ++++++
 .../Types/VideoAnalyticsConfiguration.pm      | 149 +++++++
 .../Analytics/Types/VideoAnalyticsStream.pm   | 211 +++++++++
 .../Types/VideoAnalyticsStreamExtension.pm    |  94 ++++
 .../ONVIF/Analytics/Types/VideoAttributes.pm  | 139 ++++++
 .../Types/VideoDecoderConfigurationOptions.pm | 172 ++++++++
 ...deoDecoderConfigurationOptionsExtension.pm |  94 ++++
 .../Types/VideoEncoderConfiguration.pm        | 201 +++++++++
 .../Types/VideoEncoderConfigurationOptions.pm | 212 +++++++++
 .../Types/VideoEncoderOptionsExtension.pm     | 146 ++++++
 .../Types/VideoEncoderOptionsExtension2.pm    |  94 ++++
 .../ONVIF/Analytics/Types/VideoEncoding.pm    |  65 +++
 .../lib/ONVIF/Analytics/Types/VideoOutput.pm  | 153 +++++++
 .../Types/VideoOutputConfiguration.pm         | 116 +++++
 .../Types/VideoOutputConfigurationOptions.pm  |  94 ++++
 .../Analytics/Types/VideoOutputExtension.pm   |  94 ++++
 .../ONVIF/Analytics/Types/VideoRateControl.pm | 121 +++++
 .../ONVIF/Analytics/Types/VideoResolution.pm  | 112 +++++
 .../lib/ONVIF/Analytics/Types/VideoSource.pm  | 243 ++++++++++
 .../Types/VideoSourceConfiguration.pm         | 143 ++++++
 .../VideoSourceConfigurationExtension.pm      | 118 +++++
 .../VideoSourceConfigurationExtension2.pm     |  94 ++++
 .../Types/VideoSourceConfigurationOptions.pm  | 149 +++++++
 ...ideoSourceConfigurationOptionsExtension.pm | 120 +++++
 ...deoSourceConfigurationOptionsExtension2.pm |  94 ++++
 .../Analytics/Types/VideoSourceExtension.pm   | 175 ++++++++
 .../Analytics/Types/VideoSourceExtension2.pm  |  94 ++++
 .../lib/ONVIF/Analytics/Types/WhiteBalance.pm | 121 +++++
 .../ONVIF/Analytics/Types/WhiteBalance20.pm   | 131 ++++++
 .../Types/WhiteBalance20Extension.pm          |  94 ++++
 .../ONVIF/Analytics/Types/WhiteBalanceMode.pm |  65 +++
 .../Analytics/Types/WhiteBalanceOptions.pm    | 127 ++++++
 .../Analytics/Types/WhiteBalanceOptions20.pm  | 137 ++++++
 .../Types/WhiteBalanceOptions20Extension.pm   |  94 ++++
 .../ONVIF/Analytics/Types/WideDynamicMode.pm  |  65 +++
 .../ONVIF/Analytics/Types/WideDynamicRange.pm | 112 +++++
 .../Analytics/Types/WideDynamicRange20.pm     | 112 +++++
 .../Types/WideDynamicRangeOptions.pm          | 115 +++++
 .../Types/WideDynamicRangeOptions20.pm        | 115 +++++
 .../ONVIF/Analytics/Types/XPathExpression.pm  |  65 +++
 .../lib/ONVIF/Analytics/Types/ZoomLimits.pm   | 109 +++++
 .../lib/ONVIF/Analytics/Types/base64Binary.pm | 117 +++++
 .../proxy/lib/ONVIF/Analytics/Types/detail.pm |  94 ++++
 .../ONVIF/Analytics/Types/encodingStyle.pm    |  75 ++++
 .../lib/ONVIF/Analytics/Types/hexBinary.pm    | 117 +++++
 .../ONVIF/Media/Types/TopicNamespaceType.pm   |   4 +-
 .../lib/ONVIF/PTZ/Types/TopicNamespaceType.pm |   4 +-
 .../Attributes/IsReferenceParameter.pm        |  54 +++
 .../lib/WSNotification/Attributes/base.pm     |  54 +++
 .../proxy/lib/WSNotification/Attributes/id.pm |  54 +++
 .../lib/WSNotification/Attributes/lang.pm     |  72 +++
 .../lib/WSNotification/Attributes/space.pm    |  64 +++
 .../lib/WSNotification/Attributes/topic.pm    |  54 +++
 .../Attributes/topicNamespaceLocation.pm      |  54 +++
 .../lib/WSNotification/Elements/Action.pm     |  57 +++
 .../lib/WSNotification/Elements/BaseFault.pm  |  72 +++
 .../Elements/ConsumerReference.pm             |  63 +++
 .../Elements/CreatePullPoint.pm               | 107 +++++
 .../Elements/CreatePullPointResponse.pm       | 127 ++++++
 .../WSNotification/Elements/CreationTime.pm   |  57 +++
 .../WSNotification/Elements/CurrentTime.pm    |  57 +++
 .../Elements/DestroyPullPoint.pm              | 107 +++++
 .../Elements/DestroyPullPointResponse.pm      | 107 +++++
 .../Elements/EndpointReference.pm             |  63 +++
 .../lib/WSNotification/Elements/FaultTo.pm    |  63 +++
 .../lib/WSNotification/Elements/Filter.pm     |  62 +++
 .../WSNotification/Elements/FixedTopicSet.pm  |  57 +++
 .../proxy/lib/WSNotification/Elements/From.pm |  63 +++
 .../Elements/GetCurrentMessage.pm             | 122 ++++++
 .../Elements/GetCurrentMessageResponse.pm     | 107 +++++
 .../WSNotification/Elements/GetMessages.pm    | 121 +++++
 .../Elements/GetMessagesResponse.pm           | 147 +++++++
 .../Elements/InvalidFilterFault.pm            |  59 +++
 .../InvalidMessageContentExpressionFault.pm   |  58 +++
 ...nvalidProducerPropertiesExpressionFault.pm |  58 +++
 .../Elements/InvalidTopicExpressionFault.pm   |  58 +++
 .../WSNotification/Elements/MessageContent.pm |  58 +++
 .../lib/WSNotification/Elements/MessageID.pm  |  57 +++
 .../lib/WSNotification/Elements/Metadata.pm   |  58 +++
 .../Elements/MultipleTopicsSpecifiedFault.pm  |  58 +++
 .../Elements/NoCurrentMessageOnTopicFault.pm  |  58 +++
 .../Elements/NotificationMessage.pm           |  76 ++++
 .../Elements/NotificationProducerRP.pm        | 193 ++++++++
 .../lib/WSNotification/Elements/Notify.pm     | 147 +++++++
 .../NotifyMessageNotSupportedFault.pm         |  58 +++
 .../Elements/PauseFailedFault.pm              |  58 +++
 .../Elements/PauseSubscription.pm             | 107 +++++
 .../Elements/PauseSubscriptionResponse.pm     | 107 +++++
 .../WSNotification/Elements/ProblemAction.pm  |  60 +++
 .../WSNotification/Elements/ProblemHeader.pm  |  58 +++
 .../Elements/ProblemHeaderQName.pm            |  57 +++
 .../lib/WSNotification/Elements/ProblemIRI.pm |  57 +++
 .../Elements/ProducerProperties.pm            |  58 +++
 .../Elements/ProducerReference.pm             |  63 +++
 .../lib/WSNotification/Elements/RelatesTo.pm  |  57 +++
 .../lib/WSNotification/Elements/Renew.pm      | 121 +++++
 .../WSNotification/Elements/RenewResponse.pm  | 149 +++++++
 .../lib/WSNotification/Elements/ReplyTo.pm    |  63 +++
 .../Elements/ResumeFailedFault.pm             |  58 +++
 .../Elements/ResumeSubscription.pm            | 107 +++++
 .../Elements/ResumeSubscriptionResponse.pm    | 107 +++++
 .../lib/WSNotification/Elements/RetryAfter.pm |  57 +++
 .../lib/WSNotification/Elements/Subscribe.pm  | 219 +++++++++
 .../Elements/SubscribeCreationFailedFault.pm  |  58 +++
 .../Elements/SubscribeResponse.pm             | 169 +++++++
 .../Elements/SubscriptionManagerRP.pm         | 203 +++++++++
 .../Elements/SubscriptionPolicy.pm            |  58 +++
 .../Elements/SubscriptionReference.pm         |  63 +++
 .../Elements/TerminationTime.pm               |  57 +++
 onvif/proxy/lib/WSNotification/Elements/To.pm |  57 +++
 .../lib/WSNotification/Elements/Topic.pm      |  58 +++
 .../Elements/TopicExpression.pm               |  58 +++
 .../Elements/TopicExpressionDialect.pm        |  57 +++
 .../TopicExpressionDialectUnknownFault.pm     |  58 +++
 .../WSNotification/Elements/TopicNamespace.pm |  60 +++
 .../Elements/TopicNotSupportedFault.pm        |  58 +++
 .../lib/WSNotification/Elements/TopicSet.pm   |  58 +++
 .../Elements/UnableToCreatePullPointFault.pm  |  58 +++
 .../Elements/UnableToDestroyPullPointFault.pm |  58 +++
 .../UnableToDestroySubscriptionFault.pm       |  58 +++
 .../Elements/UnableToGetMessagesFault.pm      |  58 +++
 ...UnacceptableInitialTerminationTimeFault.pm |  60 +++
 .../UnacceptableTerminationTimeFault.pm       |  60 +++
 .../UnrecognizedPolicyRequestFault.pm         |  59 +++
 .../WSNotification/Elements/Unsubscribe.pm    | 107 +++++
 .../Elements/UnsubscribeResponse.pm           | 107 +++++
 .../Elements/UnsupportedPolicyRequestFault.pm |  59 +++
 .../lib/WSNotification/Elements/UseRaw.pm     |  90 ++++
 .../NotificationProducerPort.pm               | 184 ++++++++
 .../SubscriptionManagerPort.pm                | 167 +++++++
 .../Typemaps/WSBaseNotificationSender.pm      | 210 +++++++++
 .../Types/AbsoluteOrRelativeTimeType.pm       |  76 ++++
 .../WSNotification/Types/AttributedAnyType.pm |  94 ++++
 .../Types/AttributedQNameType.pm              |  73 +++
 .../WSNotification/Types/AttributedURIType.pm |  73 +++
 .../Types/AttributedUnsignedLongType.pm       |  73 +++
 .../lib/WSNotification/Types/BaseFaultType.pm | 288 ++++++++++++
 .../Types/ConcreteTopicExpression.pm          |  65 +++
 .../lib/WSNotification/Types/Documentation.pm |  94 ++++
 .../Types/EndpointReferenceType.pm            | 130 ++++++
 .../Types/ExtensibleDocumented.pm             | 104 +++++
 .../Types/FaultCodesOpenEnumType.pm           |  76 ++++
 .../WSNotification/Types/FaultCodesType.pm    |  65 +++
 .../lib/WSNotification/Types/FilterType.pm    | 128 ++++++
 .../Types/FullTopicExpression.pm              |  65 +++
 .../Types/InvalidFilterFaultType.pm           | 261 +++++++++++
 ...nvalidMessageContentExpressionFaultType.pm | 252 +++++++++++
 ...idProducerPropertiesExpressionFaultType.pm | 252 +++++++++++
 .../Types/InvalidTopicExpressionFaultType.pm  | 252 +++++++++++
 .../lib/WSNotification/Types/MetadataType.pm  |  94 ++++
 .../Types/MultipleTopicsSpecifiedFaultType.pm | 252 +++++++++++
 .../Types/NoCurrentMessageOnTopicFaultType.pm | 252 +++++++++++
 .../Types/NotificationMessageHolderType.pm    | 209 +++++++++
 .../NotifyMessageNotSupportedFaultType.pm     | 252 +++++++++++
 .../Types/PauseFailedFaultType.pm             | 252 +++++++++++
 .../WSNotification/Types/ProblemActionType.pm | 119 +++++
 .../Types/QueryExpressionType.pm              | 139 ++++++
 .../Types/ReferenceParametersType.pm          |  94 ++++
 .../lib/WSNotification/Types/RelatesToType.pm | 118 +++++
 .../WSNotification/Types/RelationshipType.pm  |  65 +++
 .../Types/RelationshipTypeOpenEnum.pm         |  76 ++++
 .../Types/ResumeFailedFaultType.pm            | 252 +++++++++++
 .../Types/SimpleTopicExpression.pm            |  65 +++
 .../Types/SubscribeCreationFailedFaultType.pm | 252 +++++++++++
 .../Types/SubscriptionPolicyType.pm           |  94 ++++
 .../TopicExpressionDialectUnknownFaultType.pm | 252 +++++++++++
 .../Types/TopicExpressionType.pm              | 120 +++++
 .../Types/TopicNamespaceType.pm               | 256 +++++++++++
 .../Types/TopicNotSupportedFaultType.pm       | 252 +++++++++++
 .../lib/WSNotification/Types/TopicSetType.pm  | 102 +++++
 .../lib/WSNotification/Types/TopicType.pm     | 168 +++++++
 .../Types/UnableToCreatePullPointFaultType.pm | 252 +++++++++++
 .../UnableToDestroyPullPointFaultType.pm      | 252 +++++++++++
 .../UnableToDestroySubscriptionFaultType.pm   | 252 +++++++++++
 .../Types/UnableToGetMessagesFaultType.pm     | 252 +++++++++++
 ...ceptableInitialTerminationTimeFaultType.pm | 270 ++++++++++++
 .../UnacceptableTerminationTimeFaultType.pm   | 270 ++++++++++++
 .../UnrecognizedPolicyRequestFaultType.pm     | 261 +++++++++++
 .../UnsupportedPolicyRequestFaultType.pm      | 261 +++++++++++
 735 files changed, 85682 insertions(+), 4 deletions(-)
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/User.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm
 create mode 100644 onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/base.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/id.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/lang.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/space.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/topic.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Action.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/BaseFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/CreationTime.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Filter.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/From.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/GetMessages.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/MessageContent.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/MessageID.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Metadata.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Notify.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Renew.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Subscribe.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/To.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Topic.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/TopicSet.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Elements/UseRaw.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/Documentation.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/FilterType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/MetadataType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicSetType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/TopicType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm
 create mode 100644 onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm

diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm
new file mode 100644
index 000000000..32ec1b360
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::actor;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('actor');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::actor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+actor from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::actor->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm
new file mode 100644
index 000000000..7efcde9bc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm
@@ -0,0 +1,64 @@
+
+package ONVIF::Analytics::Attributes::contentType;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' }
+
+__PACKAGE__->__set_name('contentType');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::contentType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+contentType from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::contentType->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm
new file mode 100644
index 000000000..7f16b80d3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::encodingStyle;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('encodingStyle');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    ONVIF::Analytics::Types::encodingStyle
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::encodingStyle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+encodingStyle from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::encodingStyle->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm
new file mode 100644
index 000000000..cfcb44a2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::expectedContentTypes;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' }
+
+__PACKAGE__->__set_name('expectedContentTypes');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::expectedContentTypes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+expectedContentTypes from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::expectedContentTypes->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm
new file mode 100644
index 000000000..363cec963
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm
@@ -0,0 +1,64 @@
+
+package ONVIF::Analytics::Attributes::mustUnderstand;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('mustUnderstand');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::mustUnderstand
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+mustUnderstand from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::mustUnderstand->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm
new file mode 100644
index 000000000..d0fc89bd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::AudioDecoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioDecoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioDecoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioDecoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioDecoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioDecoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm
new file mode 100644
index 000000000..6c0db80d6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm
@@ -0,0 +1,72 @@
+
+package ONVIF::Analytics::Elements::AudioEncoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioEncoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioEncoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioEncoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+   Encoding => $some_value, # AudioEncoding
+   Bitrate =>  $some_value, # int
+   SampleRate =>  $some_value, # int
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm
new file mode 100644
index 000000000..f7c0f7b32
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm
@@ -0,0 +1,61 @@
+
+package ONVIF::Analytics::Elements::AudioOutputConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioOutputConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioOutputConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioOutputConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+   SendPrimacy =>  $some_value, # anyURI
+   OutputLevel =>  $some_value, # int
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm
new file mode 100644
index 000000000..d1cb63ff7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::AudioSourceConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioSourceConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioSourceConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioSourceConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm
new file mode 100644
index 000000000..41611b087
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Body;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Body');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Body
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Body
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Body from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Body->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Body
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm
new file mode 100644
index 000000000..7c134f381
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Capabilities;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('Capabilities');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Capabilities
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Capabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Capabilities->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Capabilities
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm
new file mode 100644
index 000000000..a0f19cb3b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::CreateAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..c23ffecc0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm
new file mode 100644
index 000000000..d149b29dc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::CreateRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        Rule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'Rule' => \%Rule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm
new file mode 100644
index 000000000..3c28a2165
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::CreateRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm
new file mode 100644
index 000000000..6f977ae23
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm
@@ -0,0 +1,135 @@
+
+package ONVIF::Analytics::Elements::DeleteAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModuleName_of :ATTR(:get<AnalyticsModuleName>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModuleName
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModuleName' => \%AnalyticsModuleName_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModuleName' => 'AnalyticsModuleName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModuleName
+
+ $element->set_AnalyticsModuleName($data);
+ $element->get_AnalyticsModuleName();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModuleName =>  $some_value, # string
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..f723a7331
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm
new file mode 100644
index 000000000..cc007d5f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm
@@ -0,0 +1,135 @@
+
+package ONVIF::Analytics::Elements::DeleteRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %RuleName_of :ATTR(:get<RuleName>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        RuleName
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'RuleName' => \%RuleName_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'RuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'RuleName' => 'RuleName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * RuleName
+
+ $element->set_RuleName($data);
+ $element->get_RuleName();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   RuleName =>  $some_value, # string
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm
new file mode 100644
index 000000000..d8b7d5969
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::DeleteRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm
new file mode 100644
index 000000000..65b60aeb4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm
@@ -0,0 +1,62 @@
+
+package ONVIF::Analytics::Elements::Envelope;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Envelope');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Envelope
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Envelope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Envelope from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Envelope->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Envelope
+   Header =>  { # ONVIF::Analytics::Types::Header
+   },
+   Body =>  { # ONVIF::Analytics::Types::Body
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm
new file mode 100644
index 000000000..d8903ea39
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm
@@ -0,0 +1,63 @@
+
+package ONVIF::Analytics::Elements::Fault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Fault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Fault
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Fault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Fault from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Fault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Fault
+   faultcode =>  $some_value, # QName
+   faultstring =>  $some_value, # string
+   faultactor =>  $some_value, # anyURI
+   detail =>  { # ONVIF::Analytics::Types::detail
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm
new file mode 100644
index 000000000..23039ed5d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..01509ac6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm
@@ -0,0 +1,129 @@
+
+package ONVIF::Analytics::Elements::GetAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModule
+
+    ) ],
+    {
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm
new file mode 100644
index 000000000..7d96f0a1c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm
new file mode 100644
index 000000000..510591322
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm
@@ -0,0 +1,129 @@
+
+package ONVIF::Analytics::Elements::GetRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rule
+
+    ) ],
+    {
+        'Rule' => \%Rule_of,
+    },
+    {
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm
new file mode 100644
index 000000000..dd8589e07
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm
@@ -0,0 +1,107 @@
+
+package ONVIF::Analytics::Elements::GetServiceCapabilities;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetServiceCapabilities');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetServiceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetServiceCapabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetServiceCapabilities->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm
new file mode 100644
index 000000000..3361117af
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm
@@ -0,0 +1,122 @@
+
+package ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetServiceCapabilitiesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Capabilities_of :ATTR(:get<Capabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        Capabilities
+
+    ) ],
+    {
+        'Capabilities' => \%Capabilities_of,
+    },
+    {
+        'Capabilities' => 'ONVIF::Analytics::Types::Capabilities',
+    },
+    {
+
+        'Capabilities' => 'Capabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetServiceCapabilitiesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Capabilities
+
+ $element->set_Capabilities($data);
+ $element->get_Capabilities();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Capabilities =>  { # ONVIF::Analytics::Types::Capabilities
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm
new file mode 100644
index 000000000..d2f6fc924
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetSupportedAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..9962a617c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm
@@ -0,0 +1,138 @@
+
+package ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedAnalyticsModules_of :ATTR(:get<SupportedAnalyticsModules>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedAnalyticsModules
+
+    ) ],
+    {
+        'SupportedAnalyticsModules' => \%SupportedAnalyticsModules_of,
+    },
+    {
+        'SupportedAnalyticsModules' => 'ONVIF::Analytics::Types::SupportedAnalyticsModules',
+    },
+    {
+
+        'SupportedAnalyticsModules' => 'SupportedAnalyticsModules',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedAnalyticsModules
+
+ $element->set_SupportedAnalyticsModules($data);
+ $element->get_SupportedAnalyticsModules();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SupportedAnalyticsModules =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModules
+     AnalyticsModuleContentSchemaLocation =>  $some_value, # anyURI
+     AnalyticsModuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+       Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+         SimpleItemDescription => ,
+         ElementItemDescription => ,
+         Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+         },
+       },
+       Messages =>  {
+         ParentTopic =>  $some_value, # string
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm
new file mode 100644
index 000000000..7dfd0aa7d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetSupportedRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm
new file mode 100644
index 000000000..c23b26b6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm
@@ -0,0 +1,138 @@
+
+package ONVIF::Analytics::Elements::GetSupportedRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedRules_of :ATTR(:get<SupportedRules>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedRules
+
+    ) ],
+    {
+        'SupportedRules' => \%SupportedRules_of,
+    },
+    {
+        'SupportedRules' => 'ONVIF::Analytics::Types::SupportedRules',
+    },
+    {
+
+        'SupportedRules' => 'SupportedRules',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedRules
+
+ $element->set_SupportedRules($data);
+ $element->get_SupportedRules();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SupportedRules =>  { # ONVIF::Analytics::Types::SupportedRules
+     RuleContentSchemaLocation =>  $some_value, # anyURI
+     RuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+       Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+         SimpleItemDescription => ,
+         ElementItemDescription => ,
+         Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+         },
+       },
+       Messages =>  {
+         ParentTopic =>  $some_value, # string
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SupportedRulesExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm
new file mode 100644
index 000000000..4f64e72ba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Header;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Header');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Header
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Header
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Header from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Header->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Header
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm
new file mode 100644
index 000000000..9db022058
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Include;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2004/08/xop/include' }
+
+__PACKAGE__->__set_name('Include');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Include
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Include
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Include from the namespace http://www.w3.org/2004/08/xop/include.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Include->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Include
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm
new file mode 100644
index 000000000..d71b8e03c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm
@@ -0,0 +1,207 @@
+
+package ONVIF::Analytics::Elements::Message;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Message');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Elements::Message::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemList',
+        'Key' => 'ONVIF::Analytics::Types::ItemList',
+        'Data' => 'ONVIF::Analytics::Types::ItemList',
+        'Extension' => 'ONVIF::Analytics::Types::MessageExtension',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Elements::Message::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+my %PropertyOperation_of :ATTR(:get<PropertyOperation>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+        PropertyOperation
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+
+        PropertyOperation => \%PropertyOperation_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        PropertyOperation => 'ONVIF::Analytics::Types::PropertyOperation',
+    }
+);
+
+} # end BLOCK
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Message
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Message from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+ $element->set_Source($data);
+ $element->get_Source();
+
+
+
+
+=item * Key
+
+ $element->set_Key($data);
+ $element->get_Key();
+
+
+
+
+=item * Data
+
+ $element->set_Data($data);
+ $element->get_Data();
+
+
+
+
+=item * Extension
+
+ $element->set_Extension($data);
+ $element->get_Extension();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Message->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Source =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Key =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Data =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MessageExtension
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm
new file mode 100644
index 000000000..24662efd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm
@@ -0,0 +1,89 @@
+
+package ONVIF::Analytics::Elements::MetadataConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('MetadataConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::MetadataConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::MetadataConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MetadataConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::MetadataConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfiguration
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+     Status =>  $some_value, # boolean
+     Position =>  $some_value, # boolean
+   },
+   Analytics =>  $some_value, # boolean
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm
new file mode 100644
index 000000000..eb0831001
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm
@@ -0,0 +1,192 @@
+
+package ONVIF::Analytics::Elements::MetadataStream;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('MetadataStream');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::MetadataStream
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::MetadataStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MetadataStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::MetadataStream->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   VideoAnalytics =>    { # ONVIF::Analytics::Types::VideoAnalyticsStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     Frame =>  { # ONVIF::Analytics::Types::Frame
+       PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+         Position =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+           PanTilt => $some_value, # MoveStatus
+           Zoom => $some_value, # MoveStatus
+         },
+         Error =>  $some_value, # string
+         UtcTime =>  $some_value, # dateTime
+       },
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Object =>  { # ONVIF::Analytics::Types::Object
+         Appearance =>  { # ONVIF::Analytics::Types::Appearance
+           Transformation =>  { # ONVIF::Analytics::Types::Transformation
+             Translate => ,
+             Scale => ,
+             Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+             },
+           },
+           Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+             BoundingBox => ,
+             CenterOfGravity => ,
+             Polygon =>  { # ONVIF::Analytics::Types::Polygon
+               Point => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+             },
+           },
+           Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+             ColorCluster =>  {
+               Color => ,
+               Weight =>  $some_value, # float
+               Covariance => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+             },
+           },
+           Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+             ClassCandidate =>  {
+               Type => $some_value, # ClassType
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+               OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+                 Type =>  $some_value, # string
+                 Likelihood =>  $some_value, # float
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+           },
+         },
+         Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+           Removed =>  {
+           },
+           Idle =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+         },
+       },
+       ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+         Rename =>  { # ONVIF::Analytics::Types::Rename
+           from => ,
+           to => ,
+         },
+         Split =>  { # ONVIF::Analytics::Types::Split
+           from => ,
+           to => ,
+         },
+         Merge =>  { # ONVIF::Analytics::Types::Merge
+           from => ,
+           to => ,
+         },
+         Delete => ,
+         Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+         MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+         },
+         Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+     },
+   },
+   PTZ =>    { # ONVIF::Analytics::Types::PTZStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+     },
+   },
+   Event =>  $some_value, # anyType
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension
+     AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+       AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm
new file mode 100644
index 000000000..b1115dbe6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::ModifyAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..50d373978
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm
new file mode 100644
index 000000000..cda8c66d6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::ModifyRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        Rule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'Rule' => \%Rule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm
new file mode 100644
index 000000000..0efce26d5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::ModifyRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm
new file mode 100644
index 000000000..40870ad10
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm
@@ -0,0 +1,106 @@
+
+package ONVIF::Analytics::Elements::PTZConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('PTZConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::PTZConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::PTZConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PTZConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::PTZConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfiguration
+   NodeToken => $some_value, # ReferenceToken
+   DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+   DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+   DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+   DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+   DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+   DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+   DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   DefaultPTZTimeout =>  $some_value, # duration
+   PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+     Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+     Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+     PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+       EFlip =>  { # ONVIF::Analytics::Types::EFlip
+         Mode => $some_value, # EFlipMode
+       },
+       Reverse =>  { # ONVIF::Analytics::Types::Reverse
+         Mode => $some_value, # ReverseMode
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm
new file mode 100644
index 000000000..4d4ff9f05
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::Polygon;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Polygon');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Polygon
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Polygon
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Polygon from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Polygon->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polygon
+   Point => ,
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm
new file mode 100644
index 000000000..9948d4835
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::Polyline;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Polyline');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Polyline
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Polyline
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Polyline from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Polyline->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polyline
+   Point => ,
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm
new file mode 100644
index 000000000..147929963
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm
@@ -0,0 +1,84 @@
+
+package ONVIF::Analytics::Elements::VideoAnalyticsConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoAnalyticsConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoAnalyticsConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoAnalyticsConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoAnalyticsConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+     Rule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm
new file mode 100644
index 000000000..7b0759d9c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm
@@ -0,0 +1,88 @@
+
+package ONVIF::Analytics::Elements::VideoEncoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoEncoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoEncoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoEncoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+   Encoding => $some_value, # VideoEncoding
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Quality =>  $some_value, # float
+   RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+     FrameRateLimit =>  $some_value, # int
+     EncodingInterval =>  $some_value, # int
+     BitrateLimit =>  $some_value, # int
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+     GovLength =>  $some_value, # int
+     Mpeg4Profile => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+     GovLength =>  $some_value, # int
+     H264Profile => $some_value, # H264Profile
+   },
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm
new file mode 100644
index 000000000..50fe94f88
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm
@@ -0,0 +1,70 @@
+
+package ONVIF::Analytics::Elements::VideoSourceConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoSourceConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoSourceConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoSourceConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+   Bounds => ,
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+     Rotate =>  { # ONVIF::Analytics::Types::Rotate
+       Mode => $some_value, # RotateMode
+       Degree =>  $some_value, # int
+       Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm
new file mode 100644
index 000000000..481d254ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm
@@ -0,0 +1,338 @@
+package ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require ONVIF::Analytics::Typemaps::Analytics
+    if not ONVIF::Analytics::Typemaps::Analytics->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://www.examples.com/Analytics/') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('ONVIF::Analytics::Typemaps::Analytics')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub GetServiceCapabilities {
+    my ($self, $body, $header) = @_;
+    die "GetServiceCapabilities must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetServiceCapabilities',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetServiceCapabilities',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetServiceCapabilities )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetSupportedAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "GetSupportedAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetSupportedAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetSupportedAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetSupportedAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub CreateAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "CreateAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'CreateAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/CreateAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::CreateAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub DeleteAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "DeleteAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'DeleteAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/DeleteAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::DeleteAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "GetAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub ModifyAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "ModifyAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'ModifyAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/ModifyAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::ModifyAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort - SOAP Interface for the Analytics Web Service
+
+=head1 SYNOPSIS
+
+ use ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort;
+ my $interface = ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort->new();
+
+ my $response;
+ $response = $interface->GetServiceCapabilities();
+ $response = $interface->GetSupportedAnalyticsModules();
+ $response = $interface->CreateAnalyticsModules();
+ $response = $interface->DeleteAnalyticsModules();
+ $response = $interface->GetAnalyticsModules();
+ $response = $interface->ModifyAnalyticsModules();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the Analytics web service
+located at http://www.examples.com/Analytics/.
+
+=head1 SERVICE Analytics
+
+
+
+=head2 Port AnalyticsEnginePort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 GetServiceCapabilities
+
+Returns the capabilities of the analytics service. The result is returned in a typed answer.
+
+Returns a L<ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse|ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse> object.
+
+ $response = $interface->GetServiceCapabilities( {
+  },,
+ );
+
+=head3 GetSupportedAnalyticsModules
+
+List all analytics modules that are supported by the given VideoAnalyticsConfiguration. The result of this method may depend on the overall Video analytics configuration of the device, which is available via the current set of profiles. 
+
+Returns a L<ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse|ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse> object.
+
+ $response = $interface->GetSupportedAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 CreateAnalyticsModules
+
+The device shall ensure that a corresponding analytics engine starts operation when a client subscribes directly or indirectly for events produced by the analytics or rule engine or when a client requests the corresponding scene description stream. An analytics module must be attached to a Video source using the media profiles before it can be used. In case differing analytics configurations are attached to the same profile it is undefined which of the analytics module configuration becomes active if no stream is activated or multiple streams with different profiles are activated at the same time. 
+
+Returns a L<ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse|ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse> object.
+
+ $response = $interface->CreateAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+=head3 DeleteAnalyticsModules
+
+ 
+
+Returns a L<ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse|ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse> object.
+
+ $response = $interface->DeleteAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModuleName =>  $some_value, # string
+  },,
+ );
+
+=head3 GetAnalyticsModules
+
+List the currently assigned set of analytics modules of a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::GetAnalyticsModulesResponse|ONVIF::Analytics::Elements::GetAnalyticsModulesResponse> object.
+
+ $response = $interface->GetAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 ModifyAnalyticsModules
+
+Modify the settings of one or more analytics modules of a VideoAnalyticsConfiguration. The modules are referenced by their names. It is allowed to pass only a subset to be modified. 
+
+Returns a L<ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse|ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse> object.
+
+ $response = $interface->ModifyAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Tue Jul 15 19:19:50 2014
+
+=cut
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm
new file mode 100644
index 000000000..835e119ff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm
@@ -0,0 +1,301 @@
+package ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require ONVIF::Analytics::Typemaps::Analytics
+    if not ONVIF::Analytics::Typemaps::Analytics->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://www.examples.com/Analytics/') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('ONVIF::Analytics::Typemaps::Analytics')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub GetSupportedRules {
+    my ($self, $body, $header) = @_;
+    die "GetSupportedRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetSupportedRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetSupportedRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetSupportedRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub CreateRules {
+    my ($self, $body, $header) = @_;
+    die "CreateRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'CreateRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/CreateRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::CreateRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub DeleteRules {
+    my ($self, $body, $header) = @_;
+    die "DeleteRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'DeleteRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/DeleteRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::DeleteRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetRules {
+    my ($self, $body, $header) = @_;
+    die "GetRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub ModifyRules {
+    my ($self, $body, $header) = @_;
+    die "ModifyRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'ModifyRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/ModifyRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::ModifyRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort - SOAP Interface for the Analytics Web Service
+
+=head1 SYNOPSIS
+
+ use ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort;
+ my $interface = ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort->new();
+
+ my $response;
+ $response = $interface->GetSupportedRules();
+ $response = $interface->CreateRules();
+ $response = $interface->DeleteRules();
+ $response = $interface->GetRules();
+ $response = $interface->ModifyRules();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the Analytics web service
+located at http://www.examples.com/Analytics/.
+
+=head1 SERVICE Analytics
+
+
+
+=head2 Port RuleEnginePort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 GetSupportedRules
+
+List all rules that are supported by the given VideoAnalyticsConfiguration. The result of this method may depend on the overall Video analytics configuration of the device, which is available via the current set of profiles. 
+
+Returns a L<ONVIF::Analytics::Elements::GetSupportedRulesResponse|ONVIF::Analytics::Elements::GetSupportedRulesResponse> object.
+
+ $response = $interface->GetSupportedRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 CreateRules
+
+GetCompatibleVideoAnalyticsConfigurations. 
+
+Returns a L<ONVIF::Analytics::Elements::CreateRulesResponse|ONVIF::Analytics::Elements::CreateRulesResponse> object.
+
+ $response = $interface->CreateRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    Rule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+=head3 DeleteRules
+
+Remove one or more rules from a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::DeleteRulesResponse|ONVIF::Analytics::Elements::DeleteRulesResponse> object.
+
+ $response = $interface->DeleteRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    RuleName =>  $some_value, # string
+  },,
+ );
+
+=head3 GetRules
+
+List the currently assigned set of rules of a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::GetRulesResponse|ONVIF::Analytics::Elements::GetRulesResponse> object.
+
+ $response = $interface->GetRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 ModifyRules
+
+Modify one or more rules of a VideoAnalyticsConfiguration. The rules are referenced by their names. 
+
+Returns a L<ONVIF::Analytics::Elements::ModifyRulesResponse|ONVIF::Analytics::Elements::ModifyRulesResponse> object.
+
+ $response = $interface->ModifyRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    Rule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Tue Jul 15 19:19:50 2014
+
+=cut
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm b/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm
new file mode 100644
index 000000000..7b2dfb989
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm
@@ -0,0 +1,154 @@
+
+package ONVIF::Analytics::Typemaps::Analytics;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'ModifyAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+               'ModifyRules/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'DeleteRules/RuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'CreateAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'ModifyAnalyticsModules/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/Extension' => 'ONVIF::Analytics::Types::SupportedRulesExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'CreateRules/Rule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'CreateRules/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetAnalyticsModulesResponse/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetServiceCapabilitiesResponse/Capabilities' => 'ONVIF::Analytics::Types::Capabilities',
+               'ModifyRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetRulesResponse/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'ModifyAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse',
+               'GetRulesResponse/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateRules/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModules' => 'ONVIF::Analytics::Elements::GetSupportedAnalyticsModules',
+               'DeleteAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'DeleteAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'ModifyRules/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'CreateRules' => 'ONVIF::Analytics::Elements::CreateRules',
+               'ModifyRules/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateRulesResponse' => 'ONVIF::Analytics::Elements::CreateRulesResponse',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+               'GetAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'DeleteRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'DeleteAnalyticsModules/AnalyticsModuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'DeleteAnalyticsModules' => 'ONVIF::Analytics::Elements::DeleteAnalyticsModules',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/Extension' => 'ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules' => 'ONVIF::Analytics::Types::SupportedAnalyticsModules',
+               'GetSupportedAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+               'GetSupportedRulesResponse/SupportedRules' => 'ONVIF::Analytics::Types::SupportedRules',
+               'GetSupportedRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetServiceCapabilities' => 'ONVIF::Analytics::Elements::GetServiceCapabilities',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::GetAnalyticsModulesResponse',
+               'GetRulesResponse/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'ModifyRules' => 'ONVIF::Analytics::Elements::ModifyRules',
+               'GetRulesResponse/Rule' => 'ONVIF::Analytics::Types::Config',
+               'CreateRules/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateRules/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetRulesResponse' => 'ONVIF::Analytics::Elements::GetRulesResponse',
+               'GetSupportedRules' => 'ONVIF::Analytics::Elements::GetSupportedRules',
+               'GetRulesResponse/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'ModifyRulesResponse' => 'ONVIF::Analytics::Elements::ModifyRulesResponse',
+               'GetAnalyticsModules' => 'ONVIF::Analytics::Elements::GetAnalyticsModules',
+               'ModifyRules/Rule' => 'ONVIF::Analytics::Types::Config',
+               'DeleteRulesResponse' => 'ONVIF::Analytics::Elements::DeleteRulesResponse',
+               'GetServiceCapabilitiesResponse' => 'ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'DeleteRules' => 'ONVIF::Analytics::Elements::DeleteRules',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+               'ModifyAnalyticsModules' => 'ONVIF::Analytics::Elements::ModifyAnalyticsModules',
+               'GetSupportedRulesResponse' => 'ONVIF::Analytics::Elements::GetSupportedRulesResponse',
+               'CreateAnalyticsModules/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'CreateAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse',
+               'CreateRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateAnalyticsModules' => 'ONVIF::Analytics::Elements::CreateAnalyticsModules',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'ModifyRules/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetRules' => 'ONVIF::Analytics::Elements::GetRules',
+               'GetSupportedRulesResponse/SupportedRules/RuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key' => 'ONVIF::Analytics::Types::ItemListDescription'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Typemaps::Analytics - typemap for Analytics
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm
new file mode 100644
index 000000000..376a03c4e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AACDecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AACDecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AACDecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AACDecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm
new file mode 100644
index 000000000..652d075ed
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AbsoluteFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        Speed
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Position' => 'Position',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AbsoluteFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AbsoluteFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AbsoluteFocus
+   Position =>  $some_value, # float
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm
new file mode 100644
index 000000000..4479d0524
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::AbsoluteFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        Speed
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Position' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Position' => 'Position',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AbsoluteFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AbsoluteFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+   Position =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm
new file mode 100644
index 000000000..d696c2e9e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm
@@ -0,0 +1,147 @@
+package ONVIF::Analytics::Types::ActionEngineEventPayload;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RequestInfo_of :ATTR(:get<RequestInfo>);
+my %ResponseInfo_of :ATTR(:get<ResponseInfo>);
+my %Fault_of :ATTR(:get<Fault>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RequestInfo
+        ResponseInfo
+        Fault
+        Extension
+
+    ) ],
+    {
+        'RequestInfo' => \%RequestInfo_of,
+        'ResponseInfo' => \%ResponseInfo_of,
+        'Fault' => \%Fault_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RequestInfo' => 'ONVIF::Analytics::Types::Envelope',
+        'ResponseInfo' => 'ONVIF::Analytics::Types::Envelope',
+        'Fault' => 'ONVIF::Analytics::Types::Fault',
+        'Extension' => 'ONVIF::Analytics::Types::ActionEngineEventPayloadExtension',
+    },
+    {
+
+        'RequestInfo' => 'RequestInfo',
+        'ResponseInfo' => 'ResponseInfo',
+        'Fault' => 'Fault',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ActionEngineEventPayload
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ActionEngineEventPayload from the namespace http://www.onvif.org/ver10/schema.
+
+Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RequestInfo
+
+
+=item * ResponseInfo
+
+
+=item * Fault
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ActionEngineEventPayload
+   RequestInfo =>  { # ONVIF::Analytics::Types::Envelope
+     Header =>  { # ONVIF::Analytics::Types::Header
+     },
+     Body =>  { # ONVIF::Analytics::Types::Body
+     },
+   },
+   ResponseInfo =>  { # ONVIF::Analytics::Types::Envelope
+     Header =>  { # ONVIF::Analytics::Types::Header
+     },
+     Body =>  { # ONVIF::Analytics::Types::Body
+     },
+   },
+   Fault =>  { # ONVIF::Analytics::Types::Fault
+     faultcode =>  $some_value, # QName
+     faultstring =>  $some_value, # string
+     faultactor =>  $some_value, # anyURI
+     detail =>  { # ONVIF::Analytics::Types::detail
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm
new file mode 100644
index 000000000..0c6260802
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ActionEngineEventPayloadExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ActionEngineEventPayloadExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm
new file mode 100644
index 000000000..ce9cf9183
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %AnalyticsModuleSupport_of :ATTR(:get<AnalyticsModuleSupport>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RuleSupport
+        AnalyticsModuleSupport
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RuleSupport' => \%RuleSupport_of,
+        'AnalyticsModuleSupport' => \%AnalyticsModuleSupport_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AnalyticsModuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RuleSupport' => 'RuleSupport',
+        'AnalyticsModuleSupport' => 'AnalyticsModuleSupport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RuleSupport
+
+
+=item * AnalyticsModuleSupport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsCapabilities
+   XAddr =>  $some_value, # anyURI
+   RuleSupport =>  $some_value, # boolean
+   AnalyticsModuleSupport =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm
new file mode 100644
index 000000000..c4165e3eb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RuleSupport
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RuleSupport' => \%RuleSupport_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsDeviceExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RuleSupport' => 'RuleSupport',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RuleSupport
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+   XAddr =>  $some_value, # anyURI
+   RuleSupport =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm
new file mode 100644
index 000000000..5bff395ea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EngineConfiguration_of :ATTR(:get<EngineConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EngineConfiguration
+        Extension
+
+    ) ],
+    {
+        'EngineConfiguration' => \%EngineConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EngineConfiguration' => 'ONVIF::Analytics::Types::EngineConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension',
+    },
+    {
+
+        'EngineConfiguration' => 'EngineConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EngineConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+   EngineConfiguration =>  { # ONVIF::Analytics::Types::EngineConfiguration
+     VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+       AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+         AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+         },
+       },
+       RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+         Rule =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+         },
+       },
+     },
+     AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+       InputInfo =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm
new file mode 100644
index 000000000..24cb0cff3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm
new file mode 100644
index 000000000..b3c2756f9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm
new file mode 100644
index 000000000..b2d7e8682
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::AnalyticsEngine;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        AnalyticsEngineConfiguration
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngine
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngine from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngine
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+     EngineConfiguration =>  { # ONVIF::Analytics::Types::EngineConfiguration
+       VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+         AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+           AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+             Parameters =>  { # ONVIF::Analytics::Types::ItemList
+               SimpleItem => ,
+               ElementItem =>  {
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+           },
+         },
+         RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+           Rule =>  { # ONVIF::Analytics::Types::Config
+             Parameters =>  { # ONVIF::Analytics::Types::ItemList
+               SimpleItem => ,
+               ElementItem =>  {
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+           },
+         },
+       },
+       AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+         InputInfo =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm
new file mode 100644
index 000000000..487e999e5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModule
+        Extension
+
+    ) ],
+    {
+        'AnalyticsModule' => \%AnalyticsModule_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension',
+    },
+    {
+
+        'AnalyticsModule' => 'AnalyticsModule',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModule
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm
new file mode 100644
index 000000000..314131958
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm
new file mode 100644
index 000000000..b67097ceb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm
@@ -0,0 +1,187 @@
+package ONVIF::Analytics::Types::AnalyticsEngineControl;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %EngineToken_of :ATTR(:get<EngineToken>);
+my %EngineConfigToken_of :ATTR(:get<EngineConfigToken>);
+my %InputToken_of :ATTR(:get<InputToken>);
+my %ReceiverToken_of :ATTR(:get<ReceiverToken>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %Subscription_of :ATTR(:get<Subscription>);
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        EngineToken
+        EngineConfigToken
+        InputToken
+        ReceiverToken
+        Multicast
+        Subscription
+        Mode
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'EngineToken' => \%EngineToken_of,
+        'EngineConfigToken' => \%EngineConfigToken_of,
+        'InputToken' => \%InputToken_of,
+        'ReceiverToken' => \%ReceiverToken_of,
+        'Multicast' => \%Multicast_of,
+        'Subscription' => \%Subscription_of,
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'EngineToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'EngineConfigToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'InputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'ReceiverToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'Subscription' => 'ONVIF::Analytics::Types::Config',
+        'Mode' => 'ONVIF::Analytics::Types::ModeOfOperation',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'EngineToken' => 'EngineToken',
+        'EngineConfigToken' => 'EngineConfigToken',
+        'InputToken' => 'InputToken',
+        'ReceiverToken' => 'ReceiverToken',
+        'Multicast' => 'Multicast',
+        'Subscription' => 'Subscription',
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineControl
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineControl from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EngineToken
+
+
+=item * EngineConfigToken
+
+
+=item * InputToken
+
+
+=item * ReceiverToken
+
+
+=item * Multicast
+
+
+=item * Subscription
+
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineControl
+   EngineToken => $some_value, # ReferenceToken
+   EngineConfigToken => $some_value, # ReferenceToken
+   InputToken => $some_value, # ReferenceToken
+   ReceiverToken => $some_value, # ReferenceToken
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   Subscription =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Mode => $some_value, # ModeOfOperation
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm
new file mode 100644
index 000000000..2fb5b214f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm
@@ -0,0 +1,182 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceIdentification_of :ATTR(:get<SourceIdentification>);
+my %VideoInput_of :ATTR(:get<VideoInput>);
+my %MetadataInput_of :ATTR(:get<MetadataInput>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceIdentification
+        VideoInput
+        MetadataInput
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceIdentification' => \%SourceIdentification_of,
+        'VideoInput' => \%VideoInput_of,
+        'MetadataInput' => \%MetadataInput_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceIdentification' => 'ONVIF::Analytics::Types::SourceIdentification',
+        'VideoInput' => 'ONVIF::Analytics::Types::VideoEncoderConfiguration',
+        'MetadataInput' => 'ONVIF::Analytics::Types::MetadataInput',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceIdentification' => 'SourceIdentification',
+        'VideoInput' => 'VideoInput',
+        'MetadataInput' => 'MetadataInput',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceIdentification
+
+
+=item * VideoInput
+
+
+=item * MetadataInput
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInput
+   SourceIdentification =>  { # ONVIF::Analytics::Types::SourceIdentification
+     Name =>  $some_value, # string
+     Token => $some_value, # ReferenceToken
+     Extension =>  { # ONVIF::Analytics::Types::SourceIdentificationExtension
+     },
+   },
+   VideoInput =>  { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+     Encoding => $some_value, # VideoEncoding
+     Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     Quality =>  $some_value, # float
+     RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+       FrameRateLimit =>  $some_value, # int
+       EncodingInterval =>  $some_value, # int
+       BitrateLimit =>  $some_value, # int
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+       GovLength =>  $some_value, # int
+       Mpeg4Profile => $some_value, # Mpeg4Profile
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+       GovLength =>  $some_value, # int
+       H264Profile => $some_value, # H264Profile
+     },
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   MetadataInput =>  { # ONVIF::Analytics::Types::MetadataInput
+     MetadataConfig =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataInputExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm
new file mode 100644
index 000000000..440a44bab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInputInfo;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputInfo_of :ATTR(:get<InputInfo>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputInfo
+        Extension
+
+    ) ],
+    {
+        'InputInfo' => \%InputInfo_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputInfo' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension',
+    },
+    {
+
+        'InputInfo' => 'InputInfo',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInputInfo from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputInfo
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+   InputInfo =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm
new file mode 100644
index 000000000..81e5e7049
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInputInfoExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm
new file mode 100644
index 000000000..738e47eef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AnalyticsState;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Error_of :ATTR(:get<Error>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        Error
+        State
+
+    ) ],
+    {
+        'Error' => \%Error_of,
+        'State' => \%State_of,
+    },
+    {
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'State' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Error' => 'Error',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsState
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Error
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsState
+   Error =>  $some_value, # string
+   State =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm
new file mode 100644
index 000000000..6f2694cee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::AnalyticsStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsEngineControlToken_of :ATTR(:get<AnalyticsEngineControlToken>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsEngineControlToken
+        State
+
+    ) ],
+    {
+        'AnalyticsEngineControlToken' => \%AnalyticsEngineControlToken_of,
+        'State' => \%State_of,
+    },
+    {
+        'AnalyticsEngineControlToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'State' => 'ONVIF::Analytics::Types::AnalyticsState',
+    },
+    {
+
+        'AnalyticsEngineControlToken' => 'AnalyticsEngineControlToken',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineControlToken
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsStateInformation
+   AnalyticsEngineControlToken => $some_value, # ReferenceToken
+   State =>  { # ONVIF::Analytics::Types::AnalyticsState
+     Error =>  $some_value, # string
+     State =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm
new file mode 100644
index 000000000..3094a2b53
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnyHolder;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnyHolder
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnyHolder from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnyHolder
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm
new file mode 100644
index 000000000..f115839da
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm
@@ -0,0 +1,174 @@
+package ONVIF::Analytics::Types::Appearance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Transformation_of :ATTR(:get<Transformation>);
+my %Shape_of :ATTR(:get<Shape>);
+my %Color_of :ATTR(:get<Color>);
+my %Class_of :ATTR(:get<Class>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Transformation
+        Shape
+        Color
+        Class
+        Extension
+
+    ) ],
+    {
+        'Transformation' => \%Transformation_of,
+        'Shape' => \%Shape_of,
+        'Color' => \%Color_of,
+        'Class' => \%Class_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+        'Shape' => 'ONVIF::Analytics::Types::ShapeDescriptor',
+        'Color' => 'ONVIF::Analytics::Types::ColorDescriptor',
+        'Class' => 'ONVIF::Analytics::Types::ClassDescriptor',
+        'Extension' => 'ONVIF::Analytics::Types::AppearanceExtension',
+    },
+    {
+
+        'Transformation' => 'Transformation',
+        'Shape' => 'Shape',
+        'Color' => 'Color',
+        'Class' => 'Class',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Appearance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Appearance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Transformation
+
+
+=item * Shape
+
+
+=item * Color
+
+
+=item * Class
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Appearance
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+   Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+     BoundingBox => ,
+     CenterOfGravity => ,
+     Polygon =>  { # ONVIF::Analytics::Types::Polygon
+       Point => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+     },
+   },
+   Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+     ColorCluster =>  {
+       Color => ,
+       Weight =>  $some_value, # float
+       Covariance => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+     },
+   },
+   Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+     ClassCandidate =>  {
+       Type => $some_value, # ClassType
+       Likelihood =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+       OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+         Type =>  $some_value, # string
+         Likelihood =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm
new file mode 100644
index 000000000..100aab4aa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AppearanceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AppearanceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AppearanceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AppearanceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm
new file mode 100644
index 000000000..f6af419d8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::AttachmentData;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Include_of :ATTR(:get<Include>);
+
+__PACKAGE__->_factory(
+    [ qw(        Include
+
+    ) ],
+    {
+        'Include' => \%Include_of,
+    },
+    {
+        'Include' => 'ONVIF::Analytics::Elements::Include',
+
+    },
+    {
+
+        'Include' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AttachmentData
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttachmentData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Include
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AttachmentData
+   Include =>  { # ONVIF::Analytics::Types::Include
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm
new file mode 100644
index 000000000..2c408028c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::AudioAnalyticsStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioDescriptor_of :ATTR(:get<AudioDescriptor>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioDescriptor
+        Extension
+
+    ) ],
+    {
+        'AudioDescriptor' => \%AudioDescriptor_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioDescriptor' => 'ONVIF::Analytics::Types::AudioDescriptor',
+        'Extension' => 'ONVIF::Analytics::Types::AudioAnalyticsStreamExtension',
+    },
+    {
+
+        'AudioDescriptor' => 'AudioDescriptor',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAnalyticsStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAnalyticsStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioDescriptor
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAnalyticsStream
+   AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm
new file mode 100644
index 000000000..45999e2f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioAnalyticsStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAnalyticsStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm
new file mode 100644
index 000000000..a10502dea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AudioAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Samplerate_of :ATTR(:get<Samplerate>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        Encoding
+        Samplerate
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'Encoding' => \%Encoding_of,
+        'Samplerate' => \%Samplerate_of,
+    },
+    {
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'Samplerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'Encoding' => 'Encoding',
+        'Samplerate' => 'Samplerate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * Encoding
+
+
+=item * Samplerate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAttributes
+   Bitrate =>  $some_value, # int
+   Encoding => $some_value, # AudioEncoding
+   Samplerate =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm
new file mode 100644
index 000000000..995ae3393
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AudioClassCandidate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::AudioClassType',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassCandidate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassCandidate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Likelihood
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassCandidate
+   Type => $some_value, # AudioClassType
+   Likelihood =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm
new file mode 100644
index 000000000..df1dddd75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AudioClassDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ClassCandidate_of :ATTR(:get<ClassCandidate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ClassCandidate
+        Extension
+
+    ) ],
+    {
+        'ClassCandidate' => \%ClassCandidate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ClassCandidate' => 'ONVIF::Analytics::Types::AudioClassCandidate',
+        'Extension' => 'ONVIF::Analytics::Types::AudioClassDescriptorExtension',
+    },
+    {
+
+        'ClassCandidate' => 'ClassCandidate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ClassCandidate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassDescriptor
+   ClassCandidate =>  { # ONVIF::Analytics::Types::AudioClassCandidate
+     Type => $some_value, # AudioClassType
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioClassDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm
new file mode 100644
index 000000000..8e3b28511
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioClassDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm
new file mode 100644
index 000000000..628031103
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AudioClassType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AudioClassType from the namespace http://www.onvif.org/ver10/schema.
+
+AudioClassType acceptable values are; gun_shot, scream, glass_breaking, tire_screech 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm
new file mode 100644
index 000000000..d9c4599ad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm
@@ -0,0 +1,107 @@
+package ONVIF::Analytics::Types::AudioDecoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+The Audio Decoder Configuration does not contain any that parameter to configure the decoding .A decoder shall decode every data it receives (according to its capabilities).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm
new file mode 100644
index 000000000..700aa1dfa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm
@@ -0,0 +1,152 @@
+package ONVIF::Analytics::Types::AudioDecoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AACDecOptions_of :ATTR(:get<AACDecOptions>);
+my %G711DecOptions_of :ATTR(:get<G711DecOptions>);
+my %G726DecOptions_of :ATTR(:get<G726DecOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AACDecOptions
+        G711DecOptions
+        G726DecOptions
+        Extension
+
+    ) ],
+    {
+        'AACDecOptions' => \%AACDecOptions_of,
+        'G711DecOptions' => \%G711DecOptions_of,
+        'G726DecOptions' => \%G726DecOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AACDecOptions' => 'ONVIF::Analytics::Types::AACDecOptions',
+        'G711DecOptions' => 'ONVIF::Analytics::Types::G711DecOptions',
+        'G726DecOptions' => 'ONVIF::Analytics::Types::G726DecOptions',
+        'Extension' => 'ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension',
+    },
+    {
+
+        'AACDecOptions' => 'AACDecOptions',
+        'G711DecOptions' => 'G711DecOptions',
+        'G726DecOptions' => 'G726DecOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AACDecOptions
+
+
+=item * G711DecOptions
+
+
+=item * G726DecOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+   AACDecOptions =>  { # ONVIF::Analytics::Types::AACDecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   G711DecOptions =>  { # ONVIF::Analytics::Types::G711DecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   G726DecOptions =>  { # ONVIF::Analytics::Types::G726DecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..399d1b374
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm
new file mode 100644
index 000000000..3f886044a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::AudioDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDescriptor
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * UtcTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::dateTime|SOAP::WSDL::XSD::Typelib::Builtin::dateTime>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm
new file mode 100644
index 000000000..a869c1700
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm
@@ -0,0 +1,161 @@
+package ONVIF::Analytics::Types::AudioEncoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRate_of :ATTR(:get<SampleRate>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        Encoding
+        Bitrate
+        SampleRate
+        Multicast
+        SessionTimeout
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'Encoding' => \%Encoding_of,
+        'Bitrate' => \%Bitrate_of,
+        'SampleRate' => \%SampleRate_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SampleRate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'Encoding' => 'Encoding',
+        'Bitrate' => 'Bitrate',
+        'SampleRate' => 'SampleRate',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * Bitrate
+
+
+=item * SampleRate
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+   Encoding => $some_value, # AudioEncoding
+   Bitrate =>  $some_value, # int
+   SampleRate =>  $some_value, # int
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm
new file mode 100644
index 000000000..57a8e6de1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::AudioEncoderConfigurationOption;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Encoding_of :ATTR(:get<Encoding>);
+my %BitrateList_of :ATTR(:get<BitrateList>);
+my %SampleRateList_of :ATTR(:get<SampleRateList>);
+
+__PACKAGE__->_factory(
+    [ qw(        Encoding
+        BitrateList
+        SampleRateList
+
+    ) ],
+    {
+        'Encoding' => \%Encoding_of,
+        'BitrateList' => \%BitrateList_of,
+        'SampleRateList' => \%SampleRateList_of,
+    },
+    {
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'BitrateList' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateList' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Encoding' => 'Encoding',
+        'BitrateList' => 'BitrateList',
+        'SampleRateList' => 'SampleRateList',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfigurationOption from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * BitrateList
+
+
+=item * SampleRateList
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+   Encoding => $some_value, # AudioEncoding
+   BitrateList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm
new file mode 100644
index 000000000..a044596dd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm
@@ -0,0 +1,111 @@
+package ONVIF::Analytics::Types::AudioEncoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Options_of :ATTR(:get<Options>);
+
+__PACKAGE__->_factory(
+    [ qw(        Options
+
+    ) ],
+    {
+        'Options' => \%Options_of,
+    },
+    {
+        'Options' => 'ONVIF::Analytics::Types::AudioEncoderConfigurationOption',
+    },
+    {
+
+        'Options' => 'Options',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Options
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+   Options =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+     Encoding => $some_value, # AudioEncoding
+     BitrateList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm
new file mode 100644
index 000000000..ed5275839
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AudioEncoding;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AudioEncoding from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm
new file mode 100644
index 000000000..6f6203580
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm
@@ -0,0 +1,97 @@
+package ONVIF::Analytics::Types::AudioOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutput from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical audio outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutput
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm
new file mode 100644
index 000000000..7be3bab34
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::AudioOutputConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %OutputToken_of :ATTR(:get<OutputToken>);
+my %SendPrimacy_of :ATTR(:get<SendPrimacy>);
+my %OutputLevel_of :ATTR(:get<OutputLevel>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        OutputToken
+        SendPrimacy
+        OutputLevel
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'OutputToken' => \%OutputToken_of,
+        'SendPrimacy' => \%SendPrimacy_of,
+        'OutputLevel' => \%OutputLevel_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'OutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'SendPrimacy' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'OutputLevel' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'OutputToken' => 'OutputToken',
+        'SendPrimacy' => 'SendPrimacy',
+        'OutputLevel' => 'OutputLevel',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputToken
+
+
+=item * SendPrimacy
+
+
+=item * OutputLevel
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+   SendPrimacy =>  $some_value, # anyURI
+   OutputLevel =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm
new file mode 100644
index 000000000..3baa764f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::AudioOutputConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %OutputTokensAvailable_of :ATTR(:get<OutputTokensAvailable>);
+my %SendPrimacyOptions_of :ATTR(:get<SendPrimacyOptions>);
+my %OutputLevelRange_of :ATTR(:get<OutputLevelRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        OutputTokensAvailable
+        SendPrimacyOptions
+        OutputLevelRange
+
+    ) ],
+    {
+        'OutputTokensAvailable' => \%OutputTokensAvailable_of,
+        'SendPrimacyOptions' => \%SendPrimacyOptions_of,
+        'OutputLevelRange' => \%OutputLevelRange_of,
+    },
+    {
+        'OutputTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'SendPrimacyOptions' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'OutputLevelRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'OutputTokensAvailable' => 'OutputTokensAvailable',
+        'SendPrimacyOptions' => 'SendPrimacyOptions',
+        'OutputLevelRange' => 'OutputLevelRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutputConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutputConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputTokensAvailable
+
+
+=item * SendPrimacyOptions
+
+
+=item * OutputLevelRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfigurationOptions
+   OutputTokensAvailable => $some_value, # ReferenceToken
+   SendPrimacyOptions =>  $some_value, # anyURI
+   OutputLevelRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm
new file mode 100644
index 000000000..e2c7aa095
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::AudioSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Channels_of :ATTR(:get<Channels>);
+
+__PACKAGE__->_factory(
+    [ qw(        Channels
+
+    ) ],
+    {
+        'Channels' => \%Channels_of,
+    },
+    {
+        'Channels' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Channels' => 'Channels',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSource from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical audio input.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Channels
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSource
+   Channels =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm
new file mode 100644
index 000000000..e33e7f563
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AudioSourceConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceToken_of :ATTR(:get<SourceToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceToken
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceToken' => \%SourceToken_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceToken' => 'SourceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm
new file mode 100644
index 000000000..362255479
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::AudioSourceConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputTokensAvailable_of :ATTR(:get<InputTokensAvailable>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputTokensAvailable
+        Extension
+
+    ) ],
+    {
+        'InputTokensAvailable' => \%InputTokensAvailable_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::AudioSourceOptionsExtension',
+    },
+    {
+
+        'InputTokensAvailable' => 'InputTokensAvailable',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputTokensAvailable
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfigurationOptions
+   InputTokensAvailable => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::AudioSourceOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm
new file mode 100644
index 000000000..deaaa172e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioSourceOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm
new file mode 100644
index 000000000..6020bd018
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AutoFocusMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AutoFocusMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm
new file mode 100644
index 000000000..4b794ad4b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AuxiliaryData;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AuxiliaryData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm
new file mode 100644
index 000000000..2765f7939
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::BacklightCompensation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensation
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm
new file mode 100644
index 000000000..825f37321
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::BacklightCompensation20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensation20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensation20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing whether BLC mode is enabled or disabled (on/off).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensation20
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm
new file mode 100644
index 000000000..42b10ff10
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::BacklightCompensationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+BacklightCompensationMode from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available backlight compenstation modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm
new file mode 100644
index 000000000..bdbdd60e6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BacklightCompensationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensationOptions
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm
new file mode 100644
index 000000000..1be4624ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BacklightCompensationOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensationOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensationOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensationOptions20
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm
new file mode 100644
index 000000000..b935fc38e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BackupFile;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Data_of :ATTR(:get<Data>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Data
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Data' => \%Data_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Data' => 'ONVIF::Analytics::Types::AttachmentData',
+    },
+    {
+
+        'Name' => 'Name',
+        'Data' => 'Data',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BackupFile
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BackupFile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Data
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BackupFile
+   Name =>  $some_value, # string
+   Data =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm
new file mode 100644
index 000000000..3bc6bddbe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm
@@ -0,0 +1,212 @@
+package ONVIF::Analytics::Types::Behaviour;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Removed_of :ATTR(:get<Removed>);
+my %Idle_of :ATTR(:get<Idle>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Removed
+        Idle
+        Extension
+
+    ) ],
+    {
+        'Removed' => \%Removed_of,
+        'Idle' => \%Idle_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'Removed' => 'ONVIF::Analytics::Types::Behaviour::_Removed',
+
+        'Idle' => 'ONVIF::Analytics::Types::Behaviour::_Idle',
+        'Extension' => 'ONVIF::Analytics::Types::BehaviourExtension',
+    },
+    {
+
+        'Removed' => 'Removed',
+        'Idle' => 'Idle',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Behaviour::_Idle;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::Behaviour::_Removed;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Behaviour
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Behaviour from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Removed
+
+
+=item * Idle
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Behaviour
+   Removed =>  {
+   },
+   Idle =>  {
+   },
+   Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm
new file mode 100644
index 000000000..c9645a1b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::BehaviourExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BehaviourExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BehaviourExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BehaviourExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm
new file mode 100644
index 000000000..c6e84177b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm
@@ -0,0 +1,147 @@
+package ONVIF::Analytics::Types::BinaryData;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Data_of :ATTR(:get<Data>);
+
+__PACKAGE__->_factory(
+    [ qw(        Data
+
+    ) ],
+    {
+        'Data' => \%Data_of,
+    },
+    {
+        'Data' => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+    },
+    {
+
+        'Data' => 'Data',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BinaryData
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BinaryData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Data
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BinaryData
+   Data =>  $some_value, # base64Binary
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm
new file mode 100644
index 000000000..61a44e3de
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Body;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Body
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Body from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+Prose in the spec does not specify that attributes are allowed on the Body element 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Body
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm
new file mode 100644
index 000000000..38a852a23
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm
@@ -0,0 +1,167 @@
+package ONVIF::Analytics::Types::Capabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %AnalyticsModuleSupport_of :ATTR(:get<AnalyticsModuleSupport>);
+my %CellBasedSceneDescriptionSupported_of :ATTR(:get<CellBasedSceneDescriptionSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        RuleSupport
+        AnalyticsModuleSupport
+        CellBasedSceneDescriptionSupported
+    ) ],
+    {
+
+        RuleSupport => \%RuleSupport_of,
+
+        AnalyticsModuleSupport => \%AnalyticsModuleSupport_of,
+
+        CellBasedSceneDescriptionSupported => \%CellBasedSceneDescriptionSupported_of,
+    },
+    {
+        RuleSupport => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        AnalyticsModuleSupport => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        CellBasedSceneDescriptionSupported => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Capabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Capabilities
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * RuleSupport
+
+ Indication that the device supports the rules interface and the rules syntax.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+=item * AnalyticsModuleSupport
+
+ Indication that the device supports the scene analytics module interface.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+=item * CellBasedSceneDescriptionSupported
+
+ Indication that the device produces the cell based scene description
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm
new file mode 100644
index 000000000..c753a1282
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm
@@ -0,0 +1,201 @@
+package ONVIF::Analytics::Types::CapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DeviceIO_of :ATTR(:get<DeviceIO>);
+my %Display_of :ATTR(:get<Display>);
+my %Recording_of :ATTR(:get<Recording>);
+my %Search_of :ATTR(:get<Search>);
+my %Replay_of :ATTR(:get<Replay>);
+my %Receiver_of :ATTR(:get<Receiver>);
+my %AnalyticsDevice_of :ATTR(:get<AnalyticsDevice>);
+my %Extensions_of :ATTR(:get<Extensions>);
+
+__PACKAGE__->_factory(
+    [ qw(        DeviceIO
+        Display
+        Recording
+        Search
+        Replay
+        Receiver
+        AnalyticsDevice
+        Extensions
+
+    ) ],
+    {
+        'DeviceIO' => \%DeviceIO_of,
+        'Display' => \%Display_of,
+        'Recording' => \%Recording_of,
+        'Search' => \%Search_of,
+        'Replay' => \%Replay_of,
+        'Receiver' => \%Receiver_of,
+        'AnalyticsDevice' => \%AnalyticsDevice_of,
+        'Extensions' => \%Extensions_of,
+    },
+    {
+        'DeviceIO' => 'ONVIF::Analytics::Types::DeviceIOCapabilities',
+        'Display' => 'ONVIF::Analytics::Types::DisplayCapabilities',
+        'Recording' => 'ONVIF::Analytics::Types::RecordingCapabilities',
+        'Search' => 'ONVIF::Analytics::Types::SearchCapabilities',
+        'Replay' => 'ONVIF::Analytics::Types::ReplayCapabilities',
+        'Receiver' => 'ONVIF::Analytics::Types::ReceiverCapabilities',
+        'AnalyticsDevice' => 'ONVIF::Analytics::Types::AnalyticsDeviceCapabilities',
+        'Extensions' => 'ONVIF::Analytics::Types::CapabilitiesExtension2',
+    },
+    {
+
+        'DeviceIO' => 'DeviceIO',
+        'Display' => 'Display',
+        'Recording' => 'Recording',
+        'Search' => 'Search',
+        'Replay' => 'Replay',
+        'Receiver' => 'Receiver',
+        'AnalyticsDevice' => 'AnalyticsDevice',
+        'Extensions' => 'Extensions',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DeviceIO
+
+
+=item * Display
+
+
+=item * Recording
+
+
+=item * Search
+
+
+=item * Replay
+
+
+=item * Receiver
+
+
+=item * AnalyticsDevice
+
+
+=item * Extensions
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CapabilitiesExtension
+   DeviceIO =>  { # ONVIF::Analytics::Types::DeviceIOCapabilities
+     XAddr =>  $some_value, # anyURI
+     VideoSources =>  $some_value, # int
+     VideoOutputs =>  $some_value, # int
+     AudioSources =>  $some_value, # int
+     AudioOutputs =>  $some_value, # int
+     RelayOutputs =>  $some_value, # int
+   },
+   Display =>  { # ONVIF::Analytics::Types::DisplayCapabilities
+     XAddr =>  $some_value, # anyURI
+     FixedLayout =>  $some_value, # boolean
+   },
+   Recording =>  { # ONVIF::Analytics::Types::RecordingCapabilities
+     XAddr =>  $some_value, # anyURI
+     ReceiverSource =>  $some_value, # boolean
+     MediaProfileSource =>  $some_value, # boolean
+     DynamicRecordings =>  $some_value, # boolean
+     DynamicTracks =>  $some_value, # boolean
+     MaxStringLength =>  $some_value, # int
+   },
+   Search =>  { # ONVIF::Analytics::Types::SearchCapabilities
+     XAddr =>  $some_value, # anyURI
+     MetadataSearch =>  $some_value, # boolean
+   },
+   Replay =>  { # ONVIF::Analytics::Types::ReplayCapabilities
+     XAddr =>  $some_value, # anyURI
+   },
+   Receiver =>  { # ONVIF::Analytics::Types::ReceiverCapabilities
+     XAddr =>  $some_value, # anyURI
+     RTP_Multicast =>  $some_value, # boolean
+     RTP_TCP =>  $some_value, # boolean
+     RTP_RTSP_TCP =>  $some_value, # boolean
+     SupportedReceivers =>  $some_value, # int
+     MaximumRTSPURILength =>  $some_value, # int
+   },
+   AnalyticsDevice =>  { # ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+     XAddr =>  $some_value, # anyURI
+     RuleSupport =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+     },
+   },
+   Extensions =>  { # ONVIF::Analytics::Types::CapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm
new file mode 100644
index 000000000..787bc5652
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm
new file mode 100644
index 000000000..50c163db1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::CapabilityCategory;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+CapabilityCategory from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm
new file mode 100644
index 000000000..818617d5d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm
@@ -0,0 +1,168 @@
+package ONVIF::Analytics::Types::CellLayout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Transformation_of :ATTR(:get<Transformation>);
+
+__PACKAGE__->_factory(
+    [ qw(        Transformation
+
+    ) ],
+    {
+        'Transformation' => \%Transformation_of,
+    },
+    {
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+    },
+    {
+
+        'Transformation' => 'Transformation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Columns_of :ATTR(:get<Columns>);
+my %Rows_of :ATTR(:get<Rows>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Columns
+        Rows
+    ) ],
+    {
+
+        Columns => \%Columns_of,
+
+        Rows => \%Rows_of,
+    },
+    {
+        Columns => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Rows => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CellLayout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CellLayout from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Transformation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CellLayout
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Columns
+
+ Number of columns of the cell grid (x dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Rows
+
+ Number of rows of the cell grid (y dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm
new file mode 100644
index 000000000..afe0724de
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::Certificate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Certificate_of :ATTR(:get<Certificate>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Certificate
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Certificate' => \%Certificate_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Certificate' => 'ONVIF::Analytics::Types::BinaryData',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Certificate' => 'Certificate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Certificate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Certificate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Certificate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Certificate
+   CertificateID =>  $some_value, # token
+   Certificate =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm
new file mode 100644
index 000000000..c59489646
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::CertificateGenerationParameters;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Subject_of :ATTR(:get<Subject>);
+my %ValidNotBefore_of :ATTR(:get<ValidNotBefore>);
+my %ValidNotAfter_of :ATTR(:get<ValidNotAfter>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Subject
+        ValidNotBefore
+        ValidNotAfter
+        Extension
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Subject' => \%Subject_of,
+        'ValidNotBefore' => \%ValidNotBefore_of,
+        'ValidNotAfter' => \%ValidNotAfter_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Subject' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'ValidNotBefore' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'ValidNotAfter' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Extension' => 'ONVIF::Analytics::Types::CertificateGenerationParametersExtension',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Subject' => 'Subject',
+        'ValidNotBefore' => 'ValidNotBefore',
+        'ValidNotAfter' => 'ValidNotAfter',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateGenerationParameters
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateGenerationParameters from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Subject
+
+
+=item * ValidNotBefore
+
+
+=item * ValidNotAfter
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateGenerationParameters
+   CertificateID =>  $some_value, # token
+   Subject =>  $some_value, # string
+   ValidNotBefore =>  $some_value, # token
+   ValidNotAfter =>  $some_value, # token
+   Extension =>  { # ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm
new file mode 100644
index 000000000..028bc727b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CertificateGenerationParametersExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateGenerationParametersExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm
new file mode 100644
index 000000000..406e406e7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm
@@ -0,0 +1,197 @@
+package ONVIF::Analytics::Types::CertificateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %IssuerDN_of :ATTR(:get<IssuerDN>);
+my %SubjectDN_of :ATTR(:get<SubjectDN>);
+my %KeyUsage_of :ATTR(:get<KeyUsage>);
+my %ExtendedKeyUsage_of :ATTR(:get<ExtendedKeyUsage>);
+my %KeyLength_of :ATTR(:get<KeyLength>);
+my %Version_of :ATTR(:get<Version>);
+my %SerialNum_of :ATTR(:get<SerialNum>);
+my %SignatureAlgorithm_of :ATTR(:get<SignatureAlgorithm>);
+my %Validity_of :ATTR(:get<Validity>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        IssuerDN
+        SubjectDN
+        KeyUsage
+        ExtendedKeyUsage
+        KeyLength
+        Version
+        SerialNum
+        SignatureAlgorithm
+        Validity
+        Extension
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'IssuerDN' => \%IssuerDN_of,
+        'SubjectDN' => \%SubjectDN_of,
+        'KeyUsage' => \%KeyUsage_of,
+        'ExtendedKeyUsage' => \%ExtendedKeyUsage_of,
+        'KeyLength' => \%KeyLength_of,
+        'Version' => \%Version_of,
+        'SerialNum' => \%SerialNum_of,
+        'SignatureAlgorithm' => \%SignatureAlgorithm_of,
+        'Validity' => \%Validity_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'IssuerDN' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SubjectDN' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'KeyUsage' => 'ONVIF::Analytics::Types::CertificateUsage',
+        'ExtendedKeyUsage' => 'ONVIF::Analytics::Types::CertificateUsage',
+        'KeyLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Version' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SerialNum' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SignatureAlgorithm' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Validity' => 'ONVIF::Analytics::Types::DateTimeRange',
+        'Extension' => 'ONVIF::Analytics::Types::CertificateInformationExtension',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'IssuerDN' => 'IssuerDN',
+        'SubjectDN' => 'SubjectDN',
+        'KeyUsage' => 'KeyUsage',
+        'ExtendedKeyUsage' => 'ExtendedKeyUsage',
+        'KeyLength' => 'KeyLength',
+        'Version' => 'Version',
+        'SerialNum' => 'SerialNum',
+        'SignatureAlgorithm' => 'SignatureAlgorithm',
+        'Validity' => 'Validity',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * IssuerDN
+
+
+=item * SubjectDN
+
+
+=item * KeyUsage
+
+
+=item * ExtendedKeyUsage
+
+
+=item * KeyLength
+
+
+=item * Version
+
+
+=item * SerialNum
+
+
+=item * SignatureAlgorithm
+
+
+=item * Validity
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateInformation
+   CertificateID =>  $some_value, # token
+   IssuerDN =>  $some_value, # string
+   SubjectDN =>  $some_value, # string
+   KeyUsage =>  { value => $some_value },
+   ExtendedKeyUsage =>  { value => $some_value },
+   KeyLength =>  $some_value, # int
+   Version =>  $some_value, # string
+   SerialNum =>  $some_value, # string
+   SignatureAlgorithm =>  $some_value, # string
+   Validity =>  { # ONVIF::Analytics::Types::DateTimeRange
+     From =>  $some_value, # dateTime
+     Until =>  $some_value, # dateTime
+   },
+   Extension =>  { # ONVIF::Analytics::Types::CertificateInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm
new file mode 100644
index 000000000..e900a9c76
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CertificateInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm
new file mode 100644
index 000000000..64b2a41e3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::CertificateStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Status_of :ATTR(:get<Status>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Status
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Status' => \%Status_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Status' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Status' => 'Status',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Status
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateStatus
+   CertificateID =>  $some_value, # token
+   Status =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm
new file mode 100644
index 000000000..7ba79b94e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::CertificateUsage;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Critical_of :ATTR(:get<Critical>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Critical
+    ) ],
+    {
+
+        Critical => \%Critical_of,
+    },
+    {
+        Critical => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateUsage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateUsage from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Critical
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm
new file mode 100644
index 000000000..17a7f8b97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::CertificateWithPrivateKey;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Certificate_of :ATTR(:get<Certificate>);
+my %PrivateKey_of :ATTR(:get<PrivateKey>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Certificate
+        PrivateKey
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Certificate' => \%Certificate_of,
+        'PrivateKey' => \%PrivateKey_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Certificate' => 'ONVIF::Analytics::Types::BinaryData',
+        'PrivateKey' => 'ONVIF::Analytics::Types::BinaryData',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Certificate' => 'Certificate',
+        'PrivateKey' => 'PrivateKey',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateWithPrivateKey
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateWithPrivateKey from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Certificate
+
+
+=item * PrivateKey
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateWithPrivateKey
+   CertificateID =>  $some_value, # token
+   Certificate =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+   PrivateKey =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm
new file mode 100644
index 000000000..e7bf8d651
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::ClassDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ClassCandidate_of :ATTR(:get<ClassCandidate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ClassCandidate
+        Extension
+
+    ) ],
+    {
+        'ClassCandidate' => \%ClassCandidate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'ClassCandidate' => 'ONVIF::Analytics::Types::ClassDescriptor::_ClassCandidate',
+        'Extension' => 'ONVIF::Analytics::Types::ClassDescriptorExtension',
+    },
+    {
+
+        'ClassCandidate' => 'ClassCandidate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ClassDescriptor::_ClassCandidate;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::ClassType',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ClassCandidate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptor
+   ClassCandidate =>  {
+     Type => $some_value, # ClassType
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+     OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+       Type =>  $some_value, # string
+       Likelihood =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm
new file mode 100644
index 000000000..d0f2b1fa2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::ClassDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %OtherTypes_of :ATTR(:get<OtherTypes>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        OtherTypes
+        Extension
+
+    ) ],
+    {
+        'OtherTypes' => \%OtherTypes_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'OtherTypes' => 'ONVIF::Analytics::Types::OtherType',
+        'Extension' => 'ONVIF::Analytics::Types::ClassDescriptorExtension2',
+    },
+    {
+
+        'OtherTypes' => 'OtherTypes',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OtherTypes
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptorExtension
+   OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+     Type =>  $some_value, # string
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm
new file mode 100644
index 000000000..4ef892aef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ClassDescriptorExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptorExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptorExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm
new file mode 100644
index 000000000..7d788ea56
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ClassType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ClassType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm
new file mode 100644
index 000000000..8f761ca97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm
@@ -0,0 +1,205 @@
+package ONVIF::Analytics::Types::CodingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioEncodingCapabilities_of :ATTR(:get<AudioEncodingCapabilities>);
+my %AudioDecodingCapabilities_of :ATTR(:get<AudioDecodingCapabilities>);
+my %VideoDecodingCapabilities_of :ATTR(:get<VideoDecodingCapabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioEncodingCapabilities
+        AudioDecodingCapabilities
+        VideoDecodingCapabilities
+
+    ) ],
+    {
+        'AudioEncodingCapabilities' => \%AudioEncodingCapabilities_of,
+        'AudioDecodingCapabilities' => \%AudioDecodingCapabilities_of,
+        'VideoDecodingCapabilities' => \%VideoDecodingCapabilities_of,
+    },
+    {
+        'AudioEncodingCapabilities' => 'ONVIF::Analytics::Types::AudioEncoderConfigurationOptions',
+        'AudioDecodingCapabilities' => 'ONVIF::Analytics::Types::AudioDecoderConfigurationOptions',
+        'VideoDecodingCapabilities' => 'ONVIF::Analytics::Types::VideoDecoderConfigurationOptions',
+    },
+    {
+
+        'AudioEncodingCapabilities' => 'AudioEncodingCapabilities',
+        'AudioDecodingCapabilities' => 'AudioDecodingCapabilities',
+        'VideoDecodingCapabilities' => 'VideoDecodingCapabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CodingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CodingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+This type contains the Audio and Video coding capabilities of a display service.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioEncodingCapabilities
+
+
+=item * AudioDecodingCapabilities
+
+
+=item * VideoDecodingCapabilities
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CodingCapabilities
+   AudioEncodingCapabilities =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+     Options =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+       Encoding => $some_value, # AudioEncoding
+       BitrateList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+   },
+   AudioDecodingCapabilities =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+     AACDecOptions =>  { # ONVIF::Analytics::Types::AACDecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     G711DecOptions =>  { # ONVIF::Analytics::Types::G711DecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     G726DecOptions =>  { # ONVIF::Analytics::Types::G726DecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+     },
+   },
+   VideoDecodingCapabilities =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+     JpegDecOptions =>  { # ONVIF::Analytics::Types::JpegDecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     H264DecOptions =>  { # ONVIF::Analytics::Types::H264DecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedH264Profiles => $some_value, # H264Profile
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Mpeg4DecOptions =>  { # ONVIF::Analytics::Types::Mpeg4DecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm
new file mode 100644
index 000000000..8632b3d75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::Color;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Color::_Color::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Color::_Color::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %X_of :ATTR(:get<X>);
+my %Y_of :ATTR(:get<Y>);
+my %Z_of :ATTR(:get<Z>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        X
+        Y
+        Z
+        Colorspace
+    ) ],
+    {
+
+        X => \%X_of,
+
+        Y => \%Y_of,
+
+        Z => \%Z_of,
+
+        Colorspace => \%Colorspace_of,
+    },
+    {
+        X => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Z => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Colorspace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Color
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Color from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Color::_Color::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * X
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Z
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Colorspace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm
new file mode 100644
index 000000000..f3cafc4b6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm
@@ -0,0 +1,188 @@
+package ONVIF::Analytics::Types::ColorCovariance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %XX_of :ATTR(:get<XX>);
+my %YY_of :ATTR(:get<YY>);
+my %ZZ_of :ATTR(:get<ZZ>);
+my %XY_of :ATTR(:get<XY>);
+my %XZ_of :ATTR(:get<XZ>);
+my %YZ_of :ATTR(:get<YZ>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        XX
+        YY
+        ZZ
+        XY
+        XZ
+        YZ
+        Colorspace
+    ) ],
+    {
+
+        XX => \%XX_of,
+
+        YY => \%YY_of,
+
+        ZZ => \%ZZ_of,
+
+        XY => \%XY_of,
+
+        XZ => \%XZ_of,
+
+        YZ => \%YZ_of,
+
+        Colorspace => \%Colorspace_of,
+    },
+    {
+        XX => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        YY => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        ZZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        XY => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        XZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        YZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Colorspace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorCovariance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorCovariance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * XX
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * YY
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * ZZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * XY
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * XZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * YZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Colorspace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm
new file mode 100644
index 000000000..102629f8d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::ColorDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ColorCluster_of :ATTR(:get<ColorCluster>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ColorCluster
+        Extension
+
+    ) ],
+    {
+        'ColorCluster' => \%ColorCluster_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'ColorCluster' => 'ONVIF::Analytics::Types::ColorDescriptor::_ColorCluster',
+        'Extension' => 'ONVIF::Analytics::Types::ColorDescriptorExtension',
+    },
+    {
+
+        'ColorCluster' => 'ColorCluster',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ColorDescriptor::_ColorCluster;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+my %Weight_of :ATTR(:get<Weight>);
+my %Covariance_of :ATTR(:get<Covariance>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+        Weight
+        Covariance
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+        'Weight' => \%Weight_of,
+        'Covariance' => \%Covariance_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::Color',
+        'Weight' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Covariance' => 'ONVIF::Analytics::Types::ColorCovariance',
+    },
+    {
+
+        'Color' => 'Color',
+        'Weight' => 'Weight',
+        'Covariance' => 'Covariance',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ColorCluster
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorDescriptor
+   ColorCluster =>  {
+     Color => ,
+     Weight =>  $some_value, # float
+     Covariance => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm
new file mode 100644
index 000000000..bc67c8681
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ColorDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm
new file mode 100644
index 000000000..eaf6fea9f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm
@@ -0,0 +1,128 @@
+package ONVIF::Analytics::Types::ColorOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ColorList_of :ATTR(:get<ColorList>);
+my %ColorspaceRange_of :ATTR(:get<ColorspaceRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ColorList
+        ColorspaceRange
+
+    ) ],
+    {
+        'ColorList' => \%ColorList_of,
+        'ColorspaceRange' => \%ColorspaceRange_of,
+    },
+    {
+        'ColorList' => 'ONVIF::Analytics::Types::Color',
+        'ColorspaceRange' => 'ONVIF::Analytics::Types::ColorspaceRange',
+    },
+    {
+
+        'ColorList' => 'ColorList',
+        'ColorspaceRange' => 'ColorspaceRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorOptions from the namespace http://www.onvif.org/ver10/schema.
+
+http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ColorList
+
+
+=item * ColorspaceRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorOptions
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   ColorList => ,
+   ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+     X =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Y =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Z =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Colorspace =>  $some_value, # anyURI
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm
new file mode 100644
index 000000000..9a41fd6e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::ColorspaceRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %X_of :ATTR(:get<X>);
+my %Y_of :ATTR(:get<Y>);
+my %Z_of :ATTR(:get<Z>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(        X
+        Y
+        Z
+        Colorspace
+
+    ) ],
+    {
+        'X' => \%X_of,
+        'Y' => \%Y_of,
+        'Z' => \%Z_of,
+        'Colorspace' => \%Colorspace_of,
+    },
+    {
+        'X' => 'ONVIF::Analytics::Types::FloatRange',
+        'Y' => 'ONVIF::Analytics::Types::FloatRange',
+        'Z' => 'ONVIF::Analytics::Types::FloatRange',
+        'Colorspace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'X' => 'X',
+        'Y' => 'Y',
+        'Z' => 'Z',
+        'Colorspace' => 'Colorspace',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorspaceRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorspaceRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * X
+
+
+=item * Y
+
+
+=item * Z
+
+
+=item * Colorspace
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorspaceRange
+   X =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Y =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Z =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Colorspace =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm
new file mode 100644
index 000000000..b4fbe9997
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm
@@ -0,0 +1,169 @@
+package ONVIF::Analytics::Types::Config;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Config::_Config::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Parameters_of :ATTR(:get<Parameters>);
+
+__PACKAGE__->_factory(
+    [ qw(        Parameters
+
+    ) ],
+    {
+        'Parameters' => \%Parameters_of,
+    },
+    {
+        'Parameters' => 'ONVIF::Analytics::Types::ItemList',
+    },
+    {
+
+        'Parameters' => 'Parameters',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Config::_Config::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Config
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Config from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Parameters
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Config
+   Parameters =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Config::_Config::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Name
+
+ Name of the configuration.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::string|SOAP::WSDL::XSD::Typelib::Builtin::string>.
+
+=item * Type
+
+ Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm
new file mode 100644
index 000000000..e36c3ac0b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm
@@ -0,0 +1,248 @@
+package ONVIF::Analytics::Types::ConfigDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Parameters_of :ATTR(:get<Parameters>);
+my %Messages_of :ATTR(:get<Messages>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Parameters
+        Messages
+        Extension
+
+    ) ],
+    {
+        'Parameters' => \%Parameters_of,
+        'Messages' => \%Messages_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+
+        'Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+        'Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+    },
+    {
+
+        'Parameters' => 'Parameters',
+        'Messages' => 'Messages',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ConfigDescription::_Messages;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::MessageDescription);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+my %ParentTopic_of :ATTR(:get<ParentTopic>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+        ParentTopic
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+        'ParentTopic' => \%ParentTopic_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+        'ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+        'ParentTopic' => 'ParentTopic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+    ) ],
+    {
+
+        Name => \%Name_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Parameters
+
+
+=item * Messages
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigDescription
+   Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Messages =>  {
+     ParentTopic =>  $some_value, # string
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Name
+
+ XML Type of the Configuration (e.g. "tt::LineDetector"). 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm
new file mode 100644
index 000000000..9c2eefde8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ConfigDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm
new file mode 100644
index 000000000..8e544d6a6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm
@@ -0,0 +1,159 @@
+package ONVIF::Analytics::Types::ConfigurationEntity;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigurationEntity
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigurationEntity from the namespace http://www.onvif.org/ver10/schema.
+
+Base type defining the common properties of a configuration.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * UseCount
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigurationEntity
+   Name => $some_value, # Name
+   UseCount =>  $some_value, # int
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Token that uniquely refernces this configuration. Length up to 64 characters.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm
new file mode 100644
index 000000000..cf6f1cabe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ContinuousFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Speed
+
+    ) ],
+    {
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ContinuousFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ContinuousFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ContinuousFocus
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm
new file mode 100644
index 000000000..f9970d781
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::ContinuousFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Speed
+
+    ) ],
+    {
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ContinuousFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ContinuousFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ContinuousFocusOptions
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm
new file mode 100644
index 000000000..8c0e830bb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::DNSInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %SearchDomain_of :ATTR(:get<SearchDomain>);
+my %DNSFromDHCP_of :ATTR(:get<DNSFromDHCP>);
+my %DNSManual_of :ATTR(:get<DNSManual>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        SearchDomain
+        DNSFromDHCP
+        DNSManual
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'SearchDomain' => \%SearchDomain_of,
+        'DNSFromDHCP' => \%DNSFromDHCP_of,
+        'DNSManual' => \%DNSManual_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SearchDomain' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'DNSFromDHCP' => 'ONVIF::Analytics::Types::IPAddress',
+        'DNSManual' => 'ONVIF::Analytics::Types::IPAddress',
+        'Extension' => 'ONVIF::Analytics::Types::DNSInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'SearchDomain' => 'SearchDomain',
+        'DNSFromDHCP' => 'DNSFromDHCP',
+        'DNSManual' => 'DNSManual',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DNSInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DNSInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * SearchDomain
+
+
+=item * DNSFromDHCP
+
+
+=item * DNSManual
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DNSInformation
+   FromDHCP =>  $some_value, # boolean
+   SearchDomain =>  $some_value, # token
+   DNSFromDHCP =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   DNSManual =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   Extension =>  { # ONVIF::Analytics::Types::DNSInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm
new file mode 100644
index 000000000..e5ed4f566
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DNSInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DNSInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DNSInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DNSInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm
new file mode 100644
index 000000000..b9f099649
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DNSName;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DNSName from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm
new file mode 100644
index 000000000..e528318a0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Date;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Year_of :ATTR(:get<Year>);
+my %Month_of :ATTR(:get<Month>);
+my %Day_of :ATTR(:get<Day>);
+
+__PACKAGE__->_factory(
+    [ qw(        Year
+        Month
+        Day
+
+    ) ],
+    {
+        'Year' => \%Year_of,
+        'Month' => \%Month_of,
+        'Day' => \%Day_of,
+    },
+    {
+        'Year' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Month' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Day' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Year' => 'Year',
+        'Month' => 'Month',
+        'Day' => 'Day',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Date
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Date from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Year
+
+
+=item * Month
+
+
+=item * Day
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Date
+   Year =>  $some_value, # int
+   Month =>  $some_value, # int
+   Day =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm
new file mode 100644
index 000000000..c4e1ed2b6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::DateTime;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Time_of :ATTR(:get<Time>);
+my %Date_of :ATTR(:get<Date>);
+
+__PACKAGE__->_factory(
+    [ qw(        Time
+        Date
+
+    ) ],
+    {
+        'Time' => \%Time_of,
+        'Date' => \%Date_of,
+    },
+    {
+        'Time' => 'ONVIF::Analytics::Types::Time',
+        'Date' => 'ONVIF::Analytics::Types::Date',
+    },
+    {
+
+        'Time' => 'Time',
+        'Date' => 'Date',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DateTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DateTime from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Time
+
+
+=item * Date
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DateTime
+   Time =>  { # ONVIF::Analytics::Types::Time
+     Hour =>  $some_value, # int
+     Minute =>  $some_value, # int
+     Second =>  $some_value, # int
+   },
+   Date =>  { # ONVIF::Analytics::Types::Date
+     Year =>  $some_value, # int
+     Month =>  $some_value, # int
+     Day =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm
new file mode 100644
index 000000000..38f909404
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DateTimeRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %From_of :ATTR(:get<From>);
+my %Until_of :ATTR(:get<Until>);
+
+__PACKAGE__->_factory(
+    [ qw(        From
+        Until
+
+    ) ],
+    {
+        'From' => \%From_of,
+        'Until' => \%Until_of,
+    },
+    {
+        'From' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Until' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'From' => 'From',
+        'Until' => 'Until',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DateTimeRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DateTimeRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * From
+
+
+=item * Until
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DateTimeRange
+   From =>  $some_value, # dateTime
+   Until =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm
new file mode 100644
index 000000000..bfdfdf6f1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Description;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Description from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm
new file mode 100644
index 000000000..0e7be66f8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm
@@ -0,0 +1,204 @@
+package ONVIF::Analytics::Types::DeviceCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %Network_of :ATTR(:get<Network>);
+my %System_of :ATTR(:get<System>);
+my %IO_of :ATTR(:get<IO>);
+my %Security_of :ATTR(:get<Security>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        Network
+        System
+        IO
+        Security
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'Network' => \%Network_of,
+        'System' => \%System_of,
+        'IO' => \%IO_of,
+        'Security' => \%Security_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Network' => 'ONVIF::Analytics::Types::NetworkCapabilities',
+        'System' => 'ONVIF::Analytics::Types::SystemCapabilities',
+        'IO' => 'ONVIF::Analytics::Types::IOCapabilities',
+        'Security' => 'ONVIF::Analytics::Types::SecurityCapabilities',
+        'Extension' => 'ONVIF::Analytics::Types::DeviceCapabilitiesExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'Network' => 'Network',
+        'System' => 'System',
+        'IO' => 'IO',
+        'Security' => 'Security',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * Network
+
+
+=item * System
+
+
+=item * IO
+
+
+=item * Security
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceCapabilities
+   XAddr =>  $some_value, # anyURI
+   Network =>  { # ONVIF::Analytics::Types::NetworkCapabilities
+     IPFilter =>  $some_value, # boolean
+     ZeroConfiguration =>  $some_value, # boolean
+     IPVersion6 =>  $some_value, # boolean
+     DynDNS =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+       Dot11Configuration =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+       },
+     },
+   },
+   System =>  { # ONVIF::Analytics::Types::SystemCapabilities
+     DiscoveryResolve =>  $some_value, # boolean
+     DiscoveryBye =>  $some_value, # boolean
+     RemoteDiscovery =>  $some_value, # boolean
+     SystemBackup =>  $some_value, # boolean
+     SystemLogging =>  $some_value, # boolean
+     FirmwareUpgrade =>  $some_value, # boolean
+     SupportedVersions =>  { # ONVIF::Analytics::Types::OnvifVersion
+       Major =>  $some_value, # int
+       Minor =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+       HttpFirmwareUpgrade =>  $some_value, # boolean
+       HttpSystemBackup =>  $some_value, # boolean
+       HttpSystemLogging =>  $some_value, # boolean
+       HttpSupportInformation =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+       },
+     },
+   },
+   IO =>  { # ONVIF::Analytics::Types::IOCapabilities
+     InputConnectors =>  $some_value, # int
+     RelayOutputs =>  $some_value, # int
+     Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+       Auxiliary =>  $some_value, # boolean
+       AuxiliaryCommands => $some_value, # AuxiliaryData
+       Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+       },
+     },
+   },
+   Security =>  { # ONVIF::Analytics::Types::SecurityCapabilities
+     TLS1__1 =>  $some_value, # boolean
+     TLS1__2 =>  $some_value, # boolean
+     OnboardKeyGeneration =>  $some_value, # boolean
+     AccessPolicyConfig =>  $some_value, # boolean
+     X__509Token =>  $some_value, # boolean
+     SAMLToken =>  $some_value, # boolean
+     KerberosToken =>  $some_value, # boolean
+     RELToken =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+       TLS1__0 =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+         Dot1X =>  $some_value, # boolean
+         SupportedEAPMethod =>  $some_value, # int
+         RemoteUserHandling =>  $some_value, # boolean
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm
new file mode 100644
index 000000000..286eba0c4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DeviceCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm
new file mode 100644
index 000000000..d25d9c3e1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::DeviceEntity;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceEntity
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceEntity from the namespace http://www.onvif.org/ver10/schema.
+
+Base class for physical entities like inputs and outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier referencing the physical entity.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm
new file mode 100644
index 000000000..24265c7ad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::DeviceIOCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %VideoSources_of :ATTR(:get<VideoSources>);
+my %VideoOutputs_of :ATTR(:get<VideoOutputs>);
+my %AudioSources_of :ATTR(:get<AudioSources>);
+my %AudioOutputs_of :ATTR(:get<AudioOutputs>);
+my %RelayOutputs_of :ATTR(:get<RelayOutputs>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        VideoSources
+        VideoOutputs
+        AudioSources
+        AudioOutputs
+        RelayOutputs
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'VideoSources' => \%VideoSources_of,
+        'VideoOutputs' => \%VideoOutputs_of,
+        'AudioSources' => \%AudioSources_of,
+        'AudioOutputs' => \%AudioOutputs_of,
+        'RelayOutputs' => \%RelayOutputs_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'VideoSources' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'VideoOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AudioSources' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AudioOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RelayOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'VideoSources' => 'VideoSources',
+        'VideoOutputs' => 'VideoOutputs',
+        'AudioSources' => 'AudioSources',
+        'AudioOutputs' => 'AudioOutputs',
+        'RelayOutputs' => 'RelayOutputs',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceIOCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceIOCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * VideoSources
+
+
+=item * VideoOutputs
+
+
+=item * AudioSources
+
+
+=item * AudioOutputs
+
+
+=item * RelayOutputs
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceIOCapabilities
+   XAddr =>  $some_value, # anyURI
+   VideoSources =>  $some_value, # int
+   VideoOutputs =>  $some_value, # int
+   AudioSources =>  $some_value, # int
+   AudioOutputs =>  $some_value, # int
+   RelayOutputs =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm
new file mode 100644
index 000000000..266e67b15
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm
@@ -0,0 +1,97 @@
+package ONVIF::Analytics::Types::DigitalInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DigitalInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DigitalInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DigitalInput
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm
new file mode 100644
index 000000000..e3246c2c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Direction;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Direction from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm
new file mode 100644
index 000000000..a988edbfb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DiscoveryMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DiscoveryMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm
new file mode 100644
index 000000000..396229504
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DisplayCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %FixedLayout_of :ATTR(:get<FixedLayout>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        FixedLayout
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'FixedLayout' => \%FixedLayout_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'FixedLayout' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'FixedLayout' => 'FixedLayout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DisplayCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DisplayCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * FixedLayout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DisplayCapabilities
+   XAddr =>  $some_value, # anyURI
+   FixedLayout =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm
new file mode 100644
index 000000000..90b46b2bf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Domain;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Domain from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm
new file mode 100644
index 000000000..9d0bc5945
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11AuthAndMangementSuite;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11AuthAndMangementSuite from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm
new file mode 100644
index 000000000..796f9fa92
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm
@@ -0,0 +1,158 @@
+package ONVIF::Analytics::Types::Dot11AvailableNetworks;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %BSSID_of :ATTR(:get<BSSID>);
+my %AuthAndMangementSuite_of :ATTR(:get<AuthAndMangementSuite>);
+my %PairCipher_of :ATTR(:get<PairCipher>);
+my %GroupCipher_of :ATTR(:get<GroupCipher>);
+my %SignalStrength_of :ATTR(:get<SignalStrength>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        BSSID
+        AuthAndMangementSuite
+        PairCipher
+        GroupCipher
+        SignalStrength
+        Extension
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'BSSID' => \%BSSID_of,
+        'AuthAndMangementSuite' => \%AuthAndMangementSuite_of,
+        'PairCipher' => \%PairCipher_of,
+        'GroupCipher' => \%GroupCipher_of,
+        'SignalStrength' => \%SignalStrength_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'BSSID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AuthAndMangementSuite' => 'ONVIF::Analytics::Types::Dot11AuthAndMangementSuite',
+        'PairCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'GroupCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'SignalStrength' => 'ONVIF::Analytics::Types::Dot11SignalStrength',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11AvailableNetworksExtension',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'BSSID' => 'BSSID',
+        'AuthAndMangementSuite' => 'AuthAndMangementSuite',
+        'PairCipher' => 'PairCipher',
+        'GroupCipher' => 'GroupCipher',
+        'SignalStrength' => 'SignalStrength',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11AvailableNetworks
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11AvailableNetworks from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * BSSID
+
+
+=item * AuthAndMangementSuite
+
+
+=item * PairCipher
+
+
+=item * GroupCipher
+
+
+=item * SignalStrength
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11AvailableNetworks
+   SSID => $some_value, # Dot11SSIDType
+   BSSID =>  $some_value, # string
+   AuthAndMangementSuite => $some_value, # Dot11AuthAndMangementSuite
+   PairCipher => $some_value, # Dot11Cipher
+   GroupCipher => $some_value, # Dot11Cipher
+   SignalStrength => $some_value, # Dot11SignalStrength
+   Extension =>  { # ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm
new file mode 100644
index 000000000..2360622d7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11AvailableNetworksExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11AvailableNetworksExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm
new file mode 100644
index 000000000..88c6fce06
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Dot11Capabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TKIP_of :ATTR(:get<TKIP>);
+my %ScanAvailableNetworks_of :ATTR(:get<ScanAvailableNetworks>);
+my %MultipleConfiguration_of :ATTR(:get<MultipleConfiguration>);
+my %AdHocStationMode_of :ATTR(:get<AdHocStationMode>);
+my %WEP_of :ATTR(:get<WEP>);
+
+__PACKAGE__->_factory(
+    [ qw(        TKIP
+        ScanAvailableNetworks
+        MultipleConfiguration
+        AdHocStationMode
+        WEP
+
+    ) ],
+    {
+        'TKIP' => \%TKIP_of,
+        'ScanAvailableNetworks' => \%ScanAvailableNetworks_of,
+        'MultipleConfiguration' => \%MultipleConfiguration_of,
+        'AdHocStationMode' => \%AdHocStationMode_of,
+        'WEP' => \%WEP_of,
+    },
+    {
+        'TKIP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ScanAvailableNetworks' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MultipleConfiguration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AdHocStationMode' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WEP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'TKIP' => 'TKIP',
+        'ScanAvailableNetworks' => 'ScanAvailableNetworks',
+        'MultipleConfiguration' => 'MultipleConfiguration',
+        'AdHocStationMode' => 'AdHocStationMode',
+        'WEP' => 'WEP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Capabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TKIP
+
+
+=item * ScanAvailableNetworks
+
+
+=item * MultipleConfiguration
+
+
+=item * AdHocStationMode
+
+
+=item * WEP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Capabilities
+   TKIP =>  $some_value, # boolean
+   ScanAvailableNetworks =>  $some_value, # boolean
+   MultipleConfiguration =>  $some_value, # boolean
+   AdHocStationMode =>  $some_value, # boolean
+   WEP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm
new file mode 100644
index 000000000..3f9536fcc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11Cipher;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11Cipher from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm
new file mode 100644
index 000000000..8555b434c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::Dot11Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %Mode_of :ATTR(:get<Mode>);
+my %Alias_of :ATTR(:get<Alias>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Security_of :ATTR(:get<Security>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        Mode
+        Alias
+        Priority
+        Security
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'Mode' => \%Mode_of,
+        'Alias' => \%Alias_of,
+        'Priority' => \%Priority_of,
+        'Security' => \%Security_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'Mode' => 'ONVIF::Analytics::Types::Dot11StationMode',
+        'Alias' => 'ONVIF::Analytics::Types::Name',
+        'Priority' => 'ONVIF::Analytics::Types::NetworkInterfaceConfigPriority',
+        'Security' => 'ONVIF::Analytics::Types::Dot11SecurityConfiguration',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'Mode' => 'Mode',
+        'Alias' => 'Alias',
+        'Priority' => 'Priority',
+        'Security' => 'Security',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * Mode
+
+
+=item * Alias
+
+
+=item * Priority
+
+
+=item * Security
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Configuration
+   SSID => $some_value, # Dot11SSIDType
+   Mode => $some_value, # Dot11StationMode
+   Alias => $some_value, # Name
+   Priority => $some_value, # NetworkInterfaceConfigPriority
+   Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+     Mode => $some_value, # Dot11SecurityMode
+     Algorithm => $some_value, # Dot11Cipher
+     PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+       Key => $some_value, # Dot11PSK
+       Passphrase => $some_value, # Dot11PSKPassphrase
+       Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+       },
+     },
+     Dot1X => $some_value, # ReferenceToken
+     Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm
new file mode 100644
index 000000000..2b1d80988
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11PSK;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11PSK from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm
new file mode 100644
index 000000000..4567ae0e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11PSKPassphrase;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11PSKPassphrase from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm
new file mode 100644
index 000000000..e87f83400
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Dot11PSKSet;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Key_of :ATTR(:get<Key>);
+my %Passphrase_of :ATTR(:get<Passphrase>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Key
+        Passphrase
+        Extension
+
+    ) ],
+    {
+        'Key' => \%Key_of,
+        'Passphrase' => \%Passphrase_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Key' => 'ONVIF::Analytics::Types::Dot11PSK',
+        'Passphrase' => 'ONVIF::Analytics::Types::Dot11PSKPassphrase',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11PSKSetExtension',
+    },
+    {
+
+        'Key' => 'Key',
+        'Passphrase' => 'Passphrase',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11PSKSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11PSKSet from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Key
+
+
+=item * Passphrase
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11PSKSet
+   Key => $some_value, # Dot11PSK
+   Passphrase => $some_value, # Dot11PSKPassphrase
+   Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm
new file mode 100644
index 000000000..64c9511bd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11PSKSetExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11PSKSetExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11PSKSetExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm
new file mode 100644
index 000000000..d48defbad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SSIDType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SSIDType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm
new file mode 100644
index 000000000..36ee0d7a2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::Dot11SecurityConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Algorithm_of :ATTR(:get<Algorithm>);
+my %PSK_of :ATTR(:get<PSK>);
+my %Dot1X_of :ATTR(:get<Dot1X>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Algorithm
+        PSK
+        Dot1X
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Algorithm' => \%Algorithm_of,
+        'PSK' => \%PSK_of,
+        'Dot1X' => \%Dot1X_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::Dot11SecurityMode',
+        'Algorithm' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'PSK' => 'ONVIF::Analytics::Types::Dot11PSKSet',
+        'Dot1X' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Algorithm' => 'Algorithm',
+        'PSK' => 'PSK',
+        'Dot1X' => 'Dot1X',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11SecurityConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11SecurityConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Algorithm
+
+
+=item * PSK
+
+
+=item * Dot1X
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+   Mode => $some_value, # Dot11SecurityMode
+   Algorithm => $some_value, # Dot11Cipher
+   PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+     Key => $some_value, # Dot11PSK
+     Passphrase => $some_value, # Dot11PSKPassphrase
+     Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+     },
+   },
+   Dot1X => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm
new file mode 100644
index 000000000..d08313f47
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11SecurityConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm
new file mode 100644
index 000000000..f66f64a90
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SecurityMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SecurityMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm
new file mode 100644
index 000000000..c8da97218
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SignalStrength;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SignalStrength from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm
new file mode 100644
index 000000000..6575f2a17
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11StationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11StationMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm
new file mode 100644
index 000000000..1b25f1ed0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::Dot11Status;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %BSSID_of :ATTR(:get<BSSID>);
+my %PairCipher_of :ATTR(:get<PairCipher>);
+my %GroupCipher_of :ATTR(:get<GroupCipher>);
+my %SignalStrength_of :ATTR(:get<SignalStrength>);
+my %ActiveConfigAlias_of :ATTR(:get<ActiveConfigAlias>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        BSSID
+        PairCipher
+        GroupCipher
+        SignalStrength
+        ActiveConfigAlias
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'BSSID' => \%BSSID_of,
+        'PairCipher' => \%PairCipher_of,
+        'GroupCipher' => \%GroupCipher_of,
+        'SignalStrength' => \%SignalStrength_of,
+        'ActiveConfigAlias' => \%ActiveConfigAlias_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'BSSID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'PairCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'GroupCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'SignalStrength' => 'ONVIF::Analytics::Types::Dot11SignalStrength',
+        'ActiveConfigAlias' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'BSSID' => 'BSSID',
+        'PairCipher' => 'PairCipher',
+        'GroupCipher' => 'GroupCipher',
+        'SignalStrength' => 'SignalStrength',
+        'ActiveConfigAlias' => 'ActiveConfigAlias',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Status
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Status from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * BSSID
+
+
+=item * PairCipher
+
+
+=item * GroupCipher
+
+
+=item * SignalStrength
+
+
+=item * ActiveConfigAlias
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Status
+   SSID => $some_value, # Dot11SSIDType
+   BSSID =>  $some_value, # string
+   PairCipher => $some_value, # Dot11Cipher
+   GroupCipher => $some_value, # Dot11Cipher
+   SignalStrength => $some_value, # Dot11SignalStrength
+   ActiveConfigAlias => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm
new file mode 100644
index 000000000..fc35b8a8f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm
@@ -0,0 +1,165 @@
+package ONVIF::Analytics::Types::Dot1XConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot1XConfigurationToken_of :ATTR(:get<Dot1XConfigurationToken>);
+my %Identity_of :ATTR(:get<Identity>);
+my %AnonymousID_of :ATTR(:get<AnonymousID>);
+my %EAPMethod_of :ATTR(:get<EAPMethod>);
+my %CACertificateID_of :ATTR(:get<CACertificateID>);
+my %EAPMethodConfiguration_of :ATTR(:get<EAPMethodConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot1XConfigurationToken
+        Identity
+        AnonymousID
+        EAPMethod
+        CACertificateID
+        EAPMethodConfiguration
+        Extension
+
+    ) ],
+    {
+        'Dot1XConfigurationToken' => \%Dot1XConfigurationToken_of,
+        'Identity' => \%Identity_of,
+        'AnonymousID' => \%AnonymousID_of,
+        'EAPMethod' => \%EAPMethod_of,
+        'CACertificateID' => \%CACertificateID_of,
+        'EAPMethodConfiguration' => \%EAPMethodConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot1XConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Identity' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AnonymousID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'EAPMethod' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'CACertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'EAPMethodConfiguration' => 'ONVIF::Analytics::Types::EAPMethodConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::Dot1XConfigurationExtension',
+    },
+    {
+
+        'Dot1XConfigurationToken' => 'Dot1XConfigurationToken',
+        'Identity' => 'Identity',
+        'AnonymousID' => 'AnonymousID',
+        'EAPMethod' => 'EAPMethod',
+        'CACertificateID' => 'CACertificateID',
+        'EAPMethodConfiguration' => 'EAPMethodConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot1XConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot1XConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot1XConfigurationToken
+
+
+=item * Identity
+
+
+=item * AnonymousID
+
+
+=item * EAPMethod
+
+
+=item * CACertificateID
+
+
+=item * EAPMethodConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot1XConfiguration
+   Dot1XConfigurationToken => $some_value, # ReferenceToken
+   Identity =>  $some_value, # string
+   AnonymousID =>  $some_value, # string
+   EAPMethod =>  $some_value, # int
+   CACertificateID =>  $some_value, # token
+   EAPMethodConfiguration =>  { # ONVIF::Analytics::Types::EAPMethodConfiguration
+     TLSConfiguration =>  { # ONVIF::Analytics::Types::TLSConfiguration
+       CertificateID =>  $some_value, # token
+     },
+     Password =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::EapMethodExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::Dot1XConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm
new file mode 100644
index 000000000..00d97bf6e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot1XConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot1XConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot1XConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot1XConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm
new file mode 100644
index 000000000..8613c3527
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot3Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot3Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot3Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot3Configuration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm
new file mode 100644
index 000000000..08b290b38
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Duplex;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Duplex from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm
new file mode 100644
index 000000000..6b639290c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DurationRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DurationRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DurationRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of duration greater equal Min duration and less equal Max duration.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DurationRange
+   Min =>  $some_value, # duration
+   Max =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm
new file mode 100644
index 000000000..5b237db83
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::DynamicDNSInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Name_of :ATTR(:get<Name>);
+my %TTL_of :ATTR(:get<TTL>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Name
+        TTL
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Name' => \%Name_of,
+        'TTL' => \%TTL_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::DynamicDNSType',
+        'Name' => 'ONVIF::Analytics::Types::DNSName',
+        'TTL' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::DynamicDNSInformationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'Name' => 'Name',
+        'TTL' => 'TTL',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DynamicDNSInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DynamicDNSInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Name
+
+
+=item * TTL
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DynamicDNSInformation
+   Type => $some_value, # DynamicDNSType
+   Name => $some_value, # DNSName
+   TTL =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::DynamicDNSInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm
new file mode 100644
index 000000000..57d945d5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DynamicDNSInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DynamicDNSInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DynamicDNSInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DynamicDNSInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm
new file mode 100644
index 000000000..bc2e64c1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DynamicDNSType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DynamicDNSType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm
new file mode 100644
index 000000000..cfbdff031
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::EAPMethodConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLSConfiguration_of :ATTR(:get<TLSConfiguration>);
+my %Password_of :ATTR(:get<Password>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLSConfiguration
+        Password
+        Extension
+
+    ) ],
+    {
+        'TLSConfiguration' => \%TLSConfiguration_of,
+        'Password' => \%Password_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLSConfiguration' => 'ONVIF::Analytics::Types::TLSConfiguration',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::EapMethodExtension',
+    },
+    {
+
+        'TLSConfiguration' => 'TLSConfiguration',
+        'Password' => 'Password',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EAPMethodConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EAPMethodConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLSConfiguration
+
+
+=item * Password
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EAPMethodConfiguration
+   TLSConfiguration =>  { # ONVIF::Analytics::Types::TLSConfiguration
+     CertificateID =>  $some_value, # token
+   },
+   Password =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::EapMethodExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm
new file mode 100644
index 000000000..16afe3468
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::EFlip;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::EFlipMode',
+    },
+    {
+
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlip
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlip from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlip
+   Mode => $some_value, # EFlipMode
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm
new file mode 100644
index 000000000..47585292e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::EFlipMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+EFlipMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm
new file mode 100644
index 000000000..0b4850e36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::EFlipOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::EFlipMode',
+        'Extension' => 'ONVIF::Analytics::Types::EFlipOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlipOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlipOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlipOptions
+   Mode => $some_value, # EFlipMode
+   Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm
new file mode 100644
index 000000000..8d45e135c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EFlipOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlipOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlipOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlipOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm
new file mode 100644
index 000000000..5d8e96f0f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EapMethodExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EapMethodExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EapMethodExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EapMethodExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm
new file mode 100644
index 000000000..e55f7ad77
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Enabled;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Enabled from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm
new file mode 100644
index 000000000..a4bef790f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::EngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoAnalyticsConfiguration_of :ATTR(:get<VideoAnalyticsConfiguration>);
+my %AnalyticsEngineInputInfo_of :ATTR(:get<AnalyticsEngineInputInfo>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoAnalyticsConfiguration
+        AnalyticsEngineInputInfo
+
+    ) ],
+    {
+        'VideoAnalyticsConfiguration' => \%VideoAnalyticsConfiguration_of,
+        'AnalyticsEngineInputInfo' => \%AnalyticsEngineInputInfo_of,
+    },
+    {
+        'VideoAnalyticsConfiguration' => 'ONVIF::Analytics::Types::VideoAnalyticsConfiguration',
+        'AnalyticsEngineInputInfo' => 'ONVIF::Analytics::Types::AnalyticsEngineInputInfo',
+    },
+    {
+
+        'VideoAnalyticsConfiguration' => 'VideoAnalyticsConfiguration',
+        'AnalyticsEngineInputInfo' => 'AnalyticsEngineInputInfo',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoAnalyticsConfiguration
+
+
+=item * AnalyticsEngineInputInfo
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EngineConfiguration
+   VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+       Rule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+       },
+     },
+   },
+   AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+     InputInfo =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm
new file mode 100644
index 000000000..fbf5eca8e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm
@@ -0,0 +1,128 @@
+package ONVIF::Analytics::Types::Envelope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Header_of :ATTR(:get<Header>);
+my %Body_of :ATTR(:get<Body>);
+
+__PACKAGE__->_factory(
+    [ qw(        Header
+        Body
+
+    ) ],
+    {
+        'Header' => \%Header_of,
+        'Body' => \%Body_of,
+    },
+    {
+        'Header' => 'ONVIF::Analytics::Elements::Header',
+
+        'Body' => 'ONVIF::Analytics::Elements::Body',
+
+    },
+    {
+
+        'Header' => '',
+        'Body' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Envelope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Envelope from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Header
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Body
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Envelope
+   Header =>  { # ONVIF::Analytics::Types::Header
+   },
+   Body =>  { # ONVIF::Analytics::Types::Body
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm
new file mode 100644
index 000000000..759bca600
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::EventCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %WSSubscriptionPolicySupport_of :ATTR(:get<WSSubscriptionPolicySupport>);
+my %WSPullPointSupport_of :ATTR(:get<WSPullPointSupport>);
+my %WSPausableSubscriptionManagerInterfaceSupport_of :ATTR(:get<WSPausableSubscriptionManagerInterfaceSupport>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        WSSubscriptionPolicySupport
+        WSPullPointSupport
+        WSPausableSubscriptionManagerInterfaceSupport
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'WSSubscriptionPolicySupport' => \%WSSubscriptionPolicySupport_of,
+        'WSPullPointSupport' => \%WSPullPointSupport_of,
+        'WSPausableSubscriptionManagerInterfaceSupport' => \%WSPausableSubscriptionManagerInterfaceSupport_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'WSSubscriptionPolicySupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WSPullPointSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WSPausableSubscriptionManagerInterfaceSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'WSSubscriptionPolicySupport' => 'WSSubscriptionPolicySupport',
+        'WSPullPointSupport' => 'WSPullPointSupport',
+        'WSPausableSubscriptionManagerInterfaceSupport' => 'WSPausableSubscriptionManagerInterfaceSupport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * WSSubscriptionPolicySupport
+
+
+=item * WSPullPointSupport
+
+
+=item * WSPausableSubscriptionManagerInterfaceSupport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventCapabilities
+   XAddr =>  $some_value, # anyURI
+   WSSubscriptionPolicySupport =>  $some_value, # boolean
+   WSPullPointSupport =>  $some_value, # boolean
+   WSPausableSubscriptionManagerInterfaceSupport =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm
new file mode 100644
index 000000000..f110c4f9e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EventStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm
new file mode 100644
index 000000000..4b42f6ce1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm
@@ -0,0 +1,157 @@
+package ONVIF::Analytics::Types::EventSubscription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Filter_of :ATTR(:get<Filter>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Filter
+        SubscriptionPolicy
+
+    ) ],
+    {
+        'Filter' => \%Filter_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+    },
+    {
+        'Filter' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+
+        'SubscriptionPolicy' => 'ONVIF::Analytics::Types::EventSubscription::_SubscriptionPolicy',
+    },
+    {
+
+        'Filter' => 'Filter',
+        'SubscriptionPolicy' => 'SubscriptionPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::EventSubscription::_SubscriptionPolicy;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventSubscription from the namespace http://www.onvif.org/ver10/schema.
+
+Subcription handling in the same way as base notification subscription.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Filter
+
+
+=item * SubscriptionPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventSubscription
+   Filter =>  $some_value, # anyType
+   SubscriptionPolicy =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm
new file mode 100644
index 000000000..cd47f4b0d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm
@@ -0,0 +1,202 @@
+package ONVIF::Analytics::Types::Exposure;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Window_of :ATTR(:get<Window>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        Window
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Window' => \%Window_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'Window' => 'ONVIF::Analytics::Types::Rectangle',
+        'MinExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Gain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Iris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Window' => 'Window',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Exposure
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Exposure from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Window
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Exposure
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   Window => ,
+   MinExposureTime =>  $some_value, # float
+   MaxExposureTime =>  $some_value, # float
+   MinGain =>  $some_value, # float
+   MaxGain =>  $some_value, # float
+   MinIris =>  $some_value, # float
+   MaxIris =>  $some_value, # float
+   ExposureTime =>  $some_value, # float
+   Gain =>  $some_value, # float
+   Iris =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm
new file mode 100644
index 000000000..299d6b964
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm
@@ -0,0 +1,202 @@
+package ONVIF::Analytics::Types::Exposure20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Window_of :ATTR(:get<Window>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        Window
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Window' => \%Window_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'Window' => 'ONVIF::Analytics::Types::Rectangle',
+        'MinExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Gain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Iris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Window' => 'Window',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Exposure20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Exposure20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing the exposure settings.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Window
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Exposure20
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   Window => ,
+   MinExposureTime =>  $some_value, # float
+   MaxExposureTime =>  $some_value, # float
+   MinGain =>  $some_value, # float
+   MaxGain =>  $some_value, # float
+   MinIris =>  $some_value, # float
+   MaxIris =>  $some_value, # float
+   ExposureTime =>  $some_value, # float
+   Gain =>  $some_value, # float
+   Iris =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm
new file mode 100644
index 000000000..a5265f7a1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ExposureMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ExposureMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm
new file mode 100644
index 000000000..b67e1adb7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm
@@ -0,0 +1,220 @@
+package ONVIF::Analytics::Types::ExposureOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'MinExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'ExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'Gain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Iris' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ExposureOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExposureOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ExposureOptions
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Gain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Iris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm
new file mode 100644
index 000000000..44f01abdb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm
@@ -0,0 +1,220 @@
+package ONVIF::Analytics::Types::ExposureOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'MinExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'ExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'Gain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Iris' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ExposureOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExposureOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ExposureOptions20
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Gain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Iris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm
new file mode 100644
index 000000000..2ad95fb9d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ExposurePriority;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ExposurePriority from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm
new file mode 100644
index 000000000..b616d8289
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::FactoryDefaultType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FactoryDefaultType from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available factory default modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm
new file mode 100644
index 000000000..46cfc6edd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::Fault;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %faultcode_of :ATTR(:get<faultcode>);
+my %faultstring_of :ATTR(:get<faultstring>);
+my %faultactor_of :ATTR(:get<faultactor>);
+my %detail_of :ATTR(:get<detail>);
+
+__PACKAGE__->_factory(
+    [ qw(        faultcode
+        faultstring
+        faultactor
+        detail
+
+    ) ],
+    {
+        'faultcode' => \%faultcode_of,
+        'faultstring' => \%faultstring_of,
+        'faultactor' => \%faultactor_of,
+        'detail' => \%detail_of,
+    },
+    {
+        'faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+        'faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'detail' => 'ONVIF::Analytics::Types::detail',
+    },
+    {
+
+        'faultcode' => 'faultcode',
+        'faultstring' => 'faultstring',
+        'faultactor' => 'faultactor',
+        'detail' => 'detail',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Fault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Fault from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+Fault reporting structure 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * faultcode
+
+
+=item * faultstring
+
+
+=item * faultactor
+
+
+=item * detail
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Fault
+   faultcode =>  $some_value, # QName
+   faultstring =>  $some_value, # string
+   faultactor =>  $some_value, # anyURI
+   detail =>  { # ONVIF::Analytics::Types::detail
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm
new file mode 100644
index 000000000..102d3d8aa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::FindEventResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+my %Event_of :ATTR(:get<Event>);
+my %StartStateEvent_of :ATTR(:get<StartStateEvent>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+        Event
+        StartStateEvent
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+        'Event' => \%Event_of,
+        'StartStateEvent' => \%StartStateEvent_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Event' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+        'StartStateEvent' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+        'Event' => 'Event',
+        'StartStateEvent' => 'StartStateEvent',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindEventResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindEventResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+=item * Event
+
+
+=item * StartStateEvent
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindEventResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+   Event =>  $some_value, # anyType
+   StartStateEvent =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm
new file mode 100644
index 000000000..1f716a457
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::FindEventResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindEventResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindEventResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindEventResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindEventResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindEventResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+     Event =>  $some_value, # anyType
+     StartStateEvent =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm
new file mode 100644
index 000000000..6c564e796
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::FindMetadataResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindMetadataResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindMetadataResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindMetadataResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm
new file mode 100644
index 000000000..b6f9e0a09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::FindMetadataResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindMetadataResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindMetadataResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindMetadataResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindMetadataResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindMetadataResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm
new file mode 100644
index 000000000..4f89a9351
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::FindPTZPositionResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+my %Position_of :ATTR(:get<Position>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+        Position
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+        'Position' => \%Position_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Position' => 'ONVIF::Analytics::Types::PTZVector',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+        'Position' => 'Position',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindPTZPositionResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindPTZPositionResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+=item * Position
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindPTZPositionResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+   Position =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm
new file mode 100644
index 000000000..54d31b786
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::FindPTZPositionResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindPTZPositionResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindPTZPositionResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindPTZPositionResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindPTZPositionResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindPTZPositionResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm
new file mode 100644
index 000000000..aab2a7534
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm
@@ -0,0 +1,132 @@
+package ONVIF::Analytics::Types::FindRecordingResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %RecordingInformation_of :ATTR(:get<RecordingInformation>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        RecordingInformation
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'RecordingInformation' => \%RecordingInformation_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'RecordingInformation' => 'ONVIF::Analytics::Types::RecordingInformation',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'RecordingInformation' => 'RecordingInformation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindRecordingResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindRecordingResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * RecordingInformation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindRecordingResultList
+   SearchState => $some_value, # SearchState
+   RecordingInformation =>  { # ONVIF::Analytics::Types::RecordingInformation
+     RecordingToken => $some_value, # RecordingReference
+     Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+       SourceId =>  $some_value, # anyURI
+       Name => $some_value, # Name
+       Location => $some_value, # Description
+       Description => $some_value, # Description
+       Address =>  $some_value, # anyURI
+     },
+     EarliestRecording =>  $some_value, # dateTime
+     LatestRecording =>  $some_value, # dateTime
+     Content => $some_value, # Description
+     Track =>  { # ONVIF::Analytics::Types::TrackInformation
+       TrackToken => $some_value, # TrackReference
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+       DataFrom =>  $some_value, # dateTime
+       DataTo =>  $some_value, # dateTime
+     },
+     RecordingStatus => $some_value, # RecordingStatus
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm
new file mode 100644
index 000000000..b5c004a33
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::FloatAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::float
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FloatAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::float
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm
new file mode 100644
index 000000000..78ef2a13b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::FloatList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Items_of :ATTR(:get<Items>);
+
+__PACKAGE__->_factory(
+    [ qw(        Items
+
+    ) ],
+    {
+        'Items' => \%Items_of,
+    },
+    {
+        'Items' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Items' => 'Items',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FloatList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FloatList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Items
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FloatList
+   Items =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm
new file mode 100644
index 000000000..03d97dc11
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::FloatRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FloatRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FloatRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of values greater equal Min value and less equal Max value.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FloatRange
+   Min =>  $some_value, # float
+   Max =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm
new file mode 100644
index 000000000..0006d20fc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::FocusConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusMode_of :ATTR(:get<AutoFocusMode>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusMode
+        DefaultSpeed
+        NearLimit
+        FarLimit
+
+    ) ],
+    {
+        'AutoFocusMode' => \%AutoFocusMode_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+    },
+    {
+        'AutoFocusMode' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'NearLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'FarLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'AutoFocusMode' => 'AutoFocusMode',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusMode
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration
+   AutoFocusMode => $some_value, # AutoFocusMode
+   DefaultSpeed =>  $some_value, # float
+   NearLimit =>  $some_value, # float
+   FarLimit =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm
new file mode 100644
index 000000000..7f3aa4576
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::FocusConfiguration20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusMode_of :ATTR(:get<AutoFocusMode>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusMode
+        DefaultSpeed
+        NearLimit
+        FarLimit
+        Extension
+
+    ) ],
+    {
+        'AutoFocusMode' => \%AutoFocusMode_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AutoFocusMode' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'NearLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'FarLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::FocusConfiguration20Extension',
+    },
+    {
+
+        'AutoFocusMode' => 'AutoFocusMode',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusMode
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration20
+   AutoFocusMode => $some_value, # AutoFocusMode
+   DefaultSpeed =>  $some_value, # float
+   NearLimit =>  $some_value, # float
+   FarLimit =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm
new file mode 100644
index 000000000..0a46a2e44
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusConfiguration20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm
new file mode 100644
index 000000000..432af470b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm
@@ -0,0 +1,129 @@
+package ONVIF::Analytics::Types::FocusMove;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocus',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocus',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocus',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusMove
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusMove from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusMove
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocus
+     Position =>  $some_value, # float
+     Speed =>  $some_value, # float
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocus
+     Distance =>  $some_value, # float
+     Speed =>  $some_value, # float
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocus
+     Speed =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm
new file mode 100644
index 000000000..3317e6357
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::FocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusModes_of :ATTR(:get<AutoFocusModes>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusModes
+        DefaultSpeed
+        NearLimit
+        FarLimit
+
+    ) ],
+    {
+        'AutoFocusModes' => \%AutoFocusModes_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+    },
+    {
+        'AutoFocusModes' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'ONVIF::Analytics::Types::FloatRange',
+        'NearLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'FarLimit' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'AutoFocusModes' => 'AutoFocusModes',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusModes
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions
+   AutoFocusModes => $some_value, # AutoFocusMode
+   DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm
new file mode 100644
index 000000000..098236e52
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::FocusOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusModes_of :ATTR(:get<AutoFocusModes>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusModes
+        DefaultSpeed
+        NearLimit
+        FarLimit
+        Extension
+
+    ) ],
+    {
+        'AutoFocusModes' => \%AutoFocusModes_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AutoFocusModes' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'ONVIF::Analytics::Types::FloatRange',
+        'NearLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'FarLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::FocusOptions20Extension',
+    },
+    {
+
+        'AutoFocusModes' => 'AutoFocusModes',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusModes
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions20
+   AutoFocusModes => $some_value, # AutoFocusMode
+   DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FocusOptions20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm
new file mode 100644
index 000000000..4e7e9c9e9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm
new file mode 100644
index 000000000..496497fa1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::FocusStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MoveStatus' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus
+   Position =>  $some_value, # float
+   MoveStatus => $some_value, # MoveStatus
+   Error =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm
new file mode 100644
index 000000000..f06b9c0c8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::FocusStatus20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+        Extension
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MoveStatus' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::FocusStatus20Extension',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus20
+   Position =>  $some_value, # float
+   MoveStatus => $some_value, # MoveStatus
+   Error =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::FocusStatus20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm
new file mode 100644
index 000000000..8352076c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusStatus20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm
new file mode 100644
index 000000000..b009e7042
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm
@@ -0,0 +1,274 @@
+package ONVIF::Analytics::Types::Frame;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Frame::_Frame::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Transformation_of :ATTR(:get<Transformation>);
+my %Object_of :ATTR(:get<Object>);
+my %ObjectTree_of :ATTR(:get<ObjectTree>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatus
+        Transformation
+        Object
+        ObjectTree
+        Extension
+
+    ) ],
+    {
+        'PTZStatus' => \%PTZStatus_of,
+        'Transformation' => \%Transformation_of,
+        'Object' => \%Object_of,
+        'ObjectTree' => \%ObjectTree_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZStatus',
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+        'Object' => 'ONVIF::Analytics::Types::Object',
+        'ObjectTree' => 'ONVIF::Analytics::Types::ObjectTree',
+        'Extension' => 'ONVIF::Analytics::Types::FrameExtension',
+    },
+    {
+
+        'PTZStatus' => 'PTZStatus',
+        'Transformation' => 'Transformation',
+        'Object' => 'Object',
+        'ObjectTree' => 'ObjectTree',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Frame::_Frame::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Frame
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Frame from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Transformation
+
+
+=item * Object
+
+
+=item * ObjectTree
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Frame
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+       PanTilt => $some_value, # MoveStatus
+       Zoom => $some_value, # MoveStatus
+     },
+     Error =>  $some_value, # string
+     UtcTime =>  $some_value, # dateTime
+   },
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+   Object =>  { # ONVIF::Analytics::Types::Object
+     Appearance =>  { # ONVIF::Analytics::Types::Appearance
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+         BoundingBox => ,
+         CenterOfGravity => ,
+         Polygon =>  { # ONVIF::Analytics::Types::Polygon
+           Point => ,
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+         },
+       },
+       Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+         ColorCluster =>  {
+           Color => ,
+           Weight =>  $some_value, # float
+           Covariance => ,
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+         },
+       },
+       Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+         ClassCandidate =>  {
+           Type => $some_value, # ClassType
+           Likelihood =>  $some_value, # float
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+           OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+             Type =>  $some_value, # string
+             Likelihood =>  $some_value, # float
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+       },
+     },
+     Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+       Removed =>  {
+       },
+       Idle =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+     },
+   },
+   ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+     Rename =>  { # ONVIF::Analytics::Types::Rename
+       from => ,
+       to => ,
+     },
+     Split =>  { # ONVIF::Analytics::Types::Split
+       from => ,
+       to => ,
+     },
+     Merge =>  { # ONVIF::Analytics::Types::Merge
+       from => ,
+       to => ,
+     },
+     Delete => ,
+     Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+     MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Frame::_Frame::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * UtcTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::dateTime|SOAP::WSDL::XSD::Typelib::Builtin::dateTime>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm
new file mode 100644
index 000000000..74ef68da3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::FrameExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MotionInCells_of :ATTR(:get<MotionInCells>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MotionInCells
+        Extension
+
+    ) ],
+    {
+        'MotionInCells' => \%MotionInCells_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MotionInCells' => 'ONVIF::Analytics::Types::MotionInCells',
+        'Extension' => 'ONVIF::Analytics::Types::FrameExtension2',
+    },
+    {
+
+        'MotionInCells' => 'MotionInCells',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FrameExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FrameExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MotionInCells
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FrameExtension
+   MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm
new file mode 100644
index 000000000..4b7c039c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FrameExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FrameExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FrameExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FrameExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm
new file mode 100644
index 000000000..b562f825c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::G711DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::G711DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+G711DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::G711DecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm
new file mode 100644
index 000000000..7bc884856
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::G726DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::G726DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+G726DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::G726DecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm
new file mode 100644
index 000000000..70cbdb54a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GenericEapPwdConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm
new file mode 100644
index 000000000..02e8f49c5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::GetRecordingJobsResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JobToken_of :ATTR(:get<JobToken>);
+my %JobConfiguration_of :ATTR(:get<JobConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        JobToken
+        JobConfiguration
+
+    ) ],
+    {
+        'JobToken' => \%JobToken_of,
+        'JobConfiguration' => \%JobConfiguration_of,
+    },
+    {
+        'JobToken' => 'ONVIF::Analytics::Types::RecordingJobReference',
+        'JobConfiguration' => 'ONVIF::Analytics::Types::RecordingJobConfiguration',
+    },
+    {
+
+        'JobToken' => 'JobToken',
+        'JobConfiguration' => 'JobConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetRecordingJobsResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetRecordingJobsResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JobToken
+
+
+=item * JobConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetRecordingJobsResponseItem
+   JobToken => $some_value, # RecordingJobReference
+   JobConfiguration =>  { # ONVIF::Analytics::Types::RecordingJobConfiguration
+     RecordingToken => $some_value, # RecordingReference
+     Mode => $some_value, # RecordingJobMode
+     Priority =>  $some_value, # int
+     Source =>  { # ONVIF::Analytics::Types::RecordingJobSource
+       SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+         Token => $some_value, # ReferenceToken
+       },
+       AutoCreateReceiver =>  $some_value, # boolean
+       Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+         SourceTag =>  $some_value, # string
+         Destination => $some_value, # TrackReference
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm
new file mode 100644
index 000000000..c6485467c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::GetRecordingsResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Configuration_of :ATTR(:get<Configuration>);
+my %Tracks_of :ATTR(:get<Tracks>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Configuration
+        Tracks
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Configuration' => \%Configuration_of,
+        'Tracks' => \%Tracks_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Configuration' => 'ONVIF::Analytics::Types::RecordingConfiguration',
+        'Tracks' => 'ONVIF::Analytics::Types::GetTracksResponseList',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Configuration' => 'Configuration',
+        'Tracks' => 'Tracks',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetRecordingsResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetRecordingsResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Configuration
+
+
+=item * Tracks
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetRecordingsResponseItem
+   RecordingToken => $some_value, # RecordingReference
+   Configuration =>  { # ONVIF::Analytics::Types::RecordingConfiguration
+     Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+       SourceId =>  $some_value, # anyURI
+       Name => $some_value, # Name
+       Location => $some_value, # Description
+       Description => $some_value, # Description
+       Address =>  $some_value, # anyURI
+     },
+     Content => $some_value, # Description
+     MaximumRetentionTime =>  $some_value, # duration
+   },
+   Tracks =>  { # ONVIF::Analytics::Types::GetTracksResponseList
+     Track =>  { # ONVIF::Analytics::Types::GetTracksResponseItem
+       TrackToken => $some_value, # TrackReference
+       Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+         TrackType => $some_value, # TrackType
+         Description => $some_value, # Description
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm
new file mode 100644
index 000000000..142633ae7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::GetTracksResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Configuration_of :ATTR(:get<Configuration>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackToken
+        Configuration
+
+    ) ],
+    {
+        'TrackToken' => \%TrackToken_of,
+        'Configuration' => \%Configuration_of,
+    },
+    {
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Configuration' => 'ONVIF::Analytics::Types::TrackConfiguration',
+    },
+    {
+
+        'TrackToken' => 'TrackToken',
+        'Configuration' => 'Configuration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetTracksResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetTracksResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackToken
+
+
+=item * Configuration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetTracksResponseItem
+   TrackToken => $some_value, # TrackReference
+   Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm
new file mode 100644
index 000000000..23072b371
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::GetTracksResponseList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Track_of :ATTR(:get<Track>);
+
+__PACKAGE__->_factory(
+    [ qw(        Track
+
+    ) ],
+    {
+        'Track' => \%Track_of,
+    },
+    {
+        'Track' => 'ONVIF::Analytics::Types::GetTracksResponseItem',
+    },
+    {
+
+        'Track' => 'Track',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetTracksResponseList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetTracksResponseList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Track
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetTracksResponseList
+   Track =>  { # ONVIF::Analytics::Types::GetTracksResponseItem
+     TrackToken => $some_value, # TrackReference
+     Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm
new file mode 100644
index 000000000..2db6a372a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::H264Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %GovLength_of :ATTR(:get<GovLength>);
+my %H264Profile_of :ATTR(:get<H264Profile>);
+
+__PACKAGE__->_factory(
+    [ qw(        GovLength
+        H264Profile
+
+    ) ],
+    {
+        'GovLength' => \%GovLength_of,
+        'H264Profile' => \%H264Profile_of,
+    },
+    {
+        'GovLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'H264Profile' => 'ONVIF::Analytics::Types::H264Profile',
+    },
+    {
+
+        'GovLength' => 'GovLength',
+        'H264Profile' => 'H264Profile',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GovLength
+
+
+=item * H264Profile
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Configuration
+   GovLength =>  $some_value, # int
+   H264Profile => $some_value, # H264Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm
new file mode 100644
index 000000000..9c883f654
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::H264DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedH264Profiles_of :ATTR(:get<SupportedH264Profiles>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedH264Profiles
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedH264Profiles' => \%SupportedH264Profiles_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedH264Profiles' => 'ONVIF::Analytics::Types::H264Profile',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedH264Profiles' => 'SupportedH264Profiles',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedH264Profiles
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264DecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedH264Profiles => $some_value, # H264Profile
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm
new file mode 100644
index 000000000..bd5b43fe0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::H264Options;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %H264ProfilesSupported_of :ATTR(:get<H264ProfilesSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        H264ProfilesSupported
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'H264ProfilesSupported' => \%H264ProfilesSupported_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'H264ProfilesSupported' => 'ONVIF::Analytics::Types::H264Profile',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'H264ProfilesSupported' => 'H264ProfilesSupported',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Options
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Options from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * GovLengthRange
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+=item * H264ProfilesSupported
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Options
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   H264ProfilesSupported => $some_value, # H264Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm
new file mode 100644
index 000000000..0cbd7b2eb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::H264Options2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::H264Options);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %H264ProfilesSupported_of :ATTR(:get<H264ProfilesSupported>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        H264ProfilesSupported
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'H264ProfilesSupported' => \%H264ProfilesSupported_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'H264ProfilesSupported' => 'ONVIF::Analytics::Types::H264Profile',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'H264ProfilesSupported' => 'H264ProfilesSupported',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Options2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Options2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Options2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm
new file mode 100644
index 000000000..b1776d3ec
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::H264Profile;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+H264Profile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm
new file mode 100644
index 000000000..570c7a869
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Header;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Header
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Header from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Header
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm
new file mode 100644
index 000000000..f40b423ae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::HostnameInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %Name_of :ATTR(:get<Name>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        Name
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'Name' => \%Name_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Extension' => 'ONVIF::Analytics::Types::HostnameInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'Name' => 'Name',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::HostnameInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+HostnameInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * Name
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::HostnameInformation
+   FromDHCP =>  $some_value, # boolean
+   Name =>  $some_value, # token
+   Extension =>  { # ONVIF::Analytics::Types::HostnameInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm
new file mode 100644
index 000000000..193b887ca
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::HostnameInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::HostnameInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+HostnameInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::HostnameInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm
new file mode 100644
index 000000000..db9cd4dbe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::HwAddress;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+HwAddress from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm
new file mode 100644
index 000000000..3c7ce4925
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IANA_IfTypes;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::int);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IANA-IfTypes from the namespace http://www.onvif.org/ver10/schema.
+
+For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::int
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm
new file mode 100644
index 000000000..320669865
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::IOCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputConnectors_of :ATTR(:get<InputConnectors>);
+my %RelayOutputs_of :ATTR(:get<RelayOutputs>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputConnectors
+        RelayOutputs
+        Extension
+
+    ) ],
+    {
+        'InputConnectors' => \%InputConnectors_of,
+        'RelayOutputs' => \%RelayOutputs_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputConnectors' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RelayOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::IOCapabilitiesExtension',
+    },
+    {
+
+        'InputConnectors' => 'InputConnectors',
+        'RelayOutputs' => 'RelayOutputs',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputConnectors
+
+
+=item * RelayOutputs
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilities
+   InputConnectors =>  $some_value, # int
+   RelayOutputs =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+     Auxiliary =>  $some_value, # boolean
+     AuxiliaryCommands => $some_value, # AuxiliaryData
+     Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm
new file mode 100644
index 000000000..a1ca50221
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::IOCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Auxiliary_of :ATTR(:get<Auxiliary>);
+my %AuxiliaryCommands_of :ATTR(:get<AuxiliaryCommands>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Auxiliary
+        AuxiliaryCommands
+        Extension
+
+    ) ],
+    {
+        'Auxiliary' => \%Auxiliary_of,
+        'AuxiliaryCommands' => \%AuxiliaryCommands_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Auxiliary' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AuxiliaryCommands' => 'ONVIF::Analytics::Types::AuxiliaryData',
+        'Extension' => 'ONVIF::Analytics::Types::IOCapabilitiesExtension2',
+    },
+    {
+
+        'Auxiliary' => 'Auxiliary',
+        'AuxiliaryCommands' => 'AuxiliaryCommands',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Auxiliary
+
+
+=item * AuxiliaryCommands
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+   Auxiliary =>  $some_value, # boolean
+   AuxiliaryCommands => $some_value, # AuxiliaryData
+   Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm
new file mode 100644
index 000000000..8743dece3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IOCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm
new file mode 100644
index 000000000..fabc90c3a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::IPAddress;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::IPType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddress
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddress from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddress
+   Type => $some_value, # IPType
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm
new file mode 100644
index 000000000..4749663c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::IPAddressFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::IPAddressFilterType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'Extension' => 'ONVIF::Analytics::Types::IPAddressFilterExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddressFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddressFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddressFilter
+   Type => $some_value, # IPAddressFilterType
+   IPv4Address =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   IPv6Address =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IPAddressFilterExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm
new file mode 100644
index 000000000..a0d290a09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IPAddressFilterExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddressFilterExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddressFilterExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddressFilterExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm
new file mode 100644
index 000000000..85643035b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPAddressFilterType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPAddressFilterType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm
new file mode 100644
index 000000000..64f4410e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm
new file mode 100644
index 000000000..13060faf5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv4Address;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv4Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm
new file mode 100644
index 000000000..586dc4dff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::IPv4Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Manual_of :ATTR(:get<Manual>);
+my %LinkLocal_of :ATTR(:get<LinkLocal>);
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Manual
+        LinkLocal
+        FromDHCP
+        DHCP
+
+    ) ],
+    {
+        'Manual' => \%Manual_of,
+        'LinkLocal' => \%LinkLocal_of,
+        'FromDHCP' => \%FromDHCP_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'LinkLocal' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'FromDHCP' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'DHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Manual' => 'Manual',
+        'LinkLocal' => 'LinkLocal',
+        'FromDHCP' => 'FromDHCP',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Manual
+
+
+=item * LinkLocal
+
+
+=item * FromDHCP
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4Configuration
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm
new file mode 100644
index 000000000..3f6177f4d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::IPv4NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Config_of :ATTR(:get<Config>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Config
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Config' => \%Config_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Config' => 'ONVIF::Analytics::Types::IPv4Configuration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Config' => 'Config',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Config
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Config =>  { # ONVIF::Analytics::Types::IPv4Configuration
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..b1d06aed5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Manual_of :ATTR(:get<Manual>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Manual
+        DHCP
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Manual' => \%Manual_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'DHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Manual' => 'Manual',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Manual
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm
new file mode 100644
index 000000000..4bce119b1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv6Address;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv6Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm
new file mode 100644
index 000000000..75bc7d500
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm
@@ -0,0 +1,170 @@
+package ONVIF::Analytics::Types::IPv6Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AcceptRouterAdvert_of :ATTR(:get<AcceptRouterAdvert>);
+my %DHCP_of :ATTR(:get<DHCP>);
+my %Manual_of :ATTR(:get<Manual>);
+my %LinkLocal_of :ATTR(:get<LinkLocal>);
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %FromRA_of :ATTR(:get<FromRA>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AcceptRouterAdvert
+        DHCP
+        Manual
+        LinkLocal
+        FromDHCP
+        FromRA
+        Extension
+
+    ) ],
+    {
+        'AcceptRouterAdvert' => \%AcceptRouterAdvert_of,
+        'DHCP' => \%DHCP_of,
+        'Manual' => \%Manual_of,
+        'LinkLocal' => \%LinkLocal_of,
+        'FromDHCP' => \%FromDHCP_of,
+        'FromRA' => \%FromRA_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AcceptRouterAdvert' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DHCP' => 'ONVIF::Analytics::Types::IPv6DHCPConfiguration',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'LinkLocal' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'FromDHCP' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'FromRA' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'Extension' => 'ONVIF::Analytics::Types::IPv6ConfigurationExtension',
+    },
+    {
+
+        'AcceptRouterAdvert' => 'AcceptRouterAdvert',
+        'DHCP' => 'DHCP',
+        'Manual' => 'Manual',
+        'LinkLocal' => 'LinkLocal',
+        'FromDHCP' => 'FromDHCP',
+        'FromRA' => 'FromRA',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AcceptRouterAdvert
+
+
+=item * DHCP
+
+
+=item * Manual
+
+
+=item * LinkLocal
+
+
+=item * FromDHCP
+
+
+=item * FromRA
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6Configuration
+   AcceptRouterAdvert =>  $some_value, # boolean
+   DHCP => $some_value, # IPv6DHCPConfiguration
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm
new file mode 100644
index 000000000..45cc890f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IPv6ConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6ConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6ConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm
new file mode 100644
index 000000000..3589b8cda
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv6DHCPConfiguration;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv6DHCPConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm
new file mode 100644
index 000000000..8ad389cee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::IPv6NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Config_of :ATTR(:get<Config>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Config
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Config' => \%Config_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Config' => 'ONVIF::Analytics::Types::IPv6Configuration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Config' => 'Config',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Config
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Config =>  { # ONVIF::Analytics::Types::IPv6Configuration
+     AcceptRouterAdvert =>  $some_value, # boolean
+     DHCP => $some_value, # IPv6DHCPConfiguration
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..e9804eac1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %AcceptRouterAdvert_of :ATTR(:get<AcceptRouterAdvert>);
+my %Manual_of :ATTR(:get<Manual>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        AcceptRouterAdvert
+        Manual
+        DHCP
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'AcceptRouterAdvert' => \%AcceptRouterAdvert_of,
+        'Manual' => \%Manual_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AcceptRouterAdvert' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'DHCP' => 'ONVIF::Analytics::Types::IPv6DHCPConfiguration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'AcceptRouterAdvert' => 'AcceptRouterAdvert',
+        'Manual' => 'Manual',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * AcceptRouterAdvert
+
+
+=item * Manual
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   AcceptRouterAdvert =>  $some_value, # boolean
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP => $some_value, # IPv6DHCPConfiguration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm
new file mode 100644
index 000000000..1ea11d8df
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ImageStabilization;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ImageStabilizationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::ImageStabilizationExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilization
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilization from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilization
+   Mode => $some_value, # ImageStabilizationMode
+   Level =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm
new file mode 100644
index 000000000..9fad9005e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImageStabilizationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm
new file mode 100644
index 000000000..8ff37b476
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ImageStabilizationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ImageStabilizationMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm
new file mode 100644
index 000000000..32c42d66b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::ImageStabilizationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ImageStabilizationMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::ImageStabilizationOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationOptions
+   Mode => $some_value, # ImageStabilizationMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm
new file mode 100644
index 000000000..35c64abf2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImageStabilizationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm
new file mode 100644
index 000000000..9733f5af0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ImagingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm
new file mode 100644
index 000000000..7baf69846
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm
@@ -0,0 +1,271 @@
+package ONVIF::Analytics::Types::ImagingOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilterModes_of :ATTR(:get<IrCutFilterModes>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilterModes
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilterModes' => \%IrCutFilterModes_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensationOptions',
+        'Brightness' => 'ONVIF::Analytics::Types::FloatRange',
+        'ColorSaturation' => 'ONVIF::Analytics::Types::FloatRange',
+        'Contrast' => 'ONVIF::Analytics::Types::FloatRange',
+        'Exposure' => 'ONVIF::Analytics::Types::ExposureOptions',
+        'Focus' => 'ONVIF::Analytics::Types::FocusOptions',
+        'IrCutFilterModes' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'ONVIF::Analytics::Types::FloatRange',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRangeOptions',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalanceOptions',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilterModes' => 'IrCutFilterModes',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilterModes
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensationOptions
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Brightness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ColorSaturation =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Contrast =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Exposure =>  { # ONVIF::Analytics::Types::ExposureOptions
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Gain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Iris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusOptions
+     AutoFocusModes => $some_value, # AutoFocusMode
+     DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   IrCutFilterModes => $some_value, # IrCutFilterMode
+   Sharpness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRangeOptions
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions
+     Mode => $some_value, # WhiteBalanceMode
+     YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm
new file mode 100644
index 000000000..186d0cf46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm
@@ -0,0 +1,308 @@
+package ONVIF::Analytics::Types::ImagingOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilterModes_of :ATTR(:get<IrCutFilterModes>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilterModes
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilterModes' => \%IrCutFilterModes_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensationOptions20',
+        'Brightness' => 'ONVIF::Analytics::Types::FloatRange',
+        'ColorSaturation' => 'ONVIF::Analytics::Types::FloatRange',
+        'Contrast' => 'ONVIF::Analytics::Types::FloatRange',
+        'Exposure' => 'ONVIF::Analytics::Types::ExposureOptions20',
+        'Focus' => 'ONVIF::Analytics::Types::FocusOptions20',
+        'IrCutFilterModes' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'ONVIF::Analytics::Types::FloatRange',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRangeOptions20',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalanceOptions20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilterModes' => 'IrCutFilterModes',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilterModes
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensationOptions20
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Brightness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ColorSaturation =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Contrast =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Exposure =>  { # ONVIF::Analytics::Types::ExposureOptions20
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Gain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Iris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusOptions20
+     AutoFocusModes => $some_value, # AutoFocusMode
+     DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FocusOptions20Extension
+     },
+   },
+   IrCutFilterModes => $some_value, # IrCutFilterMode
+   Sharpness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRangeOptions20
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20
+     Mode => $some_value, # WhiteBalanceMode
+     YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension
+     ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilizationOptions
+       Mode => $some_value, # ImageStabilizationMode
+       Level =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+       IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+         BoundaryType =>  $some_value, # string
+         BoundaryOffset =>  $some_value, # boolean
+         ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+           Min =>  $some_value, # duration
+           Max =>  $some_value, # duration
+         },
+         Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm
new file mode 100644
index 000000000..bb398fd72
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImageStabilization_of :ATTR(:get<ImageStabilization>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImageStabilization
+        Extension
+
+    ) ],
+    {
+        'ImageStabilization' => \%ImageStabilization_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImageStabilization' => 'ONVIF::Analytics::Types::ImageStabilizationOptions',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension2',
+    },
+    {
+
+        'ImageStabilization' => 'ImageStabilization',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImageStabilization
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension
+   ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilizationOptions
+     Mode => $some_value, # ImageStabilizationMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+     IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+       BoundaryType =>  $some_value, # string
+       BoundaryOffset =>  $some_value, # boolean
+       ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+         Min =>  $some_value, # duration
+         Max =>  $some_value, # duration
+       },
+       Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm
new file mode 100644
index 000000000..c58220565
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IrCutFilterAutoAdjustment_of :ATTR(:get<IrCutFilterAutoAdjustment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IrCutFilterAutoAdjustment
+        Extension
+
+    ) ],
+    {
+        'IrCutFilterAutoAdjustment' => \%IrCutFilterAutoAdjustment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IrCutFilterAutoAdjustment' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension3',
+    },
+    {
+
+        'IrCutFilterAutoAdjustment' => 'IrCutFilterAutoAdjustment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IrCutFilterAutoAdjustment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+   IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+     BoundaryType =>  $some_value, # string
+     BoundaryOffset =>  $some_value, # boolean
+     ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+     Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm
new file mode 100644
index 000000000..aeaec974a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension3;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension3
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension3 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm
new file mode 100644
index 000000000..f6ef5ece8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm
@@ -0,0 +1,222 @@
+package ONVIF::Analytics::Types::ImagingSettings;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilter_of :ATTR(:get<IrCutFilter>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilter
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilter' => \%IrCutFilter_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensation',
+        'Brightness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ColorSaturation' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Contrast' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Exposure' => 'ONVIF::Analytics::Types::Exposure',
+        'Focus' => 'ONVIF::Analytics::Types::FocusConfiguration',
+        'IrCutFilter' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRange',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalance',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilter' => 'IrCutFilter',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettings
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettings from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilter
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettings
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  $some_value, # float
+   },
+   Brightness =>  $some_value, # float
+   ColorSaturation =>  $some_value, # float
+   Contrast =>  $some_value, # float
+   Exposure =>  { # ONVIF::Analytics::Types::Exposure
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     Window => ,
+     MinExposureTime =>  $some_value, # float
+     MaxExposureTime =>  $some_value, # float
+     MinGain =>  $some_value, # float
+     MaxGain =>  $some_value, # float
+     MinIris =>  $some_value, # float
+     MaxIris =>  $some_value, # float
+     ExposureTime =>  $some_value, # float
+     Gain =>  $some_value, # float
+     Iris =>  $some_value, # float
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration
+     AutoFocusMode => $some_value, # AutoFocusMode
+     DefaultSpeed =>  $some_value, # float
+     NearLimit =>  $some_value, # float
+     FarLimit =>  $some_value, # float
+   },
+   IrCutFilter => $some_value, # IrCutFilterMode
+   Sharpness =>  $some_value, # float
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange
+     Mode => $some_value, # WideDynamicMode
+     Level =>  $some_value, # float
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance
+     Mode => $some_value, # WhiteBalanceMode
+     CrGain =>  $some_value, # float
+     CbGain =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm
new file mode 100644
index 000000000..1e994a51b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm
@@ -0,0 +1,243 @@
+package ONVIF::Analytics::Types::ImagingSettings20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilter_of :ATTR(:get<IrCutFilter>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilter
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilter' => \%IrCutFilter_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensation20',
+        'Brightness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ColorSaturation' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Contrast' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Exposure' => 'ONVIF::Analytics::Types::Exposure20',
+        'Focus' => 'ONVIF::Analytics::Types::FocusConfiguration20',
+        'IrCutFilter' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRange20',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalance20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension20',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilter' => 'IrCutFilter',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettings20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettings20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilter
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettings20
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  $some_value, # float
+   },
+   Brightness =>  $some_value, # float
+   ColorSaturation =>  $some_value, # float
+   Contrast =>  $some_value, # float
+   Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     Window => ,
+     MinExposureTime =>  $some_value, # float
+     MaxExposureTime =>  $some_value, # float
+     MinGain =>  $some_value, # float
+     MaxGain =>  $some_value, # float
+     MinIris =>  $some_value, # float
+     MaxIris =>  $some_value, # float
+     ExposureTime =>  $some_value, # float
+     Gain =>  $some_value, # float
+     Iris =>  $some_value, # float
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+     AutoFocusMode => $some_value, # AutoFocusMode
+     DefaultSpeed =>  $some_value, # float
+     NearLimit =>  $some_value, # float
+     FarLimit =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+     },
+   },
+   IrCutFilter => $some_value, # IrCutFilterMode
+   Sharpness =>  $some_value, # float
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+     Mode => $some_value, # WideDynamicMode
+     Level =>  $some_value, # float
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+     Mode => $some_value, # WhiteBalanceMode
+     CrGain =>  $some_value, # float
+     CbGain =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+     ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+       Mode => $some_value, # ImageStabilizationMode
+       Level =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+       IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+         BoundaryType =>  $some_value, # string
+         BoundaryOffset =>  $some_value, # float
+         ResponseTime =>  $some_value, # duration
+         Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm
new file mode 100644
index 000000000..ee229ef1d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm
new file mode 100644
index 000000000..3961abaaa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImageStabilization_of :ATTR(:get<ImageStabilization>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImageStabilization
+        Extension
+
+    ) ],
+    {
+        'ImageStabilization' => \%ImageStabilization_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImageStabilization' => 'ONVIF::Analytics::Types::ImageStabilization',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension202',
+    },
+    {
+
+        'ImageStabilization' => 'ImageStabilization',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImageStabilization
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+   ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+     Mode => $some_value, # ImageStabilizationMode
+     Level =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+     IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+       BoundaryType =>  $some_value, # string
+       BoundaryOffset =>  $some_value, # float
+       ResponseTime =>  $some_value, # duration
+       Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm
new file mode 100644
index 000000000..05bac2e9a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm
@@ -0,0 +1,119 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension202;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IrCutFilterAutoAdjustment_of :ATTR(:get<IrCutFilterAutoAdjustment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IrCutFilterAutoAdjustment
+        Extension
+
+    ) ],
+    {
+        'IrCutFilterAutoAdjustment' => \%IrCutFilterAutoAdjustment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IrCutFilterAutoAdjustment' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustment',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension203',
+    },
+    {
+
+        'IrCutFilterAutoAdjustment' => 'IrCutFilterAutoAdjustment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension202
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension202 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IrCutFilterAutoAdjustment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+   IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+     BoundaryType =>  $some_value, # string
+     BoundaryOffset =>  $some_value, # float
+     ResponseTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm
new file mode 100644
index 000000000..495c5b4ca
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension203;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension203
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension203 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm
new file mode 100644
index 000000000..d52565795
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm
@@ -0,0 +1,107 @@
+package ONVIF::Analytics::Types::ImagingStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FocusStatus_of :ATTR(:get<FocusStatus>);
+
+__PACKAGE__->_factory(
+    [ qw(        FocusStatus
+
+    ) ],
+    {
+        'FocusStatus' => \%FocusStatus_of,
+    },
+    {
+        'FocusStatus' => 'ONVIF::Analytics::Types::FocusStatus',
+    },
+    {
+
+        'FocusStatus' => 'FocusStatus',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FocusStatus
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus
+   FocusStatus =>  { # ONVIF::Analytics::Types::FocusStatus
+     Position =>  $some_value, # float
+     MoveStatus => $some_value, # MoveStatus
+     Error =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm
new file mode 100644
index 000000000..742149e19
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm
@@ -0,0 +1,119 @@
+package ONVIF::Analytics::Types::ImagingStatus20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FocusStatus20_of :ATTR(:get<FocusStatus20>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FocusStatus20
+        Extension
+
+    ) ],
+    {
+        'FocusStatus20' => \%FocusStatus20_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FocusStatus20' => 'ONVIF::Analytics::Types::FocusStatus20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingStatus20Extension',
+    },
+    {
+
+        'FocusStatus20' => 'FocusStatus20',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FocusStatus20
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus20
+   FocusStatus20 =>  { # ONVIF::Analytics::Types::FocusStatus20
+     Position =>  $some_value, # float
+     MoveStatus => $some_value, # MoveStatus
+     Error =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::FocusStatus20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingStatus20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm
new file mode 100644
index 000000000..54e5fa944
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingStatus20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm
new file mode 100644
index 000000000..5bea2349e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Include;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2004/08/xop/include' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Include::_Include::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Include::_Include::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %href_of :ATTR(:get<href>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        href
+    ) ],
+    {
+
+        href => \%href_of,
+    },
+    {
+        href => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Include
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Include from the namespace http://www.w3.org/2004/08/xop/include.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Include
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Include::_Include::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * href
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm
new file mode 100644
index 000000000..227393a28
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::IntAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::int
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IntAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::int
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm
new file mode 100644
index 000000000..f90f60ade
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::IntList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Items_of :ATTR(:get<Items>);
+
+__PACKAGE__->_factory(
+    [ qw(        Items
+
+    ) ],
+    {
+        'Items' => \%Items_of,
+    },
+    {
+        'Items' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Items' => 'Items',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntList from the namespace http://www.onvif.org/ver10/schema.
+
+List of values.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Items
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntList
+   Items =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm
new file mode 100644
index 000000000..8eb6235ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::IntRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of values greater equal Min value and less equal Max value.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntRange
+   Min =>  $some_value, # int
+   Max =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm
new file mode 100644
index 000000000..91aa0144e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::IntRectangle;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+my %width_of :ATTR(:get<width>);
+my %height_of :ATTR(:get<height>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+        width
+        height
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+
+        width => \%width_of,
+
+        height => \%height_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        width => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        height => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRectangle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRectangle from the namespace http://www.onvif.org/ver10/schema.
+
+Rectangle defined by lower left corner position and size. Units are pixel.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * width
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * height
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm
new file mode 100644
index 000000000..88df3f377
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm
@@ -0,0 +1,142 @@
+package ONVIF::Analytics::Types::IntRectangleRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XRange_of :ATTR(:get<XRange>);
+my %YRange_of :ATTR(:get<YRange>);
+my %WidthRange_of :ATTR(:get<WidthRange>);
+my %HeightRange_of :ATTR(:get<HeightRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        XRange
+        YRange
+        WidthRange
+        HeightRange
+
+    ) ],
+    {
+        'XRange' => \%XRange_of,
+        'YRange' => \%YRange_of,
+        'WidthRange' => \%WidthRange_of,
+        'HeightRange' => \%HeightRange_of,
+    },
+    {
+        'XRange' => 'ONVIF::Analytics::Types::IntRange',
+        'YRange' => 'ONVIF::Analytics::Types::IntRange',
+        'WidthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'HeightRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'XRange' => 'XRange',
+        'YRange' => 'YRange',
+        'WidthRange' => 'WidthRange',
+        'HeightRange' => 'HeightRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRectangleRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRectangleRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XRange
+
+
+=item * YRange
+
+
+=item * WidthRange
+
+
+=item * HeightRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntRectangleRange
+   XRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   YRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   WidthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   HeightRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm
new file mode 100644
index 000000000..92247d072
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustment;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundaryType_of :ATTR(:get<BoundaryType>);
+my %BoundaryOffset_of :ATTR(:get<BoundaryOffset>);
+my %ResponseTime_of :ATTR(:get<ResponseTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundaryType
+        BoundaryOffset
+        ResponseTime
+        Extension
+
+    ) ],
+    {
+        'BoundaryType' => \%BoundaryType_of,
+        'BoundaryOffset' => \%BoundaryOffset_of,
+        'ResponseTime' => \%ResponseTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundaryType' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'BoundaryOffset' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ResponseTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension',
+    },
+    {
+
+        'BoundaryType' => 'BoundaryType',
+        'BoundaryOffset' => 'BoundaryOffset',
+        'ResponseTime' => 'ResponseTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustment from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundaryType
+
+
+=item * BoundaryOffset
+
+
+=item * ResponseTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+   BoundaryType =>  $some_value, # string
+   BoundaryOffset =>  $some_value, # float
+   ResponseTime =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm
new file mode 100644
index 000000000..157cea07a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm
new file mode 100644
index 000000000..adeb25f3f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundaryType_of :ATTR(:get<BoundaryType>);
+my %BoundaryOffset_of :ATTR(:get<BoundaryOffset>);
+my %ResponseTimeRange_of :ATTR(:get<ResponseTimeRange>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundaryType
+        BoundaryOffset
+        ResponseTimeRange
+        Extension
+
+    ) ],
+    {
+        'BoundaryType' => \%BoundaryType_of,
+        'BoundaryOffset' => \%BoundaryOffset_of,
+        'ResponseTimeRange' => \%ResponseTimeRange_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundaryType' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'BoundaryOffset' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ResponseTimeRange' => 'ONVIF::Analytics::Types::DurationRange',
+        'Extension' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension',
+    },
+    {
+
+        'BoundaryType' => 'BoundaryType',
+        'BoundaryOffset' => 'BoundaryOffset',
+        'ResponseTimeRange' => 'ResponseTimeRange',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundaryType
+
+
+=item * BoundaryOffset
+
+
+=item * ResponseTimeRange
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+   BoundaryType =>  $some_value, # string
+   BoundaryOffset =>  $some_value, # boolean
+   ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm
new file mode 100644
index 000000000..816da3897
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm
new file mode 100644
index 000000000..808562cc7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoBoundaryType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IrCutFilterAutoBoundaryType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm
new file mode 100644
index 000000000..414536d0c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IrCutFilterMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IrCutFilterMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm
new file mode 100644
index 000000000..e88a0dedc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm
@@ -0,0 +1,240 @@
+package ONVIF::Analytics::Types::ItemList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SimpleItem_of :ATTR(:get<SimpleItem>);
+my %ElementItem_of :ATTR(:get<ElementItem>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SimpleItem
+        ElementItem
+        Extension
+
+    ) ],
+    {
+        'SimpleItem' => \%SimpleItem_of,
+        'ElementItem' => \%ElementItem_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+
+        'ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+        'Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+    },
+    {
+
+        'SimpleItem' => 'SimpleItem',
+        'ElementItem' => 'ElementItem',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemList::_ElementItem;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemList::_ElementItem::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemList::_ElementItem::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+    ) ],
+    {
+
+        Name => \%Name_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ItemList::_SimpleItem;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemList::_SimpleItem::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemList::_SimpleItem::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Value_of :ATTR(:get<Value>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Value
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Value => \%Value_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Value => 'SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemList from the namespace http://www.onvif.org/ver10/schema.
+
+List of parameters according to the corresponding ItemListDescription. Each item in the list shall have a unique name. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SimpleItem
+
+
+=item * ElementItem
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemList
+   SimpleItem => ,
+   ElementItem =>  {
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm
new file mode 100644
index 000000000..0da5fe2c5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm
@@ -0,0 +1,228 @@
+package ONVIF::Analytics::Types::ItemListDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SimpleItemDescription_of :ATTR(:get<SimpleItemDescription>);
+my %ElementItemDescription_of :ATTR(:get<ElementItemDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SimpleItemDescription
+        ElementItemDescription
+        Extension
+
+    ) ],
+    {
+        'SimpleItemDescription' => \%SimpleItemDescription_of,
+        'ElementItemDescription' => \%ElementItemDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+
+        'ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+        'Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+    },
+    {
+
+        'SimpleItemDescription' => 'SimpleItemDescription',
+        'ElementItemDescription' => 'ElementItemDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListDescription from the namespace http://www.onvif.org/ver10/schema.
+
+Describes a list of items. Each item in the list shall have a unique name. The list is designed as linear structure without optional or unbounded elements. Use ElementItems only when complex structures are inevitable. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SimpleItemDescription
+
+
+=item * ElementItemDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListDescription
+   SimpleItemDescription => ,
+   ElementItemDescription => ,
+   Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm
new file mode 100644
index 000000000..4e531d643
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ItemListDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm
new file mode 100644
index 000000000..71bd6fe8d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ItemListExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm
new file mode 100644
index 000000000..192353ec7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::JobToken;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+JobToken from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm
new file mode 100644
index 000000000..60eec26cf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::JpegDecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegDecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegDecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegDecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm
new file mode 100644
index 000000000..8db5cefa8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::JpegOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        FrameRateRange
+        EncodingIntervalRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm
new file mode 100644
index 000000000..408a5c745
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::JpegOptions2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::JpegOptions);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        FrameRateRange
+        EncodingIntervalRange
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegOptions2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegOptions2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegOptions2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm
new file mode 100644
index 000000000..053e408a9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::Layout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneLayout_of :ATTR(:get<PaneLayout>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneLayout
+        Extension
+
+    ) ],
+    {
+        'PaneLayout' => \%PaneLayout_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PaneLayout' => 'ONVIF::Analytics::Types::PaneLayout',
+        'Extension' => 'ONVIF::Analytics::Types::LayoutExtension',
+    },
+    {
+
+        'PaneLayout' => 'PaneLayout',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Layout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Layout from the namespace http://www.onvif.org/ver10/schema.
+
+A layout describes a set of Video windows that are displayed simultaniously on a display. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneLayout
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Layout
+   PaneLayout =>  { # ONVIF::Analytics::Types::PaneLayout
+     Pane => $some_value, # ReferenceToken
+     Area => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::LayoutExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm
new file mode 100644
index 000000000..aba7128f2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::LayoutExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm
new file mode 100644
index 000000000..24e473bee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::LayoutOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneLayoutOptions_of :ATTR(:get<PaneLayoutOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneLayoutOptions
+        Extension
+
+    ) ],
+    {
+        'PaneLayoutOptions' => \%PaneLayoutOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PaneLayoutOptions' => 'ONVIF::Analytics::Types::PaneLayoutOptions',
+        'Extension' => 'ONVIF::Analytics::Types::LayoutOptionsExtension',
+    },
+    {
+
+        'PaneLayoutOptions' => 'PaneLayoutOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutOptions from the namespace http://www.onvif.org/ver10/schema.
+
+The options supported for a display layout.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneLayoutOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutOptions
+   PaneLayoutOptions =>  { # ONVIF::Analytics::Types::PaneLayoutOptions
+     Area => ,
+     Extension =>  { # ONVIF::Analytics::Types::PaneOptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::LayoutOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm
new file mode 100644
index 000000000..ce5d361d0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::LayoutOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm
new file mode 100644
index 000000000..dee9cf4a4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm
@@ -0,0 +1,177 @@
+package ONVIF::Analytics::Types::MaximumNumberOfOSDs;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Total_of :ATTR(:get<Total>);
+my %Image_of :ATTR(:get<Image>);
+my %PlainText_of :ATTR(:get<PlainText>);
+my %Date_of :ATTR(:get<Date>);
+my %Time_of :ATTR(:get<Time>);
+my %DateAndTime_of :ATTR(:get<DateAndTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Total
+        Image
+        PlainText
+        Date
+        Time
+        DateAndTime
+    ) ],
+    {
+
+        Total => \%Total_of,
+
+        Image => \%Image_of,
+
+        PlainText => \%PlainText_of,
+
+        Date => \%Date_of,
+
+        Time => \%Time_of,
+
+        DateAndTime => \%DateAndTime_of,
+    },
+    {
+        Total => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Image => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        PlainText => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Date => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Time => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        DateAndTime => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MaximumNumberOfOSDs
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MaximumNumberOfOSDs from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Total
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Image
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * PlainText
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Date
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Time
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * DateAndTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm
new file mode 100644
index 000000000..433b277e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm
@@ -0,0 +1,157 @@
+package ONVIF::Analytics::Types::MediaAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackAttributes_of :ATTR(:get<TrackAttributes>);
+my %From_of :ATTR(:get<From>);
+my %Until_of :ATTR(:get<Until>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackAttributes
+        From
+        Until
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackAttributes' => \%TrackAttributes_of,
+        'From' => \%From_of,
+        'Until' => \%Until_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackAttributes' => 'ONVIF::Analytics::Types::TrackAttributes',
+        'From' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Until' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackAttributes' => 'TrackAttributes',
+        'From' => 'From',
+        'Until' => 'Until',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+A set of media attributes valid for a recording at a point in time or for a time interval.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackAttributes
+
+
+=item * From
+
+
+=item * Until
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaAttributes
+   RecordingToken => $some_value, # RecordingReference
+   TrackAttributes =>  { # ONVIF::Analytics::Types::TrackAttributes
+     TrackInformation =>  { # ONVIF::Analytics::Types::TrackInformation
+       TrackToken => $some_value, # TrackReference
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+       DataFrom =>  $some_value, # dateTime
+       DataTo =>  $some_value, # dateTime
+     },
+     VideoAttributes =>  { # ONVIF::Analytics::Types::VideoAttributes
+       Bitrate =>  $some_value, # int
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+       Encoding => $some_value, # VideoEncoding
+       Framerate =>  $some_value, # float
+     },
+     AudioAttributes =>  { # ONVIF::Analytics::Types::AudioAttributes
+       Bitrate =>  $some_value, # int
+       Encoding => $some_value, # AudioEncoding
+       Samplerate =>  $some_value, # int
+     },
+     MetadataAttributes =>  { # ONVIF::Analytics::Types::MetadataAttributes
+       CanContainPTZ =>  $some_value, # boolean
+       CanContainAnalytics =>  $some_value, # boolean
+       CanContainNotifications =>  $some_value, # boolean
+     },
+     Extension =>  { # ONVIF::Analytics::Types::TrackAttributesExtension
+     },
+   },
+   From =>  $some_value, # dateTime
+   Until =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm
new file mode 100644
index 000000000..37f2c6252
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::MediaCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %StreamingCapabilities_of :ATTR(:get<StreamingCapabilities>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        StreamingCapabilities
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'StreamingCapabilities' => \%StreamingCapabilities_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'StreamingCapabilities' => 'ONVIF::Analytics::Types::RealTimeStreamingCapabilities',
+        'Extension' => 'ONVIF::Analytics::Types::MediaCapabilitiesExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'StreamingCapabilities' => 'StreamingCapabilities',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * StreamingCapabilities
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaCapabilities
+   XAddr =>  $some_value, # anyURI
+   StreamingCapabilities =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+     RTPMulticast =>  $some_value, # boolean
+     RTP_TCP =>  $some_value, # boolean
+     RTP_RTSP_TCP =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MediaCapabilitiesExtension
+     ProfileCapabilities =>  { # ONVIF::Analytics::Types::ProfileCapabilities
+       MaximumNumberOfProfiles =>  $some_value, # int
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm
new file mode 100644
index 000000000..9e4d232a5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::MediaCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ProfileCapabilities_of :ATTR(:get<ProfileCapabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        ProfileCapabilities
+
+    ) ],
+    {
+        'ProfileCapabilities' => \%ProfileCapabilities_of,
+    },
+    {
+        'ProfileCapabilities' => 'ONVIF::Analytics::Types::ProfileCapabilities',
+    },
+    {
+
+        'ProfileCapabilities' => 'ProfileCapabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ProfileCapabilities
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaCapabilitiesExtension
+   ProfileCapabilities =>  { # ONVIF::Analytics::Types::ProfileCapabilities
+     MaximumNumberOfProfiles =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm
new file mode 100644
index 000000000..96135d645
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::MediaUri;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Uri_of :ATTR(:get<Uri>);
+my %InvalidAfterConnect_of :ATTR(:get<InvalidAfterConnect>);
+my %InvalidAfterReboot_of :ATTR(:get<InvalidAfterReboot>);
+my %Timeout_of :ATTR(:get<Timeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Uri
+        InvalidAfterConnect
+        InvalidAfterReboot
+        Timeout
+
+    ) ],
+    {
+        'Uri' => \%Uri_of,
+        'InvalidAfterConnect' => \%InvalidAfterConnect_of,
+        'InvalidAfterReboot' => \%InvalidAfterReboot_of,
+        'Timeout' => \%Timeout_of,
+    },
+    {
+        'Uri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'InvalidAfterConnect' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'InvalidAfterReboot' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Timeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Uri' => 'Uri',
+        'InvalidAfterConnect' => 'InvalidAfterConnect',
+        'InvalidAfterReboot' => 'InvalidAfterReboot',
+        'Timeout' => 'Timeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaUri
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaUri from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Uri
+
+
+=item * InvalidAfterConnect
+
+
+=item * InvalidAfterReboot
+
+
+=item * Timeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaUri
+   Uri =>  $some_value, # anyURI
+   InvalidAfterConnect =>  $some_value, # boolean
+   InvalidAfterReboot =>  $some_value, # boolean
+   Timeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm
new file mode 100644
index 000000000..a0110cbb2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Merge;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Merge
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Merge from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Merge
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm
new file mode 100644
index 000000000..38e24eeb5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm
@@ -0,0 +1,193 @@
+package ONVIF::Analytics::Types::MessageDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %IsProperty_of :ATTR(:get<IsProperty>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        IsProperty
+    ) ],
+    {
+
+        IsProperty => \%IsProperty_of,
+    },
+    {
+        IsProperty => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+
+=item * Key
+
+
+=item * Data
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageDescription
+   Source =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Key =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Data =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MessageDescriptionExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * IsProperty
+
+ Default is false.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm
new file mode 100644
index 000000000..d747adc69
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MessageDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm
new file mode 100644
index 000000000..96774979a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MessageExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm
new file mode 100644
index 000000000..e875154b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm
@@ -0,0 +1,168 @@
+package ONVIF::Analytics::Types::MetadataAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CanContainPTZ_of :ATTR(:get<CanContainPTZ>);
+my %CanContainAnalytics_of :ATTR(:get<CanContainAnalytics>);
+my %CanContainNotifications_of :ATTR(:get<CanContainNotifications>);
+
+__PACKAGE__->_factory(
+    [ qw(        CanContainPTZ
+        CanContainAnalytics
+        CanContainNotifications
+
+    ) ],
+    {
+        'CanContainPTZ' => \%CanContainPTZ_of,
+        'CanContainAnalytics' => \%CanContainAnalytics_of,
+        'CanContainNotifications' => \%CanContainNotifications_of,
+    },
+    {
+        'CanContainPTZ' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'CanContainAnalytics' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'CanContainNotifications' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'CanContainPTZ' => 'CanContainPTZ',
+        'CanContainAnalytics' => 'CanContainAnalytics',
+        'CanContainNotifications' => 'CanContainNotifications',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %PtzSpaces_of :ATTR(:get<PtzSpaces>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        PtzSpaces
+    ) ],
+    {
+
+        PtzSpaces => \%PtzSpaces_of,
+    },
+    {
+        PtzSpaces => 'ONVIF::Analytics::Types::StringAttrList',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CanContainPTZ
+
+
+=item * CanContainAnalytics
+
+
+=item * CanContainNotifications
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataAttributes
+   CanContainPTZ =>  $some_value, # boolean
+   CanContainAnalytics =>  $some_value, # boolean
+   CanContainNotifications =>  $some_value, # boolean
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * PtzSpaces
+
+ List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. 
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::StringAttrList|ONVIF::Analytics::Types::StringAttrList>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm
new file mode 100644
index 000000000..5ea8ec4f9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm
@@ -0,0 +1,186 @@
+package ONVIF::Analytics::Types::MetadataConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Analytics_of :ATTR(:get<Analytics>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        PTZStatus
+        Analytics
+        Multicast
+        SessionTimeout
+        AnalyticsEngineConfiguration
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'PTZStatus' => \%PTZStatus_of,
+        'Analytics' => \%Analytics_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZFilter',
+        'Analytics' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsEngineConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'PTZStatus' => 'PTZStatus',
+        'Analytics' => 'Analytics',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Analytics
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+=item * AnalyticsEngineConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfiguration
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+     Status =>  $some_value, # boolean
+     Position =>  $some_value, # boolean
+   },
+   Analytics =>  $some_value, # boolean
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm
new file mode 100644
index 000000000..d67dea763
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm
new file mode 100644
index 000000000..ac0df6882
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm
@@ -0,0 +1,110 @@
+package ONVIF::Analytics::Types::MetadataConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatusFilterOptions_of :ATTR(:get<PTZStatusFilterOptions>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatusFilterOptions
+
+    ) ],
+    {
+        'PTZStatusFilterOptions' => \%PTZStatusFilterOptions_of,
+    },
+    {
+        'PTZStatusFilterOptions' => 'ONVIF::Analytics::Types::PTZStatusFilterOptions',
+    },
+    {
+
+        'PTZStatusFilterOptions' => 'PTZStatusFilterOptions',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatusFilterOptions
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfigurationOptions
+   PTZStatusFilterOptions =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptions
+     PanTiltStatusSupported =>  $some_value, # boolean
+     ZoomStatusSupported =>  $some_value, # boolean
+     PanTiltPositionSupported =>  $some_value, # boolean
+     ZoomPositionSupported =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm
new file mode 100644
index 000000000..f6279dfb5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::MetadataFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MetadataStreamFilter_of :ATTR(:get<MetadataStreamFilter>);
+
+__PACKAGE__->_factory(
+    [ qw(        MetadataStreamFilter
+
+    ) ],
+    {
+        'MetadataStreamFilter' => \%MetadataStreamFilter_of,
+    },
+    {
+        'MetadataStreamFilter' => 'ONVIF::Analytics::Types::XPathExpression',
+    },
+    {
+
+        'MetadataStreamFilter' => 'MetadataStreamFilter',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MetadataStreamFilter
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataFilter
+   MetadataStreamFilter => $some_value, # XPathExpression
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm
new file mode 100644
index 000000000..446c47f36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::MetadataInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MetadataConfig_of :ATTR(:get<MetadataConfig>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MetadataConfig
+        Extension
+
+    ) ],
+    {
+        'MetadataConfig' => \%MetadataConfig_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MetadataConfig' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataInputExtension',
+    },
+    {
+
+        'MetadataConfig' => 'MetadataConfig',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MetadataConfig
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataInput
+   MetadataConfig =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataInputExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm
new file mode 100644
index 000000000..6204de45d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataInputExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataInputExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataInputExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataInputExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm
new file mode 100644
index 000000000..d8000cf7b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm
@@ -0,0 +1,260 @@
+package ONVIF::Analytics::Types::MetadataStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoAnalytics_of :ATTR(:get<VideoAnalytics>);
+my %PTZ_of :ATTR(:get<PTZ>);
+my %Event_of :ATTR(:get<Event>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoAnalytics
+        PTZ
+        Event
+        Extension
+
+    ) ],
+    {
+        'VideoAnalytics' => \%VideoAnalytics_of,
+        'PTZ' => \%PTZ_of,
+        'Event' => \%Event_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'VideoAnalytics' => 'ONVIF::Analytics::Types::VideoAnalyticsStream',
+        'PTZ' => 'ONVIF::Analytics::Types::PTZStream',
+        'Event' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataStreamExtension',
+    },
+    {
+
+        'VideoAnalytics' => 'VideoAnalytics',
+        'PTZ' => 'PTZ',
+        'Event' => 'Event',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoAnalytics
+
+
+=item * PTZ
+
+
+=item * Event
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   VideoAnalytics =>    { # ONVIF::Analytics::Types::VideoAnalyticsStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     Frame =>  { # ONVIF::Analytics::Types::Frame
+       PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+         Position =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+           PanTilt => $some_value, # MoveStatus
+           Zoom => $some_value, # MoveStatus
+         },
+         Error =>  $some_value, # string
+         UtcTime =>  $some_value, # dateTime
+       },
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Object =>  { # ONVIF::Analytics::Types::Object
+         Appearance =>  { # ONVIF::Analytics::Types::Appearance
+           Transformation =>  { # ONVIF::Analytics::Types::Transformation
+             Translate => ,
+             Scale => ,
+             Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+             },
+           },
+           Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+             BoundingBox => ,
+             CenterOfGravity => ,
+             Polygon =>  { # ONVIF::Analytics::Types::Polygon
+               Point => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+             },
+           },
+           Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+             ColorCluster =>  {
+               Color => ,
+               Weight =>  $some_value, # float
+               Covariance => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+             },
+           },
+           Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+             ClassCandidate =>  {
+               Type => $some_value, # ClassType
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+               OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+                 Type =>  $some_value, # string
+                 Likelihood =>  $some_value, # float
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+           },
+         },
+         Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+           Removed =>  {
+           },
+           Idle =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+         },
+       },
+       ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+         Rename =>  { # ONVIF::Analytics::Types::Rename
+           from => ,
+           to => ,
+         },
+         Split =>  { # ONVIF::Analytics::Types::Split
+           from => ,
+           to => ,
+         },
+         Merge =>  { # ONVIF::Analytics::Types::Merge
+           from => ,
+           to => ,
+         },
+         Delete => ,
+         Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+         MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+         },
+         Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+     },
+   },
+   PTZ =>    { # ONVIF::Analytics::Types::PTZStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+     },
+   },
+   Event =>  $some_value, # anyType
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension
+     AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+       AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm
new file mode 100644
index 000000000..d4c0b9015
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::MetadataStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioAnalyticsStream_of :ATTR(:get<AudioAnalyticsStream>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioAnalyticsStream
+        Extension
+
+    ) ],
+    {
+        'AudioAnalyticsStream' => \%AudioAnalyticsStream_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioAnalyticsStream' => 'ONVIF::Analytics::Types::AudioAnalyticsStream',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataStreamExtension2',
+    },
+    {
+
+        'AudioAnalyticsStream' => 'AudioAnalyticsStream',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioAnalyticsStream
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStreamExtension
+   AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+     AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm
new file mode 100644
index 000000000..3b76aa4ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataStreamExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStreamExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStreamExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStreamExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm
new file mode 100644
index 000000000..15a296e5f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ModeOfOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ModeOfOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm
new file mode 100644
index 000000000..b5970afba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::MotionExpression;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Expression_of :ATTR(:get<Expression>);
+
+__PACKAGE__->_factory(
+    [ qw(        Expression
+
+    ) ],
+    {
+        'Expression' => \%Expression_of,
+    },
+    {
+        'Expression' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Expression' => 'Expression',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Type
+    ) ],
+    {
+
+        Type => \%Type_of,
+    },
+    {
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionExpression
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionExpression from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Expression
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionExpression
+   Expression =>  $some_value, # string
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Type
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::string|SOAP::WSDL::XSD::Typelib::Builtin::string>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm
new file mode 100644
index 000000000..cb2d55d75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::MotionExpressionConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MotionExpression_of :ATTR(:get<MotionExpression>);
+
+__PACKAGE__->_factory(
+    [ qw(        MotionExpression
+
+    ) ],
+    {
+        'MotionExpression' => \%MotionExpression_of,
+    },
+    {
+        'MotionExpression' => 'ONVIF::Analytics::Types::MotionExpression',
+    },
+    {
+
+        'MotionExpression' => 'MotionExpression',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionExpressionConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionExpressionConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MotionExpression
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionExpressionConfiguration
+   MotionExpression =>  { # ONVIF::Analytics::Types::MotionExpression
+     Expression =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm
new file mode 100644
index 000000000..89de61e18
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm
@@ -0,0 +1,167 @@
+package ONVIF::Analytics::Types::MotionInCells;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Columns_of :ATTR(:get<Columns>);
+my %Rows_of :ATTR(:get<Rows>);
+my %Cells_of :ATTR(:get<Cells>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Columns
+        Rows
+        Cells
+    ) ],
+    {
+
+        Columns => \%Columns_of,
+
+        Rows => \%Rows_of,
+
+        Cells => \%Cells_of,
+    },
+    {
+        Columns => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Rows => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Cells => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionInCells
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionInCells from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionInCells
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Columns
+
+ Number of columns of the cell grid (x dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Rows
+
+ Number of rows of the cell grid (y dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Cells
+
+ A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down. If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::base64Binary|SOAP::WSDL::XSD::Typelib::Builtin::base64Binary>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm
new file mode 100644
index 000000000..d78c53c1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::MoveOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocusOptions',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocusOptions',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocusOptions',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MoveOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MoveOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MoveOptions
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+     Position =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocusOptions
+     Distance =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocusOptions
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm
new file mode 100644
index 000000000..0adb4eeba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::MoveOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocusOptions',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocusOptions20',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocusOptions',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MoveOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MoveOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MoveOptions20
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+     Position =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocusOptions20
+     Distance =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocusOptions
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm
new file mode 100644
index 000000000..4ff1de037
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::MoveStatus;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+MoveStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm
new file mode 100644
index 000000000..da13fcde6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Mpeg4Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %GovLength_of :ATTR(:get<GovLength>);
+my %Mpeg4Profile_of :ATTR(:get<Mpeg4Profile>);
+
+__PACKAGE__->_factory(
+    [ qw(        GovLength
+        Mpeg4Profile
+
+    ) ],
+    {
+        'GovLength' => \%GovLength_of,
+        'Mpeg4Profile' => \%Mpeg4Profile_of,
+    },
+    {
+        'GovLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Mpeg4Profile' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+    },
+    {
+
+        'GovLength' => 'GovLength',
+        'Mpeg4Profile' => 'Mpeg4Profile',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GovLength
+
+
+=item * Mpeg4Profile
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Configuration
+   GovLength =>  $some_value, # int
+   Mpeg4Profile => $some_value, # Mpeg4Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm
new file mode 100644
index 000000000..93aaec9b0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Mpeg4DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedMpeg4Profiles_of :ATTR(:get<SupportedMpeg4Profiles>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedMpeg4Profiles
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedMpeg4Profiles' => \%SupportedMpeg4Profiles_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedMpeg4Profiles' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedMpeg4Profiles' => 'SupportedMpeg4Profiles',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedMpeg4Profiles
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4DecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm
new file mode 100644
index 000000000..4ab63bc75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::Mpeg4Options;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %Mpeg4ProfilesSupported_of :ATTR(:get<Mpeg4ProfilesSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        Mpeg4ProfilesSupported
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'Mpeg4ProfilesSupported' => \%Mpeg4ProfilesSupported_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'Mpeg4ProfilesSupported' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'Mpeg4ProfilesSupported' => 'Mpeg4ProfilesSupported',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Options
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Options from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * GovLengthRange
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+=item * Mpeg4ProfilesSupported
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Options
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   Mpeg4ProfilesSupported => $some_value, # Mpeg4Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm
new file mode 100644
index 000000000..fc5749f7a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::Mpeg4Options2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::Mpeg4Options);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %Mpeg4ProfilesSupported_of :ATTR(:get<Mpeg4ProfilesSupported>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        Mpeg4ProfilesSupported
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'Mpeg4ProfilesSupported' => \%Mpeg4ProfilesSupported_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'Mpeg4ProfilesSupported' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'Mpeg4ProfilesSupported' => 'Mpeg4ProfilesSupported',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Options2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Options2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Options2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm
new file mode 100644
index 000000000..d73bc317a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Mpeg4Profile;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Mpeg4Profile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm
new file mode 100644
index 000000000..2dabdb738
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::MulticastConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %Port_of :ATTR(:get<Port>);
+my %TTL_of :ATTR(:get<TTL>);
+my %AutoStart_of :ATTR(:get<AutoStart>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        Port
+        TTL
+        AutoStart
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'Port' => \%Port_of,
+        'TTL' => \%TTL_of,
+        'AutoStart' => \%AutoStart_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPAddress',
+        'Port' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'TTL' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Address' => 'Address',
+        'Port' => 'Port',
+        'TTL' => 'TTL',
+        'AutoStart' => 'AutoStart',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MulticastConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MulticastConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * Port
+
+
+=item * TTL
+
+
+=item * AutoStart
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MulticastConfiguration
+   Address =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   Port =>  $some_value, # int
+   TTL =>  $some_value, # int
+   AutoStart =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm
new file mode 100644
index 000000000..531ed9206
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::NTPInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %NTPFromDHCP_of :ATTR(:get<NTPFromDHCP>);
+my %NTPManual_of :ATTR(:get<NTPManual>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        NTPFromDHCP
+        NTPManual
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'NTPFromDHCP' => \%NTPFromDHCP_of,
+        'NTPManual' => \%NTPManual_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'NTPFromDHCP' => 'ONVIF::Analytics::Types::NetworkHost',
+        'NTPManual' => 'ONVIF::Analytics::Types::NetworkHost',
+        'Extension' => 'ONVIF::Analytics::Types::NTPInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'NTPFromDHCP' => 'NTPFromDHCP',
+        'NTPManual' => 'NTPManual',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NTPInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NTPInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * NTPFromDHCP
+
+
+=item * NTPManual
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NTPInformation
+   FromDHCP =>  $some_value, # boolean
+   NTPFromDHCP =>  { # ONVIF::Analytics::Types::NetworkHost
+     Type => $some_value, # NetworkHostType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+     DNSname => $some_value, # DNSName
+     Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+     },
+   },
+   NTPManual =>  { # ONVIF::Analytics::Types::NetworkHost
+     Type => $some_value, # NetworkHostType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+     DNSname => $some_value, # DNSName
+     Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NTPInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm
new file mode 100644
index 000000000..be584bca9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NTPInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NTPInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NTPInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NTPInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm
new file mode 100644
index 000000000..f88145484
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Name;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Name from the namespace http://www.onvif.org/ver10/schema.
+
+User readable name. Length up to 64 characters.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm
new file mode 100644
index 000000000..4cfcea41c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm
@@ -0,0 +1,143 @@
+package ONVIF::Analytics::Types::NetworkCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IPFilter_of :ATTR(:get<IPFilter>);
+my %ZeroConfiguration_of :ATTR(:get<ZeroConfiguration>);
+my %IPVersion6_of :ATTR(:get<IPVersion6>);
+my %DynDNS_of :ATTR(:get<DynDNS>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IPFilter
+        ZeroConfiguration
+        IPVersion6
+        DynDNS
+        Extension
+
+    ) ],
+    {
+        'IPFilter' => \%IPFilter_of,
+        'ZeroConfiguration' => \%ZeroConfiguration_of,
+        'IPVersion6' => \%IPVersion6_of,
+        'DynDNS' => \%DynDNS_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IPFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZeroConfiguration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'IPVersion6' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynDNS' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkCapabilitiesExtension',
+    },
+    {
+
+        'IPFilter' => 'IPFilter',
+        'ZeroConfiguration' => 'ZeroConfiguration',
+        'IPVersion6' => 'IPVersion6',
+        'DynDNS' => 'DynDNS',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IPFilter
+
+
+=item * ZeroConfiguration
+
+
+=item * IPVersion6
+
+
+=item * DynDNS
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilities
+   IPFilter =>  $some_value, # boolean
+   ZeroConfiguration =>  $some_value, # boolean
+   IPVersion6 =>  $some_value, # boolean
+   DynDNS =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+     Dot11Configuration =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm
new file mode 100644
index 000000000..49aad0301
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::NetworkCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot11Configuration_of :ATTR(:get<Dot11Configuration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot11Configuration
+        Extension
+
+    ) ],
+    {
+        'Dot11Configuration' => \%Dot11Configuration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot11Configuration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkCapabilitiesExtension2',
+    },
+    {
+
+        'Dot11Configuration' => 'Dot11Configuration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot11Configuration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+   Dot11Configuration =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm
new file mode 100644
index 000000000..b47b45030
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm
new file mode 100644
index 000000000..22ca72d27
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::NetworkGateway;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        IPv4Address
+        IPv6Address
+
+    ) ],
+    {
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+    },
+    {
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+    },
+    {
+
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkGateway
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkGateway from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkGateway
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm
new file mode 100644
index 000000000..d2ba03f2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::NetworkHost;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+my %DNSname_of :ATTR(:get<DNSname>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+        DNSname
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+        'DNSname' => \%DNSname_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::NetworkHostType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+        'DNSname' => 'ONVIF::Analytics::Types::DNSName',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkHostExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+        'DNSname' => 'DNSname',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkHost
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkHost from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+=item * DNSname
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkHost
+   Type => $some_value, # NetworkHostType
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+   DNSname => $some_value, # DNSName
+   Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm
new file mode 100644
index 000000000..5aff9a65a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkHostExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkHostExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkHostExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkHostExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm
new file mode 100644
index 000000000..23c06aa48
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkHostType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkHostType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm
new file mode 100644
index 000000000..96748702a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm
@@ -0,0 +1,233 @@
+package ONVIF::Analytics::Types::NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Info_of :ATTR(:get<Info>);
+my %Link_of :ATTR(:get<Link>);
+my %IPv4_of :ATTR(:get<IPv4>);
+my %IPv6_of :ATTR(:get<IPv6>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Info
+        Link
+        IPv4
+        IPv6
+        Extension
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Info' => \%Info_of,
+        'Link' => \%Link_of,
+        'IPv4' => \%IPv4_of,
+        'IPv6' => \%IPv6_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Info' => 'ONVIF::Analytics::Types::NetworkInterfaceInfo',
+        'Link' => 'ONVIF::Analytics::Types::NetworkInterfaceLink',
+        'IPv4' => 'ONVIF::Analytics::Types::IPv4NetworkInterface',
+        'IPv6' => 'ONVIF::Analytics::Types::IPv6NetworkInterface',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceExtension',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Info' => 'Info',
+        'Link' => 'Link',
+        'IPv4' => 'IPv4',
+        'IPv6' => 'IPv6',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Info
+
+
+=item * Link
+
+
+=item * IPv4
+
+
+=item * IPv6
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Info =>  { # ONVIF::Analytics::Types::NetworkInterfaceInfo
+     Name =>  $some_value, # string
+     HwAddress => $some_value, # HwAddress
+     MTU =>  $some_value, # int
+   },
+   Link =>  { # ONVIF::Analytics::Types::NetworkInterfaceLink
+     AdminSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+       AutoNegotiation =>  $some_value, # boolean
+       Speed =>  $some_value, # int
+       Duplex => $some_value, # Duplex
+     },
+     OperSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+       AutoNegotiation =>  $some_value, # boolean
+       Speed =>  $some_value, # int
+       Duplex => $some_value, # Duplex
+     },
+     InterfaceType => $some_value, # IANA-IfTypes
+   },
+   IPv4 =>  { # ONVIF::Analytics::Types::IPv4NetworkInterface
+     Enabled =>  $some_value, # boolean
+     Config =>  { # ONVIF::Analytics::Types::IPv4Configuration
+       Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       DHCP =>  $some_value, # boolean
+     },
+   },
+   IPv6 =>  { # ONVIF::Analytics::Types::IPv6NetworkInterface
+     Enabled =>  $some_value, # boolean
+     Config =>  { # ONVIF::Analytics::Types::IPv6Configuration
+       AcceptRouterAdvert =>  $some_value, # boolean
+       DHCP => $some_value, # IPv6DHCPConfiguration
+       Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension
+     InterfaceType => $some_value, # IANA-IfTypes
+     Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+     },
+     Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+       SSID => $some_value, # Dot11SSIDType
+       Mode => $some_value, # Dot11StationMode
+       Alias => $some_value, # Name
+       Priority => $some_value, # NetworkInterfaceConfigPriority
+       Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+         Mode => $some_value, # Dot11SecurityMode
+         Algorithm => $some_value, # Dot11Cipher
+         PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+           Key => $some_value, # Dot11PSK
+           Passphrase => $some_value, # Dot11PSKPassphrase
+           Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+           },
+         },
+         Dot1X => $some_value, # ReferenceToken
+         Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm
new file mode 100644
index 000000000..974026b66
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkInterfaceConfigPriority;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::integer);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkInterfaceConfigPriority from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::integer
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm
new file mode 100644
index 000000000..1fb953c0c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoNegotiation_of :ATTR(:get<AutoNegotiation>);
+my %Speed_of :ATTR(:get<Speed>);
+my %Duplex_of :ATTR(:get<Duplex>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoNegotiation
+        Speed
+        Duplex
+
+    ) ],
+    {
+        'AutoNegotiation' => \%AutoNegotiation_of,
+        'Speed' => \%Speed_of,
+        'Duplex' => \%Duplex_of,
+    },
+    {
+        'AutoNegotiation' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Duplex' => 'ONVIF::Analytics::Types::Duplex',
+    },
+    {
+
+        'AutoNegotiation' => 'AutoNegotiation',
+        'Speed' => 'Speed',
+        'Duplex' => 'Duplex',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceConnectionSetting from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoNegotiation
+
+
+=item * Speed
+
+
+=item * Duplex
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+   AutoNegotiation =>  $some_value, # boolean
+   Speed =>  $some_value, # int
+   Duplex => $some_value, # Duplex
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm
new file mode 100644
index 000000000..9def16d78
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm
@@ -0,0 +1,150 @@
+package ONVIF::Analytics::Types::NetworkInterfaceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InterfaceType_of :ATTR(:get<InterfaceType>);
+my %Dot3_of :ATTR(:get<Dot3>);
+my %Dot11_of :ATTR(:get<Dot11>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InterfaceType
+        Dot3
+        Dot11
+        Extension
+
+    ) ],
+    {
+        'InterfaceType' => \%InterfaceType_of,
+        'Dot3' => \%Dot3_of,
+        'Dot11' => \%Dot11_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InterfaceType' => 'ONVIF::Analytics::Types::IANA_IfTypes',
+        'Dot3' => 'ONVIF::Analytics::Types::Dot3Configuration',
+        'Dot11' => 'ONVIF::Analytics::Types::Dot11Configuration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceExtension2',
+    },
+    {
+
+        'InterfaceType' => 'InterfaceType',
+        'Dot3' => 'Dot3',
+        'Dot11' => 'Dot11',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InterfaceType
+
+
+=item * Dot3
+
+
+=item * Dot11
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceExtension
+   InterfaceType => $some_value, # IANA-IfTypes
+   Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+   },
+   Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+     SSID => $some_value, # Dot11SSIDType
+     Mode => $some_value, # Dot11StationMode
+     Alias => $some_value, # Name
+     Priority => $some_value, # NetworkInterfaceConfigPriority
+     Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+       Mode => $some_value, # Dot11SecurityMode
+       Algorithm => $some_value, # Dot11Cipher
+       PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+         Key => $some_value, # Dot11PSK
+         Passphrase => $some_value, # Dot11PSKPassphrase
+         Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+         },
+       },
+       Dot1X => $some_value, # ReferenceToken
+       Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm
new file mode 100644
index 000000000..cd9cb116c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkInterfaceExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm
new file mode 100644
index 000000000..b9abc22e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::NetworkInterfaceInfo;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %HwAddress_of :ATTR(:get<HwAddress>);
+my %MTU_of :ATTR(:get<MTU>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        HwAddress
+        MTU
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'HwAddress' => \%HwAddress_of,
+        'MTU' => \%MTU_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'HwAddress' => 'ONVIF::Analytics::Types::HwAddress',
+        'MTU' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'HwAddress' => 'HwAddress',
+        'MTU' => 'MTU',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceInfo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceInfo from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * HwAddress
+
+
+=item * MTU
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceInfo
+   Name =>  $some_value, # string
+   HwAddress => $some_value, # HwAddress
+   MTU =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm
new file mode 100644
index 000000000..f54a7a060
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm
@@ -0,0 +1,129 @@
+package ONVIF::Analytics::Types::NetworkInterfaceLink;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AdminSettings_of :ATTR(:get<AdminSettings>);
+my %OperSettings_of :ATTR(:get<OperSettings>);
+my %InterfaceType_of :ATTR(:get<InterfaceType>);
+
+__PACKAGE__->_factory(
+    [ qw(        AdminSettings
+        OperSettings
+        InterfaceType
+
+    ) ],
+    {
+        'AdminSettings' => \%AdminSettings_of,
+        'OperSettings' => \%OperSettings_of,
+        'InterfaceType' => \%InterfaceType_of,
+    },
+    {
+        'AdminSettings' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'OperSettings' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'InterfaceType' => 'ONVIF::Analytics::Types::IANA_IfTypes',
+    },
+    {
+
+        'AdminSettings' => 'AdminSettings',
+        'OperSettings' => 'OperSettings',
+        'InterfaceType' => 'InterfaceType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceLink
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceLink from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AdminSettings
+
+
+=item * OperSettings
+
+
+=item * InterfaceType
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceLink
+   AdminSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   OperSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   InterfaceType => $some_value, # IANA-IfTypes
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..4e0ba7705
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,191 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Link_of :ATTR(:get<Link>);
+my %MTU_of :ATTR(:get<MTU>);
+my %IPv4_of :ATTR(:get<IPv4>);
+my %IPv6_of :ATTR(:get<IPv6>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Link
+        MTU
+        IPv4
+        IPv6
+        Extension
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Link' => \%Link_of,
+        'MTU' => \%MTU_of,
+        'IPv4' => \%IPv4_of,
+        'IPv6' => \%IPv6_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Link' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'MTU' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'IPv4' => 'ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration',
+        'IPv6' => 'ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Link' => 'Link',
+        'MTU' => 'MTU',
+        'IPv4' => 'IPv4',
+        'IPv6' => 'IPv6',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Link
+
+
+=item * MTU
+
+
+=item * IPv4
+
+
+=item * IPv6
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   Link =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   MTU =>  $some_value, # int
+   IPv4 =>  { # ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+     Enabled =>  $some_value, # boolean
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP =>  $some_value, # boolean
+   },
+   IPv6 =>  { # ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+     Enabled =>  $some_value, # boolean
+     AcceptRouterAdvert =>  $some_value, # boolean
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP => $some_value, # IPv6DHCPConfiguration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+     Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+     },
+     Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+       SSID => $some_value, # Dot11SSIDType
+       Mode => $some_value, # Dot11StationMode
+       Alias => $some_value, # Name
+       Priority => $some_value, # NetworkInterfaceConfigPriority
+       Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+         Mode => $some_value, # Dot11SecurityMode
+         Algorithm => $some_value, # Dot11Cipher
+         PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+           Key => $some_value, # Dot11PSK
+           Passphrase => $some_value, # Dot11PSKPassphrase
+           Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+           },
+         },
+         Dot1X => $some_value, # ReferenceToken
+         Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm
new file mode 100644
index 000000000..6cfe08cb3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm
@@ -0,0 +1,141 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot3_of :ATTR(:get<Dot3>);
+my %Dot11_of :ATTR(:get<Dot11>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot3
+        Dot11
+        Extension
+
+    ) ],
+    {
+        'Dot3' => \%Dot3_of,
+        'Dot11' => \%Dot11_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot3' => 'ONVIF::Analytics::Types::Dot3Configuration',
+        'Dot11' => 'ONVIF::Analytics::Types::Dot11Configuration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2',
+    },
+    {
+
+        'Dot3' => 'Dot3',
+        'Dot11' => 'Dot11',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot3
+
+
+=item * Dot11
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+   Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+   },
+   Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+     SSID => $some_value, # Dot11SSIDType
+     Mode => $some_value, # Dot11StationMode
+     Alias => $some_value, # Name
+     Priority => $some_value, # NetworkInterfaceConfigPriority
+     Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+       Mode => $some_value, # Dot11SecurityMode
+       Algorithm => $some_value, # Dot11Cipher
+       PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+         Key => $some_value, # Dot11PSK
+         Passphrase => $some_value, # Dot11PSKPassphrase
+         Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+         },
+       },
+       Dot1X => $some_value, # ReferenceToken
+       Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm
new file mode 100644
index 000000000..90786a2b9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm
new file mode 100644
index 000000000..2079fd87e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::NetworkProtocol;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Port_of :ATTR(:get<Port>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Enabled
+        Port
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Enabled' => \%Enabled_of,
+        'Port' => \%Port_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::NetworkProtocolType',
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Port' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkProtocolExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Enabled' => 'Enabled',
+        'Port' => 'Port',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkProtocol
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkProtocol from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Enabled
+
+
+=item * Port
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkProtocol
+   Name => $some_value, # NetworkProtocolType
+   Enabled =>  $some_value, # boolean
+   Port =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::NetworkProtocolExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm
new file mode 100644
index 000000000..8dec59681
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkProtocolExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkProtocolExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkProtocolExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkProtocolExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm
new file mode 100644
index 000000000..e46ec2839
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkProtocolType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkProtocolType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm
new file mode 100644
index 000000000..258296363
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::NetworkZeroConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InterfaceToken_of :ATTR(:get<InterfaceToken>);
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Addresses_of :ATTR(:get<Addresses>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InterfaceToken
+        Enabled
+        Addresses
+        Extension
+
+    ) ],
+    {
+        'InterfaceToken' => \%InterfaceToken_of,
+        'Enabled' => \%Enabled_of,
+        'Addresses' => \%Addresses_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InterfaceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Addresses' => 'ONVIF::Analytics::Types::IPv4Address',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkZeroConfigurationExtension',
+    },
+    {
+
+        'InterfaceToken' => 'InterfaceToken',
+        'Enabled' => 'Enabled',
+        'Addresses' => 'Addresses',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InterfaceToken
+
+
+=item * Enabled
+
+
+=item * Addresses
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfiguration
+   InterfaceToken => $some_value, # ReferenceToken
+   Enabled =>  $some_value, # boolean
+   Addresses => $some_value, # IPv4Address
+   Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+     Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm
new file mode 100644
index 000000000..ec65f3f5c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm
@@ -0,0 +1,104 @@
+package ONVIF::Analytics::Types::NetworkZeroConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Extension
+
+    ) ],
+    {
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Extension' => 'ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2',
+    },
+    {
+
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+   Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm
new file mode 100644
index 000000000..a6a609181
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm
new file mode 100644
index 000000000..729660b3c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::OSDColor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::Color',
+    },
+    {
+
+        'Color' => 'Color',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Transparent_of :ATTR(:get<Transparent>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Transparent
+    ) ],
+    {
+
+        Transparent => \%Transparent_of,
+    },
+    {
+        Transparent => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColor from the namespace http://www.onvif.org/ver10/schema.
+
+The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Color
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColor
+   Color => ,
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Transparent
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm
new file mode 100644
index 000000000..f39a8d84c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::OSDColorOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+my %Transparent_of :ATTR(:get<Transparent>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+        Transparent
+        Extension
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+        'Transparent' => \%Transparent_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::ColorOptions',
+        'Transparent' => 'ONVIF::Analytics::Types::IntRange',
+        'Extension' => 'ONVIF::Analytics::Types::OSDColorOptionsExtension',
+    },
+    {
+
+        'Color' => 'Color',
+        'Transparent' => 'Transparent',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColorOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColorOptions from the namespace http://www.onvif.org/ver10/schema.
+
+Describe the option of the color and its transparency.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Color
+
+
+=item * Transparent
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColorOptions
+   Color =>    { # ONVIF::Analytics::Types::ColorOptions
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     ColorList => ,
+     ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+       X =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Y =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Z =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Colorspace =>  $some_value, # anyURI
+     },
+   },
+   Transparent =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm
new file mode 100644
index 000000000..5258befce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDColorOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColorOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColorOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm
new file mode 100644
index 000000000..ed260ef01
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm
@@ -0,0 +1,175 @@
+package ONVIF::Analytics::Types::OSDConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoSourceConfigurationToken_of :ATTR(:get<VideoSourceConfigurationToken>);
+my %Type_of :ATTR(:get<Type>);
+my %Position_of :ATTR(:get<Position>);
+my %TextString_of :ATTR(:get<TextString>);
+my %Image_of :ATTR(:get<Image>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoSourceConfigurationToken
+        Type
+        Position
+        TextString
+        Image
+        Extension
+
+    ) ],
+    {
+        'VideoSourceConfigurationToken' => \%VideoSourceConfigurationToken_of,
+        'Type' => \%Type_of,
+        'Position' => \%Position_of,
+        'TextString' => \%TextString_of,
+        'Image' => \%Image_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'VideoSourceConfigurationToken' => 'ONVIF::Analytics::Types::OSDReference',
+        'Type' => 'ONVIF::Analytics::Types::OSDType',
+        'Position' => 'ONVIF::Analytics::Types::OSDPosConfiguration',
+        'TextString' => 'ONVIF::Analytics::Types::OSDTextConfiguration',
+        'Image' => 'ONVIF::Analytics::Types::OSDImgConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::OSDConfigurationExtension',
+    },
+    {
+
+        'VideoSourceConfigurationToken' => 'VideoSourceConfigurationToken',
+        'Type' => 'Type',
+        'Position' => 'Position',
+        'TextString' => 'TextString',
+        'Image' => 'Image',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoSourceConfigurationToken
+
+
+=item * Type
+
+
+=item * Position
+
+
+=item * TextString
+
+
+=item * Image
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfiguration
+   VideoSourceConfigurationToken =>  { value => $some_value },
+   Type => $some_value, # OSDType
+   Position =>  { # ONVIF::Analytics::Types::OSDPosConfiguration
+     Type =>  $some_value, # string
+     Pos => ,
+     Extension =>  { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+     },
+   },
+   TextString =>  { # ONVIF::Analytics::Types::OSDTextConfiguration
+     Type =>  $some_value, # string
+     DateFormat =>  $some_value, # string
+     TimeFormat =>  $some_value, # string
+     FontSize =>  $some_value, # int
+     FontColor =>  { # ONVIF::Analytics::Types::OSDColor
+       Color => ,
+     },
+     BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColor
+       Color => ,
+     },
+     PlainText =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+     },
+   },
+   Image =>  { # ONVIF::Analytics::Types::OSDImgConfiguration
+     ImgPath =>  $some_value, # anyURI
+     Extension =>  { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm
new file mode 100644
index 000000000..6bad82ef8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm
new file mode 100644
index 000000000..105d52097
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm
@@ -0,0 +1,219 @@
+package ONVIF::Analytics::Types::OSDConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfOSDs_of :ATTR(:get<MaximumNumberOfOSDs>);
+my %Type_of :ATTR(:get<Type>);
+my %PositionOption_of :ATTR(:get<PositionOption>);
+my %TextOption_of :ATTR(:get<TextOption>);
+my %ImageOption_of :ATTR(:get<ImageOption>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfOSDs
+        Type
+        PositionOption
+        TextOption
+        ImageOption
+        Extension
+
+    ) ],
+    {
+        'MaximumNumberOfOSDs' => \%MaximumNumberOfOSDs_of,
+        'Type' => \%Type_of,
+        'PositionOption' => \%PositionOption_of,
+        'TextOption' => \%TextOption_of,
+        'ImageOption' => \%ImageOption_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MaximumNumberOfOSDs' => 'ONVIF::Analytics::Types::MaximumNumberOfOSDs',
+        'Type' => 'ONVIF::Analytics::Types::OSDType',
+        'PositionOption' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TextOption' => 'ONVIF::Analytics::Types::OSDTextOptions',
+        'ImageOption' => 'ONVIF::Analytics::Types::OSDImgOptions',
+        'Extension' => 'ONVIF::Analytics::Types::OSDConfigurationOptionsExtension',
+    },
+    {
+
+        'MaximumNumberOfOSDs' => 'MaximumNumberOfOSDs',
+        'Type' => 'Type',
+        'PositionOption' => 'PositionOption',
+        'TextOption' => 'TextOption',
+        'ImageOption' => 'ImageOption',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfOSDs
+
+
+=item * Type
+
+
+=item * PositionOption
+
+
+=item * TextOption
+
+
+=item * ImageOption
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationOptions
+   MaximumNumberOfOSDs => ,
+   Type => $some_value, # OSDType
+   PositionOption =>  $some_value, # string
+   TextOption =>  { # ONVIF::Analytics::Types::OSDTextOptions
+     Type =>  $some_value, # string
+     FontSizeRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     DateFormat =>  $some_value, # string
+     TimeFormat =>  $some_value, # string
+     FontColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+       Color =>        { # ONVIF::Analytics::Types::ColorOptions
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         ColorList => ,
+         ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+           X =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Y =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Z =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Colorspace =>  $some_value, # anyURI
+         },
+       },
+       Transparent =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+       },
+     },
+     BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+       Color =>        { # ONVIF::Analytics::Types::ColorOptions
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         ColorList => ,
+         ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+           X =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Y =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Z =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Colorspace =>  $some_value, # anyURI
+         },
+       },
+       Transparent =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+     },
+   },
+   ImageOption =>  { # ONVIF::Analytics::Types::OSDImgOptions
+     ImagePath =>  $some_value, # anyURI
+     Extension =>  { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..93dd125dc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm
new file mode 100644
index 000000000..8d1c4dc35
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::OSDImgConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImgPath_of :ATTR(:get<ImgPath>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImgPath
+        Extension
+
+    ) ],
+    {
+        'ImgPath' => \%ImgPath_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImgPath' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Extension' => 'ONVIF::Analytics::Types::OSDImgConfigurationExtension',
+    },
+    {
+
+        'ImgPath' => 'ImgPath',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImgPath
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgConfiguration
+   ImgPath =>  $some_value, # anyURI
+   Extension =>  { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm
new file mode 100644
index 000000000..9a790ef00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDImgConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm
new file mode 100644
index 000000000..7c5503915
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::OSDImgOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImagePath_of :ATTR(:get<ImagePath>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImagePath
+        Extension
+
+    ) ],
+    {
+        'ImagePath' => \%ImagePath_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImagePath' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Extension' => 'ONVIF::Analytics::Types::OSDImgOptionsExtension',
+    },
+    {
+
+        'ImagePath' => 'ImagePath',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImagePath
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgOptions
+   ImagePath =>  $some_value, # anyURI
+   Extension =>  { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm
new file mode 100644
index 000000000..789954585
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDImgOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm
new file mode 100644
index 000000000..c8abf5160
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::OSDPosConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Pos_of :ATTR(:get<Pos>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Pos
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Pos' => \%Pos_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Pos' => 'ONVIF::Analytics::Types::Vector',
+        'Extension' => 'ONVIF::Analytics::Types::OSDPosConfigurationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'Pos' => 'Pos',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDPosConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDPosConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Pos
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDPosConfiguration
+   Type =>  $some_value, # string
+   Pos => ,
+   Extension =>  { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm
new file mode 100644
index 000000000..bc381246a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDPosConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDPosConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDPosConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm
new file mode 100644
index 000000000..de597bd4a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm
@@ -0,0 +1,73 @@
+package ONVIF::Analytics::Types::OSDReference;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    ONVIF::Analytics::Types::ReferenceToken
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm
new file mode 100644
index 000000000..67042e77a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm
@@ -0,0 +1,171 @@
+package ONVIF::Analytics::Types::OSDTextConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %DateFormat_of :ATTR(:get<DateFormat>);
+my %TimeFormat_of :ATTR(:get<TimeFormat>);
+my %FontSize_of :ATTR(:get<FontSize>);
+my %FontColor_of :ATTR(:get<FontColor>);
+my %BackgroundColor_of :ATTR(:get<BackgroundColor>);
+my %PlainText_of :ATTR(:get<PlainText>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        DateFormat
+        TimeFormat
+        FontSize
+        FontColor
+        BackgroundColor
+        PlainText
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'DateFormat' => \%DateFormat_of,
+        'TimeFormat' => \%TimeFormat_of,
+        'FontSize' => \%FontSize_of,
+        'FontColor' => \%FontColor_of,
+        'BackgroundColor' => \%BackgroundColor_of,
+        'PlainText' => \%PlainText_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'DateFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TimeFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontSize' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'FontColor' => 'ONVIF::Analytics::Types::OSDColor',
+        'BackgroundColor' => 'ONVIF::Analytics::Types::OSDColor',
+        'PlainText' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::OSDTextConfigurationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'DateFormat' => 'DateFormat',
+        'TimeFormat' => 'TimeFormat',
+        'FontSize' => 'FontSize',
+        'FontColor' => 'FontColor',
+        'BackgroundColor' => 'BackgroundColor',
+        'PlainText' => 'PlainText',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * DateFormat
+
+
+=item * TimeFormat
+
+
+=item * FontSize
+
+
+=item * FontColor
+
+
+=item * BackgroundColor
+
+
+=item * PlainText
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextConfiguration
+   Type =>  $some_value, # string
+   DateFormat =>  $some_value, # string
+   TimeFormat =>  $some_value, # string
+   FontSize =>  $some_value, # int
+   FontColor =>  { # ONVIF::Analytics::Types::OSDColor
+     Color => ,
+   },
+   BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColor
+     Color => ,
+   },
+   PlainText =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm
new file mode 100644
index 000000000..060d4e4b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDTextConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm
new file mode 100644
index 000000000..533602ffe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm
@@ -0,0 +1,215 @@
+package ONVIF::Analytics::Types::OSDTextOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %FontSizeRange_of :ATTR(:get<FontSizeRange>);
+my %DateFormat_of :ATTR(:get<DateFormat>);
+my %TimeFormat_of :ATTR(:get<TimeFormat>);
+my %FontColor_of :ATTR(:get<FontColor>);
+my %BackgroundColor_of :ATTR(:get<BackgroundColor>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        FontSizeRange
+        DateFormat
+        TimeFormat
+        FontColor
+        BackgroundColor
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'FontSizeRange' => \%FontSizeRange_of,
+        'DateFormat' => \%DateFormat_of,
+        'TimeFormat' => \%TimeFormat_of,
+        'FontColor' => \%FontColor_of,
+        'BackgroundColor' => \%BackgroundColor_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontSizeRange' => 'ONVIF::Analytics::Types::IntRange',
+        'DateFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TimeFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontColor' => 'ONVIF::Analytics::Types::OSDColorOptions',
+        'BackgroundColor' => 'ONVIF::Analytics::Types::OSDColorOptions',
+        'Extension' => 'ONVIF::Analytics::Types::OSDTextOptionsExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'FontSizeRange' => 'FontSizeRange',
+        'DateFormat' => 'DateFormat',
+        'TimeFormat' => 'TimeFormat',
+        'FontColor' => 'FontColor',
+        'BackgroundColor' => 'BackgroundColor',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * FontSizeRange
+
+
+=item * DateFormat
+
+
+=item * TimeFormat
+
+
+=item * FontColor
+
+
+=item * BackgroundColor
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextOptions
+   Type =>  $some_value, # string
+   FontSizeRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   DateFormat =>  $some_value, # string
+   TimeFormat =>  $some_value, # string
+   FontColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+     Color =>      { # ONVIF::Analytics::Types::ColorOptions
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       ColorList => ,
+       ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+         X =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Y =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Z =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Colorspace =>  $some_value, # anyURI
+       },
+     },
+     Transparent =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+     },
+   },
+   BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+     Color =>      { # ONVIF::Analytics::Types::ColorOptions
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       ColorList => ,
+       ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+         X =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Y =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Z =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Colorspace =>  $some_value, # anyURI
+       },
+     },
+     Transparent =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm
new file mode 100644
index 000000000..875943f5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDTextOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm
new file mode 100644
index 000000000..e1d8bfe71
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::OSDType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+OSDType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm
new file mode 100644
index 000000000..7c5925644
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm
@@ -0,0 +1,173 @@
+package ONVIF::Analytics::Types::Object;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ObjectId);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Appearance_of :ATTR(:get<Appearance>);
+my %Behaviour_of :ATTR(:get<Behaviour>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Appearance
+        Behaviour
+        Extension
+
+    ) ],
+    {
+        'Appearance' => \%Appearance_of,
+        'Behaviour' => \%Behaviour_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Appearance' => 'ONVIF::Analytics::Types::Appearance',
+        'Behaviour' => 'ONVIF::Analytics::Types::Behaviour',
+        'Extension' => 'ONVIF::Analytics::Types::ObjectExtension',
+    },
+    {
+
+        'Appearance' => 'Appearance',
+        'Behaviour' => 'Behaviour',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Object
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Object from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Appearance
+
+
+=item * Behaviour
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Object
+   Appearance =>  { # ONVIF::Analytics::Types::Appearance
+     Transformation =>  { # ONVIF::Analytics::Types::Transformation
+       Translate => ,
+       Scale => ,
+       Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+       },
+     },
+     Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+       BoundingBox => ,
+       CenterOfGravity => ,
+       Polygon =>  { # ONVIF::Analytics::Types::Polygon
+         Point => ,
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+       },
+     },
+     Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+       ColorCluster =>  {
+         Color => ,
+         Weight =>  $some_value, # float
+         Covariance => ,
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+       },
+     },
+     Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+       ClassCandidate =>  {
+         Type => $some_value, # ClassType
+         Likelihood =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+         OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+           Type =>  $some_value, # string
+           Likelihood =>  $some_value, # float
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+     },
+   },
+   Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+     Removed =>  {
+     },
+     Idle =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm
new file mode 100644
index 000000000..7d8cb57fb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ObjectExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm
new file mode 100644
index 000000000..dcea2f434
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ObjectId;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %ObjectId_of :ATTR(:get<ObjectId>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        ObjectId
+    ) ],
+    {
+
+        ObjectId => \%ObjectId_of,
+    },
+    {
+        ObjectId => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectId
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectId from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * ObjectId
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm
new file mode 100644
index 000000000..667a4090f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::ObjectTree;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rename_of :ATTR(:get<Rename>);
+my %Split_of :ATTR(:get<Split>);
+my %Merge_of :ATTR(:get<Merge>);
+my %Delete_of :ATTR(:get<Delete>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rename
+        Split
+        Merge
+        Delete
+        Extension
+
+    ) ],
+    {
+        'Rename' => \%Rename_of,
+        'Split' => \%Split_of,
+        'Merge' => \%Merge_of,
+        'Delete' => \%Delete_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rename' => 'ONVIF::Analytics::Types::Rename',
+        'Split' => 'ONVIF::Analytics::Types::Split',
+        'Merge' => 'ONVIF::Analytics::Types::Merge',
+        'Delete' => 'ONVIF::Analytics::Types::ObjectId',
+        'Extension' => 'ONVIF::Analytics::Types::ObjectTreeExtension',
+    },
+    {
+
+        'Rename' => 'Rename',
+        'Split' => 'Split',
+        'Merge' => 'Merge',
+        'Delete' => 'Delete',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectTree
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectTree from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rename
+
+
+=item * Split
+
+
+=item * Merge
+
+
+=item * Delete
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectTree
+   Rename =>  { # ONVIF::Analytics::Types::Rename
+     from => ,
+     to => ,
+   },
+   Split =>  { # ONVIF::Analytics::Types::Split
+     from => ,
+     to => ,
+   },
+   Merge =>  { # ONVIF::Analytics::Types::Merge
+     from => ,
+     to => ,
+   },
+   Delete => ,
+   Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm
new file mode 100644
index 000000000..f573a8775
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ObjectTreeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectTreeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectTreeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectTreeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm
new file mode 100644
index 000000000..508dc0f75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::OnvifVersion;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Major_of :ATTR(:get<Major>);
+my %Minor_of :ATTR(:get<Minor>);
+
+__PACKAGE__->_factory(
+    [ qw(        Major
+        Minor
+
+    ) ],
+    {
+        'Major' => \%Major_of,
+        'Minor' => \%Minor_of,
+    },
+    {
+        'Major' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Minor' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Major' => 'Major',
+        'Minor' => 'Minor',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OnvifVersion
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OnvifVersion from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Major
+
+
+=item * Minor
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OnvifVersion
+   Major =>  $some_value, # int
+   Minor =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm
new file mode 100644
index 000000000..4d4132965
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::OtherType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OtherType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OtherType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Likelihood
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OtherType
+   Type =>  $some_value, # string
+   Likelihood =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm
new file mode 100644
index 000000000..1a2b55efb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::PTControlDirection;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EFlip_of :ATTR(:get<EFlip>);
+my %Reverse_of :ATTR(:get<Reverse>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EFlip
+        Reverse
+        Extension
+
+    ) ],
+    {
+        'EFlip' => \%EFlip_of,
+        'Reverse' => \%Reverse_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EFlip' => 'ONVIF::Analytics::Types::EFlip',
+        'Reverse' => 'ONVIF::Analytics::Types::Reverse',
+        'Extension' => 'ONVIF::Analytics::Types::PTControlDirectionExtension',
+    },
+    {
+
+        'EFlip' => 'EFlip',
+        'Reverse' => 'Reverse',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirection
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirection from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EFlip
+
+
+=item * Reverse
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirection
+   EFlip =>  { # ONVIF::Analytics::Types::EFlip
+     Mode => $some_value, # EFlipMode
+   },
+   Reverse =>  { # ONVIF::Analytics::Types::Reverse
+     Mode => $some_value, # ReverseMode
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm
new file mode 100644
index 000000000..e0b3997cd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTControlDirectionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm
new file mode 100644
index 000000000..46f6ee5d3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::PTControlDirectionOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EFlip_of :ATTR(:get<EFlip>);
+my %Reverse_of :ATTR(:get<Reverse>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EFlip
+        Reverse
+        Extension
+
+    ) ],
+    {
+        'EFlip' => \%EFlip_of,
+        'Reverse' => \%Reverse_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EFlip' => 'ONVIF::Analytics::Types::EFlipOptions',
+        'Reverse' => 'ONVIF::Analytics::Types::ReverseOptions',
+        'Extension' => 'ONVIF::Analytics::Types::PTControlDirectionOptionsExtension',
+    },
+    {
+
+        'EFlip' => 'EFlip',
+        'Reverse' => 'Reverse',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EFlip
+
+
+=item * Reverse
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionOptions
+   EFlip =>  { # ONVIF::Analytics::Types::EFlipOptions
+     Mode => $some_value, # EFlipMode
+     Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+     },
+   },
+   Reverse =>  { # ONVIF::Analytics::Types::ReverseOptions
+     Mode => $some_value, # ReverseMode
+     Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm
new file mode 100644
index 000000000..73abb64e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTControlDirectionOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm
new file mode 100644
index 000000000..c425c9d39
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::PTZCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm
new file mode 100644
index 000000000..1e4198863
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm
@@ -0,0 +1,251 @@
+package ONVIF::Analytics::Types::PTZConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %NodeToken_of :ATTR(:get<NodeToken>);
+my %DefaultAbsolutePantTiltPositionSpace_of :ATTR(:get<DefaultAbsolutePantTiltPositionSpace>);
+my %DefaultAbsoluteZoomPositionSpace_of :ATTR(:get<DefaultAbsoluteZoomPositionSpace>);
+my %DefaultRelativePanTiltTranslationSpace_of :ATTR(:get<DefaultRelativePanTiltTranslationSpace>);
+my %DefaultRelativeZoomTranslationSpace_of :ATTR(:get<DefaultRelativeZoomTranslationSpace>);
+my %DefaultContinuousPanTiltVelocitySpace_of :ATTR(:get<DefaultContinuousPanTiltVelocitySpace>);
+my %DefaultContinuousZoomVelocitySpace_of :ATTR(:get<DefaultContinuousZoomVelocitySpace>);
+my %DefaultPTZSpeed_of :ATTR(:get<DefaultPTZSpeed>);
+my %DefaultPTZTimeout_of :ATTR(:get<DefaultPTZTimeout>);
+my %PanTiltLimits_of :ATTR(:get<PanTiltLimits>);
+my %ZoomLimits_of :ATTR(:get<ZoomLimits>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        NodeToken
+        DefaultAbsolutePantTiltPositionSpace
+        DefaultAbsoluteZoomPositionSpace
+        DefaultRelativePanTiltTranslationSpace
+        DefaultRelativeZoomTranslationSpace
+        DefaultContinuousPanTiltVelocitySpace
+        DefaultContinuousZoomVelocitySpace
+        DefaultPTZSpeed
+        DefaultPTZTimeout
+        PanTiltLimits
+        ZoomLimits
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'NodeToken' => \%NodeToken_of,
+        'DefaultAbsolutePantTiltPositionSpace' => \%DefaultAbsolutePantTiltPositionSpace_of,
+        'DefaultAbsoluteZoomPositionSpace' => \%DefaultAbsoluteZoomPositionSpace_of,
+        'DefaultRelativePanTiltTranslationSpace' => \%DefaultRelativePanTiltTranslationSpace_of,
+        'DefaultRelativeZoomTranslationSpace' => \%DefaultRelativeZoomTranslationSpace_of,
+        'DefaultContinuousPanTiltVelocitySpace' => \%DefaultContinuousPanTiltVelocitySpace_of,
+        'DefaultContinuousZoomVelocitySpace' => \%DefaultContinuousZoomVelocitySpace_of,
+        'DefaultPTZSpeed' => \%DefaultPTZSpeed_of,
+        'DefaultPTZTimeout' => \%DefaultPTZTimeout_of,
+        'PanTiltLimits' => \%PanTiltLimits_of,
+        'ZoomLimits' => \%ZoomLimits_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'NodeToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'DefaultAbsolutePantTiltPositionSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultAbsoluteZoomPositionSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultRelativePanTiltTranslationSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultRelativeZoomTranslationSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultContinuousPanTiltVelocitySpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultContinuousZoomVelocitySpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultPTZSpeed' => 'ONVIF::Analytics::Types::PTZSpeed',
+        'DefaultPTZTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'PanTiltLimits' => 'ONVIF::Analytics::Types::PanTiltLimits',
+        'ZoomLimits' => 'ONVIF::Analytics::Types::ZoomLimits',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'NodeToken' => 'NodeToken',
+        'DefaultAbsolutePantTiltPositionSpace' => 'DefaultAbsolutePantTiltPositionSpace',
+        'DefaultAbsoluteZoomPositionSpace' => 'DefaultAbsoluteZoomPositionSpace',
+        'DefaultRelativePanTiltTranslationSpace' => 'DefaultRelativePanTiltTranslationSpace',
+        'DefaultRelativeZoomTranslationSpace' => 'DefaultRelativeZoomTranslationSpace',
+        'DefaultContinuousPanTiltVelocitySpace' => 'DefaultContinuousPanTiltVelocitySpace',
+        'DefaultContinuousZoomVelocitySpace' => 'DefaultContinuousZoomVelocitySpace',
+        'DefaultPTZSpeed' => 'DefaultPTZSpeed',
+        'DefaultPTZTimeout' => 'DefaultPTZTimeout',
+        'PanTiltLimits' => 'PanTiltLimits',
+        'ZoomLimits' => 'ZoomLimits',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NodeToken
+
+
+=item * DefaultAbsolutePantTiltPositionSpace
+
+
+=item * DefaultAbsoluteZoomPositionSpace
+
+
+=item * DefaultRelativePanTiltTranslationSpace
+
+
+=item * DefaultRelativeZoomTranslationSpace
+
+
+=item * DefaultContinuousPanTiltVelocitySpace
+
+
+=item * DefaultContinuousZoomVelocitySpace
+
+
+=item * DefaultPTZSpeed
+
+
+=item * DefaultPTZTimeout
+
+
+=item * PanTiltLimits
+
+
+=item * ZoomLimits
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfiguration
+   NodeToken => $some_value, # ReferenceToken
+   DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+   DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+   DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+   DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+   DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+   DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+   DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   DefaultPTZTimeout =>  $some_value, # duration
+   PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+     Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+     Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+     PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+       EFlip =>  { # ONVIF::Analytics::Types::EFlip
+         Mode => $some_value, # EFlipMode
+       },
+       Reverse =>  { # ONVIF::Analytics::Types::Reverse
+         Mode => $some_value, # ReverseMode
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm
new file mode 100644
index 000000000..6758f2267
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::PTZConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTControlDirection_of :ATTR(:get<PTControlDirection>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTControlDirection
+        Extension
+
+    ) ],
+    {
+        'PTControlDirection' => \%PTControlDirection_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTControlDirection' => 'ONVIF::Analytics::Types::PTControlDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationExtension2',
+    },
+    {
+
+        'PTControlDirection' => 'PTControlDirection',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTControlDirection
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationExtension
+   PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+     EFlip =>  { # ONVIF::Analytics::Types::EFlip
+       Mode => $some_value, # EFlipMode
+     },
+     Reverse =>  { # ONVIF::Analytics::Types::Reverse
+       Mode => $some_value, # ReverseMode
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm
new file mode 100644
index 000000000..43dbc7870
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm
new file mode 100644
index 000000000..a9304fbee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm
@@ -0,0 +1,218 @@
+package ONVIF::Analytics::Types::PTZConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Spaces_of :ATTR(:get<Spaces>);
+my %PTZTimeout_of :ATTR(:get<PTZTimeout>);
+my %PTControlDirection_of :ATTR(:get<PTControlDirection>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Spaces
+        PTZTimeout
+        PTControlDirection
+        Extension
+
+    ) ],
+    {
+        'Spaces' => \%Spaces_of,
+        'PTZTimeout' => \%PTZTimeout_of,
+        'PTControlDirection' => \%PTControlDirection_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Spaces' => 'ONVIF::Analytics::Types::PTZSpaces',
+        'PTZTimeout' => 'ONVIF::Analytics::Types::DurationRange',
+        'PTControlDirection' => 'ONVIF::Analytics::Types::PTControlDirectionOptions',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationOptions2',
+    },
+    {
+
+        'Spaces' => 'Spaces',
+        'PTZTimeout' => 'PTZTimeout',
+        'PTControlDirection' => 'PTControlDirection',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Spaces
+
+
+=item * PTZTimeout
+
+
+=item * PTControlDirection
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationOptions
+   Spaces =>  { # ONVIF::Analytics::Types::PTZSpaces
+     AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+     },
+   },
+   PTZTimeout =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirectionOptions
+     EFlip =>  { # ONVIF::Analytics::Types::EFlipOptions
+       Mode => $some_value, # EFlipMode
+       Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+       },
+     },
+     Reverse =>  { # ONVIF::Analytics::Types::ReverseOptions
+       Mode => $some_value, # ReverseMode
+       Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationOptions2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm
new file mode 100644
index 000000000..aa768d92f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZConfigurationOptions2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationOptions2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationOptions2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationOptions2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm
new file mode 100644
index 000000000..29a368678
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Status_of :ATTR(:get<Status>);
+my %Position_of :ATTR(:get<Position>);
+
+__PACKAGE__->_factory(
+    [ qw(        Status
+        Position
+
+    ) ],
+    {
+        'Status' => \%Status_of,
+        'Position' => \%Position_of,
+    },
+    {
+        'Status' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Status' => 'Status',
+        'Position' => 'Position',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Status
+
+
+=item * Position
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZFilter
+   Status =>  $some_value, # boolean
+   Position =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm
new file mode 100644
index 000000000..3b545bdcf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZMoveStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Zoom' => 'ONVIF::Analytics::Types::MoveStatus',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZMoveStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZMoveStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZMoveStatus
+   PanTilt => $some_value, # MoveStatus
+   Zoom => $some_value, # MoveStatus
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm
new file mode 100644
index 000000000..6facb5026
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm
@@ -0,0 +1,278 @@
+package ONVIF::Analytics::Types::PTZNode;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %SupportedPTZSpaces_of :ATTR(:get<SupportedPTZSpaces>);
+my %MaximumNumberOfPresets_of :ATTR(:get<MaximumNumberOfPresets>);
+my %HomeSupported_of :ATTR(:get<HomeSupported>);
+my %AuxiliaryCommands_of :ATTR(:get<AuxiliaryCommands>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        SupportedPTZSpaces
+        MaximumNumberOfPresets
+        HomeSupported
+        AuxiliaryCommands
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'SupportedPTZSpaces' => \%SupportedPTZSpaces_of,
+        'MaximumNumberOfPresets' => \%MaximumNumberOfPresets_of,
+        'HomeSupported' => \%HomeSupported_of,
+        'AuxiliaryCommands' => \%AuxiliaryCommands_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'SupportedPTZSpaces' => 'ONVIF::Analytics::Types::PTZSpaces',
+        'MaximumNumberOfPresets' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'HomeSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AuxiliaryCommands' => 'ONVIF::Analytics::Types::AuxiliaryData',
+        'Extension' => 'ONVIF::Analytics::Types::PTZNodeExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'SupportedPTZSpaces' => 'SupportedPTZSpaces',
+        'MaximumNumberOfPresets' => 'MaximumNumberOfPresets',
+        'HomeSupported' => 'HomeSupported',
+        'AuxiliaryCommands' => 'AuxiliaryCommands',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %FixedHomePosition_of :ATTR(:get<FixedHomePosition>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        FixedHomePosition
+    ) ],
+    {
+
+        FixedHomePosition => \%FixedHomePosition_of,
+    },
+    {
+        FixedHomePosition => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNode
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * SupportedPTZSpaces
+
+
+=item * MaximumNumberOfPresets
+
+
+=item * HomeSupported
+
+
+=item * AuxiliaryCommands
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNode
+   Name => $some_value, # Name
+   SupportedPTZSpaces =>  { # ONVIF::Analytics::Types::PTZSpaces
+     AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+     },
+   },
+   MaximumNumberOfPresets =>  $some_value, # int
+   HomeSupported =>  $some_value, # boolean
+   AuxiliaryCommands => $some_value, # AuxiliaryData
+   Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension
+     SupportedPresetTour =>  { # ONVIF::Analytics::Types::PTZPresetTourSupported
+       MaximumNumberOfPresetTours =>  $some_value, # int
+       PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * FixedHomePosition
+
+ Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command. 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm
new file mode 100644
index 000000000..adc8820a4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::PTZNodeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedPresetTour_of :ATTR(:get<SupportedPresetTour>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedPresetTour
+        Extension
+
+    ) ],
+    {
+        'SupportedPresetTour' => \%SupportedPresetTour_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SupportedPresetTour' => 'ONVIF::Analytics::Types::PTZPresetTourSupported',
+        'Extension' => 'ONVIF::Analytics::Types::PTZNodeExtension2',
+    },
+    {
+
+        'SupportedPresetTour' => 'SupportedPresetTour',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNodeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNodeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedPresetTour
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNodeExtension
+   SupportedPresetTour =>  { # ONVIF::Analytics::Types::PTZPresetTourSupported
+     MaximumNumberOfPresetTours =>  $some_value, # int
+     PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm
new file mode 100644
index 000000000..61ebb3156
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZNodeExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNodeExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNodeExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNodeExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm
new file mode 100644
index 000000000..ed1e087f7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::PTZPositionFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MinPosition_of :ATTR(:get<MinPosition>);
+my %MaxPosition_of :ATTR(:get<MaxPosition>);
+my %EnterOrExit_of :ATTR(:get<EnterOrExit>);
+
+__PACKAGE__->_factory(
+    [ qw(        MinPosition
+        MaxPosition
+        EnterOrExit
+
+    ) ],
+    {
+        'MinPosition' => \%MinPosition_of,
+        'MaxPosition' => \%MaxPosition_of,
+        'EnterOrExit' => \%EnterOrExit_of,
+    },
+    {
+        'MinPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'MaxPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'EnterOrExit' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'MinPosition' => 'MinPosition',
+        'MaxPosition' => 'MaxPosition',
+        'EnterOrExit' => 'EnterOrExit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPositionFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPositionFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinPosition
+
+
+=item * MaxPosition
+
+
+=item * EnterOrExit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPositionFilter
+   MinPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   MaxPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   EnterOrExit =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm
new file mode 100644
index 000000000..a0f3b3eab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::PTZPreset;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %PTZPosition_of :ATTR(:get<PTZPosition>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        PTZPosition
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'PTZPosition' => \%PTZPosition_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'PTZPosition' => 'ONVIF::Analytics::Types::PTZVector',
+    },
+    {
+
+        'Name' => 'Name',
+        'PTZPosition' => 'PTZPosition',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPreset
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPreset from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * PTZPosition
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPreset
+   Name => $some_value, # Name
+   PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+  
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm
new file mode 100644
index 000000000..8740b6cf4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourDirection;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourDirection from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm
new file mode 100644
index 000000000..ce0ac2a20
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm
new file mode 100644
index 000000000..009b6bdcd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm
new file mode 100644
index 000000000..e9f13635e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::PTZPresetTourOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoStart_of :ATTR(:get<AutoStart>);
+my %StartingCondition_of :ATTR(:get<StartingCondition>);
+my %TourSpot_of :ATTR(:get<TourSpot>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoStart
+        StartingCondition
+        TourSpot
+
+    ) ],
+    {
+        'AutoStart' => \%AutoStart_of,
+        'StartingCondition' => \%StartingCondition_of,
+        'TourSpot' => \%TourSpot_of,
+    },
+    {
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'StartingCondition' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions',
+        'TourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpotOptions',
+    },
+    {
+
+        'AutoStart' => 'AutoStart',
+        'StartingCondition' => 'StartingCondition',
+        'TourSpot' => 'TourSpot',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoStart
+
+
+=item * StartingCondition
+
+
+=item * TourSpot
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourOptions
+   AutoStart =>  $some_value, # boolean
+   StartingCondition =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+     RecurringTime =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     RecurringDuration =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+     Direction => $some_value, # PTZPresetTourDirection
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+     },
+   },
+   TourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+     PresetDetail =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         YRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+       ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+       },
+     },
+     StayTime =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm
new file mode 100644
index 000000000..f8e0c4128
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetail;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetToken_of :ATTR(:get<PresetToken>);
+my %Home_of :ATTR(:get<Home>);
+my %PTZPosition_of :ATTR(:get<PTZPosition>);
+my %TypeExtension_of :ATTR(:get<TypeExtension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetToken
+        Home
+        PTZPosition
+        TypeExtension
+
+    ) ],
+    {
+        'PresetToken' => \%PresetToken_of,
+        'Home' => \%Home_of,
+        'PTZPosition' => \%PTZPosition_of,
+        'TypeExtension' => \%TypeExtension_of,
+    },
+    {
+        'PresetToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Home' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PTZPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'TypeExtension' => 'ONVIF::Analytics::Types::PTZPresetTourTypeExtension',
+    },
+    {
+
+        'PresetToken' => 'PresetToken',
+        'Home' => 'Home',
+        'PTZPosition' => 'PTZPosition',
+        'TypeExtension' => 'TypeExtension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetail from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetToken
+
+
+=item * Home
+
+
+=item * PTZPosition
+
+
+=item * TypeExtension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   PresetToken => $some_value, # ReferenceToken
+   Home =>  $some_value, # boolean
+   PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm
new file mode 100644
index 000000000..6d8bbefdd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm
@@ -0,0 +1,156 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetToken_of :ATTR(:get<PresetToken>);
+my %Home_of :ATTR(:get<Home>);
+my %PanTiltPositionSpace_of :ATTR(:get<PanTiltPositionSpace>);
+my %ZoomPositionSpace_of :ATTR(:get<ZoomPositionSpace>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetToken
+        Home
+        PanTiltPositionSpace
+        ZoomPositionSpace
+        Extension
+
+    ) ],
+    {
+        'PresetToken' => \%PresetToken_of,
+        'Home' => \%Home_of,
+        'PanTiltPositionSpace' => \%PanTiltPositionSpace_of,
+        'ZoomPositionSpace' => \%ZoomPositionSpace_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PresetToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Home' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PanTiltPositionSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'ZoomPositionSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension',
+    },
+    {
+
+        'PresetToken' => 'PresetToken',
+        'Home' => 'Home',
+        'PanTiltPositionSpace' => 'PanTiltPositionSpace',
+        'ZoomPositionSpace' => 'ZoomPositionSpace',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetailOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetToken
+
+
+=item * Home
+
+
+=item * PanTiltPositionSpace
+
+
+=item * ZoomPositionSpace
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+   PresetToken => $some_value, # ReferenceToken
+   Home =>  $some_value, # boolean
+   PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm
new file mode 100644
index 000000000..599d19346
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetailOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm
new file mode 100644
index 000000000..d7cdb6d61
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpot;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetDetail_of :ATTR(:get<PresetDetail>);
+my %Speed_of :ATTR(:get<Speed>);
+my %StayTime_of :ATTR(:get<StayTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetDetail
+        Speed
+        StayTime
+        Extension
+
+    ) ],
+    {
+        'PresetDetail' => \%PresetDetail_of,
+        'Speed' => \%Speed_of,
+        'StayTime' => \%StayTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PresetDetail' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetail',
+        'Speed' => 'ONVIF::Analytics::Types::PTZSpeed',
+        'StayTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourSpotExtension',
+    },
+    {
+
+        'PresetDetail' => 'PresetDetail',
+        'Speed' => 'Speed',
+        'StayTime' => 'StayTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpot
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpot from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetDetail
+
+
+=item * Speed
+
+
+=item * StayTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpot
+   PresetDetail =>    { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PresetToken => $some_value, # ReferenceToken
+     Home =>  $some_value, # boolean
+     PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+     },
+   },
+   Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   StayTime =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm
new file mode 100644
index 000000000..b9481d85c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpotExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpotExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm
new file mode 100644
index 000000000..b3749ff54
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm
@@ -0,0 +1,138 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpotOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetDetail_of :ATTR(:get<PresetDetail>);
+my %StayTime_of :ATTR(:get<StayTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetDetail
+        StayTime
+
+    ) ],
+    {
+        'PresetDetail' => \%PresetDetail_of,
+        'StayTime' => \%StayTime_of,
+    },
+    {
+        'PresetDetail' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions',
+        'StayTime' => 'ONVIF::Analytics::Types::DurationRange',
+    },
+    {
+
+        'PresetDetail' => 'PresetDetail',
+        'StayTime' => 'StayTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpotOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetDetail
+
+
+=item * StayTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+   PresetDetail =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+     PresetToken => $some_value, # ReferenceToken
+     Home =>  $some_value, # boolean
+     PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+     },
+   },
+   StayTime =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm
new file mode 100644
index 000000000..d9a5d928d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingCondition;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecurringTime_of :ATTR(:get<RecurringTime>);
+my %RecurringDuration_of :ATTR(:get<RecurringDuration>);
+my %Direction_of :ATTR(:get<Direction>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecurringTime
+        RecurringDuration
+        Direction
+        Extension
+
+    ) ],
+    {
+        'RecurringTime' => \%RecurringTime_of,
+        'RecurringDuration' => \%RecurringDuration_of,
+        'Direction' => \%Direction_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecurringTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RecurringDuration' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Direction' => 'ONVIF::Analytics::Types::PTZPresetTourDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension',
+    },
+    {
+
+        'RecurringTime' => 'RecurringTime',
+        'RecurringDuration' => 'RecurringDuration',
+        'Direction' => 'Direction',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingCondition from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecurringTime
+
+
+=item * RecurringDuration
+
+
+=item * Direction
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+   RecurringTime =>  $some_value, # int
+   RecurringDuration =>  $some_value, # duration
+   Direction => $some_value, # PTZPresetTourDirection
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm
new file mode 100644
index 000000000..9d3896e27
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm
new file mode 100644
index 000000000..ebd2c75c3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecurringTime_of :ATTR(:get<RecurringTime>);
+my %RecurringDuration_of :ATTR(:get<RecurringDuration>);
+my %Direction_of :ATTR(:get<Direction>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecurringTime
+        RecurringDuration
+        Direction
+        Extension
+
+    ) ],
+    {
+        'RecurringTime' => \%RecurringTime_of,
+        'RecurringDuration' => \%RecurringDuration_of,
+        'Direction' => \%Direction_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecurringTime' => 'ONVIF::Analytics::Types::IntRange',
+        'RecurringDuration' => 'ONVIF::Analytics::Types::DurationRange',
+        'Direction' => 'ONVIF::Analytics::Types::PTZPresetTourDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension',
+    },
+    {
+
+        'RecurringTime' => 'RecurringTime',
+        'RecurringDuration' => 'RecurringDuration',
+        'Direction' => 'Direction',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecurringTime
+
+
+=item * RecurringDuration
+
+
+=item * Direction
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+   RecurringTime =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   RecurringDuration =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   Direction => $some_value, # PTZPresetTourDirection
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm
new file mode 100644
index 000000000..26b76f243
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm
new file mode 100644
index 000000000..9d5117059
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm
new file mode 100644
index 000000000..2058e86f7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm
@@ -0,0 +1,142 @@
+package ONVIF::Analytics::Types::PTZPresetTourStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %State_of :ATTR(:get<State>);
+my %CurrentTourSpot_of :ATTR(:get<CurrentTourSpot>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        State
+        CurrentTourSpot
+        Extension
+
+    ) ],
+    {
+        'State' => \%State_of,
+        'CurrentTourSpot' => \%CurrentTourSpot_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'State' => 'ONVIF::Analytics::Types::PTZPresetTourState',
+        'CurrentTourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpot',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStatusExtension',
+    },
+    {
+
+        'State' => 'State',
+        'CurrentTourSpot' => 'CurrentTourSpot',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * State
+
+
+=item * CurrentTourSpot
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStatus
+   State => $some_value, # PTZPresetTourState
+   CurrentTourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+     PresetDetail =>      { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+       },
+     },
+     Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     StayTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm
new file mode 100644
index 000000000..8c390f236
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStatusExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStatusExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm
new file mode 100644
index 000000000..4245f4878
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::PTZPresetTourSupported;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfPresetTours_of :ATTR(:get<MaximumNumberOfPresetTours>);
+my %PTZPresetTourOperation_of :ATTR(:get<PTZPresetTourOperation>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfPresetTours
+        PTZPresetTourOperation
+        Extension
+
+    ) ],
+    {
+        'MaximumNumberOfPresetTours' => \%MaximumNumberOfPresetTours_of,
+        'PTZPresetTourOperation' => \%PTZPresetTourOperation_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MaximumNumberOfPresetTours' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'PTZPresetTourOperation' => 'ONVIF::Analytics::Types::PTZPresetTourOperation',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourSupportedExtension',
+    },
+    {
+
+        'MaximumNumberOfPresetTours' => 'MaximumNumberOfPresetTours',
+        'PTZPresetTourOperation' => 'PTZPresetTourOperation',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSupported
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSupported from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfPresetTours
+
+
+=item * PTZPresetTourOperation
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSupported
+   MaximumNumberOfPresetTours =>  $some_value, # int
+   PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm
new file mode 100644
index 000000000..6456b9d09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourSupportedExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSupportedExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm
new file mode 100644
index 000000000..74247cbfc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourTypeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourTypeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm
new file mode 100644
index 000000000..ae25e0cc4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm
@@ -0,0 +1,236 @@
+package ONVIF::Analytics::Types::PTZSpaces;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AbsolutePanTiltPositionSpace_of :ATTR(:get<AbsolutePanTiltPositionSpace>);
+my %AbsoluteZoomPositionSpace_of :ATTR(:get<AbsoluteZoomPositionSpace>);
+my %RelativePanTiltTranslationSpace_of :ATTR(:get<RelativePanTiltTranslationSpace>);
+my %RelativeZoomTranslationSpace_of :ATTR(:get<RelativeZoomTranslationSpace>);
+my %ContinuousPanTiltVelocitySpace_of :ATTR(:get<ContinuousPanTiltVelocitySpace>);
+my %ContinuousZoomVelocitySpace_of :ATTR(:get<ContinuousZoomVelocitySpace>);
+my %PanTiltSpeedSpace_of :ATTR(:get<PanTiltSpeedSpace>);
+my %ZoomSpeedSpace_of :ATTR(:get<ZoomSpeedSpace>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AbsolutePanTiltPositionSpace
+        AbsoluteZoomPositionSpace
+        RelativePanTiltTranslationSpace
+        RelativeZoomTranslationSpace
+        ContinuousPanTiltVelocitySpace
+        ContinuousZoomVelocitySpace
+        PanTiltSpeedSpace
+        ZoomSpeedSpace
+        Extension
+
+    ) ],
+    {
+        'AbsolutePanTiltPositionSpace' => \%AbsolutePanTiltPositionSpace_of,
+        'AbsoluteZoomPositionSpace' => \%AbsoluteZoomPositionSpace_of,
+        'RelativePanTiltTranslationSpace' => \%RelativePanTiltTranslationSpace_of,
+        'RelativeZoomTranslationSpace' => \%RelativeZoomTranslationSpace_of,
+        'ContinuousPanTiltVelocitySpace' => \%ContinuousPanTiltVelocitySpace_of,
+        'ContinuousZoomVelocitySpace' => \%ContinuousZoomVelocitySpace_of,
+        'PanTiltSpeedSpace' => \%PanTiltSpeedSpace_of,
+        'ZoomSpeedSpace' => \%ZoomSpeedSpace_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AbsolutePanTiltPositionSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'AbsoluteZoomPositionSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'RelativePanTiltTranslationSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'RelativeZoomTranslationSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'ContinuousPanTiltVelocitySpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'ContinuousZoomVelocitySpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'PanTiltSpeedSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'ZoomSpeedSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'Extension' => 'ONVIF::Analytics::Types::PTZSpacesExtension',
+    },
+    {
+
+        'AbsolutePanTiltPositionSpace' => 'AbsolutePanTiltPositionSpace',
+        'AbsoluteZoomPositionSpace' => 'AbsoluteZoomPositionSpace',
+        'RelativePanTiltTranslationSpace' => 'RelativePanTiltTranslationSpace',
+        'RelativeZoomTranslationSpace' => 'RelativeZoomTranslationSpace',
+        'ContinuousPanTiltVelocitySpace' => 'ContinuousPanTiltVelocitySpace',
+        'ContinuousZoomVelocitySpace' => 'ContinuousZoomVelocitySpace',
+        'PanTiltSpeedSpace' => 'PanTiltSpeedSpace',
+        'ZoomSpeedSpace' => 'ZoomSpeedSpace',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpaces
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpaces from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AbsolutePanTiltPositionSpace
+
+
+=item * AbsoluteZoomPositionSpace
+
+
+=item * RelativePanTiltTranslationSpace
+
+
+=item * RelativeZoomTranslationSpace
+
+
+=item * ContinuousPanTiltVelocitySpace
+
+
+=item * ContinuousZoomVelocitySpace
+
+
+=item * PanTiltSpeedSpace
+
+
+=item * ZoomSpeedSpace
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpaces
+   AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm
new file mode 100644
index 000000000..cb439a62b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZSpacesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpacesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpacesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpacesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm
new file mode 100644
index 000000000..414e7028d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZSpeed;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::Vector2D',
+        'Zoom' => 'ONVIF::Analytics::Types::Vector1D',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpeed
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpeed from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpeed
+   PanTilt => ,
+   Zoom => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm
new file mode 100644
index 000000000..8958f747b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::PTZStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+        UtcTime
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+        'UtcTime' => \%UtcTime_of,
+    },
+    {
+        'Position' => 'ONVIF::Analytics::Types::PTZVector',
+        'MoveStatus' => 'ONVIF::Analytics::Types::PTZMoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UtcTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+        'UtcTime' => 'UtcTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+=item * UtcTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatus
+   Position =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+     PanTilt => $some_value, # MoveStatus
+     Zoom => $some_value, # MoveStatus
+   },
+   Error =>  $some_value, # string
+   UtcTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm
new file mode 100644
index 000000000..b56b650d2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::PTZStatusFilterOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTiltStatusSupported_of :ATTR(:get<PanTiltStatusSupported>);
+my %ZoomStatusSupported_of :ATTR(:get<ZoomStatusSupported>);
+my %PanTiltPositionSupported_of :ATTR(:get<PanTiltPositionSupported>);
+my %ZoomPositionSupported_of :ATTR(:get<ZoomPositionSupported>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTiltStatusSupported
+        ZoomStatusSupported
+        PanTiltPositionSupported
+        ZoomPositionSupported
+        Extension
+
+    ) ],
+    {
+        'PanTiltStatusSupported' => \%PanTiltStatusSupported_of,
+        'ZoomStatusSupported' => \%ZoomStatusSupported_of,
+        'PanTiltPositionSupported' => \%PanTiltPositionSupported_of,
+        'ZoomPositionSupported' => \%ZoomPositionSupported_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PanTiltStatusSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZoomStatusSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PanTiltPositionSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZoomPositionSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension',
+    },
+    {
+
+        'PanTiltStatusSupported' => 'PanTiltStatusSupported',
+        'ZoomStatusSupported' => 'ZoomStatusSupported',
+        'PanTiltPositionSupported' => 'PanTiltPositionSupported',
+        'ZoomPositionSupported' => 'ZoomPositionSupported',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatusFilterOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatusFilterOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTiltStatusSupported
+
+
+=item * ZoomStatusSupported
+
+
+=item * PanTiltPositionSupported
+
+
+=item * ZoomPositionSupported
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatusFilterOptions
+   PanTiltStatusSupported =>  $some_value, # boolean
+   ZoomStatusSupported =>  $some_value, # boolean
+   PanTiltPositionSupported =>  $some_value, # boolean
+   ZoomPositionSupported =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm
new file mode 100644
index 000000000..96362c006
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatusFilterOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm
new file mode 100644
index 000000000..a717d6a1c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::PTZStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatus
+        Extension
+
+    ) ],
+    {
+        'PTZStatus' => \%PTZStatus_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZStatus',
+        'Extension' => 'ONVIF::Analytics::Types::PTZStreamExtension',
+    },
+    {
+
+        'PTZStatus' => 'PTZStatus',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+       PanTilt => $some_value, # MoveStatus
+       Zoom => $some_value, # MoveStatus
+     },
+     Error =>  $some_value, # string
+     UtcTime =>  $some_value, # dateTime
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm
new file mode 100644
index 000000000..2e7c13340
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm
new file mode 100644
index 000000000..08b3c6f9b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZVector;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::Vector2D',
+        'Zoom' => 'ONVIF::Analytics::Types::Vector1D',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZVector
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZVector from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZVector
+   PanTilt => ,
+   Zoom => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm
new file mode 100644
index 000000000..8ff07059f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::PanTiltLimits;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Range_of :ATTR(:get<Range>);
+
+__PACKAGE__->_factory(
+    [ qw(        Range
+
+    ) ],
+    {
+        'Range' => \%Range_of,
+    },
+    {
+        'Range' => 'ONVIF::Analytics::Types::Space2DDescription',
+    },
+    {
+
+        'Range' => 'Range',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PanTiltLimits
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PanTiltLimits from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Range
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PanTiltLimits
+   Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm
new file mode 100644
index 000000000..f3522da41
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm
@@ -0,0 +1,163 @@
+package ONVIF::Analytics::Types::PaneConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneName_of :ATTR(:get<PaneName>);
+my %AudioOutputToken_of :ATTR(:get<AudioOutputToken>);
+my %AudioSourceToken_of :ATTR(:get<AudioSourceToken>);
+my %AudioEncoderConfiguration_of :ATTR(:get<AudioEncoderConfiguration>);
+my %ReceiverToken_of :ATTR(:get<ReceiverToken>);
+my %Token_of :ATTR(:get<Token>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneName
+        AudioOutputToken
+        AudioSourceToken
+        AudioEncoderConfiguration
+        ReceiverToken
+        Token
+
+    ) ],
+    {
+        'PaneName' => \%PaneName_of,
+        'AudioOutputToken' => \%AudioOutputToken_of,
+        'AudioSourceToken' => \%AudioSourceToken_of,
+        'AudioEncoderConfiguration' => \%AudioEncoderConfiguration_of,
+        'ReceiverToken' => \%ReceiverToken_of,
+        'Token' => \%Token_of,
+    },
+    {
+        'PaneName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AudioOutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AudioSourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AudioEncoderConfiguration' => 'ONVIF::Analytics::Types::AudioEncoderConfiguration',
+        'ReceiverToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'PaneName' => 'PaneName',
+        'AudioOutputToken' => 'AudioOutputToken',
+        'AudioSourceToken' => 'AudioSourceToken',
+        'AudioEncoderConfiguration' => 'AudioEncoderConfiguration',
+        'ReceiverToken' => 'ReceiverToken',
+        'Token' => 'Token',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Configuration of the streaming and coding settings of a Video window.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneName
+
+
+=item * AudioOutputToken
+
+
+=item * AudioSourceToken
+
+
+=item * AudioEncoderConfiguration
+
+
+=item * ReceiverToken
+
+
+=item * Token
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneConfiguration
+   PaneName =>  $some_value, # string
+   AudioOutputToken => $some_value, # ReferenceToken
+   AudioSourceToken => $some_value, # ReferenceToken
+   AudioEncoderConfiguration =>  { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+     Encoding => $some_value, # AudioEncoding
+     Bitrate =>  $some_value, # int
+     SampleRate =>  $some_value, # int
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   ReceiverToken => $some_value, # ReferenceToken
+   Token => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm
new file mode 100644
index 000000000..fe5d98bee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PaneLayout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Pane_of :ATTR(:get<Pane>);
+my %Area_of :ATTR(:get<Area>);
+
+__PACKAGE__->_factory(
+    [ qw(        Pane
+        Area
+
+    ) ],
+    {
+        'Pane' => \%Pane_of,
+        'Area' => \%Area_of,
+    },
+    {
+        'Pane' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Area' => 'ONVIF::Analytics::Types::Rectangle',
+    },
+    {
+
+        'Pane' => 'Pane',
+        'Area' => 'Area',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneLayout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneLayout from the namespace http://www.onvif.org/ver10/schema.
+
+A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Pane
+
+
+=item * Area
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneLayout
+   Pane => $some_value, # ReferenceToken
+   Area => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm
new file mode 100644
index 000000000..c00fdf10c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::PaneLayoutOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Area_of :ATTR(:get<Area>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Area
+        Extension
+
+    ) ],
+    {
+        'Area' => \%Area_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Area' => 'ONVIF::Analytics::Types::Rectangle',
+        'Extension' => 'ONVIF::Analytics::Types::PaneOptionExtension',
+    },
+    {
+
+        'Area' => 'Area',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneLayoutOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneLayoutOptions from the namespace http://www.onvif.org/ver10/schema.
+
+Description of a pane layout describing a complete display layout.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Area
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneLayoutOptions
+   Area => ,
+   Extension =>  { # ONVIF::Analytics::Types::PaneOptionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm
new file mode 100644
index 000000000..9f7b8bc0d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PaneOptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneOptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneOptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneOptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm
new file mode 100644
index 000000000..4b2978611
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Polygon;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Point_of :ATTR(:get<Point>);
+
+__PACKAGE__->_factory(
+    [ qw(        Point
+
+    ) ],
+    {
+        'Point' => \%Point_of,
+    },
+    {
+        'Point' => 'ONVIF::Analytics::Types::Vector',
+    },
+    {
+
+        'Point' => 'Point',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Polygon
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Polygon from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Point
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polygon
+   Point => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm
new file mode 100644
index 000000000..8d7bc386d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::PolygonConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Polygon_of :ATTR(:get<Polygon>);
+
+__PACKAGE__->_factory(
+    [ qw(        Polygon
+
+    ) ],
+    {
+        'Polygon' => \%Polygon_of,
+    },
+    {
+        'Polygon' => 'ONVIF::Analytics::Types::Polygon',
+    },
+    {
+
+        'Polygon' => 'Polygon',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolygonConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolygonConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Polygon
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolygonConfiguration
+   Polygon =>  { # ONVIF::Analytics::Types::Polygon
+     Point => ,
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm
new file mode 100644
index 000000000..0bf44cd46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Polyline;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Point_of :ATTR(:get<Point>);
+
+__PACKAGE__->_factory(
+    [ qw(        Point
+
+    ) ],
+    {
+        'Point' => \%Point_of,
+    },
+    {
+        'Point' => 'ONVIF::Analytics::Types::Vector',
+    },
+    {
+
+        'Point' => 'Point',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Polyline
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Polyline from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Point
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polyline
+   Point => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm
new file mode 100644
index 000000000..cec5deb4e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::PolylineArray;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Segment_of :ATTR(:get<Segment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Segment
+        Extension
+
+    ) ],
+    {
+        'Segment' => \%Segment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Segment' => 'ONVIF::Analytics::Types::Polyline',
+        'Extension' => 'ONVIF::Analytics::Types::PolylineArrayExtension',
+    },
+    {
+
+        'Segment' => 'Segment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArray
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArray from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Segment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArray
+   Segment =>  { # ONVIF::Analytics::Types::Polyline
+     Point => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PolylineArrayExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm
new file mode 100644
index 000000000..2682aa621
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::PolylineArrayConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PolylineArray_of :ATTR(:get<PolylineArray>);
+
+__PACKAGE__->_factory(
+    [ qw(        PolylineArray
+
+    ) ],
+    {
+        'PolylineArray' => \%PolylineArray_of,
+    },
+    {
+        'PolylineArray' => 'ONVIF::Analytics::Types::PolylineArray',
+    },
+    {
+
+        'PolylineArray' => 'PolylineArray',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArrayConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArrayConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PolylineArray
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArrayConfiguration
+   PolylineArray =>  { # ONVIF::Analytics::Types::PolylineArray
+     Segment =>  { # ONVIF::Analytics::Types::Polyline
+       Point => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PolylineArrayExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm
new file mode 100644
index 000000000..4bff09a76
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PolylineArrayExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArrayExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArrayExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArrayExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm
new file mode 100644
index 000000000..68f378577
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PrefixedIPv4Address;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %PrefixLength_of :ATTR(:get<PrefixLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        PrefixLength
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'PrefixLength' => \%PrefixLength_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'PrefixLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Address' => 'Address',
+        'PrefixLength' => 'PrefixLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PrefixedIPv4Address
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PrefixedIPv4Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * PrefixLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PrefixedIPv4Address
+   Address => $some_value, # IPv4Address
+   PrefixLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm
new file mode 100644
index 000000000..82a554151
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PrefixedIPv6Address;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %PrefixLength_of :ATTR(:get<PrefixLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        PrefixLength
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'PrefixLength' => \%PrefixLength_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPv6Address',
+        'PrefixLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Address' => 'Address',
+        'PrefixLength' => 'PrefixLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PrefixedIPv6Address
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PrefixedIPv6Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * PrefixLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PrefixedIPv6Address
+   Address => $some_value, # IPv6Address
+   PrefixLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm
new file mode 100644
index 000000000..e084452c2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm
@@ -0,0 +1,247 @@
+package ONVIF::Analytics::Types::PresetTour;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Status_of :ATTR(:get<Status>);
+my %AutoStart_of :ATTR(:get<AutoStart>);
+my %StartingCondition_of :ATTR(:get<StartingCondition>);
+my %TourSpot_of :ATTR(:get<TourSpot>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Status
+        AutoStart
+        StartingCondition
+        TourSpot
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Status' => \%Status_of,
+        'AutoStart' => \%AutoStart_of,
+        'StartingCondition' => \%StartingCondition_of,
+        'TourSpot' => \%TourSpot_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'Status' => 'ONVIF::Analytics::Types::PTZPresetTourStatus',
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'StartingCondition' => 'ONVIF::Analytics::Types::PTZPresetTourStartingCondition',
+        'TourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpot',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Status' => 'Status',
+        'AutoStart' => 'AutoStart',
+        'StartingCondition' => 'StartingCondition',
+        'TourSpot' => 'TourSpot',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PresetTour
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PresetTour from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Status
+
+
+=item * AutoStart
+
+
+=item * StartingCondition
+
+
+=item * TourSpot
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PresetTour
+   Name => $some_value, # Name
+   Status =>  { # ONVIF::Analytics::Types::PTZPresetTourStatus
+     State => $some_value, # PTZPresetTourState
+     CurrentTourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+       PresetDetail =>        { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         PresetToken => $some_value, # ReferenceToken
+         Home =>  $some_value, # boolean
+         PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+         },
+       },
+       Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+         PanTilt => ,
+         Zoom => ,
+       },
+       StayTime =>  $some_value, # duration
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+     },
+   },
+   AutoStart =>  $some_value, # boolean
+   StartingCondition =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+     RecurringTime =>  $some_value, # int
+     RecurringDuration =>  $some_value, # duration
+     Direction => $some_value, # PTZPresetTourDirection
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+     },
+   },
+   TourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+     PresetDetail =>      { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+       },
+     },
+     Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     StayTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier of this preset tour.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm
new file mode 100644
index 000000000..bff819dfc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm
@@ -0,0 +1,414 @@
+package ONVIF::Analytics::Types::Profile;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Profile::_Profile::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %VideoSourceConfiguration_of :ATTR(:get<VideoSourceConfiguration>);
+my %AudioSourceConfiguration_of :ATTR(:get<AudioSourceConfiguration>);
+my %VideoEncoderConfiguration_of :ATTR(:get<VideoEncoderConfiguration>);
+my %AudioEncoderConfiguration_of :ATTR(:get<AudioEncoderConfiguration>);
+my %VideoAnalyticsConfiguration_of :ATTR(:get<VideoAnalyticsConfiguration>);
+my %PTZConfiguration_of :ATTR(:get<PTZConfiguration>);
+my %MetadataConfiguration_of :ATTR(:get<MetadataConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        VideoSourceConfiguration
+        AudioSourceConfiguration
+        VideoEncoderConfiguration
+        AudioEncoderConfiguration
+        VideoAnalyticsConfiguration
+        PTZConfiguration
+        MetadataConfiguration
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'VideoSourceConfiguration' => \%VideoSourceConfiguration_of,
+        'AudioSourceConfiguration' => \%AudioSourceConfiguration_of,
+        'VideoEncoderConfiguration' => \%VideoEncoderConfiguration_of,
+        'AudioEncoderConfiguration' => \%AudioEncoderConfiguration_of,
+        'VideoAnalyticsConfiguration' => \%VideoAnalyticsConfiguration_of,
+        'PTZConfiguration' => \%PTZConfiguration_of,
+        'MetadataConfiguration' => \%MetadataConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'VideoSourceConfiguration' => 'ONVIF::Analytics::Types::VideoSourceConfiguration',
+        'AudioSourceConfiguration' => 'ONVIF::Analytics::Types::AudioSourceConfiguration',
+        'VideoEncoderConfiguration' => 'ONVIF::Analytics::Types::VideoEncoderConfiguration',
+        'AudioEncoderConfiguration' => 'ONVIF::Analytics::Types::AudioEncoderConfiguration',
+        'VideoAnalyticsConfiguration' => 'ONVIF::Analytics::Types::VideoAnalyticsConfiguration',
+        'PTZConfiguration' => 'ONVIF::Analytics::Types::PTZConfiguration',
+        'MetadataConfiguration' => 'ONVIF::Analytics::Types::MetadataConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::ProfileExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'VideoSourceConfiguration' => 'VideoSourceConfiguration',
+        'AudioSourceConfiguration' => 'AudioSourceConfiguration',
+        'VideoEncoderConfiguration' => 'VideoEncoderConfiguration',
+        'AudioEncoderConfiguration' => 'AudioEncoderConfiguration',
+        'VideoAnalyticsConfiguration' => 'VideoAnalyticsConfiguration',
+        'PTZConfiguration' => 'PTZConfiguration',
+        'MetadataConfiguration' => 'MetadataConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Profile::_Profile::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+my %fixed_of :ATTR(:get<fixed>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+        fixed
+    ) ],
+    {
+
+        token => \%token_of,
+
+        fixed => \%fixed_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+        fixed => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Profile
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Profile from the namespace http://www.onvif.org/ver10/schema.
+
+A profile consists of a set of interconnected configuration entities. Configurations are provided by the NVT and can be either static or created dynamically by the NVT. For example, the dynamic configurations can be created by the NVT depending on current available encoding resources. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * VideoSourceConfiguration
+
+
+=item * AudioSourceConfiguration
+
+
+=item * VideoEncoderConfiguration
+
+
+=item * AudioEncoderConfiguration
+
+
+=item * VideoAnalyticsConfiguration
+
+
+=item * PTZConfiguration
+
+
+=item * MetadataConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Profile
+   Name => $some_value, # Name
+   VideoSourceConfiguration =>  { # ONVIF::Analytics::Types::VideoSourceConfiguration
+     SourceToken => $some_value, # ReferenceToken
+     Bounds => ,
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+       Rotate =>  { # ONVIF::Analytics::Types::Rotate
+         Mode => $some_value, # RotateMode
+         Degree =>  $some_value, # int
+         Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+       },
+     },
+   },
+   AudioSourceConfiguration =>  { # ONVIF::Analytics::Types::AudioSourceConfiguration
+     SourceToken => $some_value, # ReferenceToken
+   },
+   VideoEncoderConfiguration =>  { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+     Encoding => $some_value, # VideoEncoding
+     Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     Quality =>  $some_value, # float
+     RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+       FrameRateLimit =>  $some_value, # int
+       EncodingInterval =>  $some_value, # int
+       BitrateLimit =>  $some_value, # int
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+       GovLength =>  $some_value, # int
+       Mpeg4Profile => $some_value, # Mpeg4Profile
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+       GovLength =>  $some_value, # int
+       H264Profile => $some_value, # H264Profile
+     },
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   AudioEncoderConfiguration =>  { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+     Encoding => $some_value, # AudioEncoding
+     Bitrate =>  $some_value, # int
+     SampleRate =>  $some_value, # int
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+       Rule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+       },
+     },
+   },
+   PTZConfiguration =>  { # ONVIF::Analytics::Types::PTZConfiguration
+     NodeToken => $some_value, # ReferenceToken
+     DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+     DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+     DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+     DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+     DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+     DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+     DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     DefaultPTZTimeout =>  $some_value, # duration
+     PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+       Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         YRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+     },
+     ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+       Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+       PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+         EFlip =>  { # ONVIF::Analytics::Types::EFlip
+           Mode => $some_value, # EFlipMode
+         },
+         Reverse =>  { # ONVIF::Analytics::Types::Reverse
+           Mode => $some_value, # ReverseMode
+         },
+         Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+       },
+     },
+   },
+   MetadataConfiguration =>  { # ONVIF::Analytics::Types::MetadataConfiguration
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+       Status =>  $some_value, # boolean
+       Position =>  $some_value, # boolean
+     },
+     Analytics =>  $some_value, # boolean
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ProfileExtension
+     AudioOutputConfiguration =>  { # ONVIF::Analytics::Types::AudioOutputConfiguration
+       OutputToken => $some_value, # ReferenceToken
+       SendPrimacy =>  $some_value, # anyURI
+       OutputLevel =>  $some_value, # int
+     },
+     AudioDecoderConfiguration =>  { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ProfileExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Profile::_Profile::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier of the profile.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+=item * fixed
+
+ A value of true signals that the profile cannot be deleted. Default is false.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm
new file mode 100644
index 000000000..c923d8461
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ProfileCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfProfiles_of :ATTR(:get<MaximumNumberOfProfiles>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfProfiles
+
+    ) ],
+    {
+        'MaximumNumberOfProfiles' => \%MaximumNumberOfProfiles_of,
+    },
+    {
+        'MaximumNumberOfProfiles' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'MaximumNumberOfProfiles' => 'MaximumNumberOfProfiles',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfProfiles
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileCapabilities
+   MaximumNumberOfProfiles =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm
new file mode 100644
index 000000000..fba4940e2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::ProfileExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioOutputConfiguration_of :ATTR(:get<AudioOutputConfiguration>);
+my %AudioDecoderConfiguration_of :ATTR(:get<AudioDecoderConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioOutputConfiguration
+        AudioDecoderConfiguration
+        Extension
+
+    ) ],
+    {
+        'AudioOutputConfiguration' => \%AudioOutputConfiguration_of,
+        'AudioDecoderConfiguration' => \%AudioDecoderConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioOutputConfiguration' => 'ONVIF::Analytics::Types::AudioOutputConfiguration',
+        'AudioDecoderConfiguration' => 'ONVIF::Analytics::Types::AudioDecoderConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::ProfileExtension2',
+    },
+    {
+
+        'AudioOutputConfiguration' => 'AudioOutputConfiguration',
+        'AudioDecoderConfiguration' => 'AudioDecoderConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioOutputConfiguration
+
+
+=item * AudioDecoderConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileExtension
+   AudioOutputConfiguration =>  { # ONVIF::Analytics::Types::AudioOutputConfiguration
+     OutputToken => $some_value, # ReferenceToken
+     SendPrimacy =>  $some_value, # anyURI
+     OutputLevel =>  $some_value, # int
+   },
+   AudioDecoderConfiguration =>  { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ProfileExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm
new file mode 100644
index 000000000..29fd174e5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ProfileExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm
new file mode 100644
index 000000000..395b38b58
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PropertyOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PropertyOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm
new file mode 100644
index 000000000..e84341465
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::RealTimeStreamingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RTPMulticast_of :ATTR(:get<RTPMulticast>);
+my %RTP_TCP_of :ATTR(:get<RTP_TCP>);
+my %RTP_RTSP_TCP_of :ATTR(:get<RTP_RTSP_TCP>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RTPMulticast
+        RTP_TCP
+        RTP_RTSP_TCP
+        Extension
+
+    ) ],
+    {
+        'RTPMulticast' => \%RTPMulticast_of,
+        'RTP_TCP' => \%RTP_TCP_of,
+        'RTP_RTSP_TCP' => \%RTP_RTSP_TCP_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RTPMulticast' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_RTSP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension',
+    },
+    {
+
+        'RTPMulticast' => 'RTPMulticast',
+        'RTP_TCP' => 'RTP_TCP',
+        'RTP_RTSP_TCP' => 'RTP_RTSP_TCP',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RealTimeStreamingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RTPMulticast
+
+
+=item * RTP_TCP
+
+
+=item * RTP_RTSP_TCP
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+   RTPMulticast =>  $some_value, # boolean
+   RTP_TCP =>  $some_value, # boolean
+   RTP_RTSP_TCP =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm
new file mode 100644
index 000000000..6d569eba1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RealTimeStreamingCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm
new file mode 100644
index 000000000..b3e0f0edb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Receiver;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Token_of :ATTR(:get<Token>);
+my %Configuration_of :ATTR(:get<Configuration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Token
+        Configuration
+
+    ) ],
+    {
+        'Token' => \%Token_of,
+        'Configuration' => \%Configuration_of,
+    },
+    {
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Configuration' => 'ONVIF::Analytics::Types::ReceiverConfiguration',
+    },
+    {
+
+        'Token' => 'Token',
+        'Configuration' => 'Configuration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Receiver
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Receiver from the namespace http://www.onvif.org/ver10/schema.
+
+Description of a receiver, including its token and configuration. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Token
+
+
+=item * Configuration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Receiver
+   Token => $some_value, # ReferenceToken
+   Configuration =>  { # ONVIF::Analytics::Types::ReceiverConfiguration
+     Mode => $some_value, # ReceiverMode
+     MediaUri =>  $some_value, # anyURI
+     StreamSetup =>  { # ONVIF::Analytics::Types::StreamSetup
+       Stream => $some_value, # StreamType
+       Transport =>  { # ONVIF::Analytics::Types::Transport
+         Protocol => $some_value, # TransportProtocol
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm
new file mode 100644
index 000000000..8a27bff2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::ReceiverCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RTP_Multicast_of :ATTR(:get<RTP_Multicast>);
+my %RTP_TCP_of :ATTR(:get<RTP_TCP>);
+my %RTP_RTSP_TCP_of :ATTR(:get<RTP_RTSP_TCP>);
+my %SupportedReceivers_of :ATTR(:get<SupportedReceivers>);
+my %MaximumRTSPURILength_of :ATTR(:get<MaximumRTSPURILength>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RTP_Multicast
+        RTP_TCP
+        RTP_RTSP_TCP
+        SupportedReceivers
+        MaximumRTSPURILength
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RTP_Multicast' => \%RTP_Multicast_of,
+        'RTP_TCP' => \%RTP_TCP_of,
+        'RTP_RTSP_TCP' => \%RTP_RTSP_TCP_of,
+        'SupportedReceivers' => \%SupportedReceivers_of,
+        'MaximumRTSPURILength' => \%MaximumRTSPURILength_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RTP_Multicast' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_RTSP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedReceivers' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'MaximumRTSPURILength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RTP_Multicast' => 'RTP_Multicast',
+        'RTP_TCP' => 'RTP_TCP',
+        'RTP_RTSP_TCP' => 'RTP_RTSP_TCP',
+        'SupportedReceivers' => 'SupportedReceivers',
+        'MaximumRTSPURILength' => 'MaximumRTSPURILength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RTP_Multicast
+
+
+=item * RTP_TCP
+
+
+=item * RTP_RTSP_TCP
+
+
+=item * SupportedReceivers
+
+
+=item * MaximumRTSPURILength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverCapabilities
+   XAddr =>  $some_value, # anyURI
+   RTP_Multicast =>  $some_value, # boolean
+   RTP_TCP =>  $some_value, # boolean
+   RTP_RTSP_TCP =>  $some_value, # boolean
+   SupportedReceivers =>  $some_value, # int
+   MaximumRTSPURILength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm
new file mode 100644
index 000000000..60d4b4f90
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::ReceiverConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %MediaUri_of :ATTR(:get<MediaUri>);
+my %StreamSetup_of :ATTR(:get<StreamSetup>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        MediaUri
+        StreamSetup
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'MediaUri' => \%MediaUri_of,
+        'StreamSetup' => \%StreamSetup_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReceiverMode',
+        'MediaUri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'StreamSetup' => 'ONVIF::Analytics::Types::StreamSetup',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'MediaUri' => 'MediaUri',
+        'StreamSetup' => 'StreamSetup',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Describes the configuration of a receiver. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * MediaUri
+
+
+=item * StreamSetup
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverConfiguration
+   Mode => $some_value, # ReceiverMode
+   MediaUri =>  $some_value, # anyURI
+   StreamSetup =>  { # ONVIF::Analytics::Types::StreamSetup
+     Stream => $some_value, # StreamType
+     Transport =>  { # ONVIF::Analytics::Types::Transport
+       Protocol => $some_value, # TransportProtocol
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm
new file mode 100644
index 000000000..5ccaf84c6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverMode from the namespace http://www.onvif.org/ver10/schema.
+
+Specifies a receiver connection mode. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm
new file mode 100644
index 000000000..9447dbc2f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm
new file mode 100644
index 000000000..f5e7ad4b8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverState from the namespace http://www.onvif.org/ver10/schema.
+
+Specifies the current connection state of the receiver. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm
new file mode 100644
index 000000000..6e4b9e588
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::ReceiverStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %State_of :ATTR(:get<State>);
+my %AutoCreated_of :ATTR(:get<AutoCreated>);
+
+__PACKAGE__->_factory(
+    [ qw(        State
+        AutoCreated
+
+    ) ],
+    {
+        'State' => \%State_of,
+        'AutoCreated' => \%AutoCreated_of,
+    },
+    {
+        'State' => 'ONVIF::Analytics::Types::ReceiverState',
+        'AutoCreated' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'State' => 'State',
+        'AutoCreated' => 'AutoCreated',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+Contains information about a receiver's current state. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * State
+
+
+=item * AutoCreated
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverStateInformation
+   State => $some_value, # ReceiverState
+   AutoCreated =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm
new file mode 100644
index 000000000..62993cdd2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::RecordingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %ReceiverSource_of :ATTR(:get<ReceiverSource>);
+my %MediaProfileSource_of :ATTR(:get<MediaProfileSource>);
+my %DynamicRecordings_of :ATTR(:get<DynamicRecordings>);
+my %DynamicTracks_of :ATTR(:get<DynamicTracks>);
+my %MaxStringLength_of :ATTR(:get<MaxStringLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        ReceiverSource
+        MediaProfileSource
+        DynamicRecordings
+        DynamicTracks
+        MaxStringLength
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'ReceiverSource' => \%ReceiverSource_of,
+        'MediaProfileSource' => \%MediaProfileSource_of,
+        'DynamicRecordings' => \%DynamicRecordings_of,
+        'DynamicTracks' => \%DynamicTracks_of,
+        'MaxStringLength' => \%MaxStringLength_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'ReceiverSource' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MediaProfileSource' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynamicRecordings' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynamicTracks' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MaxStringLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'ReceiverSource' => 'ReceiverSource',
+        'MediaProfileSource' => 'MediaProfileSource',
+        'DynamicRecordings' => 'DynamicRecordings',
+        'DynamicTracks' => 'DynamicTracks',
+        'MaxStringLength' => 'MaxStringLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * ReceiverSource
+
+
+=item * MediaProfileSource
+
+
+=item * DynamicRecordings
+
+
+=item * DynamicTracks
+
+
+=item * MaxStringLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingCapabilities
+   XAddr =>  $some_value, # anyURI
+   ReceiverSource =>  $some_value, # boolean
+   MediaProfileSource =>  $some_value, # boolean
+   DynamicRecordings =>  $some_value, # boolean
+   DynamicTracks =>  $some_value, # boolean
+   MaxStringLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm
new file mode 100644
index 000000000..4ade11780
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::RecordingConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Content_of :ATTR(:get<Content>);
+my %MaximumRetentionTime_of :ATTR(:get<MaximumRetentionTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Content
+        MaximumRetentionTime
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Content' => \%Content_of,
+        'MaximumRetentionTime' => \%MaximumRetentionTime_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::RecordingSourceInformation',
+        'Content' => 'ONVIF::Analytics::Types::Description',
+        'MaximumRetentionTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Source' => 'Source',
+        'Content' => 'Content',
+        'MaximumRetentionTime' => 'MaximumRetentionTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+
+=item * Content
+
+
+=item * MaximumRetentionTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingConfiguration
+   Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+     SourceId =>  $some_value, # anyURI
+     Name => $some_value, # Name
+     Location => $some_value, # Description
+     Description => $some_value, # Description
+     Address =>  $some_value, # anyURI
+   },
+   Content => $some_value, # Description
+   MaximumRetentionTime =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm
new file mode 100644
index 000000000..f28a40c8c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm
@@ -0,0 +1,169 @@
+package ONVIF::Analytics::Types::RecordingInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Source_of :ATTR(:get<Source>);
+my %EarliestRecording_of :ATTR(:get<EarliestRecording>);
+my %LatestRecording_of :ATTR(:get<LatestRecording>);
+my %Content_of :ATTR(:get<Content>);
+my %Track_of :ATTR(:get<Track>);
+my %RecordingStatus_of :ATTR(:get<RecordingStatus>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Source
+        EarliestRecording
+        LatestRecording
+        Content
+        Track
+        RecordingStatus
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Source' => \%Source_of,
+        'EarliestRecording' => \%EarliestRecording_of,
+        'LatestRecording' => \%LatestRecording_of,
+        'Content' => \%Content_of,
+        'Track' => \%Track_of,
+        'RecordingStatus' => \%RecordingStatus_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Source' => 'ONVIF::Analytics::Types::RecordingSourceInformation',
+        'EarliestRecording' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'LatestRecording' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Content' => 'ONVIF::Analytics::Types::Description',
+        'Track' => 'ONVIF::Analytics::Types::TrackInformation',
+        'RecordingStatus' => 'ONVIF::Analytics::Types::RecordingStatus',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Source' => 'Source',
+        'EarliestRecording' => 'EarliestRecording',
+        'LatestRecording' => 'LatestRecording',
+        'Content' => 'Content',
+        'Track' => 'Track',
+        'RecordingStatus' => 'RecordingStatus',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Source
+
+
+=item * EarliestRecording
+
+
+=item * LatestRecording
+
+
+=item * Content
+
+
+=item * Track
+
+
+=item * RecordingStatus
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingInformation
+   RecordingToken => $some_value, # RecordingReference
+   Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+     SourceId =>  $some_value, # anyURI
+     Name => $some_value, # Name
+     Location => $some_value, # Description
+     Description => $some_value, # Description
+     Address =>  $some_value, # anyURI
+   },
+   EarliestRecording =>  $some_value, # dateTime
+   LatestRecording =>  $some_value, # dateTime
+   Content => $some_value, # Description
+   Track =>  { # ONVIF::Analytics::Types::TrackInformation
+     TrackToken => $some_value, # TrackReference
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+     DataFrom =>  $some_value, # dateTime
+     DataTo =>  $some_value, # dateTime
+   },
+   RecordingStatus => $some_value, # RecordingStatus
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm
new file mode 100644
index 000000000..96dee7293
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::RecordingJobConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Source_of :ATTR(:get<Source>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Mode
+        Priority
+        Source
+        Extension
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Source' => \%Source_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Mode' => 'ONVIF::Analytics::Types::RecordingJobMode',
+        'Priority' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Source' => 'ONVIF::Analytics::Types::RecordingJobSource',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobConfigurationExtension',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Source' => 'Source',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Source
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobConfiguration
+   RecordingToken => $some_value, # RecordingReference
+   Mode => $some_value, # RecordingJobMode
+   Priority =>  $some_value, # int
+   Source =>  { # ONVIF::Analytics::Types::RecordingJobSource
+     SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+       Token => $some_value, # ReferenceToken
+     },
+     AutoCreateReceiver =>  $some_value, # boolean
+     Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+       SourceTag =>  $some_value, # string
+       Destination => $some_value, # TrackReference
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm
new file mode 100644
index 000000000..36e91245d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm
new file mode 100644
index 000000000..947f64438
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm
new file mode 100644
index 000000000..d11a48e2c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm
new file mode 100644
index 000000000..b1a49182a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::RecordingJobSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %AutoCreateReceiver_of :ATTR(:get<AutoCreateReceiver>);
+my %Tracks_of :ATTR(:get<Tracks>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceToken
+        AutoCreateReceiver
+        Tracks
+        Extension
+
+    ) ],
+    {
+        'SourceToken' => \%SourceToken_of,
+        'AutoCreateReceiver' => \%AutoCreateReceiver_of,
+        'Tracks' => \%Tracks_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SourceToken' => 'ONVIF::Analytics::Types::SourceReference',
+        'AutoCreateReceiver' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Tracks' => 'ONVIF::Analytics::Types::RecordingJobTrack',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobSourceExtension',
+    },
+    {
+
+        'SourceToken' => 'SourceToken',
+        'AutoCreateReceiver' => 'AutoCreateReceiver',
+        'Tracks' => 'Tracks',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobSource from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * AutoCreateReceiver
+
+
+=item * Tracks
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobSource
+   SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   AutoCreateReceiver =>  $some_value, # boolean
+   Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+     SourceTag =>  $some_value, # string
+     Destination => $some_value, # TrackReference
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm
new file mode 100644
index 000000000..f4ba87152
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobSourceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobSourceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobSourceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm
new file mode 100644
index 000000000..30a799e3b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm
new file mode 100644
index 000000000..2c3e60f8a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::RecordingJobStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %State_of :ATTR(:get<State>);
+my %Sources_of :ATTR(:get<Sources>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        State
+        Sources
+        Extension
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'State' => \%State_of,
+        'Sources' => \%Sources_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+        'Sources' => 'ONVIF::Analytics::Types::RecordingJobStateSource',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobStateInformationExtension',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'State' => 'State',
+        'Sources' => 'Sources',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * State
+
+
+=item * Sources
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateInformation
+   RecordingToken => $some_value, # RecordingReference
+   State => $some_value, # RecordingJobState
+   Sources =>  { # ONVIF::Analytics::Types::RecordingJobStateSource
+     SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+       Token => $some_value, # ReferenceToken
+     },
+     State => $some_value, # RecordingJobState
+     Tracks =>  { # ONVIF::Analytics::Types::RecordingJobStateTracks
+       Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+         SourceTag =>  $some_value, # string
+         Destination => $some_value, # TrackReference
+         Error =>  $some_value, # string
+         State => $some_value, # RecordingJobState
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm
new file mode 100644
index 000000000..849778fa5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobStateInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm
new file mode 100644
index 000000000..0c57fe796
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::RecordingJobStateSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %State_of :ATTR(:get<State>);
+my %Tracks_of :ATTR(:get<Tracks>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceToken
+        State
+        Tracks
+
+    ) ],
+    {
+        'SourceToken' => \%SourceToken_of,
+        'State' => \%State_of,
+        'Tracks' => \%Tracks_of,
+    },
+    {
+        'SourceToken' => 'ONVIF::Analytics::Types::SourceReference',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+        'Tracks' => 'ONVIF::Analytics::Types::RecordingJobStateTracks',
+    },
+    {
+
+        'SourceToken' => 'SourceToken',
+        'State' => 'State',
+        'Tracks' => 'Tracks',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateSource from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * State
+
+
+=item * Tracks
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateSource
+   SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   State => $some_value, # RecordingJobState
+   Tracks =>  { # ONVIF::Analytics::Types::RecordingJobStateTracks
+     Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+       SourceTag =>  $some_value, # string
+       Destination => $some_value, # TrackReference
+       Error =>  $some_value, # string
+       State => $some_value, # RecordingJobState
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm
new file mode 100644
index 000000000..0fae234e3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::RecordingJobStateTrack;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceTag_of :ATTR(:get<SourceTag>);
+my %Destination_of :ATTR(:get<Destination>);
+my %Error_of :ATTR(:get<Error>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceTag
+        Destination
+        Error
+        State
+
+    ) ],
+    {
+        'SourceTag' => \%SourceTag_of,
+        'Destination' => \%Destination_of,
+        'Error' => \%Error_of,
+        'State' => \%State_of,
+    },
+    {
+        'SourceTag' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Destination' => 'ONVIF::Analytics::Types::TrackReference',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+    },
+    {
+
+        'SourceTag' => 'SourceTag',
+        'Destination' => 'Destination',
+        'Error' => 'Error',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateTrack
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateTrack from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceTag
+
+
+=item * Destination
+
+
+=item * Error
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateTrack
+   SourceTag =>  $some_value, # string
+   Destination => $some_value, # TrackReference
+   Error =>  $some_value, # string
+   State => $some_value, # RecordingJobState
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm
new file mode 100644
index 000000000..e7f1acd98
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm
@@ -0,0 +1,108 @@
+package ONVIF::Analytics::Types::RecordingJobStateTracks;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Track_of :ATTR(:get<Track>);
+
+__PACKAGE__->_factory(
+    [ qw(        Track
+
+    ) ],
+    {
+        'Track' => \%Track_of,
+    },
+    {
+        'Track' => 'ONVIF::Analytics::Types::RecordingJobStateTrack',
+    },
+    {
+
+        'Track' => 'Track',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateTracks
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateTracks from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Track
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateTracks
+   Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+     SourceTag =>  $some_value, # string
+     Destination => $some_value, # TrackReference
+     Error =>  $some_value, # string
+     State => $some_value, # RecordingJobState
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm
new file mode 100644
index 000000000..1c9a13e5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::RecordingJobTrack;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceTag_of :ATTR(:get<SourceTag>);
+my %Destination_of :ATTR(:get<Destination>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceTag
+        Destination
+
+    ) ],
+    {
+        'SourceTag' => \%SourceTag_of,
+        'Destination' => \%Destination_of,
+    },
+    {
+        'SourceTag' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Destination' => 'ONVIF::Analytics::Types::TrackReference',
+    },
+    {
+
+        'SourceTag' => 'SourceTag',
+        'Destination' => 'Destination',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobTrack
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobTrack from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceTag
+
+
+=item * Destination
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobTrack
+   SourceTag =>  $some_value, # string
+   Destination => $some_value, # TrackReference
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm
new file mode 100644
index 000000000..d9a277699
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm
new file mode 100644
index 000000000..b68d50d33
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::RecordingSourceInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceId_of :ATTR(:get<SourceId>);
+my %Name_of :ATTR(:get<Name>);
+my %Location_of :ATTR(:get<Location>);
+my %Description_of :ATTR(:get<Description>);
+my %Address_of :ATTR(:get<Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceId
+        Name
+        Location
+        Description
+        Address
+
+    ) ],
+    {
+        'SourceId' => \%SourceId_of,
+        'Name' => \%Name_of,
+        'Location' => \%Location_of,
+        'Description' => \%Description_of,
+        'Address' => \%Address_of,
+    },
+    {
+        'SourceId' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'Location' => 'ONVIF::Analytics::Types::Description',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+        'Address' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'SourceId' => 'SourceId',
+        'Name' => 'Name',
+        'Location' => 'Location',
+        'Description' => 'Description',
+        'Address' => 'Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingSourceInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingSourceInformation from the namespace http://www.onvif.org/ver10/schema.
+
+A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceId
+
+
+=item * Name
+
+
+=item * Location
+
+
+=item * Description
+
+
+=item * Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingSourceInformation
+   SourceId =>  $some_value, # anyURI
+   Name => $some_value, # Name
+   Location => $some_value, # Description
+   Description => $some_value, # Description
+   Address =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm
new file mode 100644
index 000000000..7ba3fed1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingStatus;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm
new file mode 100644
index 000000000..c53b402ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RecordingSummary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DataFrom_of :ATTR(:get<DataFrom>);
+my %DataUntil_of :ATTR(:get<DataUntil>);
+my %NumberRecordings_of :ATTR(:get<NumberRecordings>);
+
+__PACKAGE__->_factory(
+    [ qw(        DataFrom
+        DataUntil
+        NumberRecordings
+
+    ) ],
+    {
+        'DataFrom' => \%DataFrom_of,
+        'DataUntil' => \%DataUntil_of,
+        'NumberRecordings' => \%NumberRecordings_of,
+    },
+    {
+        'DataFrom' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'DataUntil' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'NumberRecordings' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'DataFrom' => 'DataFrom',
+        'DataUntil' => 'DataUntil',
+        'NumberRecordings' => 'NumberRecordings',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingSummary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingSummary from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DataFrom
+
+
+=item * DataUntil
+
+
+=item * NumberRecordings
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingSummary
+   DataFrom =>  $some_value, # dateTime
+   DataUntil =>  $some_value, # dateTime
+   NumberRecordings =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm
new file mode 100644
index 000000000..180c2081b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::Rectangle;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %bottom_of :ATTR(:get<bottom>);
+my %top_of :ATTR(:get<top>);
+my %right_of :ATTR(:get<right>);
+my %left_of :ATTR(:get<left>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        bottom
+        top
+        right
+        left
+    ) ],
+    {
+
+        bottom => \%bottom_of,
+
+        top => \%top_of,
+
+        right => \%right_of,
+
+        left => \%left_of,
+    },
+    {
+        bottom => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        top => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        right => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        left => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rectangle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rectangle from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * bottom
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * top
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * right
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * left
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm
new file mode 100644
index 000000000..b77ccfd7c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReferenceToken;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReferenceToken from the namespace http://www.onvif.org/ver10/schema.
+
+Unique identifier for a physical or logical resource. Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class. Length up to 64 characters.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm
new file mode 100644
index 000000000..a111f5d6a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::RelativeFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocus
+   Distance =>  $some_value, # float
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm
new file mode 100644
index 000000000..47ba1237d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::RelativeFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocusOptions
+   Distance =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm
new file mode 100644
index 000000000..81e706fab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::RelativeFocusOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocusOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocusOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocusOptions20
+   Distance =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm
new file mode 100644
index 000000000..b59b35f86
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayIdleState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayIdleState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm
new file mode 100644
index 000000000..14e4a2776
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayLogicalState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayLogicalState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm
new file mode 100644
index 000000000..67cb69d00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm
new file mode 100644
index 000000000..da73c5508
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm
@@ -0,0 +1,110 @@
+package ONVIF::Analytics::Types::RelayOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Properties_of :ATTR(:get<Properties>);
+
+__PACKAGE__->_factory(
+    [ qw(        Properties
+
+    ) ],
+    {
+        'Properties' => \%Properties_of,
+    },
+    {
+        'Properties' => 'ONVIF::Analytics::Types::RelayOutputSettings',
+    },
+    {
+
+        'Properties' => 'Properties',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelayOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelayOutput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Properties
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelayOutput
+   Properties =>  { # ONVIF::Analytics::Types::RelayOutputSettings
+     Mode => $some_value, # RelayMode
+     DelayTime =>  $some_value, # duration
+     IdleState => $some_value, # RelayIdleState
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm
new file mode 100644
index 000000000..b0b942587
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RelayOutputSettings;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %DelayTime_of :ATTR(:get<DelayTime>);
+my %IdleState_of :ATTR(:get<IdleState>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        DelayTime
+        IdleState
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'DelayTime' => \%DelayTime_of,
+        'IdleState' => \%IdleState_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RelayMode',
+        'DelayTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'IdleState' => 'ONVIF::Analytics::Types::RelayIdleState',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'DelayTime' => 'DelayTime',
+        'IdleState' => 'IdleState',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelayOutputSettings
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelayOutputSettings from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * DelayTime
+
+
+=item * IdleState
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelayOutputSettings
+   Mode => $some_value, # RelayMode
+   DelayTime =>  $some_value, # duration
+   IdleState => $some_value, # RelayIdleState
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm
new file mode 100644
index 000000000..5d4ee46c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RemoteUser;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Username_of :ATTR(:get<Username>);
+my %Password_of :ATTR(:get<Password>);
+my %UseDerivedPassword_of :ATTR(:get<UseDerivedPassword>);
+
+__PACKAGE__->_factory(
+    [ qw(        Username
+        Password
+        UseDerivedPassword
+
+    ) ],
+    {
+        'Username' => \%Username_of,
+        'Password' => \%Password_of,
+        'UseDerivedPassword' => \%UseDerivedPassword_of,
+    },
+    {
+        'Username' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UseDerivedPassword' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Username' => 'Username',
+        'Password' => 'Password',
+        'UseDerivedPassword' => 'UseDerivedPassword',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RemoteUser
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RemoteUser from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Username
+
+
+=item * Password
+
+
+=item * UseDerivedPassword
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RemoteUser
+   Username =>  $some_value, # string
+   Password =>  $some_value, # string
+   UseDerivedPassword =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm
new file mode 100644
index 000000000..07c215e38
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Rename;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rename
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rename from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Rename
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm
new file mode 100644
index 000000000..94c73655a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ReplayCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReplayCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReplayCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReplayCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm
new file mode 100644
index 000000000..9ae67956e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ReplayConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        SessionTimeout
+
+    ) ],
+    {
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReplayConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReplayConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Configuration parameters for the replay service. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReplayConfiguration
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm
new file mode 100644
index 000000000..54e9fe9f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Reverse;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReverseMode',
+    },
+    {
+
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Reverse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Reverse from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Reverse
+   Mode => $some_value, # ReverseMode
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm
new file mode 100644
index 000000000..4380cfb3a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReverseMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReverseMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm
new file mode 100644
index 000000000..ba4cc93f1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::ReverseOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReverseMode',
+        'Extension' => 'ONVIF::Analytics::Types::ReverseOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReverseOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReverseOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReverseOptions
+   Mode => $some_value, # ReverseMode
+   Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm
new file mode 100644
index 000000000..540fabd6c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ReverseOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReverseOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReverseOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReverseOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm
new file mode 100644
index 000000000..801082f56
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Rotate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Degree_of :ATTR(:get<Degree>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Degree
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Degree' => \%Degree_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RotateMode',
+        'Degree' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::RotateExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Degree' => 'Degree',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rotate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rotate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Degree
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Rotate
+   Mode => $some_value, # RotateMode
+   Degree =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm
new file mode 100644
index 000000000..8fe572d08
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RotateExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm
new file mode 100644
index 000000000..f6f09f30b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RotateMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RotateMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm
new file mode 100644
index 000000000..3af81f8a2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::RotateOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %DegreeList_of :ATTR(:get<DegreeList>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        DegreeList
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'DegreeList' => \%DegreeList_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RotateMode',
+        'DegreeList' => 'ONVIF::Analytics::Types::IntList',
+        'Extension' => 'ONVIF::Analytics::Types::RotateOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'DegreeList' => 'DegreeList',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * DegreeList
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateOptions
+   Mode => $some_value, # RotateMode
+   DegreeList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm
new file mode 100644
index 000000000..6f12f5898
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RotateOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm
new file mode 100644
index 000000000..9a2ddcfc3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RuleEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rule_of :ATTR(:get<Rule>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rule
+        Extension
+
+    ) ],
+    {
+        'Rule' => \%Rule_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::RuleEngineConfigurationExtension',
+    },
+    {
+
+        'Rule' => 'Rule',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RuleEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RuleEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rule
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RuleEngineConfiguration
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm
new file mode 100644
index 000000000..6664059e1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RuleEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RuleEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm
new file mode 100644
index 000000000..9976def16
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Scope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ScopeDef_of :ATTR(:get<ScopeDef>);
+my %ScopeItem_of :ATTR(:get<ScopeItem>);
+
+__PACKAGE__->_factory(
+    [ qw(        ScopeDef
+        ScopeItem
+
+    ) ],
+    {
+        'ScopeDef' => \%ScopeDef_of,
+        'ScopeItem' => \%ScopeItem_of,
+    },
+    {
+        'ScopeDef' => 'ONVIF::Analytics::Types::ScopeDefinition',
+        'ScopeItem' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'ScopeDef' => 'ScopeDef',
+        'ScopeItem' => 'ScopeItem',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Scope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Scope from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ScopeDef
+
+
+=item * ScopeItem
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Scope
+   ScopeDef => $some_value, # ScopeDefinition
+   ScopeItem =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm
new file mode 100644
index 000000000..947a12244
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ScopeDefinition;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ScopeDefinition from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm
new file mode 100644
index 000000000..dac0bff4a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::SearchCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %MetadataSearch_of :ATTR(:get<MetadataSearch>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        MetadataSearch
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'MetadataSearch' => \%MetadataSearch_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'MetadataSearch' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'MetadataSearch' => 'MetadataSearch',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * MetadataSearch
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchCapabilities
+   XAddr =>  $some_value, # anyURI
+   MetadataSearch =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm
new file mode 100644
index 000000000..c46182384
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::SearchScope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IncludedSources_of :ATTR(:get<IncludedSources>);
+my %IncludedRecordings_of :ATTR(:get<IncludedRecordings>);
+my %RecordingInformationFilter_of :ATTR(:get<RecordingInformationFilter>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IncludedSources
+        IncludedRecordings
+        RecordingInformationFilter
+        Extension
+
+    ) ],
+    {
+        'IncludedSources' => \%IncludedSources_of,
+        'IncludedRecordings' => \%IncludedRecordings_of,
+        'RecordingInformationFilter' => \%RecordingInformationFilter_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IncludedSources' => 'ONVIF::Analytics::Types::SourceReference',
+        'IncludedRecordings' => 'ONVIF::Analytics::Types::RecordingReference',
+        'RecordingInformationFilter' => 'ONVIF::Analytics::Types::XPathExpression',
+        'Extension' => 'ONVIF::Analytics::Types::SearchScopeExtension',
+    },
+    {
+
+        'IncludedSources' => 'IncludedSources',
+        'IncludedRecordings' => 'IncludedRecordings',
+        'RecordingInformationFilter' => 'RecordingInformationFilter',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchScope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchScope from the namespace http://www.onvif.org/ver10/schema.
+
+A structure for defining a limited scope when searching in recorded data.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IncludedSources
+
+
+=item * IncludedRecordings
+
+
+=item * RecordingInformationFilter
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchScope
+   IncludedSources =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   IncludedRecordings => $some_value, # RecordingReference
+   RecordingInformationFilter => $some_value, # XPathExpression
+   Extension =>  { # ONVIF::Analytics::Types::SearchScopeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm
new file mode 100644
index 000000000..44678bce2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SearchScopeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchScopeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchScopeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchScopeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm
new file mode 100644
index 000000000..f5e52a857
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SearchState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SearchState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm
new file mode 100644
index 000000000..88206f48a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm
@@ -0,0 +1,200 @@
+package ONVIF::Analytics::Types::SecurityCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLS1__1_of :ATTR(:get<TLS1__1>);
+my %TLS1__2_of :ATTR(:get<TLS1__2>);
+my %OnboardKeyGeneration_of :ATTR(:get<OnboardKeyGeneration>);
+my %AccessPolicyConfig_of :ATTR(:get<AccessPolicyConfig>);
+my %X__509Token_of :ATTR(:get<X__509Token>);
+my %SAMLToken_of :ATTR(:get<SAMLToken>);
+my %KerberosToken_of :ATTR(:get<KerberosToken>);
+my %RELToken_of :ATTR(:get<RELToken>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLS1__1
+        TLS1__2
+        OnboardKeyGeneration
+        AccessPolicyConfig
+        X__509Token
+        SAMLToken
+        KerberosToken
+        RELToken
+        Extension
+
+    ) ],
+    {
+        'TLS1__1' => \%TLS1__1_of,
+        'TLS1__2' => \%TLS1__2_of,
+        'OnboardKeyGeneration' => \%OnboardKeyGeneration_of,
+        'AccessPolicyConfig' => \%AccessPolicyConfig_of,
+        'X__509Token' => \%X__509Token_of,
+        'SAMLToken' => \%SAMLToken_of,
+        'KerberosToken' => \%KerberosToken_of,
+        'RELToken' => \%RELToken_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLS1__1' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'TLS1__2' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'OnboardKeyGeneration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AccessPolicyConfig' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'X__509Token' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SAMLToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'KerberosToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RELToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SecurityCapabilitiesExtension',
+    },
+    {
+
+        'TLS1__1' => 'TLS1.1',
+        'TLS1__2' => 'TLS1.2',
+        'OnboardKeyGeneration' => 'OnboardKeyGeneration',
+        'AccessPolicyConfig' => 'AccessPolicyConfig',
+        'X__509Token' => 'X.509Token',
+        'SAMLToken' => 'SAMLToken',
+        'KerberosToken' => 'KerberosToken',
+        'RELToken' => 'RELToken',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLS1__1
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.1
+
+
+=item * TLS1__2
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.2
+
+
+=item * OnboardKeyGeneration
+
+
+=item * AccessPolicyConfig
+
+
+=item * X__509Token
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ X.509Token
+
+
+=item * SAMLToken
+
+
+=item * KerberosToken
+
+
+=item * RELToken
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilities
+   TLS1__1 =>  $some_value, # boolean
+   TLS1__2 =>  $some_value, # boolean
+   OnboardKeyGeneration =>  $some_value, # boolean
+   AccessPolicyConfig =>  $some_value, # boolean
+   X__509Token =>  $some_value, # boolean
+   SAMLToken =>  $some_value, # boolean
+   KerberosToken =>  $some_value, # boolean
+   RELToken =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+     TLS1__0 =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+       Dot1X =>  $some_value, # boolean
+       SupportedEAPMethod =>  $some_value, # int
+       RemoteUserHandling =>  $some_value, # boolean
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm
new file mode 100644
index 000000000..5ddfe67d4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::SecurityCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLS1__0_of :ATTR(:get<TLS1__0>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLS1__0
+        Extension
+
+    ) ],
+    {
+        'TLS1__0' => \%TLS1__0_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLS1__0' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SecurityCapabilitiesExtension2',
+    },
+    {
+
+        'TLS1__0' => 'TLS1.0',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLS1__0
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.0
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+   TLS1__0 =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+     Dot1X =>  $some_value, # boolean
+     SupportedEAPMethod =>  $some_value, # int
+     RemoteUserHandling =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm
new file mode 100644
index 000000000..51498a5e6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::SecurityCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot1X_of :ATTR(:get<Dot1X>);
+my %SupportedEAPMethod_of :ATTR(:get<SupportedEAPMethod>);
+my %RemoteUserHandling_of :ATTR(:get<RemoteUserHandling>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot1X
+        SupportedEAPMethod
+        RemoteUserHandling
+
+    ) ],
+    {
+        'Dot1X' => \%Dot1X_of,
+        'SupportedEAPMethod' => \%SupportedEAPMethod_of,
+        'RemoteUserHandling' => \%RemoteUserHandling_of,
+    },
+    {
+        'Dot1X' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedEAPMethod' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RemoteUserHandling' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Dot1X' => 'Dot1X',
+        'SupportedEAPMethod' => 'SupportedEAPMethod',
+        'RemoteUserHandling' => 'RemoteUserHandling',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot1X
+
+
+=item * SupportedEAPMethod
+
+
+=item * RemoteUserHandling
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+   Dot1X =>  $some_value, # boolean
+   SupportedEAPMethod =>  $some_value, # int
+   RemoteUserHandling =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm
new file mode 100644
index 000000000..c1e2add46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SetDateTimeType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SetDateTimeType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm
new file mode 100644
index 000000000..a974ed995
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::ShapeDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundingBox_of :ATTR(:get<BoundingBox>);
+my %CenterOfGravity_of :ATTR(:get<CenterOfGravity>);
+my %Polygon_of :ATTR(:get<Polygon>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundingBox
+        CenterOfGravity
+        Polygon
+        Extension
+
+    ) ],
+    {
+        'BoundingBox' => \%BoundingBox_of,
+        'CenterOfGravity' => \%CenterOfGravity_of,
+        'Polygon' => \%Polygon_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundingBox' => 'ONVIF::Analytics::Types::Rectangle',
+        'CenterOfGravity' => 'ONVIF::Analytics::Types::Vector',
+        'Polygon' => 'ONVIF::Analytics::Types::Polygon',
+        'Extension' => 'ONVIF::Analytics::Types::ShapeDescriptorExtension',
+    },
+    {
+
+        'BoundingBox' => 'BoundingBox',
+        'CenterOfGravity' => 'CenterOfGravity',
+        'Polygon' => 'Polygon',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ShapeDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ShapeDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundingBox
+
+
+=item * CenterOfGravity
+
+
+=item * Polygon
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ShapeDescriptor
+   BoundingBox => ,
+   CenterOfGravity => ,
+   Polygon =>  { # ONVIF::Analytics::Types::Polygon
+     Point => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm
new file mode 100644
index 000000000..5d1f7aca0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ShapeDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ShapeDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ShapeDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm
new file mode 100644
index 000000000..b7374df75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::SourceIdentification;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Token_of :ATTR(:get<Token>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Token
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Token' => \%Token_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::SourceIdentificationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Token' => 'Token',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceIdentification
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceIdentification from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Token
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceIdentification
+   Name =>  $some_value, # string
+   Token => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::SourceIdentificationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm
new file mode 100644
index 000000000..df00c4a61
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SourceIdentificationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceIdentificationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceIdentificationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceIdentificationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm
new file mode 100644
index 000000000..4944eedd9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::SourceReference;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Token_of :ATTR(:get<Token>);
+
+__PACKAGE__->_factory(
+    [ qw(        Token
+
+    ) ],
+    {
+        'Token' => \%Token_of,
+    },
+    {
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Token' => 'Token',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Type
+    ) ],
+    {
+
+        Type => \%Type_of,
+    },
+    {
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Token
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceReference
+   Token => $some_value, # ReferenceToken
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Type
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm
new file mode 100644
index 000000000..1b602d932
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::Space1DDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %URI_of :ATTR(:get<URI>);
+my %XRange_of :ATTR(:get<XRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        URI
+        XRange
+
+    ) ],
+    {
+        'URI' => \%URI_of,
+        'XRange' => \%XRange_of,
+    },
+    {
+        'URI' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'XRange' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'URI' => 'URI',
+        'XRange' => 'XRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Space1DDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Space1DDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * URI
+
+
+=item * XRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Space1DDescription
+   URI =>  $some_value, # anyURI
+   XRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm
new file mode 100644
index 000000000..c8a4bceea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::Space2DDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %URI_of :ATTR(:get<URI>);
+my %XRange_of :ATTR(:get<XRange>);
+my %YRange_of :ATTR(:get<YRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        URI
+        XRange
+        YRange
+
+    ) ],
+    {
+        'URI' => \%URI_of,
+        'XRange' => \%XRange_of,
+        'YRange' => \%YRange_of,
+    },
+    {
+        'URI' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'XRange' => 'ONVIF::Analytics::Types::FloatRange',
+        'YRange' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'URI' => 'URI',
+        'XRange' => 'XRange',
+        'YRange' => 'YRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Space2DDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Space2DDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * URI
+
+
+=item * XRange
+
+
+=item * YRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Space2DDescription
+   URI =>  $some_value, # anyURI
+   XRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm
new file mode 100644
index 000000000..afc0d186e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Split;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Split
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Split from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Split
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm
new file mode 100644
index 000000000..f466bff11
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::StreamSetup;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Stream_of :ATTR(:get<Stream>);
+my %Transport_of :ATTR(:get<Transport>);
+
+__PACKAGE__->_factory(
+    [ qw(        Stream
+        Transport
+
+    ) ],
+    {
+        'Stream' => \%Stream_of,
+        'Transport' => \%Transport_of,
+    },
+    {
+        'Stream' => 'ONVIF::Analytics::Types::StreamType',
+        'Transport' => 'ONVIF::Analytics::Types::Transport',
+    },
+    {
+
+        'Stream' => 'Stream',
+        'Transport' => 'Transport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::StreamSetup
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+StreamSetup from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Stream
+
+
+=item * Transport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::StreamSetup
+   Stream => $some_value, # StreamType
+   Transport =>  { # ONVIF::Analytics::Types::Transport
+     Protocol => $some_value, # TransportProtocol
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm
new file mode 100644
index 000000000..c61236c97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::StreamType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+StreamType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm
new file mode 100644
index 000000000..2443b43ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::StringAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+StringAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm
new file mode 100644
index 000000000..85006a054
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::SupportInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Binary_of :ATTR(:get<Binary>);
+my %String_of :ATTR(:get<String>);
+
+__PACKAGE__->_factory(
+    [ qw(        Binary
+        String
+
+    ) ],
+    {
+        'Binary' => \%Binary_of,
+        'String' => \%String_of,
+    },
+    {
+        'Binary' => 'ONVIF::Analytics::Types::AttachmentData',
+        'String' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Binary' => 'Binary',
+        'String' => 'String',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Binary
+
+
+=item * String
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportInformation
+   Binary =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+   String =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm
new file mode 100644
index 000000000..3ac211144
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::SupportedAnalyticsModules;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModuleContentSchemaLocation_of :ATTR(:get<AnalyticsModuleContentSchemaLocation>);
+my %AnalyticsModuleDescription_of :ATTR(:get<AnalyticsModuleDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModuleContentSchemaLocation
+        AnalyticsModuleDescription
+        Extension
+
+    ) ],
+    {
+        'AnalyticsModuleContentSchemaLocation' => \%AnalyticsModuleContentSchemaLocation_of,
+        'AnalyticsModuleDescription' => \%AnalyticsModuleDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AnalyticsModuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'AnalyticsModuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+        'Extension' => 'ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension',
+    },
+    {
+
+        'AnalyticsModuleContentSchemaLocation' => 'AnalyticsModuleContentSchemaLocation',
+        'AnalyticsModuleDescription' => 'AnalyticsModuleDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedAnalyticsModules from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModuleContentSchemaLocation
+
+
+=item * AnalyticsModuleDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedAnalyticsModules
+   AnalyticsModuleContentSchemaLocation =>  $some_value, # anyURI
+   AnalyticsModuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+     Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+       SimpleItemDescription => ,
+       ElementItemDescription => ,
+       Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+       },
+     },
+     Messages =>  {
+       ParentTopic =>  $some_value, # string
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm
new file mode 100644
index 000000000..1d2054c36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedAnalyticsModulesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm
new file mode 100644
index 000000000..41555c585
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::SupportedRules;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RuleContentSchemaLocation_of :ATTR(:get<RuleContentSchemaLocation>);
+my %RuleDescription_of :ATTR(:get<RuleDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RuleContentSchemaLocation
+        RuleDescription
+        Extension
+
+    ) ],
+    {
+        'RuleContentSchemaLocation' => \%RuleContentSchemaLocation_of,
+        'RuleDescription' => \%RuleDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+        'Extension' => 'ONVIF::Analytics::Types::SupportedRulesExtension',
+    },
+    {
+
+        'RuleContentSchemaLocation' => 'RuleContentSchemaLocation',
+        'RuleDescription' => 'RuleDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedRules from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RuleContentSchemaLocation
+
+
+=item * RuleDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedRules
+   RuleContentSchemaLocation =>  $some_value, # anyURI
+   RuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+     Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+       SimpleItemDescription => ,
+       ElementItemDescription => ,
+       Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+       },
+     },
+     Messages =>  {
+       ParentTopic =>  $some_value, # string
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SupportedRulesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm
new file mode 100644
index 000000000..6d3f89691
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SupportedRulesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedRulesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedRulesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedRulesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm
new file mode 100644
index 000000000..e3f34aca3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::SystemCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DiscoveryResolve_of :ATTR(:get<DiscoveryResolve>);
+my %DiscoveryBye_of :ATTR(:get<DiscoveryBye>);
+my %RemoteDiscovery_of :ATTR(:get<RemoteDiscovery>);
+my %SystemBackup_of :ATTR(:get<SystemBackup>);
+my %SystemLogging_of :ATTR(:get<SystemLogging>);
+my %FirmwareUpgrade_of :ATTR(:get<FirmwareUpgrade>);
+my %SupportedVersions_of :ATTR(:get<SupportedVersions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        DiscoveryResolve
+        DiscoveryBye
+        RemoteDiscovery
+        SystemBackup
+        SystemLogging
+        FirmwareUpgrade
+        SupportedVersions
+        Extension
+
+    ) ],
+    {
+        'DiscoveryResolve' => \%DiscoveryResolve_of,
+        'DiscoveryBye' => \%DiscoveryBye_of,
+        'RemoteDiscovery' => \%RemoteDiscovery_of,
+        'SystemBackup' => \%SystemBackup_of,
+        'SystemLogging' => \%SystemLogging_of,
+        'FirmwareUpgrade' => \%FirmwareUpgrade_of,
+        'SupportedVersions' => \%SupportedVersions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'DiscoveryResolve' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DiscoveryBye' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RemoteDiscovery' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SystemBackup' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SystemLogging' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'FirmwareUpgrade' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedVersions' => 'ONVIF::Analytics::Types::OnvifVersion',
+        'Extension' => 'ONVIF::Analytics::Types::SystemCapabilitiesExtension',
+    },
+    {
+
+        'DiscoveryResolve' => 'DiscoveryResolve',
+        'DiscoveryBye' => 'DiscoveryBye',
+        'RemoteDiscovery' => 'RemoteDiscovery',
+        'SystemBackup' => 'SystemBackup',
+        'SystemLogging' => 'SystemLogging',
+        'FirmwareUpgrade' => 'FirmwareUpgrade',
+        'SupportedVersions' => 'SupportedVersions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DiscoveryResolve
+
+
+=item * DiscoveryBye
+
+
+=item * RemoteDiscovery
+
+
+=item * SystemBackup
+
+
+=item * SystemLogging
+
+
+=item * FirmwareUpgrade
+
+
+=item * SupportedVersions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilities
+   DiscoveryResolve =>  $some_value, # boolean
+   DiscoveryBye =>  $some_value, # boolean
+   RemoteDiscovery =>  $some_value, # boolean
+   SystemBackup =>  $some_value, # boolean
+   SystemLogging =>  $some_value, # boolean
+   FirmwareUpgrade =>  $some_value, # boolean
+   SupportedVersions =>  { # ONVIF::Analytics::Types::OnvifVersion
+     Major =>  $some_value, # int
+     Minor =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+     HttpFirmwareUpgrade =>  $some_value, # boolean
+     HttpSystemBackup =>  $some_value, # boolean
+     HttpSystemLogging =>  $some_value, # boolean
+     HttpSupportInformation =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm
new file mode 100644
index 000000000..4bf5cc0c6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::SystemCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %HttpFirmwareUpgrade_of :ATTR(:get<HttpFirmwareUpgrade>);
+my %HttpSystemBackup_of :ATTR(:get<HttpSystemBackup>);
+my %HttpSystemLogging_of :ATTR(:get<HttpSystemLogging>);
+my %HttpSupportInformation_of :ATTR(:get<HttpSupportInformation>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        HttpFirmwareUpgrade
+        HttpSystemBackup
+        HttpSystemLogging
+        HttpSupportInformation
+        Extension
+
+    ) ],
+    {
+        'HttpFirmwareUpgrade' => \%HttpFirmwareUpgrade_of,
+        'HttpSystemBackup' => \%HttpSystemBackup_of,
+        'HttpSystemLogging' => \%HttpSystemLogging_of,
+        'HttpSupportInformation' => \%HttpSupportInformation_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'HttpFirmwareUpgrade' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSystemBackup' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSystemLogging' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSupportInformation' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SystemCapabilitiesExtension2',
+    },
+    {
+
+        'HttpFirmwareUpgrade' => 'HttpFirmwareUpgrade',
+        'HttpSystemBackup' => 'HttpSystemBackup',
+        'HttpSystemLogging' => 'HttpSystemLogging',
+        'HttpSupportInformation' => 'HttpSupportInformation',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * HttpFirmwareUpgrade
+
+
+=item * HttpSystemBackup
+
+
+=item * HttpSystemLogging
+
+
+=item * HttpSupportInformation
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+   HttpFirmwareUpgrade =>  $some_value, # boolean
+   HttpSystemBackup =>  $some_value, # boolean
+   HttpSystemLogging =>  $some_value, # boolean
+   HttpSupportInformation =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm
new file mode 100644
index 000000000..1067d599f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SystemCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm
new file mode 100644
index 000000000..12d9cef01
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm
@@ -0,0 +1,173 @@
+package ONVIF::Analytics::Types::SystemDateTime;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DateTimeType_of :ATTR(:get<DateTimeType>);
+my %DaylightSavings_of :ATTR(:get<DaylightSavings>);
+my %TimeZone_of :ATTR(:get<TimeZone>);
+my %UTCDateTime_of :ATTR(:get<UTCDateTime>);
+my %LocalDateTime_of :ATTR(:get<LocalDateTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        DateTimeType
+        DaylightSavings
+        TimeZone
+        UTCDateTime
+        LocalDateTime
+        Extension
+
+    ) ],
+    {
+        'DateTimeType' => \%DateTimeType_of,
+        'DaylightSavings' => \%DaylightSavings_of,
+        'TimeZone' => \%TimeZone_of,
+        'UTCDateTime' => \%UTCDateTime_of,
+        'LocalDateTime' => \%LocalDateTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'DateTimeType' => 'ONVIF::Analytics::Types::SetDateTimeType',
+        'DaylightSavings' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'TimeZone' => 'ONVIF::Analytics::Types::TimeZone',
+        'UTCDateTime' => 'ONVIF::Analytics::Types::DateTime',
+        'LocalDateTime' => 'ONVIF::Analytics::Types::DateTime',
+        'Extension' => 'ONVIF::Analytics::Types::SystemDateTimeExtension',
+    },
+    {
+
+        'DateTimeType' => 'DateTimeType',
+        'DaylightSavings' => 'DaylightSavings',
+        'TimeZone' => 'TimeZone',
+        'UTCDateTime' => 'UTCDateTime',
+        'LocalDateTime' => 'LocalDateTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemDateTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemDateTime from the namespace http://www.onvif.org/ver10/schema.
+
+General date time inforamtion returned by the GetSystemDateTime method.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DateTimeType
+
+
+=item * DaylightSavings
+
+
+=item * TimeZone
+
+
+=item * UTCDateTime
+
+
+=item * LocalDateTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemDateTime
+   DateTimeType => $some_value, # SetDateTimeType
+   DaylightSavings =>  $some_value, # boolean
+   TimeZone =>  { # ONVIF::Analytics::Types::TimeZone
+     TZ =>  $some_value, # token
+   },
+   UTCDateTime =>  { # ONVIF::Analytics::Types::DateTime
+     Time =>  { # ONVIF::Analytics::Types::Time
+       Hour =>  $some_value, # int
+       Minute =>  $some_value, # int
+       Second =>  $some_value, # int
+     },
+     Date =>  { # ONVIF::Analytics::Types::Date
+       Year =>  $some_value, # int
+       Month =>  $some_value, # int
+       Day =>  $some_value, # int
+     },
+   },
+   LocalDateTime =>  { # ONVIF::Analytics::Types::DateTime
+     Time =>  { # ONVIF::Analytics::Types::Time
+       Hour =>  $some_value, # int
+       Minute =>  $some_value, # int
+       Second =>  $some_value, # int
+     },
+     Date =>  { # ONVIF::Analytics::Types::Date
+       Year =>  $some_value, # int
+       Month =>  $some_value, # int
+       Day =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SystemDateTimeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm
new file mode 100644
index 000000000..646dc5ceb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SystemDateTimeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemDateTimeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemDateTimeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemDateTimeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm
new file mode 100644
index 000000000..93670c674
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::SystemLog;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Binary_of :ATTR(:get<Binary>);
+my %String_of :ATTR(:get<String>);
+
+__PACKAGE__->_factory(
+    [ qw(        Binary
+        String
+
+    ) ],
+    {
+        'Binary' => \%Binary_of,
+        'String' => \%String_of,
+    },
+    {
+        'Binary' => 'ONVIF::Analytics::Types::AttachmentData',
+        'String' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Binary' => 'Binary',
+        'String' => 'String',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLog
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLog from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Binary
+
+
+=item * String
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLog
+   Binary =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+   String =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm
new file mode 100644
index 000000000..22b7f6fd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SystemLogType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SystemLogType from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available system log modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm
new file mode 100644
index 000000000..8f01e4703
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::SystemLogUri;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Uri_of :ATTR(:get<Uri>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Uri
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Uri' => \%Uri_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::SystemLogType',
+        'Uri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'Type' => 'Type',
+        'Uri' => 'Uri',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLogUri
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLogUri from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Uri
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLogUri
+   Type => $some_value, # SystemLogType
+   Uri =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm
new file mode 100644
index 000000000..01dd73bc6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::SystemLogUriList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SystemLog_of :ATTR(:get<SystemLog>);
+
+__PACKAGE__->_factory(
+    [ qw(        SystemLog
+
+    ) ],
+    {
+        'SystemLog' => \%SystemLog_of,
+    },
+    {
+        'SystemLog' => 'ONVIF::Analytics::Types::SystemLogUri',
+    },
+    {
+
+        'SystemLog' => 'SystemLog',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLogUriList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLogUriList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SystemLog
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLogUriList
+   SystemLog =>  { # ONVIF::Analytics::Types::SystemLogUri
+     Type => $some_value, # SystemLogType
+     Uri =>  $some_value, # anyURI
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm
new file mode 100644
index 000000000..9114975ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::TLSConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TLSConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TLSConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TLSConfiguration
+   CertificateID =>  $some_value, # token
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm
new file mode 100644
index 000000000..fe87c8c6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Time;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Hour_of :ATTR(:get<Hour>);
+my %Minute_of :ATTR(:get<Minute>);
+my %Second_of :ATTR(:get<Second>);
+
+__PACKAGE__->_factory(
+    [ qw(        Hour
+        Minute
+        Second
+
+    ) ],
+    {
+        'Hour' => \%Hour_of,
+        'Minute' => \%Minute_of,
+        'Second' => \%Second_of,
+    },
+    {
+        'Hour' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Minute' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Second' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Hour' => 'Hour',
+        'Minute' => 'Minute',
+        'Second' => 'Second',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Time
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Time from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Hour
+
+
+=item * Minute
+
+
+=item * Second
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Time
+   Hour =>  $some_value, # int
+   Minute =>  $some_value, # int
+   Second =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm
new file mode 100644
index 000000000..670e61144
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::TimeZone;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TZ_of :ATTR(:get<TZ>);
+
+__PACKAGE__->_factory(
+    [ qw(        TZ
+
+    ) ],
+    {
+        'TZ' => \%TZ_of,
+    },
+    {
+        'TZ' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+    },
+    {
+
+        'TZ' => 'TZ',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TimeZone
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TimeZone from the namespace http://www.onvif.org/ver10/schema.
+
+ 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TZ
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TimeZone
+   TZ =>  $some_value, # token
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm
new file mode 100644
index 000000000..2b1584c2b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TopicNamespaceLocation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TopicNamespaceLocation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm
new file mode 100644
index 000000000..839b10857
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm
@@ -0,0 +1,160 @@
+package ONVIF::Analytics::Types::TrackAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackInformation_of :ATTR(:get<TrackInformation>);
+my %VideoAttributes_of :ATTR(:get<VideoAttributes>);
+my %AudioAttributes_of :ATTR(:get<AudioAttributes>);
+my %MetadataAttributes_of :ATTR(:get<MetadataAttributes>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackInformation
+        VideoAttributes
+        AudioAttributes
+        MetadataAttributes
+        Extension
+
+    ) ],
+    {
+        'TrackInformation' => \%TrackInformation_of,
+        'VideoAttributes' => \%VideoAttributes_of,
+        'AudioAttributes' => \%AudioAttributes_of,
+        'MetadataAttributes' => \%MetadataAttributes_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TrackInformation' => 'ONVIF::Analytics::Types::TrackInformation',
+        'VideoAttributes' => 'ONVIF::Analytics::Types::VideoAttributes',
+        'AudioAttributes' => 'ONVIF::Analytics::Types::AudioAttributes',
+        'MetadataAttributes' => 'ONVIF::Analytics::Types::MetadataAttributes',
+        'Extension' => 'ONVIF::Analytics::Types::TrackAttributesExtension',
+    },
+    {
+
+        'TrackInformation' => 'TrackInformation',
+        'VideoAttributes' => 'VideoAttributes',
+        'AudioAttributes' => 'AudioAttributes',
+        'MetadataAttributes' => 'MetadataAttributes',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackInformation
+
+
+=item * VideoAttributes
+
+
+=item * AudioAttributes
+
+
+=item * MetadataAttributes
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackAttributes
+   TrackInformation =>  { # ONVIF::Analytics::Types::TrackInformation
+     TrackToken => $some_value, # TrackReference
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+     DataFrom =>  $some_value, # dateTime
+     DataTo =>  $some_value, # dateTime
+   },
+   VideoAttributes =>  { # ONVIF::Analytics::Types::VideoAttributes
+     Bitrate =>  $some_value, # int
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+     Encoding => $some_value, # VideoEncoding
+     Framerate =>  $some_value, # float
+   },
+   AudioAttributes =>  { # ONVIF::Analytics::Types::AudioAttributes
+     Bitrate =>  $some_value, # int
+     Encoding => $some_value, # AudioEncoding
+     Samplerate =>  $some_value, # int
+   },
+   MetadataAttributes =>  { # ONVIF::Analytics::Types::MetadataAttributes
+     CanContainPTZ =>  $some_value, # boolean
+     CanContainAnalytics =>  $some_value, # boolean
+     CanContainNotifications =>  $some_value, # boolean
+   },
+   Extension =>  { # ONVIF::Analytics::Types::TrackAttributesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm
new file mode 100644
index 000000000..c526555cf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::TrackAttributesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackAttributesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackAttributesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackAttributesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm
new file mode 100644
index 000000000..ec6254467
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::TrackConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackType_of :ATTR(:get<TrackType>);
+my %Description_of :ATTR(:get<Description>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackType
+        Description
+
+    ) ],
+    {
+        'TrackType' => \%TrackType_of,
+        'Description' => \%Description_of,
+    },
+    {
+        'TrackType' => 'ONVIF::Analytics::Types::TrackType',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+    },
+    {
+
+        'TrackType' => 'TrackType',
+        'Description' => 'Description',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackType
+
+
+=item * Description
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackConfiguration
+   TrackType => $some_value, # TrackType
+   Description => $some_value, # Description
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm
new file mode 100644
index 000000000..9423157b3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::TrackInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %TrackType_of :ATTR(:get<TrackType>);
+my %Description_of :ATTR(:get<Description>);
+my %DataFrom_of :ATTR(:get<DataFrom>);
+my %DataTo_of :ATTR(:get<DataTo>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackToken
+        TrackType
+        Description
+        DataFrom
+        DataTo
+
+    ) ],
+    {
+        'TrackToken' => \%TrackToken_of,
+        'TrackType' => \%TrackType_of,
+        'Description' => \%Description_of,
+        'DataFrom' => \%DataFrom_of,
+        'DataTo' => \%DataTo_of,
+    },
+    {
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'TrackType' => 'ONVIF::Analytics::Types::TrackType',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+        'DataFrom' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'DataTo' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'TrackToken' => 'TrackToken',
+        'TrackType' => 'TrackType',
+        'Description' => 'Description',
+        'DataFrom' => 'DataFrom',
+        'DataTo' => 'DataTo',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackToken
+
+
+=item * TrackType
+
+
+=item * Description
+
+
+=item * DataFrom
+
+
+=item * DataTo
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackInformation
+   TrackToken => $some_value, # TrackReference
+   TrackType => $some_value, # TrackType
+   Description => $some_value, # Description
+   DataFrom =>  $some_value, # dateTime
+   DataTo =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm
new file mode 100644
index 000000000..3be509164
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TrackReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TrackReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm
new file mode 100644
index 000000000..a88e3a2ef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TrackType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TrackType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm
new file mode 100644
index 000000000..0cd060e79
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Transformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Translate_of :ATTR(:get<Translate>);
+my %Scale_of :ATTR(:get<Scale>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Translate
+        Scale
+        Extension
+
+    ) ],
+    {
+        'Translate' => \%Translate_of,
+        'Scale' => \%Scale_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Translate' => 'ONVIF::Analytics::Types::Vector',
+        'Scale' => 'ONVIF::Analytics::Types::Vector',
+        'Extension' => 'ONVIF::Analytics::Types::TransformationExtension',
+    },
+    {
+
+        'Translate' => 'Translate',
+        'Scale' => 'Scale',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Transformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Transformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Translate
+
+
+=item * Scale
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Transformation
+   Translate => ,
+   Scale => ,
+   Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm
new file mode 100644
index 000000000..f2d990123
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::TransformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TransformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TransformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TransformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm
new file mode 100644
index 000000000..fed1f6666
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Transport;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Protocol_of :ATTR(:get<Protocol>);
+
+__PACKAGE__->_factory(
+    [ qw(        Protocol
+
+    ) ],
+    {
+        'Protocol' => \%Protocol_of,
+    },
+    {
+        'Protocol' => 'ONVIF::Analytics::Types::TransportProtocol',
+    },
+    {
+
+        'Protocol' => 'Protocol',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Transport
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Transport from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Protocol
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Transport
+   Protocol => $some_value, # TransportProtocol
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm
new file mode 100644
index 000000000..77be9dac9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TransportProtocol;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TransportProtocol from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm
new file mode 100644
index 000000000..b16cb4f65
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::User;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Username_of :ATTR(:get<Username>);
+my %Password_of :ATTR(:get<Password>);
+my %UserLevel_of :ATTR(:get<UserLevel>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Username
+        Password
+        UserLevel
+        Extension
+
+    ) ],
+    {
+        'Username' => \%Username_of,
+        'Password' => \%Password_of,
+        'UserLevel' => \%UserLevel_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Username' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UserLevel' => 'ONVIF::Analytics::Types::UserLevel',
+        'Extension' => 'ONVIF::Analytics::Types::UserExtension',
+    },
+    {
+
+        'Username' => 'Username',
+        'Password' => 'Password',
+        'UserLevel' => 'UserLevel',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::User
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+User from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Username
+
+
+=item * Password
+
+
+=item * UserLevel
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::User
+   Username =>  $some_value, # string
+   Password =>  $some_value, # string
+   UserLevel => $some_value, # UserLevel
+   Extension =>  { # ONVIF::Analytics::Types::UserExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm
new file mode 100644
index 000000000..a82566bb0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::UserExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::UserExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UserExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::UserExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm
new file mode 100644
index 000000000..391914793
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::UserLevel;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+UserLevel from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm
new file mode 100644
index 000000000..cc3438d95
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::Vector;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector::_Vector::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector::_Vector::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector::_Vector::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm
new file mode 100644
index 000000000..ab497c64a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm
@@ -0,0 +1,135 @@
+package ONVIF::Analytics::Types::Vector1D;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %space_of :ATTR(:get<space>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        space
+    ) ],
+    {
+
+        x => \%x_of,
+
+        space => \%space_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        space => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector1D
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector1D from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * space
+
+ http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm
new file mode 100644
index 000000000..d6b0899d2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm
@@ -0,0 +1,146 @@
+package ONVIF::Analytics::Types::Vector2D;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+my %space_of :ATTR(:get<space>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+        space
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+
+        space => \%space_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        space => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector2D
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector2D from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * space
+
+ http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm
new file mode 100644
index 000000000..3f5307054
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::VideoAnalyticsConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+my %RuleEngineConfiguration_of :ATTR(:get<RuleEngineConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        AnalyticsEngineConfiguration
+        RuleEngineConfiguration
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+        'RuleEngineConfiguration' => \%RuleEngineConfiguration_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsEngineConfiguration',
+        'RuleEngineConfiguration' => 'ONVIF::Analytics::Types::RuleEngineConfiguration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+        'RuleEngineConfiguration' => 'RuleEngineConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineConfiguration
+
+
+=item * RuleEngineConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+     Rule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm
new file mode 100644
index 000000000..d5cadba4f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm
@@ -0,0 +1,211 @@
+package ONVIF::Analytics::Types::VideoAnalyticsStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Frame_of :ATTR(:get<Frame>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Frame
+        Extension
+
+    ) ],
+    {
+        'Frame' => \%Frame_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Frame' => 'ONVIF::Analytics::Types::Frame',
+        'Extension' => 'ONVIF::Analytics::Types::VideoAnalyticsStreamExtension',
+    },
+    {
+
+        'Frame' => 'Frame',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Frame
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   Frame =>  { # ONVIF::Analytics::Types::Frame
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Transformation =>  { # ONVIF::Analytics::Types::Transformation
+       Translate => ,
+       Scale => ,
+       Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+       },
+     },
+     Object =>  { # ONVIF::Analytics::Types::Object
+       Appearance =>  { # ONVIF::Analytics::Types::Appearance
+         Transformation =>  { # ONVIF::Analytics::Types::Transformation
+           Translate => ,
+           Scale => ,
+           Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+           },
+         },
+         Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+           BoundingBox => ,
+           CenterOfGravity => ,
+           Polygon =>  { # ONVIF::Analytics::Types::Polygon
+             Point => ,
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+           },
+         },
+         Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+           ColorCluster =>  {
+             Color => ,
+             Weight =>  $some_value, # float
+             Covariance => ,
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+           },
+         },
+         Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+           ClassCandidate =>  {
+             Type => $some_value, # ClassType
+             Likelihood =>  $some_value, # float
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+             OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+               Type =>  $some_value, # string
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+         },
+       },
+       Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+         Removed =>  {
+         },
+         Idle =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+       },
+     },
+     ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+       Rename =>  { # ONVIF::Analytics::Types::Rename
+         from => ,
+         to => ,
+       },
+       Split =>  { # ONVIF::Analytics::Types::Split
+         from => ,
+         to => ,
+       },
+       Merge =>  { # ONVIF::Analytics::Types::Merge
+         from => ,
+         to => ,
+       },
+       Delete => ,
+       Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+       MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm
new file mode 100644
index 000000000..fe1ea75a8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoAnalyticsStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm
new file mode 100644
index 000000000..ced5fe09f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::VideoAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %Width_of :ATTR(:get<Width>);
+my %Height_of :ATTR(:get<Height>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Framerate_of :ATTR(:get<Framerate>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        Width
+        Height
+        Encoding
+        Framerate
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'Width' => \%Width_of,
+        'Height' => \%Height_of,
+        'Encoding' => \%Encoding_of,
+        'Framerate' => \%Framerate_of,
+    },
+    {
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Width' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Height' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::VideoEncoding',
+        'Framerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'Width' => 'Width',
+        'Height' => 'Height',
+        'Encoding' => 'Encoding',
+        'Framerate' => 'Framerate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * Width
+
+
+=item * Height
+
+
+=item * Encoding
+
+
+=item * Framerate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAttributes
+   Bitrate =>  $some_value, # int
+   Width =>  $some_value, # int
+   Height =>  $some_value, # int
+   Encoding => $some_value, # VideoEncoding
+   Framerate =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm
new file mode 100644
index 000000000..7b3db81bc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm
@@ -0,0 +1,172 @@
+package ONVIF::Analytics::Types::VideoDecoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JpegDecOptions_of :ATTR(:get<JpegDecOptions>);
+my %H264DecOptions_of :ATTR(:get<H264DecOptions>);
+my %Mpeg4DecOptions_of :ATTR(:get<Mpeg4DecOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        JpegDecOptions
+        H264DecOptions
+        Mpeg4DecOptions
+        Extension
+
+    ) ],
+    {
+        'JpegDecOptions' => \%JpegDecOptions_of,
+        'H264DecOptions' => \%H264DecOptions_of,
+        'Mpeg4DecOptions' => \%Mpeg4DecOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'JpegDecOptions' => 'ONVIF::Analytics::Types::JpegDecOptions',
+        'H264DecOptions' => 'ONVIF::Analytics::Types::H264DecOptions',
+        'Mpeg4DecOptions' => 'ONVIF::Analytics::Types::Mpeg4DecOptions',
+        'Extension' => 'ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension',
+    },
+    {
+
+        'JpegDecOptions' => 'JpegDecOptions',
+        'H264DecOptions' => 'H264DecOptions',
+        'Mpeg4DecOptions' => 'Mpeg4DecOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoDecoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JpegDecOptions
+
+
+=item * H264DecOptions
+
+
+=item * Mpeg4DecOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+   JpegDecOptions =>  { # ONVIF::Analytics::Types::JpegDecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   H264DecOptions =>  { # ONVIF::Analytics::Types::H264DecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedH264Profiles => $some_value, # H264Profile
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Mpeg4DecOptions =>  { # ONVIF::Analytics::Types::Mpeg4DecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..15a183231
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoDecoderConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm
new file mode 100644
index 000000000..ed1bd6795
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm
@@ -0,0 +1,201 @@
+package ONVIF::Analytics::Types::VideoEncoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %Quality_of :ATTR(:get<Quality>);
+my %RateControl_of :ATTR(:get<RateControl>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        Encoding
+        Resolution
+        Quality
+        RateControl
+        MPEG4
+        H264
+        Multicast
+        SessionTimeout
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'Encoding' => \%Encoding_of,
+        'Resolution' => \%Resolution_of,
+        'Quality' => \%Quality_of,
+        'RateControl' => \%RateControl_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::VideoEncoding',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'Quality' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'RateControl' => 'ONVIF::Analytics::Types::VideoRateControl',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Configuration',
+        'H264' => 'ONVIF::Analytics::Types::H264Configuration',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'Encoding' => 'Encoding',
+        'Resolution' => 'Resolution',
+        'Quality' => 'Quality',
+        'RateControl' => 'RateControl',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * Resolution
+
+
+=item * Quality
+
+
+=item * RateControl
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+   Encoding => $some_value, # VideoEncoding
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Quality =>  $some_value, # float
+   RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+     FrameRateLimit =>  $some_value, # int
+     EncodingInterval =>  $some_value, # int
+     BitrateLimit =>  $some_value, # int
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+     GovLength =>  $some_value, # int
+     Mpeg4Profile => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+     GovLength =>  $some_value, # int
+     H264Profile => $some_value, # H264Profile
+   },
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm
new file mode 100644
index 000000000..40079729e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm
@@ -0,0 +1,212 @@
+package ONVIF::Analytics::Types::VideoEncoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %QualityRange_of :ATTR(:get<QualityRange>);
+my %JPEG_of :ATTR(:get<JPEG>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        QualityRange
+        JPEG
+        MPEG4
+        H264
+        Extension
+
+    ) ],
+    {
+        'QualityRange' => \%QualityRange_of,
+        'JPEG' => \%JPEG_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'QualityRange' => 'ONVIF::Analytics::Types::IntRange',
+        'JPEG' => 'ONVIF::Analytics::Types::JpegOptions',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Options',
+        'H264' => 'ONVIF::Analytics::Types::H264Options',
+        'Extension' => 'ONVIF::Analytics::Types::VideoEncoderOptionsExtension',
+    },
+    {
+
+        'QualityRange' => 'QualityRange',
+        'JPEG' => 'JPEG',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * QualityRange
+
+
+=item * JPEG
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfigurationOptions
+   QualityRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   JPEG =>  { # ONVIF::Analytics::Types::JpegOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Mpeg4ProfilesSupported => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Options
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     H264ProfilesSupported => $some_value, # H264Profile
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+     JPEG =>  { # ONVIF::Analytics::Types::JpegOptions2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Options2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm
new file mode 100644
index 000000000..9fc237041
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm
@@ -0,0 +1,146 @@
+package ONVIF::Analytics::Types::VideoEncoderOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JPEG_of :ATTR(:get<JPEG>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        JPEG
+        MPEG4
+        H264
+        Extension
+
+    ) ],
+    {
+        'JPEG' => \%JPEG_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'JPEG' => 'ONVIF::Analytics::Types::JpegOptions2',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Options2',
+        'H264' => 'ONVIF::Analytics::Types::H264Options2',
+        'Extension' => 'ONVIF::Analytics::Types::VideoEncoderOptionsExtension2',
+    },
+    {
+
+        'JPEG' => 'JPEG',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JPEG
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+   JPEG =>  { # ONVIF::Analytics::Types::JpegOptions2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Options2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm
new file mode 100644
index 000000000..8cc11bb64
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoEncoderOptionsExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderOptionsExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm
new file mode 100644
index 000000000..a34c45189
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::VideoEncoding;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+VideoEncoding from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm
new file mode 100644
index 000000000..a6bdbcd5e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm
@@ -0,0 +1,153 @@
+package ONVIF::Analytics::Types::VideoOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Layout_of :ATTR(:get<Layout>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %RefreshRate_of :ATTR(:get<RefreshRate>);
+my %AspectRatio_of :ATTR(:get<AspectRatio>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Layout
+        Resolution
+        RefreshRate
+        AspectRatio
+        Extension
+
+    ) ],
+    {
+        'Layout' => \%Layout_of,
+        'Resolution' => \%Resolution_of,
+        'RefreshRate' => \%RefreshRate_of,
+        'AspectRatio' => \%AspectRatio_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Layout' => 'ONVIF::Analytics::Types::Layout',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'RefreshRate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'AspectRatio' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::VideoOutputExtension',
+    },
+    {
+
+        'Layout' => 'Layout',
+        'Resolution' => 'Resolution',
+        'RefreshRate' => 'RefreshRate',
+        'AspectRatio' => 'AspectRatio',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutput from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical video outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Layout
+
+
+=item * Resolution
+
+
+=item * RefreshRate
+
+
+=item * AspectRatio
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutput
+   Layout =>  { # ONVIF::Analytics::Types::Layout
+     PaneLayout =>  { # ONVIF::Analytics::Types::PaneLayout
+       Pane => $some_value, # ReferenceToken
+       Area => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::LayoutExtension
+     },
+   },
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   RefreshRate =>  $some_value, # float
+   AspectRatio =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::VideoOutputExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm
new file mode 100644
index 000000000..cb9256a60
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::VideoOutputConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %OutputToken_of :ATTR(:get<OutputToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        OutputToken
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'OutputToken' => \%OutputToken_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'OutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'OutputToken' => 'OutputToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputToken
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm
new file mode 100644
index 000000000..bd89496f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoOutputConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputConfigurationOptions
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm
new file mode 100644
index 000000000..87c63a16d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoOutputExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm
new file mode 100644
index 000000000..65124ed50
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::VideoRateControl;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FrameRateLimit_of :ATTR(:get<FrameRateLimit>);
+my %EncodingInterval_of :ATTR(:get<EncodingInterval>);
+my %BitrateLimit_of :ATTR(:get<BitrateLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        FrameRateLimit
+        EncodingInterval
+        BitrateLimit
+
+    ) ],
+    {
+        'FrameRateLimit' => \%FrameRateLimit_of,
+        'EncodingInterval' => \%EncodingInterval_of,
+        'BitrateLimit' => \%BitrateLimit_of,
+    },
+    {
+        'FrameRateLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'EncodingInterval' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'BitrateLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'FrameRateLimit' => 'FrameRateLimit',
+        'EncodingInterval' => 'EncodingInterval',
+        'BitrateLimit' => 'BitrateLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoRateControl
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoRateControl from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FrameRateLimit
+
+
+=item * EncodingInterval
+
+
+=item * BitrateLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoRateControl
+   FrameRateLimit =>  $some_value, # int
+   EncodingInterval =>  $some_value, # int
+   BitrateLimit =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm
new file mode 100644
index 000000000..5d33ca894
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::VideoResolution;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Width_of :ATTR(:get<Width>);
+my %Height_of :ATTR(:get<Height>);
+
+__PACKAGE__->_factory(
+    [ qw(        Width
+        Height
+
+    ) ],
+    {
+        'Width' => \%Width_of,
+        'Height' => \%Height_of,
+    },
+    {
+        'Width' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Height' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Width' => 'Width',
+        'Height' => 'Height',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoResolution
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoResolution from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Width
+
+
+=item * Height
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoResolution
+   Width =>  $some_value, # int
+   Height =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm
new file mode 100644
index 000000000..7cb3363e2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm
@@ -0,0 +1,243 @@
+package ONVIF::Analytics::Types::VideoSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Framerate_of :ATTR(:get<Framerate>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %Imaging_of :ATTR(:get<Imaging>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Framerate
+        Resolution
+        Imaging
+        Extension
+
+    ) ],
+    {
+        'Framerate' => \%Framerate_of,
+        'Resolution' => \%Resolution_of,
+        'Imaging' => \%Imaging_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Framerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'Imaging' => 'ONVIF::Analytics::Types::ImagingSettings',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceExtension',
+    },
+    {
+
+        'Framerate' => 'Framerate',
+        'Resolution' => 'Resolution',
+        'Imaging' => 'Imaging',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSource from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical video input.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Framerate
+
+
+=item * Resolution
+
+
+=item * Imaging
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSource
+   Framerate =>  $some_value, # float
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings
+     BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation
+       Mode => $some_value, # BacklightCompensationMode
+       Level =>  $some_value, # float
+     },
+     Brightness =>  $some_value, # float
+     ColorSaturation =>  $some_value, # float
+     Contrast =>  $some_value, # float
+     Exposure =>  { # ONVIF::Analytics::Types::Exposure
+       Mode => $some_value, # ExposureMode
+       Priority => $some_value, # ExposurePriority
+       Window => ,
+       MinExposureTime =>  $some_value, # float
+       MaxExposureTime =>  $some_value, # float
+       MinGain =>  $some_value, # float
+       MaxGain =>  $some_value, # float
+       MinIris =>  $some_value, # float
+       MaxIris =>  $some_value, # float
+       ExposureTime =>  $some_value, # float
+       Gain =>  $some_value, # float
+       Iris =>  $some_value, # float
+     },
+     Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration
+       AutoFocusMode => $some_value, # AutoFocusMode
+       DefaultSpeed =>  $some_value, # float
+       NearLimit =>  $some_value, # float
+       FarLimit =>  $some_value, # float
+     },
+     IrCutFilter => $some_value, # IrCutFilterMode
+     Sharpness =>  $some_value, # float
+     WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange
+       Mode => $some_value, # WideDynamicMode
+       Level =>  $some_value, # float
+     },
+     WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance
+       Mode => $some_value, # WhiteBalanceMode
+       CrGain =>  $some_value, # float
+       CbGain =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension
+     Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings20
+       BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+         Mode => $some_value, # BacklightCompensationMode
+         Level =>  $some_value, # float
+       },
+       Brightness =>  $some_value, # float
+       ColorSaturation =>  $some_value, # float
+       Contrast =>  $some_value, # float
+       Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+         Mode => $some_value, # ExposureMode
+         Priority => $some_value, # ExposurePriority
+         Window => ,
+         MinExposureTime =>  $some_value, # float
+         MaxExposureTime =>  $some_value, # float
+         MinGain =>  $some_value, # float
+         MaxGain =>  $some_value, # float
+         MinIris =>  $some_value, # float
+         MaxIris =>  $some_value, # float
+         ExposureTime =>  $some_value, # float
+         Gain =>  $some_value, # float
+         Iris =>  $some_value, # float
+       },
+       Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+         AutoFocusMode => $some_value, # AutoFocusMode
+         DefaultSpeed =>  $some_value, # float
+         NearLimit =>  $some_value, # float
+         FarLimit =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+         },
+       },
+       IrCutFilter => $some_value, # IrCutFilterMode
+       Sharpness =>  $some_value, # float
+       WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+         Mode => $some_value, # WideDynamicMode
+         Level =>  $some_value, # float
+       },
+       WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+         Mode => $some_value, # WhiteBalanceMode
+         CrGain =>  $some_value, # float
+         CbGain =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+         ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+           Mode => $some_value, # ImageStabilizationMode
+           Level =>  $some_value, # float
+           Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+           IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+             BoundaryType =>  $some_value, # string
+             BoundaryOffset =>  $some_value, # float
+             ResponseTime =>  $some_value, # duration
+             Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+           },
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm
new file mode 100644
index 000000000..d10cc394c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm
@@ -0,0 +1,143 @@
+package ONVIF::Analytics::Types::VideoSourceConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %Bounds_of :ATTR(:get<Bounds>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceToken
+        Bounds
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceToken' => \%SourceToken_of,
+        'Bounds' => \%Bounds_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Bounds' => 'ONVIF::Analytics::Types::IntRectangle',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceToken' => 'SourceToken',
+        'Bounds' => 'Bounds',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * Bounds
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+   Bounds => ,
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+     Rotate =>  { # ONVIF::Analytics::Types::Rotate
+       Mode => $some_value, # RotateMode
+       Degree =>  $some_value, # int
+       Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm
new file mode 100644
index 000000000..8b3705038
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rotate_of :ATTR(:get<Rotate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rotate
+        Extension
+
+    ) ],
+    {
+        'Rotate' => \%Rotate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rotate' => 'ONVIF::Analytics::Types::Rotate',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationExtension2',
+    },
+    {
+
+        'Rotate' => 'Rotate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rotate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+   Rotate =>  { # ONVIF::Analytics::Types::Rotate
+     Mode => $some_value, # RotateMode
+     Degree =>  $some_value, # int
+     Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm
new file mode 100644
index 000000000..6780c80c4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm
new file mode 100644
index 000000000..bb61463d7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundsRange_of :ATTR(:get<BoundsRange>);
+my %VideoSourceTokensAvailable_of :ATTR(:get<VideoSourceTokensAvailable>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundsRange
+        VideoSourceTokensAvailable
+        Extension
+
+    ) ],
+    {
+        'BoundsRange' => \%BoundsRange_of,
+        'VideoSourceTokensAvailable' => \%VideoSourceTokensAvailable_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundsRange' => 'ONVIF::Analytics::Types::IntRectangleRange',
+        'VideoSourceTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension',
+    },
+    {
+
+        'BoundsRange' => 'BoundsRange',
+        'VideoSourceTokensAvailable' => 'VideoSourceTokensAvailable',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundsRange
+
+
+=item * VideoSourceTokensAvailable
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptions
+   BoundsRange =>  { # ONVIF::Analytics::Types::IntRectangleRange
+     XRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     YRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     WidthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     HeightRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   VideoSourceTokensAvailable => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+     Rotate =>  { # ONVIF::Analytics::Types::RotateOptions
+       Mode => $some_value, # RotateMode
+       DegreeList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..222088d9a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rotate_of :ATTR(:get<Rotate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rotate
+        Extension
+
+    ) ],
+    {
+        'Rotate' => \%Rotate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rotate' => 'ONVIF::Analytics::Types::RotateOptions',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2',
+    },
+    {
+
+        'Rotate' => 'Rotate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rotate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+   Rotate =>  { # ONVIF::Analytics::Types::RotateOptions
+     Mode => $some_value, # RotateMode
+     DegreeList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm
new file mode 100644
index 000000000..2167b07fb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptionsExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm
new file mode 100644
index 000000000..2086a317d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm
@@ -0,0 +1,175 @@
+package ONVIF::Analytics::Types::VideoSourceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Imaging_of :ATTR(:get<Imaging>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Imaging
+        Extension
+
+    ) ],
+    {
+        'Imaging' => \%Imaging_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Imaging' => 'ONVIF::Analytics::Types::ImagingSettings20',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceExtension2',
+    },
+    {
+
+        'Imaging' => 'Imaging',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Imaging
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceExtension
+   Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings20
+     BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+       Mode => $some_value, # BacklightCompensationMode
+       Level =>  $some_value, # float
+     },
+     Brightness =>  $some_value, # float
+     ColorSaturation =>  $some_value, # float
+     Contrast =>  $some_value, # float
+     Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+       Mode => $some_value, # ExposureMode
+       Priority => $some_value, # ExposurePriority
+       Window => ,
+       MinExposureTime =>  $some_value, # float
+       MaxExposureTime =>  $some_value, # float
+       MinGain =>  $some_value, # float
+       MaxGain =>  $some_value, # float
+       MinIris =>  $some_value, # float
+       MaxIris =>  $some_value, # float
+       ExposureTime =>  $some_value, # float
+       Gain =>  $some_value, # float
+       Iris =>  $some_value, # float
+     },
+     Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+       AutoFocusMode => $some_value, # AutoFocusMode
+       DefaultSpeed =>  $some_value, # float
+       NearLimit =>  $some_value, # float
+       FarLimit =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+       },
+     },
+     IrCutFilter => $some_value, # IrCutFilterMode
+     Sharpness =>  $some_value, # float
+     WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+       Mode => $some_value, # WideDynamicMode
+       Level =>  $some_value, # float
+     },
+     WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+       Mode => $some_value, # WhiteBalanceMode
+       CrGain =>  $some_value, # float
+       CbGain =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+       ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+         Mode => $some_value, # ImageStabilizationMode
+         Level =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+         IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+           BoundaryType =>  $some_value, # string
+           BoundaryOffset =>  $some_value, # float
+           ResponseTime =>  $some_value, # duration
+           Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+         },
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm
new file mode 100644
index 000000000..610bb47a6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm
new file mode 100644
index 000000000..f6eae8d08
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::WhiteBalance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %CrGain_of :ATTR(:get<CrGain>);
+my %CbGain_of :ATTR(:get<CbGain>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        CrGain
+        CbGain
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'CrGain' => \%CrGain_of,
+        'CbGain' => \%CbGain_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'CrGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'CbGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'CrGain' => 'CrGain',
+        'CbGain' => 'CbGain',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * CrGain
+
+
+=item * CbGain
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance
+   Mode => $some_value, # WhiteBalanceMode
+   CrGain =>  $some_value, # float
+   CbGain =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm
new file mode 100644
index 000000000..ca0ac4fae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::WhiteBalance20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %CrGain_of :ATTR(:get<CrGain>);
+my %CbGain_of :ATTR(:get<CbGain>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        CrGain
+        CbGain
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'CrGain' => \%CrGain_of,
+        'CbGain' => \%CbGain_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'CrGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'CbGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::WhiteBalance20Extension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'CrGain' => 'CrGain',
+        'CbGain' => 'CbGain',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * CrGain
+
+
+=item * CbGain
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance20
+   Mode => $some_value, # WhiteBalanceMode
+   CrGain =>  $some_value, # float
+   CbGain =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm
new file mode 100644
index 000000000..ded67ea69
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::WhiteBalance20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm
new file mode 100644
index 000000000..6f6874644
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::WhiteBalanceMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+WhiteBalanceMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm
new file mode 100644
index 000000000..7338fe9e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %YrGain_of :ATTR(:get<YrGain>);
+my %YbGain_of :ATTR(:get<YbGain>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        YrGain
+        YbGain
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'YrGain' => \%YrGain_of,
+        'YbGain' => \%YbGain_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'YrGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'YbGain' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'YrGain' => 'YrGain',
+        'YbGain' => 'YbGain',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * YrGain
+
+
+=item * YbGain
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions
+   Mode => $some_value, # WhiteBalanceMode
+   YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm
new file mode 100644
index 000000000..0d9c2e07b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %YrGain_of :ATTR(:get<YrGain>);
+my %YbGain_of :ATTR(:get<YbGain>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        YrGain
+        YbGain
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'YrGain' => \%YrGain_of,
+        'YbGain' => \%YbGain_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'YrGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'YbGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::WhiteBalanceOptions20Extension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'YrGain' => 'YrGain',
+        'YbGain' => 'YbGain',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * YrGain
+
+
+=item * YbGain
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions20
+   Mode => $some_value, # WhiteBalanceMode
+   YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm
new file mode 100644
index 000000000..a52f56ce8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm
new file mode 100644
index 000000000..458ae39b0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::WideDynamicMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+WideDynamicMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm
new file mode 100644
index 000000000..34c785541
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::WideDynamicRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRange
+   Mode => $some_value, # WideDynamicMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm
new file mode 100644
index 000000000..8aa02026a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::WideDynamicRange20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRange20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRange20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing whether WDR mode is enabled or disabled (on/off).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRange20
+   Mode => $some_value, # WideDynamicMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm
new file mode 100644
index 000000000..7e0b20aae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::WideDynamicRangeOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRangeOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRangeOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRangeOptions
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm
new file mode 100644
index 000000000..039d219b5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::WideDynamicRangeOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRangeOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRangeOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRangeOptions20
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm
new file mode 100644
index 000000000..903dbe9bf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::XPathExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+XPathExpression from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm
new file mode 100644
index 000000000..41983d779
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::ZoomLimits;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Range_of :ATTR(:get<Range>);
+
+__PACKAGE__->_factory(
+    [ qw(        Range
+
+    ) ],
+    {
+        'Range' => \%Range_of,
+    },
+    {
+        'Range' => 'ONVIF::Analytics::Types::Space1DDescription',
+    },
+    {
+
+        'Range' => 'Range',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ZoomLimits
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ZoomLimits from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Range
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ZoomLimits
+   Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm
new file mode 100644
index 000000000..c571f96cc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::base64Binary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::base64Binary
+);
+
+package ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::base64Binary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+base64Binary from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm
new file mode 100644
index 000000000..62be02785
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::detail;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::detail
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+detail from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::detail
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm
new file mode 100644
index 000000000..5603dad00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::encodingStyle;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+encodingStyle from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification 
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm
new file mode 100644
index 000000000..d988616ff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::hexBinary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+);
+
+package ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::hexBinary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+hexBinary from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm b/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
index 437ef094c..a9545c41b 100644
--- a/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
+++ b/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
@@ -63,7 +63,7 @@ sub __get_attr_class {
 }
 
 
-use base qw(ONVIF::Media::Types::TopicType);
+use base qw(WSNotification::Types::TopicType);
 # Variety: sequence
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
@@ -90,7 +90,7 @@ __PACKAGE__->_factory(
     {
         'documentation' => 'ONVIF::Media::Types::Documentation',
         'MessagePattern' => 'ONVIF::Media::Types::QueryExpressionType',
-        'Topic' => 'ONVIF::Media::Types::TopicType',
+        'Topic' => 'WSNotification::Types::TopicType',
     },
     {
 
diff --git a/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm b/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
index d5ae7f8d5..ea69830bd 100644
--- a/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
+++ b/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
@@ -63,7 +63,7 @@ sub __get_attr_class {
 }
 
 
-use base qw(ONVIF::PTZ::Types::TopicType);
+use base qw(WSNotification::Types::TopicType);
 # Variety: sequence
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
@@ -90,7 +90,7 @@ __PACKAGE__->_factory(
     {
         'documentation' => 'ONVIF::PTZ::Types::Documentation',
         'MessagePattern' => 'ONVIF::PTZ::Types::QueryExpressionType',
-        'Topic' => 'ONVIF::PTZ::Types::TopicType',
+        'Topic' => 'WSNotification::Types::TopicType',
     },
     {
 
diff --git a/onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm b/onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
new file mode 100644
index 000000000..ae78b1f36
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::IsReferenceParameter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('IsReferenceParameter');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::IsReferenceParameter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::IsReferenceParameter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/base.pm b/onvif/proxy/lib/WSNotification/Attributes/base.pm
new file mode 100644
index 000000000..97dd22b2d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/base.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::base;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('base');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::base
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+base from the namespace http://www.w3.org/XML/1998/namespace.
+
+http://www.w3.org/TR/xmlbase/ for information about this attribute. 
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::base->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/id.pm b/onvif/proxy/lib/WSNotification/Attributes/id.pm
new file mode 100644
index 000000000..619ebc869
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/id.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::id;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('id');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::ID
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::id
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+id from the namespace http://www.w3.org/XML/1998/namespace.
+
+http://www.w3.org/TR/xml-id/ for information about this attribute. 
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::id->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/lang.pm b/onvif/proxy/lib/WSNotification/Attributes/lang.pm
new file mode 100644
index 000000000..781d7e766
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/lang.pm
@@ -0,0 +1,72 @@
+
+package WSNotification::Attributes::lang;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('lang');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::lang
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+lang from the namespace http://www.w3.org/XML/1998/namespace.
+
+The union allows for the 'un-declaration' of xml:lang with the empty string. 
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::lang->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/space.pm b/onvif/proxy/lib/WSNotification/Attributes/space.pm
new file mode 100644
index 000000000..e585b2974
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/space.pm
@@ -0,0 +1,64 @@
+
+package WSNotification::Attributes::space;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('space');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::NCName);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::space
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+space from the namespace http://www.w3.org/XML/1998/namespace.
+
+denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. 
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::space->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/topic.pm b/onvif/proxy/lib/WSNotification/Attributes/topic.pm
new file mode 100644
index 000000000..b3f89669e
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/topic.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::topic;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('topic');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::topic
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+topic from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::topic->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm b/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm
new file mode 100644
index 000000000..178f270c6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::topicNamespaceLocation;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('topicNamespaceLocation');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::topicNamespaceLocation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+topicNamespaceLocation from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::topicNamespaceLocation->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Action.pm b/onvif/proxy/lib/WSNotification/Elements/Action.pm
new file mode 100644
index 000000000..fa2034ea9
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Action.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::Action;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('Action');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Action
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Action from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Action->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm b/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm
new file mode 100644
index 000000000..aae497541
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm
@@ -0,0 +1,72 @@
+
+package WSNotification::Elements::BaseFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsrf/bf-2' }
+
+__PACKAGE__->__set_name('BaseFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::BaseFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::BaseFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+BaseFault from the namespace http://docs.oasis-open.org/wsrf/bf-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::BaseFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::BaseFaultType
+   Timestamp =>  $some_value, # dateTime
+   Originator =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   ErrorCode => 
+ # No documentation generated for complexContent / extension yet
+,
+   Description =>  { value => $some_value },
+   FaultCause =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm b/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm
new file mode 100644
index 000000000..abf894ef7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::ConsumerReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ConsumerReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ConsumerReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ConsumerReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ConsumerReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm b/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm
new file mode 100644
index 000000000..e072f4513
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::CreatePullPoint;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreatePullPoint');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreatePullPoint
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreatePullPoint from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreatePullPoint->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm b/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm
new file mode 100644
index 000000000..ad7aee7c6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm
@@ -0,0 +1,127 @@
+
+package WSNotification::Elements::CreatePullPointResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreatePullPointResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PullPoint_of :ATTR(:get<PullPoint>);
+
+__PACKAGE__->_factory(
+    [ qw(        PullPoint
+
+    ) ],
+    {
+        'PullPoint' => \%PullPoint_of,
+    },
+    {
+        'PullPoint' => 'WSNotification::Types::EndpointReferenceType',
+    },
+    {
+
+        'PullPoint' => 'PullPoint',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreatePullPointResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreatePullPointResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PullPoint
+
+ $element->set_PullPoint($data);
+ $element->get_PullPoint();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreatePullPointResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   PullPoint =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm b/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm
new file mode 100644
index 000000000..cc7f3bfbc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::CreationTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreationTime');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreationTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreationTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreationTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm b/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm
new file mode 100644
index 000000000..8ec8517c0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::CurrentTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CurrentTime');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CurrentTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CurrentTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CurrentTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm
new file mode 100644
index 000000000..6c1ce18b4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::DestroyPullPoint;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('DestroyPullPoint');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::DestroyPullPoint
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DestroyPullPoint from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::DestroyPullPoint->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm
new file mode 100644
index 000000000..f2e97fb62
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::DestroyPullPointResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('DestroyPullPointResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::DestroyPullPointResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DestroyPullPointResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::DestroyPullPointResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm b/onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
new file mode 100644
index 000000000..3ea0ed684
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::EndpointReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('EndpointReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::EndpointReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+EndpointReference from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::EndpointReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/FaultTo.pm b/onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
new file mode 100644
index 000000000..d2504a5af
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::FaultTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('FaultTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::FaultTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FaultTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::FaultTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Filter.pm b/onvif/proxy/lib/WSNotification/Elements/Filter.pm
new file mode 100644
index 000000000..78118bc24
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Filter.pm
@@ -0,0 +1,62 @@
+
+package WSNotification::Elements::Filter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Filter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::FilterType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Filter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Filter from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Filter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::FilterType
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   MessageContent =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm b/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm
new file mode 100644
index 000000000..ff1edd9f6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::FixedTopicSet;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('FixedTopicSet');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::FixedTopicSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FixedTopicSet from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::FixedTopicSet->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # boolean
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/From.pm b/onvif/proxy/lib/WSNotification/Elements/From.pm
new file mode 100644
index 000000000..7e7ba2f30
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/From.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::From;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('From');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::From
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+From from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::From->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm
new file mode 100644
index 000000000..e06255356
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm
@@ -0,0 +1,122 @@
+
+package WSNotification::Elements::GetCurrentMessage;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetCurrentMessage');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Topic_of :ATTR(:get<Topic>);
+
+__PACKAGE__->_factory(
+    [ qw(        Topic
+
+    ) ],
+    {
+        'Topic' => \%Topic_of,
+    },
+    {
+        'Topic' => 'WSNotification::Types::TopicExpressionType',
+    },
+    {
+
+        'Topic' => 'Topic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetCurrentMessage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetCurrentMessage from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Topic
+
+ $element->set_Topic($data);
+ $element->get_Topic();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetCurrentMessage->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm
new file mode 100644
index 000000000..9fae76077
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::GetCurrentMessageResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetCurrentMessageResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetCurrentMessageResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetCurrentMessageResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetCurrentMessageResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm b/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm
new file mode 100644
index 000000000..fcb244fd1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm
@@ -0,0 +1,121 @@
+
+package WSNotification::Elements::GetMessages;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetMessages');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumber_of :ATTR(:get<MaximumNumber>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumber
+
+    ) ],
+    {
+        'MaximumNumber' => \%MaximumNumber_of,
+    },
+    {
+        'MaximumNumber' => 'SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger',
+    },
+    {
+
+        'MaximumNumber' => 'MaximumNumber',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetMessages
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetMessages from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumber
+
+ $element->set_MaximumNumber($data);
+ $element->get_MaximumNumber();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetMessages->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   MaximumNumber =>  $some_value, # nonNegativeInteger
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm b/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm
new file mode 100644
index 000000000..6eca425c5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm
@@ -0,0 +1,147 @@
+
+package WSNotification::Elements::GetMessagesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetMessagesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %NotificationMessage_of :ATTR(:get<NotificationMessage>);
+
+__PACKAGE__->_factory(
+    [ qw(        NotificationMessage
+
+    ) ],
+    {
+        'NotificationMessage' => \%NotificationMessage_of,
+    },
+    {
+        'NotificationMessage' => 'WSNotification::Elements::NotificationMessage',
+
+    },
+    {
+
+        'NotificationMessage' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetMessagesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetMessagesResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NotificationMessage
+
+ $element->set_NotificationMessage($data);
+ $element->get_NotificationMessage();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetMessagesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   NotificationMessage =>  { # WSNotification::Types::NotificationMessageHolderType
+     SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Topic =>  { # WSNotification::Types::TopicExpressionType
+     },
+     ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Message =>  {
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm
new file mode 100644
index 000000000..e7dd68101
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::InvalidFilterFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidFilterFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidFilterFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidFilterFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidFilterFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidFilterFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidFilterFaultType
+   UnknownFilter =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm
new file mode 100644
index 000000000..2813d9dc0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidMessageContentExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidMessageContentExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidMessageContentExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidMessageContentExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidMessageContentExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidMessageContentExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidMessageContentExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm
new file mode 100644
index 000000000..41dde93d4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidProducerPropertiesExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidProducerPropertiesExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidProducerPropertiesExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidProducerPropertiesExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidProducerPropertiesExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm
new file mode 100644
index 000000000..a4c60dfae
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidTopicExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidTopicExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidTopicExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidTopicExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidTopicExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidTopicExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidTopicExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm b/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm
new file mode 100644
index 000000000..b963df968
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::MessageContent;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('MessageContent');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::QueryExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::MessageContent
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MessageContent from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::MessageContent->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/MessageID.pm b/onvif/proxy/lib/WSNotification/Elements/MessageID.pm
new file mode 100644
index 000000000..9d56cf303
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/MessageID.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::MessageID;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('MessageID');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::MessageID
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MessageID from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::MessageID->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Metadata.pm b/onvif/proxy/lib/WSNotification/Elements/Metadata.pm
new file mode 100644
index 000000000..9511c6578
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Metadata.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::Metadata;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('Metadata');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::MetadataType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Metadata
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Metadata from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Metadata->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MetadataType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm b/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm
new file mode 100644
index 000000000..2256bedee
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::MultipleTopicsSpecifiedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('MultipleTopicsSpecifiedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::MultipleTopicsSpecifiedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::MultipleTopicsSpecifiedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MultipleTopicsSpecifiedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::MultipleTopicsSpecifiedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MultipleTopicsSpecifiedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm b/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm
new file mode 100644
index 000000000..22d200003
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::NoCurrentMessageOnTopicFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NoCurrentMessageOnTopicFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NoCurrentMessageOnTopicFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NoCurrentMessageOnTopicFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NoCurrentMessageOnTopicFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NoCurrentMessageOnTopicFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NoCurrentMessageOnTopicFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm b/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm
new file mode 100644
index 000000000..7efc19920
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm
@@ -0,0 +1,76 @@
+
+package WSNotification::Elements::NotificationMessage;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotificationMessage');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NotificationMessageHolderType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotificationMessage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotificationMessage from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotificationMessage->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotificationMessageHolderType
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+   ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Message =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm b/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm
new file mode 100644
index 000000000..40e91087f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm
@@ -0,0 +1,193 @@
+
+package WSNotification::Elements::NotificationProducerRP;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotificationProducerRP');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TopicExpression_of :ATTR(:get<TopicExpression>);
+my %FixedTopicSet_of :ATTR(:get<FixedTopicSet>);
+my %TopicExpressionDialect_of :ATTR(:get<TopicExpressionDialect>);
+my %TopicSet_of :ATTR(:get<TopicSet>);
+
+__PACKAGE__->_factory(
+    [ qw(        TopicExpression
+        FixedTopicSet
+        TopicExpressionDialect
+        TopicSet
+
+    ) ],
+    {
+        'TopicExpression' => \%TopicExpression_of,
+        'FixedTopicSet' => \%FixedTopicSet_of,
+        'TopicExpressionDialect' => \%TopicExpressionDialect_of,
+        'TopicSet' => \%TopicSet_of,
+    },
+    {
+        'TopicExpression' => 'WSNotification::Elements::TopicExpression',
+
+        'FixedTopicSet' => 'WSNotification::Elements::FixedTopicSet',
+
+        'TopicExpressionDialect' => 'WSNotification::Elements::TopicExpressionDialect',
+
+        'TopicSet' => 'WSNotification::Elements::TopicSet',
+
+    },
+    {
+
+        'TopicExpression' => '',
+        'FixedTopicSet' => '',
+        'TopicExpressionDialect' => '',
+        'TopicSet' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotificationProducerRP
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotificationProducerRP from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TopicExpression
+
+ $element->set_TopicExpression($data);
+ $element->get_TopicExpression();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * FixedTopicSet
+
+ $element->set_FixedTopicSet($data);
+ $element->get_FixedTopicSet();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TopicExpressionDialect
+
+ $element->set_TopicExpressionDialect($data);
+ $element->get_TopicExpressionDialect();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TopicSet
+
+ $element->set_TopicSet($data);
+ $element->get_TopicSet();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotificationProducerRP->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   FixedTopicSet =>  $some_value, # boolean
+   TopicExpressionDialect =>  $some_value, # anyURI
+   TopicSet =>  { # WSNotification::Types::TopicSetType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Notify.pm b/onvif/proxy/lib/WSNotification/Elements/Notify.pm
new file mode 100644
index 000000000..781b0551d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Notify.pm
@@ -0,0 +1,147 @@
+
+package WSNotification::Elements::Notify;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Notify');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %NotificationMessage_of :ATTR(:get<NotificationMessage>);
+
+__PACKAGE__->_factory(
+    [ qw(        NotificationMessage
+
+    ) ],
+    {
+        'NotificationMessage' => \%NotificationMessage_of,
+    },
+    {
+        'NotificationMessage' => 'WSNotification::Elements::NotificationMessage',
+
+    },
+    {
+
+        'NotificationMessage' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Notify
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Notify from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NotificationMessage
+
+ $element->set_NotificationMessage($data);
+ $element->get_NotificationMessage();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Notify->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   NotificationMessage =>  { # WSNotification::Types::NotificationMessageHolderType
+     SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Topic =>  { # WSNotification::Types::TopicExpressionType
+     },
+     ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Message =>  {
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm b/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm
new file mode 100644
index 000000000..f322b7f0f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::NotifyMessageNotSupportedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotifyMessageNotSupportedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NotifyMessageNotSupportedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotifyMessageNotSupportedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotifyMessageNotSupportedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotifyMessageNotSupportedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotifyMessageNotSupportedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm b/onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
new file mode 100644
index 000000000..bcf1aa8e6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::PauseFailedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('PauseFailedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::PauseFailedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::PauseFailedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PauseFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::PauseFailedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::PauseFailedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm b/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm
new file mode 100644
index 000000000..eb6e991d6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::PauseSubscription;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('PauseSubscription');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::PauseSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PauseSubscription from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::PauseSubscription->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm b/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm
new file mode 100644
index 000000000..ef09471e9
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::PauseSubscriptionResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('PauseSubscriptionResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::PauseSubscriptionResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PauseSubscriptionResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::PauseSubscriptionResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
new file mode 100644
index 000000000..b6463ca9b
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::ProblemAction;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemAction');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::ProblemActionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProblemAction
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemAction from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProblemAction->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ProblemActionType
+   Action =>  { value => $some_value },
+   SoapAction =>  $some_value, # anyURI
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm
new file mode 100644
index 000000000..dc58a06ee
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ProblemHeader;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemHeader');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedAnyType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProblemHeader
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemHeader from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProblemHeader->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::AttributedAnyType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
new file mode 100644
index 000000000..eb1651154
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::ProblemHeaderQName;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemHeaderQName');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedQNameType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProblemHeaderQName
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemHeaderQName from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProblemHeaderQName->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
new file mode 100644
index 000000000..336b92027
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::ProblemIRI;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemIRI');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProblemIRI
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProblemIRI->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm b/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm
new file mode 100644
index 000000000..cdfef17d7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ProducerProperties;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ProducerProperties');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::QueryExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProducerProperties
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProducerProperties from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProducerProperties->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm b/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm
new file mode 100644
index 000000000..8fad76b7a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::ProducerReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ProducerReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProducerReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProducerReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProducerReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm b/onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
new file mode 100644
index 000000000..7561b146a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::RelatesTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('RelatesTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::RelatesToType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::RelatesTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::RelatesTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Renew.pm b/onvif/proxy/lib/WSNotification/Elements/Renew.pm
new file mode 100644
index 000000000..0647997fa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Renew.pm
@@ -0,0 +1,121 @@
+
+package WSNotification::Elements::Renew;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Renew');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        TerminationTime
+
+    ) ],
+    {
+        'TerminationTime' => \%TerminationTime_of,
+    },
+    {
+        'TerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+    },
+    {
+
+        'TerminationTime' => 'TerminationTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Renew
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Renew from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Renew->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm b/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm
new file mode 100644
index 000000000..805e90e2b
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm
@@ -0,0 +1,149 @@
+
+package WSNotification::Elements::RenewResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('RenewResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+my %CurrentTime_of :ATTR(:get<CurrentTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        TerminationTime
+        CurrentTime
+
+    ) ],
+    {
+        'TerminationTime' => \%TerminationTime_of,
+        'CurrentTime' => \%CurrentTime_of,
+    },
+    {
+        'TerminationTime' => 'WSNotification::Elements::TerminationTime',
+
+        'CurrentTime' => 'WSNotification::Elements::CurrentTime',
+
+    },
+    {
+
+        'TerminationTime' => '',
+        'CurrentTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::RenewResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RenewResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * CurrentTime
+
+ $element->set_CurrentTime($data);
+ $element->get_CurrentTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::RenewResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TerminationTime =>  $some_value, # dateTime
+   CurrentTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm b/onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
new file mode 100644
index 000000000..b60354464
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::ReplyTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ReplyTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyTo from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ReplyTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm
new file mode 100644
index 000000000..d25a20fe7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ResumeFailedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeFailedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::ResumeFailedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeFailedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeFailedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ResumeFailedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm
new file mode 100644
index 000000000..23571e479
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::ResumeSubscription;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeSubscription');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeSubscription from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeSubscription->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm
new file mode 100644
index 000000000..bdb2bf122
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::ResumeSubscriptionResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeSubscriptionResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeSubscriptionResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeSubscriptionResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeSubscriptionResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm b/onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
new file mode 100644
index 000000000..1299defd3
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::RetryAfter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('RetryAfter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedUnsignedLongType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::RetryAfter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::RetryAfter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm b/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm
new file mode 100644
index 000000000..a1971bbfc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm
@@ -0,0 +1,219 @@
+
+package WSNotification::Elements::Subscribe;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Subscribe');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConsumerReference_of :ATTR(:get<ConsumerReference>);
+my %Filter_of :ATTR(:get<Filter>);
+my %InitialTerminationTime_of :ATTR(:get<InitialTerminationTime>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConsumerReference
+        Filter
+        InitialTerminationTime
+        SubscriptionPolicy
+
+    ) ],
+    {
+        'ConsumerReference' => \%ConsumerReference_of,
+        'Filter' => \%Filter_of,
+        'InitialTerminationTime' => \%InitialTerminationTime_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+    },
+    {
+        'ConsumerReference' => 'WSNotification::Types::EndpointReferenceType',
+        'Filter' => 'WSNotification::Types::FilterType',
+        'InitialTerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+
+        'SubscriptionPolicy' => 'WSNotification::Elements::Subscribe::_SubscriptionPolicy',
+    },
+    {
+
+        'ConsumerReference' => 'ConsumerReference',
+        'Filter' => 'Filter',
+        'InitialTerminationTime' => 'InitialTerminationTime',
+        'SubscriptionPolicy' => 'SubscriptionPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Elements::Subscribe::_SubscriptionPolicy;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Subscribe
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Subscribe from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConsumerReference
+
+ $element->set_ConsumerReference($data);
+ $element->get_ConsumerReference();
+
+
+
+
+=item * Filter
+
+ $element->set_Filter($data);
+ $element->get_Filter();
+
+
+
+
+=item * InitialTerminationTime
+
+ $element->set_InitialTerminationTime($data);
+ $element->get_InitialTerminationTime();
+
+
+
+
+=item * SubscriptionPolicy
+
+ $element->set_SubscriptionPolicy($data);
+ $element->get_SubscriptionPolicy();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Subscribe->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Filter =>  { # WSNotification::Types::FilterType
+     TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+     },
+     MessageContent =>  { # WSNotification::Types::QueryExpressionType
+     },
+   },
+   InitialTerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+   SubscriptionPolicy =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm b/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm
new file mode 100644
index 000000000..1084e01a1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::SubscribeCreationFailedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscribeCreationFailedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::SubscribeCreationFailedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscribeCreationFailedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscribeCreationFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscribeCreationFailedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscribeCreationFailedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm b/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm
new file mode 100644
index 000000000..6c7ad4444
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm
@@ -0,0 +1,169 @@
+
+package WSNotification::Elements::SubscribeResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscribeResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SubscriptionReference_of :ATTR(:get<SubscriptionReference>);
+my %CurrentTime_of :ATTR(:get<CurrentTime>);
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        SubscriptionReference
+        CurrentTime
+        TerminationTime
+
+    ) ],
+    {
+        'SubscriptionReference' => \%SubscriptionReference_of,
+        'CurrentTime' => \%CurrentTime_of,
+        'TerminationTime' => \%TerminationTime_of,
+    },
+    {
+        'SubscriptionReference' => 'WSNotification::Types::EndpointReferenceType',
+        'CurrentTime' => 'WSNotification::Elements::CurrentTime',
+
+        'TerminationTime' => 'WSNotification::Elements::TerminationTime',
+
+    },
+    {
+
+        'SubscriptionReference' => 'SubscriptionReference',
+        'CurrentTime' => '',
+        'TerminationTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscribeResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscribeResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SubscriptionReference
+
+ $element->set_SubscriptionReference($data);
+ $element->get_SubscriptionReference();
+
+
+
+
+=item * CurrentTime
+
+ $element->set_CurrentTime($data);
+ $element->get_CurrentTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscribeResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   CurrentTime =>  $some_value, # dateTime
+   TerminationTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm
new file mode 100644
index 000000000..e6813d8a5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm
@@ -0,0 +1,203 @@
+
+package WSNotification::Elements::SubscriptionManagerRP;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionManagerRP');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConsumerReference_of :ATTR(:get<ConsumerReference>);
+my %Filter_of :ATTR(:get<Filter>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+my %CreationTime_of :ATTR(:get<CreationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConsumerReference
+        Filter
+        SubscriptionPolicy
+        CreationTime
+
+    ) ],
+    {
+        'ConsumerReference' => \%ConsumerReference_of,
+        'Filter' => \%Filter_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+        'CreationTime' => \%CreationTime_of,
+    },
+    {
+        'ConsumerReference' => 'WSNotification::Elements::ConsumerReference',
+
+        'Filter' => 'WSNotification::Elements::Filter',
+
+        'SubscriptionPolicy' => 'WSNotification::Elements::SubscriptionPolicy',
+
+        'CreationTime' => 'WSNotification::Elements::CreationTime',
+
+    },
+    {
+
+        'ConsumerReference' => '',
+        'Filter' => '',
+        'SubscriptionPolicy' => '',
+        'CreationTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionManagerRP
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionManagerRP from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConsumerReference
+
+ $element->set_ConsumerReference($data);
+ $element->get_ConsumerReference();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * Filter
+
+ $element->set_Filter($data);
+ $element->get_Filter();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * SubscriptionPolicy
+
+ $element->set_SubscriptionPolicy($data);
+ $element->get_SubscriptionPolicy();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * CreationTime
+
+ $element->set_CreationTime($data);
+ $element->get_CreationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionManagerRP->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Filter =>  { # WSNotification::Types::FilterType
+     TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+     },
+     MessageContent =>  { # WSNotification::Types::QueryExpressionType
+     },
+   },
+   SubscriptionPolicy =>  { # WSNotification::Types::SubscriptionPolicyType
+   },
+   CreationTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm
new file mode 100644
index 000000000..db3b04824
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::SubscriptionPolicy;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionPolicy');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::SubscriptionPolicyType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionPolicy
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionPolicy from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionPolicy->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscriptionPolicyType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm
new file mode 100644
index 000000000..a367610ec
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::SubscriptionReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm b/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm
new file mode 100644
index 000000000..86b99fa06
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::TerminationTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TerminationTime');
+__PACKAGE__->__set_nillable(1);
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TerminationTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TerminationTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TerminationTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/To.pm b/onvif/proxy/lib/WSNotification/Elements/To.pm
new file mode 100644
index 000000000..6f1c2d2f0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/To.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::To;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('To');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedURIType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::To
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+To from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::To->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Topic.pm b/onvif/proxy/lib/WSNotification/Elements/Topic.pm
new file mode 100644
index 000000000..27eab03a8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Topic.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::Topic;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Topic');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Topic
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Topic from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Topic->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm
new file mode 100644
index 000000000..98422a5aa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicExpression;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpression');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpression
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpression from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpression->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm
new file mode 100644
index 000000000..4d988174b
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::TopicExpressionDialect;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpressionDialect');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpressionDialect
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpressionDialect from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpressionDialect->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # anyURI
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm
new file mode 100644
index 000000000..74a693e86
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicExpressionDialectUnknownFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpressionDialectUnknownFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionDialectUnknownFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpressionDialectUnknownFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpressionDialectUnknownFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpressionDialectUnknownFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionDialectUnknownFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm b/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm
new file mode 100644
index 000000000..22d33fa09
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::TopicNamespace;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('TopicNamespace');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicNamespaceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicNamespace
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicNamespace from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicNamespace->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNamespaceType
+   Topic =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm b/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm
new file mode 100644
index 000000000..3bc6bae18
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicNotSupportedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicNotSupportedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicNotSupportedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicNotSupportedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicNotSupportedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicNotSupportedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNotSupportedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm b/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm
new file mode 100644
index 000000000..ded38f095
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicSet;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('TopicSet');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicSetType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicSet from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicSet->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicSetType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm
new file mode 100644
index 000000000..b6503cb83
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToCreatePullPointFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToCreatePullPointFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToCreatePullPointFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToCreatePullPointFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToCreatePullPointFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToCreatePullPointFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToCreatePullPointFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm
new file mode 100644
index 000000000..69a502678
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToDestroyPullPointFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToDestroyPullPointFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToDestroyPullPointFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToDestroyPullPointFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToDestroyPullPointFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToDestroyPullPointFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroyPullPointFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm
new file mode 100644
index 000000000..b9a73e1e4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToDestroySubscriptionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToDestroySubscriptionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToDestroySubscriptionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToDestroySubscriptionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToDestroySubscriptionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToDestroySubscriptionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroySubscriptionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm
new file mode 100644
index 000000000..4933af814
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToGetMessagesFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToGetMessagesFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToGetMessagesFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToGetMessagesFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToGetMessagesFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToGetMessagesFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToGetMessagesFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm
new file mode 100644
index 000000000..f140e9682
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::UnacceptableInitialTerminationTimeFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnacceptableInitialTerminationTimeFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnacceptableInitialTerminationTimeFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnacceptableInitialTerminationTimeFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnacceptableInitialTerminationTimeFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm
new file mode 100644
index 000000000..78e04e206
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::UnacceptableTerminationTimeFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnacceptableTerminationTimeFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnacceptableTerminationTimeFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnacceptableTerminationTimeFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnacceptableTerminationTimeFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnacceptableTerminationTimeFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm
new file mode 100644
index 000000000..c0ab348b7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::UnrecognizedPolicyRequestFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnrecognizedPolicyRequestFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnrecognizedPolicyRequestFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnrecognizedPolicyRequestFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnrecognizedPolicyRequestFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnrecognizedPolicyRequestFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnrecognizedPolicyRequestFaultType
+   UnrecognizedPolicy =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm b/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm
new file mode 100644
index 000000000..5263f5069
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::Unsubscribe;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Unsubscribe');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Unsubscribe
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Unsubscribe from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Unsubscribe->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm b/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm
new file mode 100644
index 000000000..70119e1e3
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::UnsubscribeResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnsubscribeResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnsubscribeResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnsubscribeResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnsubscribeResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm
new file mode 100644
index 000000000..4270ec2fa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::UnsupportedPolicyRequestFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnsupportedPolicyRequestFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnsupportedPolicyRequestFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnsupportedPolicyRequestFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnsupportedPolicyRequestFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnsupportedPolicyRequestFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnsupportedPolicyRequestFaultType
+   UnsupportedPolicy =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm b/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm
new file mode 100644
index 000000000..04d636ea3
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm
@@ -0,0 +1,90 @@
+
+package WSNotification::Elements::UseRaw;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UseRaw');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UseRaw
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UseRaw from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UseRaw->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
new file mode 100644
index 000000000..c86b26f9f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
@@ -0,0 +1,184 @@
+package WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require WSNotification::Typemaps::WSBaseNotificationSender
+    if not WSNotification::Typemaps::WSBaseNotificationSender->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://docs.oasis-open.org/wsn/bw-2') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('WSNotification::Typemaps::WSBaseNotificationSender')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub Subscribe {
+    my ($self, $body, $header) = @_;
+    die "Subscribe must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Subscribe',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Subscribe',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Subscribe )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetCurrentMessage {
+    my ($self, $body, $header) = @_;
+    die "GetCurrentMessage must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetCurrentMessage',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/GetCurrentMessage',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::GetCurrentMessage )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort - SOAP Interface for the WSBaseNotificationSender Web Service
+
+=head1 SYNOPSIS
+
+ use WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
+ my $interface = WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort->new();
+
+ my $response;
+ $response = $interface->Subscribe();
+ $response = $interface->GetCurrentMessage();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the WSBaseNotificationSender web service
+located at http://docs.oasis-open.org/wsn/bw-2.
+
+=head1 SERVICE WSBaseNotificationSender
+
+
+
+=head2 Port NotificationProducerPort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 Subscribe
+
+
+
+Returns a L<WSNotification::Elements::SubscribeResponse|WSNotification::Elements::SubscribeResponse> object.
+
+ $response = $interface->Subscribe( {
+    ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+      Address =>  { value => $some_value },
+      ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+      },
+      Metadata =>  { # WSNotification::Types::MetadataType
+      },
+    },
+    Filter =>  { # WSNotification::Types::FilterType
+      TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+      },
+      MessageContent =>  { # WSNotification::Types::QueryExpressionType
+      },
+    },
+    InitialTerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+    SubscriptionPolicy =>  {
+    },
+  },,
+ );
+
+=head3 GetCurrentMessage
+
+
+
+Returns a L<WSNotification::Elements::GetCurrentMessageResponse|WSNotification::Elements::GetCurrentMessageResponse> object.
+
+ $response = $interface->GetCurrentMessage( {
+    Topic =>  { # WSNotification::Types::TopicExpressionType
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Fri Aug  8 16:49:21 2014
+
+=cut
diff --git a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm
new file mode 100644
index 000000000..a10978083
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm
@@ -0,0 +1,167 @@
+package WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require WSNotification::Typemaps::WSBaseNotificationSender
+    if not WSNotification::Typemaps::WSBaseNotificationSender->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://docs.oasis-open.org/wsn/bw-2') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('WSNotification::Typemaps::WSBaseNotificationSender')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub Renew {
+    my ($self, $body, $header) = @_;
+    die "Renew must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Renew',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Renew',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Renew )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub Unsubscribe {
+    my ($self, $body, $header) = @_;
+    die "Unsubscribe must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Unsubscribe',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Unsubscribe',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Unsubscribe )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort - SOAP Interface for the WSBaseNotificationSender Web Service
+
+=head1 SYNOPSIS
+
+ use WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort;
+ my $interface = WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort->new();
+
+ my $response;
+ $response = $interface->Renew();
+ $response = $interface->Unsubscribe();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the WSBaseNotificationSender web service
+located at http://docs.oasis-open.org/wsn/bw-2.
+
+=head1 SERVICE WSBaseNotificationSender
+
+
+
+=head2 Port SubscriptionManagerPort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 Renew
+
+
+
+Returns a L<WSNotification::Elements::RenewResponse|WSNotification::Elements::RenewResponse> object.
+
+ $response = $interface->Renew( {
+    TerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+  },,
+ );
+
+=head3 Unsubscribe
+
+
+
+Returns a L<WSNotification::Elements::UnsubscribeResponse|WSNotification::Elements::UnsubscribeResponse> object.
+
+ $response = $interface->Unsubscribe( {
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Fri Aug  8 16:49:21 2014
+
+=cut
diff --git a/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm b/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm
new file mode 100644
index 000000000..cebd9edb8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm
@@ -0,0 +1,210 @@
+
+package WSNotification::Typemaps::WSBaseNotificationSender;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'InvalidMessageContentExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Subscribe/InitialTerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+               'InvalidTopicExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NotifyMessageNotSupportedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'SubscribeCreationFailedFault' => 'WSNotification::Elements::SubscribeCreationFailedFault',
+               'UnsupportedPolicyRequestFault' => 'WSNotification::Elements::UnsupportedPolicyRequestFault',
+               'UnrecognizedPolicyRequestFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Subscribe/Filter/MessageContent' => 'WSNotification::Types::QueryExpressionType',
+               'InvalidMessageContentExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnacceptableInitialTerminationTimeFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableInitialTerminationTimeFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'NotifyMessageNotSupportedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableInitialTerminationTimeFault' => 'WSNotification::Elements::UnacceptableInitialTerminationTimeFault',
+               'InvalidProducerPropertiesExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NotifyMessageNotSupportedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'NotifyMessageNotSupportedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'TopicNotSupportedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'RenewResponse' => 'WSNotification::Elements::RenewResponse',
+               'InvalidMessageContentExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnableToDestroySubscriptionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicExpressionDialectUnknownFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableTerminationTimeFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableTerminationTimeFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidFilterFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnableToDestroySubscriptionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnrecognizedPolicyRequestFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnrecognizedPolicyRequestFault/UnrecognizedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'InvalidProducerPropertiesExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Renew' => 'WSNotification::Elements::Renew',
+               'UnsupportedPolicyRequestFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'TopicExpressionDialectUnknownFault' => 'WSNotification::Elements::TopicExpressionDialectUnknownFault',
+               'UnacceptableInitialTerminationTimeFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidTopicExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'MultipleTopicsSpecifiedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnrecognizedPolicyRequestFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidMessageContentExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Subscribe/ConsumerReference/Address' => 'WSNotification::Types::AttributedURIType',
+               'TopicExpressionDialectUnknownFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableTerminationTimeFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'UnsupportedPolicyRequestFault/UnsupportedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'Subscribe/ConsumerReference/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'MultipleTopicsSpecifiedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicExpressionDialectUnknownFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnrecognizedPolicyRequestFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'TopicNotSupportedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidProducerPropertiesExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Unsubscribe' => 'WSNotification::Elements::Unsubscribe',
+               'NoCurrentMessageOnTopicFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicNotSupportedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicNotSupportedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'MultipleTopicsSpecifiedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnableToDestroySubscriptionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnacceptableInitialTerminationTimeFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'InvalidTopicExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableTerminationTimeFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'RenewResponse/CurrentTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnsupportedPolicyRequestFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'SubscribeCreationFailedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnrecognizedPolicyRequestFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'Subscribe/SubscriptionPolicy' => 'WSNotification::Elements::Subscribe::_SubscriptionPolicy',
+               'InvalidFilterFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NoCurrentMessageOnTopicFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'TopicNotSupportedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnrecognizedPolicyRequestFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidProducerPropertiesExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'Renew/TerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+               'UnsupportedPolicyRequestFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidTopicExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicNotSupportedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnacceptableTerminationTimeFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnrecognizedPolicyRequestFault' => 'WSNotification::Elements::UnrecognizedPolicyRequestFault',
+               'UnacceptableTerminationTimeFault/MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidTopicExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'SubscribeCreationFailedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnsupportedPolicyRequestFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'RenewResponse/TerminationTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidTopicExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'TopicExpressionDialectUnknownFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnacceptableInitialTerminationTimeFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidTopicExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'SubscribeResponse/SubscriptionReference/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'InvalidMessageContentExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'Subscribe/ConsumerReference' => 'WSNotification::Types::EndpointReferenceType',
+               'UnableToDestroySubscriptionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'GetCurrentMessage' => 'WSNotification::Elements::GetCurrentMessage',
+               'TopicExpressionDialectUnknownFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'SubscribeCreationFailedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'NoCurrentMessageOnTopicFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnrecognizedPolicyRequestFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'InvalidFilterFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'SubscribeCreationFailedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'InvalidFilterFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicExpressionDialectUnknownFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidFilterFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnacceptableInitialTerminationTimeFault/MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'NotifyMessageNotSupportedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeResponse/SubscriptionReference/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeCreationFailedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'NotifyMessageNotSupportedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicNotSupportedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnsupportedPolicyRequestFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'TopicExpressionDialectUnknownFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnableToDestroySubscriptionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'TopicNotSupportedFault' => 'WSNotification::Elements::TopicNotSupportedFault',
+               'InvalidMessageContentExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'MultipleTopicsSpecifiedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidFilterFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'MultipleTopicsSpecifiedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnsubscribeResponse' => 'WSNotification::Elements::UnsubscribeResponse',
+               'Subscribe' => 'WSNotification::Elements::Subscribe',
+               'GetCurrentMessageResponse' => 'WSNotification::Elements::GetCurrentMessageResponse',
+               'NotifyMessageNotSupportedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'NoCurrentMessageOnTopicFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableInitialTerminationTimeFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'Subscribe/ConsumerReference/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnsupportedPolicyRequestFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'NotifyMessageNotSupportedFault' => 'WSNotification::Elements::NotifyMessageNotSupportedFault',
+               'InvalidTopicExpressionFault' => 'WSNotification::Elements::InvalidTopicExpressionFault',
+               'UnableToDestroySubscriptionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidFilterFault' => 'WSNotification::Elements::InvalidFilterFault',
+               'GetCurrentMessage/Topic' => 'WSNotification::Types::TopicExpressionType',
+               'SubscribeResponse/SubscriptionReference/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidFilterFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'InvalidMessageContentExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Subscribe/Filter/TopicExpression' => 'WSNotification::Types::TopicExpressionType',
+               'SubscribeResponse' => 'WSNotification::Elements::SubscribeResponse',
+               'TopicExpressionDialectUnknownFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidMessageContentExpressionFault' => 'WSNotification::Elements::InvalidMessageContentExpressionFault',
+               'NotifyMessageNotSupportedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnrecognizedPolicyRequestFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'MultipleTopicsSpecifiedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeResponse/SubscriptionReference' => 'WSNotification::Types::EndpointReferenceType',
+               'UnsupportedPolicyRequestFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'InvalidFilterFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NoCurrentMessageOnTopicFault' => 'WSNotification::Elements::NoCurrentMessageOnTopicFault',
+               'InvalidMessageContentExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnsupportedPolicyRequestFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnacceptableTerminationTimeFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnableToDestroySubscriptionFault' => 'WSNotification::Elements::UnableToDestroySubscriptionFault',
+               'UnacceptableTerminationTimeFault' => 'WSNotification::Elements::UnacceptableTerminationTimeFault',
+               'Subscribe/Filter' => 'WSNotification::Types::FilterType',
+               'UnacceptableTerminationTimeFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidTopicExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnacceptableInitialTerminationTimeFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault' => 'WSNotification::Elements::MultipleTopicsSpecifiedFault',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'TopicNotSupportedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnacceptableTerminationTimeFault/MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'InvalidProducerPropertiesExpressionFault' => 'WSNotification::Elements::InvalidProducerPropertiesExpressionFault',
+               'UnacceptableTerminationTimeFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'SubscribeResponse/CurrentTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableInitialTerminationTimeFault/MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'SubscribeResponse/TerminationTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidFilterFault/UnknownFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'UnableToDestroySubscriptionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableInitialTerminationTimeFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidProducerPropertiesExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnableToDestroySubscriptionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Typemaps::WSBaseNotificationSender - typemap for WSBaseNotificationSender
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm b/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm
new file mode 100644
index 000000000..ac8dc805d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm
@@ -0,0 +1,76 @@
+package WSNotification::Types::AbsoluteOrRelativeTimeType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AbsoluteOrRelativeTimeType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm
new file mode 100644
index 000000000..248338084
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::AttributedAnyType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::AttributedAnyType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedAnyType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::AttributedAnyType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
new file mode 100644
index 000000000..5ae9529bb
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
@@ -0,0 +1,73 @@
+package WSNotification::Types::AttributedQNameType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::AttributedQNameType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedQNameType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
new file mode 100644
index 000000000..b561322d5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
@@ -0,0 +1,73 @@
+package WSNotification::Types::AttributedURIType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::AttributedURIType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedURIType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
new file mode 100644
index 000000000..39796def5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
@@ -0,0 +1,73 @@
+package WSNotification::Types::AttributedUnsignedLongType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::AttributedUnsignedLongType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedUnsignedLongType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm b/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm
new file mode 100644
index 000000000..90323617a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm
@@ -0,0 +1,288 @@
+package WSNotification::Types::BaseFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsrf/bf-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(SOAP::WSDL::XSD::Typelib::Builtin::anyType);
+# Variety: 
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::BaseFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BaseFaultType from the namespace http://docs.oasis-open.org/wsrf/bf-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Timestamp
+
+
+=item * Originator
+
+
+=item * ErrorCode
+
+
+=item * Description
+
+
+=item * FaultCause
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::BaseFaultType
+   Timestamp =>  $some_value, # dateTime
+   Originator =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   ErrorCode => 
+ # No documentation generated for complexContent / extension yet
+,
+   Description =>  { value => $some_value },
+   FaultCause =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm
new file mode 100644
index 000000000..48b4b3475
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::ConcreteTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ConcreteTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+The pattern allows strings matching the following EBNF: ConcreteTopicPath ::= RootTopic ChildTopic* RootTopic ::= QName ChildTopic ::= '/' (QName | NCName) 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/Documentation.pm b/onvif/proxy/lib/WSNotification/Types/Documentation.pm
new file mode 100644
index 000000000..84f61d65f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/Documentation.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::Documentation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::Documentation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Documentation from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::Documentation
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
new file mode 100644
index 000000000..c12ba0cc4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
@@ -0,0 +1,130 @@
+package WSNotification::Types::EndpointReferenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
+my %Metadata_of :ATTR(:get<Metadata>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        ReferenceParameters
+        Metadata
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'ReferenceParameters' => \%ReferenceParameters_of,
+        'Metadata' => \%Metadata_of,
+    },
+    {
+        'Address' => 'WSNotification::Types::AttributedURIType',
+        'ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+        'Metadata' => 'WSNotification::Elements::Metadata',
+
+    },
+    {
+
+        'Address' => 'Address',
+        'ReferenceParameters' => 'ReferenceParameters',
+        'Metadata' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::EndpointReferenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EndpointReferenceType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * ReferenceParameters
+
+
+=item * Metadata
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm b/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm
new file mode 100644
index 000000000..e7c4deef6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm
@@ -0,0 +1,104 @@
+package WSNotification::Types::ExtensibleDocumented;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+    },
+    {
+
+        'documentation' => 'documentation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ExtensibleDocumented
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExtensibleDocumented from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * documentation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ExtensibleDocumented
+   documentation =>  { # WSNotification::Types::Documentation
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm b/onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
new file mode 100644
index 000000000..06e4df192
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
@@ -0,0 +1,76 @@
+package WSNotification::Types::FaultCodesOpenEnumType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodesOpenEnumType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm b/onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
new file mode 100644
index 000000000..88146b753
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::FaultCodesType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultCodesType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/FilterType.pm b/onvif/proxy/lib/WSNotification/Types/FilterType.pm
new file mode 100644
index 000000000..7aece8cf1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FilterType.pm
@@ -0,0 +1,128 @@
+package WSNotification::Types::FilterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TopicExpression_of :ATTR(:get<TopicExpression>);
+my %MessageContent_of :ATTR(:get<MessageContent>);
+
+__PACKAGE__->_factory(
+    [ qw(        TopicExpression
+        MessageContent
+
+    ) ],
+    {
+        'TopicExpression' => \%TopicExpression_of,
+        'MessageContent' => \%MessageContent_of,
+    },
+    {
+        'TopicExpression' => 'WSNotification::Elements::TopicExpression',
+
+        'MessageContent' => 'WSNotification::Elements::MessageContent',
+
+    },
+    {
+
+        'TopicExpression' => '',
+        'MessageContent' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::FilterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FilterType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TopicExpression
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MessageContent
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::FilterType
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   MessageContent =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm
new file mode 100644
index 000000000..07498a001
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::FullTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FullTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+TopicPathExpression ::= TopicPath ( '|' TopicPath )* TopicPath ::= RootTopic ChildTopicExpression* RootTopic ::= NamespacePrefix? ('//')? (NCName | '*') NamespacePrefix ::= NCName ':' ChildTopicExpression ::= '/' '/'? (QName | NCName | '*'| '.') 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm
new file mode 100644
index 000000000..f16776fa2
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::InvalidFilterFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnknownFilter_of :ATTR(:get<UnknownFilter>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnknownFilter
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnknownFilter' => \%UnknownFilter_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnknownFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnknownFilter' => 'UnknownFilter',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidFilterFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidFilterFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnknownFilter
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidFilterFaultType
+   UnknownFilter =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm
new file mode 100644
index 000000000..c8a643358
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidMessageContentExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidMessageContentExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidMessageContentExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidMessageContentExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm
new file mode 100644
index 000000000..ea5a790ea
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidProducerPropertiesExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidProducerPropertiesExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm
new file mode 100644
index 000000000..f3061a2db
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidTopicExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidTopicExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidTopicExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidTopicExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/MetadataType.pm b/onvif/proxy/lib/WSNotification/Types/MetadataType.pm
new file mode 100644
index 000000000..d1bcd64a0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/MetadataType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::MetadataType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::MetadataType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MetadataType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm
new file mode 100644
index 000000000..64015b34d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::MultipleTopicsSpecifiedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::MultipleTopicsSpecifiedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MultipleTopicsSpecifiedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MultipleTopicsSpecifiedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm b/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm
new file mode 100644
index 000000000..a9e3d2817
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::NoCurrentMessageOnTopicFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NoCurrentMessageOnTopicFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NoCurrentMessageOnTopicFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NoCurrentMessageOnTopicFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm b/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm
new file mode 100644
index 000000000..8eae83502
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm
@@ -0,0 +1,209 @@
+package WSNotification::Types::NotificationMessageHolderType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SubscriptionReference_of :ATTR(:get<SubscriptionReference>);
+my %Topic_of :ATTR(:get<Topic>);
+my %ProducerReference_of :ATTR(:get<ProducerReference>);
+my %Message_of :ATTR(:get<Message>);
+
+__PACKAGE__->_factory(
+    [ qw(        SubscriptionReference
+        Topic
+        ProducerReference
+        Message
+
+    ) ],
+    {
+        'SubscriptionReference' => \%SubscriptionReference_of,
+        'Topic' => \%Topic_of,
+        'ProducerReference' => \%ProducerReference_of,
+        'Message' => \%Message_of,
+    },
+    {
+        'SubscriptionReference' => 'WSNotification::Elements::SubscriptionReference',
+
+        'Topic' => 'WSNotification::Elements::Topic',
+
+        'ProducerReference' => 'WSNotification::Elements::ProducerReference',
+
+
+        'Message' => 'WSNotification::Types::NotificationMessageHolderType::_Message',
+    },
+    {
+
+        'SubscriptionReference' => '',
+        'Topic' => '',
+        'ProducerReference' => '',
+        'Message' => 'Message',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::NotificationMessageHolderType::_Message;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NotificationMessageHolderType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NotificationMessageHolderType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SubscriptionReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Topic
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * ProducerReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Message
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotificationMessageHolderType
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+   ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Message =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm
new file mode 100644
index 000000000..2604e277f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::NotifyMessageNotSupportedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NotifyMessageNotSupportedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NotifyMessageNotSupportedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotifyMessageNotSupportedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm
new file mode 100644
index 000000000..03660d798
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::PauseFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::PauseFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PauseFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::PauseFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm b/onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
new file mode 100644
index 000000000..4f583bda7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
@@ -0,0 +1,119 @@
+package WSNotification::Types::ProblemActionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Action_of :ATTR(:get<Action>);
+my %SoapAction_of :ATTR(:get<SoapAction>);
+
+__PACKAGE__->_factory(
+    [ qw(        Action
+        SoapAction
+
+    ) ],
+    {
+        'Action' => \%Action_of,
+        'SoapAction' => \%SoapAction_of,
+    },
+    {
+        'Action' => 'WSNotification::Elements::Action',
+
+        'SoapAction' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'Action' => '',
+        'SoapAction' => 'SoapAction',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ProblemActionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProblemActionType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Action
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * SoapAction
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ProblemActionType
+   Action =>  { value => $some_value },
+   SoapAction =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm b/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm
new file mode 100644
index 000000000..a8bfcdb54
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm
@@ -0,0 +1,139 @@
+package WSNotification::Types::QueryExpressionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Dialect_of :ATTR(:get<Dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Dialect
+    ) ],
+    {
+
+        Dialect => \%Dialect_of,
+    },
+    {
+        Dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::QueryExpressionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+QueryExpressionType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Dialect
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
new file mode 100644
index 000000000..914afc5e7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::ReferenceParametersType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ReferenceParametersType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReferenceParametersType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ReferenceParametersType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/RelatesToType.pm b/onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
new file mode 100644
index 000000000..7e38c6d2e
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
@@ -0,0 +1,118 @@
+package WSNotification::Types::RelatesToType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+package WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %RelationshipType_of :ATTR(:get<RelationshipType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        RelationshipType
+    ) ],
+    {
+
+        RelationshipType => \%RelationshipType_of,
+    },
+    {
+        RelationshipType => 'WSNotification::Types::RelationshipTypeOpenEnum',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::RelatesToType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelatesToType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * RelationshipType
+
+
+
+This attribute is of type L<WSNotification::Types::RelationshipTypeOpenEnum|WSNotification::Types::RelationshipTypeOpenEnum>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/RelationshipType.pm b/onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
new file mode 100644
index 000000000..e3f288911
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::RelationshipType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm b/onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
new file mode 100644
index 000000000..e598093cb
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
@@ -0,0 +1,76 @@
+package WSNotification::Types::RelationshipTypeOpenEnum;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipTypeOpenEnum from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm
new file mode 100644
index 000000000..52b5ed041
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::ResumeFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ResumeFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ResumeFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ResumeFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm
new file mode 100644
index 000000000..5f67e1970
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::SimpleTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SimpleTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+The pattern allows strings matching the following EBNF: RootTopic ::= QName 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm
new file mode 100644
index 000000000..cbfd7724a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::SubscribeCreationFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::SubscribeCreationFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SubscribeCreationFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscribeCreationFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm b/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm
new file mode 100644
index 000000000..b79ec4774
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::SubscriptionPolicyType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::SubscriptionPolicyType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SubscriptionPolicyType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscriptionPolicyType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm b/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm
new file mode 100644
index 000000000..d640d9d19
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::TopicExpressionDialectUnknownFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicExpressionDialectUnknownFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicExpressionDialectUnknownFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionDialectUnknownFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm b/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm
new file mode 100644
index 000000000..20910969c
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm
@@ -0,0 +1,120 @@
+package WSNotification::Types::TopicExpressionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+package WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Dialect_of :ATTR(:get<Dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Dialect
+    ) ],
+    {
+
+        Dialect => \%Dialect_of,
+    },
+    {
+        Dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicExpressionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicExpressionType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Dialect
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm b/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm
new file mode 100644
index 000000000..b08fe6e53
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm
@@ -0,0 +1,256 @@
+package WSNotification::Types::TopicNamespaceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %Topic_of :ATTR(:get<Topic>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        Topic
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'Topic' => \%Topic_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+
+        'Topic' => 'WSNotification::Types::TopicNamespaceType::_Topic',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'Topic' => 'Topic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicNamespaceType::_Topic;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicNamespaceType::_Topic::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::TopicType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %MessagePattern_of :ATTR(:get<MessagePattern>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        MessagePattern
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'MessagePattern' => \%MessagePattern_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+        'MessagePattern' => 'WSNotification::Types::QueryExpressionType',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'MessagePattern' => 'MessagePattern',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicNamespaceType::_Topic::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %parent_of :ATTR(:get<parent>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        parent
+    ) ],
+    {
+
+        parent => \%parent_of,
+    },
+    {
+        parent => 'WSNotification::Types::ConcreteTopicExpression',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %name_of :ATTR(:get<name>);
+my %targetNamespace_of :ATTR(:get<targetNamespace>);
+my %final_of :ATTR(:get<final>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        name
+        targetNamespace
+        final
+    ) ],
+    {
+
+        name => \%name_of,
+
+        targetNamespace => \%targetNamespace_of,
+
+        final => \%final_of,
+    },
+    {
+        name => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+        targetNamespace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        final => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicNamespaceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicNamespaceType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Topic
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNamespaceType
+   Topic =>  {
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * name
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+=item * targetNamespace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+=item * final
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm
new file mode 100644
index 000000000..d4639c99a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::TopicNotSupportedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicNotSupportedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicNotSupportedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNotSupportedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm b/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm
new file mode 100644
index 000000000..4c6e58c45
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm
@@ -0,0 +1,102 @@
+package WSNotification::Types::TopicSetType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+    },
+    {
+
+        'documentation' => 'documentation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicSetType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicSetType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicSetType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicType.pm b/onvif/proxy/lib/WSNotification/Types/TopicType.pm
new file mode 100644
index 000000000..c20dbb6a8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicType.pm
@@ -0,0 +1,168 @@
+package WSNotification::Types::TopicType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicType::_TopicType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %MessagePattern_of :ATTR(:get<MessagePattern>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        MessagePattern
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'MessagePattern' => \%MessagePattern_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+        'MessagePattern' => 'WSNotification::Types::QueryExpressionType',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'MessagePattern' => 'MessagePattern',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicType::_TopicType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %name_of :ATTR(:get<name>);
+my %final_of :ATTR(:get<final>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        name
+        final
+    ) ],
+    {
+
+        name => \%name_of,
+
+        final => \%final_of,
+    },
+    {
+        name => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+        final => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MessagePattern
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicType
+   MessagePattern =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicType::_TopicType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * name
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+=item * final
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm
new file mode 100644
index 000000000..1eaa5945f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToCreatePullPointFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToCreatePullPointFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToCreatePullPointFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToCreatePullPointFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm
new file mode 100644
index 000000000..61618b190
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToDestroyPullPointFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToDestroyPullPointFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToDestroyPullPointFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroyPullPointFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm
new file mode 100644
index 000000000..fd1de261f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToDestroySubscriptionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToDestroySubscriptionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToDestroySubscriptionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroySubscriptionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm
new file mode 100644
index 000000000..df0dfd4a0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToGetMessagesFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToGetMessagesFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToGetMessagesFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToGetMessagesFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm
new file mode 100644
index 000000000..d9803c706
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm
@@ -0,0 +1,270 @@
+package WSNotification::Types::UnacceptableInitialTerminationTimeFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %MinimumTime_of :ATTR(:get<MinimumTime>);
+my %MaximumTime_of :ATTR(:get<MaximumTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        MinimumTime
+        MaximumTime
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'MinimumTime' => \%MinimumTime_of,
+        'MaximumTime' => \%MaximumTime_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'MinimumTime' => 'MinimumTime',
+        'MaximumTime' => 'MaximumTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnacceptableInitialTerminationTimeFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinimumTime
+
+
+=item * MaximumTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm
new file mode 100644
index 000000000..649b61830
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm
@@ -0,0 +1,270 @@
+package WSNotification::Types::UnacceptableTerminationTimeFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %MinimumTime_of :ATTR(:get<MinimumTime>);
+my %MaximumTime_of :ATTR(:get<MaximumTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        MinimumTime
+        MaximumTime
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'MinimumTime' => \%MinimumTime_of,
+        'MaximumTime' => \%MaximumTime_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'MinimumTime' => 'MinimumTime',
+        'MaximumTime' => 'MaximumTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnacceptableTerminationTimeFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnacceptableTerminationTimeFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinimumTime
+
+
+=item * MaximumTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm
new file mode 100644
index 000000000..a82914c62
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::UnrecognizedPolicyRequestFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnrecognizedPolicy_of :ATTR(:get<UnrecognizedPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnrecognizedPolicy
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnrecognizedPolicy' => \%UnrecognizedPolicy_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnrecognizedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnrecognizedPolicy' => 'UnrecognizedPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnrecognizedPolicyRequestFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnrecognizedPolicyRequestFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnrecognizedPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnrecognizedPolicyRequestFaultType
+   UnrecognizedPolicy =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm
new file mode 100644
index 000000000..8c22f4cbc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::UnsupportedPolicyRequestFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnsupportedPolicy_of :ATTR(:get<UnsupportedPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnsupportedPolicy
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnsupportedPolicy' => \%UnsupportedPolicy_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnsupportedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnsupportedPolicy' => 'UnsupportedPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnsupportedPolicyRequestFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnsupportedPolicyRequestFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnsupportedPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnsupportedPolicyRequestFaultType
+   UnsupportedPolicy =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+

From 0af83ed7f365b8cd99019704b03380c5804f94a5 Mon Sep 17 00:00:00 2001
From: Matt N <github@matthew.noorenberghe.com>
Date: Sun, 13 Mar 2016 15:19:04 -0700
Subject: [PATCH 318/362] Change README documentation link to readthedocs

The wiki just ends up linking there
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcd96bfd6..893decd17 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ ZoneMinder
 
 [![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 
-All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki/index.php/Documentation
+All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 
 ## Overview
 

From 4581379d45e67ea7d86a635ea8c6e336f30f3f71 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Tue, 15 Mar 2016 07:21:34 -0500
Subject: [PATCH 319/362] Update redhat.rst

minor edits
---
 docs/installationguide/redhat.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 17157cfb6..8cac087f0 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -46,7 +46,7 @@ The following notes are based on real problems which have occurred:
 
 - Each ZoneMinder rpm includes a README file under /usr/share/doc. You must follow the all steps in this README file, precisely, each and every time ZoneMinder is installed or upgraded. **Failure to do so is guaranteed to result in a non-functional system.**
 
-To being the installation of ZoneMinder on your Redhat based distro, please navigate to: http://zmrepo.zoneminder.com
+To begin the installation of ZoneMinder on your Redhat based distro, please navigate to: http://zmrepo.zoneminder.com
 
 How to Build a (Custom) ZoneMinder Package
 ------------------------------------------
@@ -150,7 +150,7 @@ From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and pla
 
 ::
 
-    rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+    rpm -ivh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
 
 
 IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
@@ -165,8 +165,11 @@ Make sure you have git installed:
 Now clone the ZoneMinder git repository:
 
 ::
-
+    cd
     git clone https://github.com/ZoneMinder/ZoneMinder
+    cd ZoneMinder
+    git submodule init
+    git submodule update
 
 This will create a sub-folder called ZoneMinder, which will contain the latest development.
 

From dcdb879637a37eb9bab281d880cf5d801d40c657 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Tue, 15 Mar 2016 07:24:15 -0500
Subject: [PATCH 320/362] Update redhat.rst

---
 docs/installationguide/redhat.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 8cac087f0..7466f5b0c 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -165,6 +165,7 @@ Make sure you have git installed:
 Now clone the ZoneMinder git repository:
 
 ::
+
     cd
     git clone https://github.com/ZoneMinder/ZoneMinder
     cd ZoneMinder

From 68a5e78efced55541655cd79a53ad161ef337c82 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Tue, 15 Mar 2016 07:30:31 -0500
Subject: [PATCH 321/362] Update redhat.rst

---
 docs/installationguide/redhat.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 7466f5b0c..afb8a5402 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -21,7 +21,7 @@ One can think of Fedora as RHEL or CentOS Beta. This is in fact, what it is. Fed
 
 Fedora has a short life-cycle of just 6 months. However, Fedora, and consequently ZoneMinder, is available on armv7 architecture. Rejoice, Raspberry Pi users!
 
-If you desire newer packages than what it available in RHEL and CentOS, then you should consider using Fedora.
+If you desire newer packages than what is available in RHEL or CentOS, you should consider using Fedora.
 
 Zmrepo – A ZoneMinder RPM Repository
 ------------------------------------

From fe46785e94081d86b6dfb565c423198b52855c77 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Tue, 15 Mar 2016 07:33:40 -0500
Subject: [PATCH 322/362] Update redhat.rst

---
 docs/installationguide/redhat.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index afb8a5402..bf0cfdc60 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -34,7 +34,7 @@ The following notes are based on real problems which have occurred:
 
 - Zmrepo assumes you have installed the underlying distrubution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
 
-- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, but some invariably will not. Astericks is one such example.
+- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, some invariably will not. Astericks is one such example.
 
 - Be advised that you need to start with a clean system before using zmrepo.
 

From 94057a94ffb0b879f00578e8b1a26975273aa41d Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Fri, 18 Mar 2016 22:42:34 +0000
Subject: [PATCH 323/362] Fix spelling of 'environment'

---
 distros/redhat/README.Centos7 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7
index de0bd52d6..47ec542ac 100644
--- a/distros/redhat/README.Centos7
+++ b/distros/redhat/README.Centos7
@@ -40,7 +40,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
    something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.

From 06e04127d65adbe268c155d6179c13bba736911b Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Fri, 18 Mar 2016 23:27:43 +0000
Subject: [PATCH 324/362] Fix spelling in other README files as well

---
 distros/fedora/README.Fedora | 2 +-
 distros/redhat/README.CentOS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora
index 18d091772..74386c9df 100644
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@@ -42,7 +42,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
    something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS
index 35718a691..2cdaea68e 100644
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@@ -34,7 +34,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder mysql credentials to something
    other than zmuser/zmpass then you must now edit /etc/zm.conf. Change

From 16cf1b6245ad427dc723c4bc87cd881cfd2819f2 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sat, 19 Mar 2016 13:31:33 +0000
Subject: [PATCH 325/362] Detect IP address in URLs like http://ip:port/

This if for devices like the Tenvis TH661 which responds with:

http://192.168.1.246:8080/onvif/devices
---
 onvif/scripts/zmonvif-probe.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 8740fb7e6..9d4e67fd2 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -114,7 +114,7 @@ sub interpret_messages
     my $xaddr;  
     foreach my $l_xaddr (split ' ', $result->get_ProbeMatch()->get_XAddrs()) {
   #   find IPv4 address
-      if($l_xaddr =~ m|//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/|) { 
+      if($l_xaddr =~ m|//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[:/]|) {
         $xaddr = $l_xaddr;
         last;
       }

From ed7e3e47b73d0a6fe0bce25fd6dc687cd51a1a89 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sat, 19 Mar 2016 14:15:51 +0000
Subject: [PATCH 326/362] Add more checking around xaddr parsing

---
 onvif/scripts/zmonvif-probe.pl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 9d4e67fd2..ed81e3961 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -114,12 +114,20 @@ sub interpret_messages
     my $xaddr;  
     foreach my $l_xaddr (split ' ', $result->get_ProbeMatch()->get_XAddrs()) {
   #   find IPv4 address
+      if($verbose) {
+        print "l_xaddr = $l_xaddr\n";
+      }
       if($l_xaddr =~ m|//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[:/]|) {
         $xaddr = $l_xaddr;
         last;
+      } else {
+        print STDERR "Unable to find IPv4 address from xaddr $l_xaddr\n";
       }
     }
 
+    # No usable address found
+    next if not $xaddr;
+
     # ignore multiple responses from one service
     next if defined $services{$xaddr};
     $services{$xaddr} = 1;

From 909c23c38bda1abd0c86b597d6c300d43e8849f8 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sat, 19 Mar 2016 14:50:44 +0000
Subject: [PATCH 327/362] ONVIF: Make GetStreamUri try both RTP_unicast and
 RTP-Unicast

The specification gives conflicting values for the unicast stream
type in different parts of the document:

http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri

Description has: StreamType = "RTP_unicast"

Input has: enum { 'RTP-Unicast', 'RTP-Multicast' }

The Tenvis TH661 only accepts RTP-Unicast but the original code was
using RTP_unicast. Try both and take the result of the first one
which works.
---
 onvif/scripts/zmonvif-probe.pl | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index ed81e3961..5351ede6a 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -232,16 +232,21 @@ sub profiles
          $profile->get_VideoEncoderConfiguration()->get_RateControl()->get_FrameRateLimit() .
          ", ";
 
-    $result = $client->get_endpoint('media')->GetStreamUri( { 
-      StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
-        Stream => 'RTP_unicast', # StreamType
-        Transport =>  { # ONVIF::Media::Types::Transport
-          Protocol => 'RTSP', # TransportProtocol
-        },
-      },
-      ProfileToken => $token, # ReferenceToken  
-    } ,, );
-    die $result if not $result;
+   # Specification gives conflicting values for unicast stream types, try both.
+   # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
+   foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast' ) {
+     $result = $client->get_endpoint('media')->GetStreamUri( {
+       StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
+         Stream => $streamtype, # StreamType
+         Transport =>  { # ONVIF::Media::Types::Transport
+           Protocol => 'RTSP', # TransportProtocol
+         },
+       },
+       ProfileToken => $token, # ReferenceToken
+     } ,, );
+     last if $result;
+   }
+   die $result if not $result;
   #  print $result . "\n";
 
     print $result->get_MediaUri()->get_Uri() .

From b11f3bce53a2797c07c76cf49be7bd5fb037697d Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sat, 19 Mar 2016 15:25:17 +0000
Subject: [PATCH 328/362] Assume this was meant to be Asterisk, not Astericks.

---
 docs/installationguide/redhat.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index bf0cfdc60..98c911bbc 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -34,7 +34,7 @@ The following notes are based on real problems which have occurred:
 
 - Zmrepo assumes you have installed the underlying distrubution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
 
-- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, some invariably will not. Astericks is one such example.
+- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, some invariably will not. Asterisk is one such example.
 
 - Be advised that you need to start with a clean system before using zmrepo.
 

From 6fd718e2e68a38cf449546847c29020e360e57d6 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sat, 19 Mar 2016 17:28:39 +0000
Subject: [PATCH 329/362] ONVIF: Fix hash reference mixups which broke 1.1
 detection

With these changes the script now detects my camera during the
1.1 scan and ignores the duplicate 1.2 response.

$ ~/zmonvif-probe.git.pl probe
http://192.168.1.246:8080/onvif/devices, 1.1, (Profile='Streaming', model='C6F0SeZ0N0P0L0', name='IPCAM', location/country='china')
---
 onvif/scripts/zmonvif-probe.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 5351ede6a..d776f61c6 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -95,7 +95,7 @@ sub deserialize_message
 
 sub interpret_messages
 {
-  my ($svc_discover, @responses, %services) = @_;
+  my ($svc_discover, $services, @responses ) = @_;
 
   foreach my $response ( @responses ) {
 
@@ -129,8 +129,8 @@ sub interpret_messages
     next if not $xaddr;
 
     # ignore multiple responses from one service
-    next if defined $services{$xaddr};
-    $services{$xaddr} = 1;
+    next if defined $services->{$xaddr};
+    $services->{$xaddr} = 1;
 
     print "$xaddr, " . $svc_discover->get_soap_version() . ", ";
 
@@ -184,7 +184,7 @@ sub discover
   );
 #  print $result . "\n";
 
-  interpret_messages($svc_discover, \@responses, \%services);
+  interpret_messages($svc_discover, \%services, @responses);
   @responses = ();
 
   if($verbose) {
@@ -203,7 +203,7 @@ sub discover
   );
 #  print $result . "\n";
 
-  interpret_messages($svc_discover, @responses, \%services);
+  interpret_messages($svc_discover, \%services, @responses);
 }
 
 

From 39053f932573ad1f071a19a576b1db7b0f930d7c Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sat, 19 Mar 2016 18:36:12 +0100
Subject: [PATCH 330/362] WSDiscovery version changed from 1.1 to 1.0

---
 .../WSDiscovery/Elements/EndpointReference.pm |  63 --------
 .../proxy/lib/WSDiscovery/Elements/FaultTo.pm |  63 --------
 onvif/proxy/lib/WSDiscovery/Elements/From.pm  |  63 --------
 .../lib/WSDiscovery/Elements/Metadata.pm      |  58 -------
 .../lib/WSDiscovery/Elements/ProblemAction.pm |  60 --------
 .../Elements/ProblemHeaderQName.pm            |  57 -------
 .../Elements/ReferenceParameters.pm           |  58 -------
 .../proxy/lib/WSDiscovery/Elements/ReplyTo.pm |  63 --------
 .../proxy/lib/WSDiscovery/Elements/Resolve.pm |  65 --------
 .../lib/WSDiscovery/Typemaps/WSDiscovery.pm   |  59 --------
 .../Types/EndpointReferenceType.pm            | 137 -----------------
 .../WSDiscovery/Types/ProblemActionType.pm    | 119 ---------------
 .../Types/RelationshipTypeOpenEnum.pm         |  76 ----------
 .../Attributes/Action.pm}                     |  14 +-
 .../Attributes/Id.pm                          |  10 +-
 .../Elements/Action.pm                        |  12 +-
 .../Elements/AppSequence.pm                   |  14 +-
 .../Elements/Bye.pm                           |  22 +--
 .../Elements/EndpointReference.pm             |  65 ++++++++
 .../lib/WSDiscovery10/Elements/FaultTo.pm     |  65 ++++++++
 .../proxy/lib/WSDiscovery10/Elements/From.pm  |  65 ++++++++
 .../Elements/Hello.pm                         |  22 +--
 .../Elements/MessageID.pm                     |  12 +-
 .../Elements/MetadataVersion.pm               |  10 +-
 .../Elements/Probe.pm                         |  14 +-
 .../Elements/ProbeMatches.pm                  |  24 +--
 .../Elements/RelatesTo.pm                     |  12 +-
 .../Elements/ReplyAfter.pm}                   |  14 +-
 .../lib/WSDiscovery10/Elements/ReplyTo.pm     |  65 ++++++++
 .../lib/WSDiscovery10/Elements/Resolve.pm     |  67 +++++++++
 .../Elements/ResolveMatches.pm                |  24 +--
 .../Elements/RetryAfter.pm                    |  12 +-
 .../Elements/Scopes.pm                        |  12 +-
 .../Elements/Security.pm                      |  16 +-
 .../Elements/Sig.pm                           |  14 +-
 .../Elements/SupportedMatchingRules.pm        |  12 +-
 .../Elements/To.pm                            |  12 +-
 .../Elements/Types.pm                         |  12 +-
 .../Elements/XAddrs.pm                        |  12 +-
 .../Interfaces/WSDiscovery/WSDiscoveryPort.pm |  24 +--
 .../lib/WSDiscovery10/Typemaps/WSDiscovery.pm |  56 +++++++
 .../Types/AppSequenceType.pm                  |  16 +-
 .../Types/AttributedQName.pm}                 |   8 +-
 .../Types/AttributedURI.pm}                   |   8 +-
 .../Types/ByeType.pm                          |  28 ++--
 .../Types/EndpointReferenceType.pm            | 141 ++++++++++++++++++
 .../Types/FaultCodeOpenType.pm                |   6 +-
 .../Types/FaultCodeType.pm                    |   6 +-
 .../Types/FaultSubcodeValues.pm}              |  10 +-
 .../Types/HelloType.pm                        |  28 ++--
 .../Types/OpenRelationshipType.pm}            |   6 +-
 .../Types/ProbeMatchType.pm                   |  28 ++--
 .../Types/ProbeMatchesType.pm                 |  22 +--
 .../Types/ProbeType.pm                        |  14 +-
 .../Types/QNameListType.pm                    |   6 +-
 .../Types/ReferenceParametersType.pm          |  10 +-
 .../Types/ReferencePropertiesType.pm}         |  10 +-
 .../Types/Relationship.pm}                    |  18 +--
 .../Types/RelationshipType.pm}                |   6 +-
 .../Types/RelationshipTypeValues.pm           |  65 ++++++++
 .../Types/ReplyAfterType.pm}                  |  10 +-
 .../Types/ResolveMatchType.pm                 |  28 ++--
 .../Types/ResolveMatchesType.pm               |  22 +--
 .../Types/ResolveType.pm                      |  20 +--
 .../lib/WSDiscovery10/Types/RetryAfterType.pm |  73 +++++++++
 .../Types/ScopesType.pm                       |  16 +-
 .../Types/SecurityType.pm                     |  14 +-
 .../WSDiscovery10/Types/ServiceNameType.pm    | 118 +++++++++++++++
 .../Types/SigType.pm                          |  16 +-
 .../Types/UriListType.pm                      |   6 +-
 onvif/scripts/zmonvif-probe.pl                |  10 +-
 71 files changed, 1142 insertions(+), 1281 deletions(-)
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/From.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
 delete mode 100644 onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
 rename onvif/proxy/lib/{WSDiscovery/Attributes/IsReferenceParameter.pm => WSDiscovery10/Attributes/Action.pm} (50%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Attributes/Id.pm (64%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Action.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/AppSequence.pm (58%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Bye.pm (53%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/From.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Hello.pm (53%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/MessageID.pm (62%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/MetadataVersion.pm (65%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Probe.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/ProbeMatches.pm (50%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/RelatesTo.pm (62%)
 rename onvif/proxy/lib/{WSDiscovery/Elements/ProblemIRI.pm => WSDiscovery10/Elements/ReplyAfter.pm} (57%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/ResolveMatches.pm (50%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/RetryAfter.pm (62%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Scopes.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Security.pm (56%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Sig.pm (61%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/SupportedMatchingRules.pm (59%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/To.pm (64%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/Types.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Elements/XAddrs.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Interfaces/WSDiscovery/WSDiscoveryPort.pm (72%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/AppSequenceType.pm (78%)
 rename onvif/proxy/lib/{WSDiscovery/Types/AttributedQNameType.pm => WSDiscovery10/Types/AttributedQName.pm} (74%)
 rename onvif/proxy/lib/{WSDiscovery/Types/AttributedURIType.pm => WSDiscovery10/Types/AttributedURI.pm} (75%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ByeType.pm (76%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/FaultCodeOpenType.pm (85%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/FaultCodeType.pm (80%)
 rename onvif/proxy/lib/{WSDiscovery/Types/RelationshipType.pm => WSDiscovery10/Types/FaultSubcodeValues.pm} (71%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/HelloType.pm (76%)
 rename onvif/proxy/lib/{WSDiscovery/Types/FaultCodesOpenEnumType.pm => WSDiscovery10/Types/OpenRelationshipType.pm} (85%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ProbeMatchType.pm (75%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ProbeMatchesType.pm (63%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ProbeType.pm (81%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/QNameListType.pm (81%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ReferenceParametersType.pm (72%)
 rename onvif/proxy/lib/{WSDiscovery/Types/MetadataType.pm => WSDiscovery10/Types/ReferencePropertiesType.pm} (72%)
 rename onvif/proxy/lib/{WSDiscovery/Types/RelatesToType.pm => WSDiscovery10/Types/Relationship.pm} (66%)
 rename onvif/proxy/lib/{WSDiscovery/Types/FaultCodesType.pm => WSDiscovery10/Types/RelationshipType.pm} (80%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
 rename onvif/proxy/lib/{WSDiscovery/Types/AttributedUnsignedLongType.pm => WSDiscovery10/Types/ReplyAfterType.pm} (68%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ResolveMatchType.pm (75%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ResolveMatchesType.pm (62%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ResolveType.pm (66%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/ScopesType.pm (73%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/SecurityType.pm (75%)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/SigType.pm (83%)
 rename onvif/proxy/lib/{WSDiscovery => WSDiscovery10}/Types/UriListType.pm (81%)

diff --git a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
deleted file mode 100644
index 96c690bb4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::EndpointReference;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('EndpointReference');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::EndpointReference
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-EndpointReference from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::EndpointReference->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
deleted file mode 100644
index 530f9a4a4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::FaultTo;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('FaultTo');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::FaultTo
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-FaultTo from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::FaultTo->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/From.pm b/onvif/proxy/lib/WSDiscovery/Elements/From.pm
deleted file mode 100644
index 727c6a7ef..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/From.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::From;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('From');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::From
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-From from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::From->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm b/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
deleted file mode 100644
index 1567ef36a..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package WSDiscovery::Elements::Metadata;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('Metadata');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::MetadataType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::Metadata
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-Metadata from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::Metadata->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::MetadataType
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm b/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
deleted file mode 100644
index 2512b7e91..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
+++ /dev/null
@@ -1,60 +0,0 @@
-
-package WSDiscovery::Elements::ProblemAction;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ProblemAction');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProblemActionType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ProblemAction
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ProblemAction from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ProblemAction->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ProblemActionType
-   Action =>  { value => $some_value },
-   SoapAction =>  $some_value, # anyURI
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm b/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
deleted file mode 100644
index bd6f34982..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package WSDiscovery::Elements::ProblemHeaderQName;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ProblemHeaderQName');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedQNameType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ProblemHeaderQName
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ProblemHeaderQName from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ProblemHeaderQName->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { value => $some_value },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm b/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
deleted file mode 100644
index 1f8cd7cbc..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-
-package WSDiscovery::Elements::ReferenceParameters;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ReferenceParameters');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ReferenceParametersType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ReferenceParameters
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ReferenceParameters from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ReferenceParameters->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ReferenceParametersType
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
deleted file mode 100644
index 428378c5e..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package WSDiscovery::Elements::ReplyTo;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
-
-__PACKAGE__->__set_name('ReplyTo');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::ReplyTo
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-ReplyTo from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::ReplyTo->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
deleted file mode 100644
index 57849ce57..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package WSDiscovery::Elements::Resolve;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
-
-__PACKAGE__->__set_name('Resolve');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::Resolve
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-Resolve from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::Resolve->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
-     Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-     },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
-     },
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
deleted file mode 100644
index 136550e96..000000000
--- a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-
-package WSDiscovery::Typemaps::WSDiscovery;
-use strict;
-use warnings;
-
-our $typemap_1 = {
-               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery::Types::UriListType',
-               'ProbeMatches/ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
-               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/EndpointReference/Metadata' => 'WSDiscovery::Types::MetadataType',
-               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery::Types::AttributedURIType',
-               'Probe/Types' => 'WSDiscovery::Types::QNameListType',
-               'Probe' => 'WSDiscovery::Elements::Probe',
-               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
-               'Probe/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
-               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
-               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery::Types::QNameListType',
-               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery::Types::ReferenceParametersType',
-               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery::Types::EndpointReferenceType',
-               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
-               'ProbeMatches' => 'WSDiscovery::Elements::ProbeMatches',
-               'MessageID' => 'WSDiscovery::Elements::MessageID',
-               'RelatesTo' => '__SKIP__',
-               'To' => '__SKIP__',
-               'Action' => '__SKIP__',
-               'AppSequence' => '__SKIP__',
-              }; 
-;
-
-sub get_class {
-  my $name = join '/', @{ $_[1] };
-  return $typemap_1->{ $name };
-}
-
-sub get_typemap {
-    return $typemap_1;
-}
-
-1;
-
-__END__
-
-__END__
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Typemaps::WSDiscovery - typemap for WSDiscovery
-
-=head1 DESCRIPTION
-
-Typemap created by SOAP::WSDL for map-based SOAP message parsers.
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
deleted file mode 100644
index 59411fa37..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
+++ /dev/null
@@ -1,137 +0,0 @@
-package WSDiscovery::Types::EndpointReferenceType;
-use strict;
-use warnings;
-
-
-__PACKAGE__->_set_element_form_qualified(0);
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
-
-our $XML_ATTRIBUTE_CLASS;
-undef $XML_ATTRIBUTE_CLASS;
-
-sub __get_attr_class {
-    return $XML_ATTRIBUTE_CLASS;
-}
-
-use Class::Std::Fast::Storable constructor => 'none';
-use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
-
-Class::Std::initialize();
-
-{ # BLOCK to scope variables
-
-my %Address_of :ATTR(:get<Address>);
-my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
-my %Metadata_of :ATTR(:get<Metadata>);
-
-__PACKAGE__->_factory(
-    [ qw(        Address
-        ReferenceParameters
-        Metadata
-
-    ) ],
-    {
-        'Address' => \%Address_of,
-        'ReferenceParameters' => \%ReferenceParameters_of,
-        'Metadata' => \%Metadata_of,
-    },
-    {
-        'Address' => 'WSDiscovery::Types::AttributedURIType',
-        'ReferenceParameters' => 'WSDiscovery::Elements::ReferenceParameters',
-
-        'Metadata' => 'WSDiscovery::Elements::Metadata',
-
-    },
-    {
-
-        'Address' => 'Address',
-        'ReferenceParameters' => '',
-        'Metadata' => '',
-    }
-);
-
-} # end BLOCK
-
-
-
-
-
-
-
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Types::EndpointReferenceType
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined complexType
-EndpointReferenceType from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-=head2 PROPERTIES
-
-The following properties may be accessed using get_PROPERTY / set_PROPERTY
-methods:
-
-=over
-
-=item * Address
-
-
-=item * ReferenceParameters
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-=item * Metadata
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-
-
-=back
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::EndpointReferenceType
-   Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-   },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
-   },
- },
-
-
-
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm b/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
deleted file mode 100644
index 1426017f4..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
+++ /dev/null
@@ -1,119 +0,0 @@
-package WSDiscovery::Types::ProblemActionType;
-use strict;
-use warnings;
-
-
-__PACKAGE__->_set_element_form_qualified(0);
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
-
-our $XML_ATTRIBUTE_CLASS;
-undef $XML_ATTRIBUTE_CLASS;
-
-sub __get_attr_class {
-    return $XML_ATTRIBUTE_CLASS;
-}
-
-use Class::Std::Fast::Storable constructor => 'none';
-use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
-
-Class::Std::initialize();
-
-{ # BLOCK to scope variables
-
-my %Action_of :ATTR(:get<Action>);
-my %SoapAction_of :ATTR(:get<SoapAction>);
-
-__PACKAGE__->_factory(
-    [ qw(        Action
-        SoapAction
-
-    ) ],
-    {
-        'Action' => \%Action_of,
-        'SoapAction' => \%SoapAction_of,
-    },
-    {
-        'Action' => 'WSDiscovery::Elements::Action',
-
-        'SoapAction' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
-    },
-    {
-
-        'Action' => '',
-        'SoapAction' => 'SoapAction',
-    }
-);
-
-} # end BLOCK
-
-
-
-
-
-
-
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Types::ProblemActionType
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined complexType
-ProblemActionType from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-
-=head2 PROPERTIES
-
-The following properties may be accessed using get_PROPERTY / set_PROPERTY
-methods:
-
-=over
-
-=item * Action
-
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
-
-=item * SoapAction
-
-
-
-
-=back
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ProblemActionType
-   Action =>  { value => $some_value },
-   SoapAction =>  $some_value, # anyURI
- },
-
-
-
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm b/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
deleted file mode 100644
index dc3e004c2..000000000
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
+++ /dev/null
@@ -1,76 +0,0 @@
-package WSDiscovery::Types::RelationshipTypeOpenEnum;
-use strict;
-use warnings;
-
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
-
-# derivation by union
-# union is not fully supported yet - value space constraints are not
-# checked yet.
-# This implementation of union resorts to the simplest possible base, which
-# is: "If the <list> or <union> alternative is chosen, then the
-# simple ur-type definition·."
-#
-
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
-);
-
-
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined simpleType
-RelationshipTypeOpenEnum from the namespace http://www.w3.org/2005/08/addressing.
-
-
-
-
-
-This type class is derived by union.
-
-Derivation by union is not fully supported yet - value space constraints are
-not checked yet.
-
-The current implementation of union resorts to inheriting from the base type,
-which means (quoted from the XML Schema specs): "If the <list> or <union>
-alternative is chosen, then the simple ur-type definition·."
-
-
-
-=head1 METHODS
-
-=head2 new
-
-Constructor.
-
-=head2 get_value / set_value
-
-Getter and setter for the simpleType's value.
-
-=head1 OVERLOADING
-
-Depending on the simple type's base type, the following operations are overloaded
-
- Stringification
- Numerification
- Boolification
-
-Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
rename to onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
index c04039b1f..84a19fd8c 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
@@ -1,17 +1,17 @@
 
-package WSDiscovery::Attributes::IsReferenceParameter;
+package WSDiscovery10::Attributes::Action;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
-__PACKAGE__->__set_name('IsReferenceParameter');
+__PACKAGE__->__set_name('Action');
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Attribute
-    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
 );
 
 }
@@ -23,12 +23,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::IsReferenceParameter
+WSDiscovery10::Attributes::Action
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined attribute
-IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -40,7 +40,7 @@ IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::IsReferenceParameter->new($data);
+ my $element = WSDiscovery10::Attributes::Action->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
rename to onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
index 56d5115e4..97a3ee603 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Attributes::Id;
+package WSDiscovery10::Attributes::Id;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Id');
 __PACKAGE__->__set_ref();
@@ -23,12 +23,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::Id
+WSDiscovery10::Attributes::Id
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined attribute
-Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Id from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -40,7 +40,7 @@ Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::Id->new($data);
+ my $element = WSDiscovery10::Attributes::Id->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Action.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
index a24d6fdd9..141d1d8a9 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Action;
+package WSDiscovery10::Elements::Action;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('Action');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Action
+WSDiscovery10::Elements::Action
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Action from the namespace http://www.w3.org/2005/08/addressing.
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ Action from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Action->new($data);
+ my $element = WSDiscovery10::Elements::Action->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
similarity index 58%
rename from onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
index 63be6d678..d6662e940 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::AppSequence;
+package WSDiscovery10::Elements::AppSequence;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('AppSequence');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AppSequenceType
+    WSDiscovery10::Types::AppSequenceType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::AppSequence
+WSDiscovery10::Elements::AppSequence
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequence from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/200
 
 =head2 new
 
- my $element = WSDiscovery::Elements::AppSequence->new($data);
+ my $element = WSDiscovery10::Elements::AppSequence->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
index a89c3b48c..d5e15b25d 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Bye;
+package WSDiscovery10::Elements::Bye;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Bye');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ByeType
+    WSDiscovery10::Types::ByeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Bye
+WSDiscovery10::Elements::Bye
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Bye from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Bye->new($data);
+ my $element = WSDiscovery10::Elements::Bye->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
new file mode 100644
index 000000000..105df00dd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::EndpointReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('EndpointReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::EndpointReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+EndpointReference from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::EndpointReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
new file mode 100644
index 000000000..02235cfb8
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::FaultTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('FaultTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::FaultTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FaultTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::FaultTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/From.pm b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
new file mode 100644
index 000000000..ec56001f6
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::From;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('From');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::From
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+From from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::From->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
index 894f8482d..783e051e0 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Hello;
+package WSDiscovery10::Elements::Hello;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Hello');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::HelloType
+    WSDiscovery10::Types::HelloType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Hello
+WSDiscovery10::Elements::Hello
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Hello from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Hello->new($data);
+ my $element = WSDiscovery10::Elements::Hello->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
index 54dfa6a50..44ace37cd 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::MessageID;
+package WSDiscovery10::Elements::MessageID;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('MessageID');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MessageID
+WSDiscovery10::Elements::MessageID
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-MessageID from the namespace http://www.w3.org/2005/08/addressing.
+MessageID from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ MessageID from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MessageID->new($data);
+ my $element = WSDiscovery10::Elements::MessageID->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
index acb6c5246..bf56da261 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::MetadataVersion;
+package WSDiscovery10::Elements::MetadataVersion;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('MetadataVersion');
 __PACKAGE__->__set_nillable();
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MetadataVersion
+WSDiscovery10::Elements::MetadataVersion
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+MetadataVersion from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MetadataVersion->new($data);
+ my $element = WSDiscovery10::Elements::MetadataVersion->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
index b5b780a24..e07ec2510 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Probe;
+package WSDiscovery10::Elements::Probe;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Probe');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeType
+    WSDiscovery10::Types::ProbeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Probe
+WSDiscovery10::Elements::Probe
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Probe from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Probe->new($data);
+ my $element = WSDiscovery10::Elements::Probe->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
index 5cf9f8fac..e64b8de42 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ProbeMatches;
+package WSDiscovery10::Elements::ProbeMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ProbeMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeMatchesType
+    WSDiscovery10::Types::ProbeMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProbeMatches
+WSDiscovery10::Elements::ProbeMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/20
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProbeMatches->new($data);
+ my $element = WSDiscovery10::Elements::ProbeMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
index ffdf501aa..51cc80a4f 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::RelatesTo;
+package WSDiscovery10::Elements::RelatesTo;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('RelatesTo');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::RelatesToType
+    WSDiscovery10::Types::Relationship
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RelatesTo
+WSDiscovery10::Elements::RelatesTo
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
+RelatesTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RelatesTo->new($data);
+ my $element = WSDiscovery10::Elements::RelatesTo->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
similarity index 57%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
index 70fe19410..4e0364477 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
@@ -1,20 +1,20 @@
 
-package WSDiscovery::Elements::ProblemIRI;
+package WSDiscovery10::Elements::ReplyAfter;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
-__PACKAGE__->__set_name('ProblemIRI');
+__PACKAGE__->__set_name('ReplyAfter');
 __PACKAGE__->__set_nillable();
 __PACKAGE__->__set_minOccurs();
 __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::ReplyAfterType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProblemIRI
+WSDiscovery10::Elements::ReplyAfter
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
+ReplyAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProblemIRI->new($data);
+ my $element = WSDiscovery10::Elements::ReplyAfter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
new file mode 100644
index 000000000..4f4f2b496
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::ReplyTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::ReplyTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::ReplyTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
new file mode 100644
index 000000000..17c834e4e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
@@ -0,0 +1,67 @@
+
+package WSDiscovery10::Elements::Resolve;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
+
+__PACKAGE__->__set_name('Resolve');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::ResolveType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::Resolve
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Resolve from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::Resolve->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+     },
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+     },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
index cfaabc989..c2ebe9979 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ResolveMatches;
+package WSDiscovery10::Elements::ResolveMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ResolveMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveMatchesType
+    WSDiscovery10::Types::ResolveMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ResolveMatches
+WSDiscovery10::Elements::ResolveMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ResolveMatches->new($data);
+ my $element = WSDiscovery10::Elements::ResolveMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
index 980eeab2d..8c43deb40 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::RetryAfter;
+package WSDiscovery10::Elements::RetryAfter;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('RetryAfter');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedUnsignedLongType
+    WSDiscovery10::Types::RetryAfterType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RetryAfter
+WSDiscovery10::Elements::RetryAfter
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
+RetryAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RetryAfter->new($data);
+ my $element = WSDiscovery10::Elements::RetryAfter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
index 1dde55ce1..9aceeab7c 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Scopes;
+package WSDiscovery10::Elements::Scopes;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Scopes');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ScopesType
+    WSDiscovery10::Types::ScopesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Scopes
+WSDiscovery10::Elements::Scopes
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Scopes from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Scopes->new($data);
+ my $element = WSDiscovery10::Elements::Scopes->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
similarity index 56%
rename from onvif/proxy/lib/WSDiscovery/Elements/Security.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
index f9d4aff4d..6eeb876e7 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Security;
+package WSDiscovery10::Elements::Security;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Security');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SecurityType
+    WSDiscovery10::Types::SecurityType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Security
+WSDiscovery10::Elements::Security
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Security from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,12 +43,12 @@ Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/0
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Security->new($data);
+ my $element = WSDiscovery10::Elements::Security->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
similarity index 61%
rename from onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
index 6ddab0bed..edfa22491 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Sig;
+package WSDiscovery10::Elements::Sig;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Sig');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SigType
+    WSDiscovery10::Types::SigType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Sig
+WSDiscovery10::Elements::Sig
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Sig from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Sig->new($data);
+ my $element = WSDiscovery10::Elements::Sig->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
similarity index 59%
rename from onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
index 908566429..4b45ed553 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::SupportedMatchingRules;
+package WSDiscovery10::Elements::SupportedMatchingRules;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('SupportedMatchingRules');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::SupportedMatchingRules
+WSDiscovery10::Elements::SupportedMatchingRules
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SupportedMatchingRules from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/di
 
 =head2 new
 
- my $element = WSDiscovery::Elements::SupportedMatchingRules->new($data);
+ my $element = WSDiscovery10::Elements::SupportedMatchingRules->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/To.pm b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Elements/To.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/To.pm
index d435b934d..52e2b7d1a 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/To.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::To;
+package WSDiscovery10::Elements::To;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
 
 __PACKAGE__->__set_name('To');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSDiscovery10::Types::AttributedURI
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::To
+WSDiscovery10::Elements::To
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-To from the namespace http://www.w3.org/2005/08/addressing.
+To from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -43,7 +43,7 @@ To from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::To->new($data);
+ my $element = WSDiscovery10::Elements::To->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Types.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
index 15667a3a0..92c821480 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Types;
+package WSDiscovery10::Elements::Types;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Types');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::QNameListType
+    WSDiscovery10::Types::QNameListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Types
+WSDiscovery10::Elements::Types
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Types from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Types->new($data);
+ my $element = WSDiscovery10::Elements::Types->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
index bc0c8d998..2a43da505 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::XAddrs;
+package WSDiscovery10::Elements::XAddrs;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('XAddrs');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::XAddrs
+WSDiscovery10::Elements::XAddrs
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+XAddrs from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::XAddrs->new($data);
+ my $element = WSDiscovery10::Elements::XAddrs->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
rename to onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
index a7dcd3532..d194bbc87 100644
--- a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
+package WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
@@ -6,12 +6,12 @@ use Scalar::Util qw(blessed);
 use base qw(SOAP::WSDL::Client::Base);
 
 # only load if it hasn't been loaded before
-require WSDiscovery::Typemaps::WSDiscovery
-    if not WSDiscovery::Typemaps::WSDiscovery->can('get_class');
+require WSDiscovery10::Typemaps::WSDiscovery
+    if not WSDiscovery10::Typemaps::WSDiscovery->can('get_class');
 
 sub START {
     $_[0]->set_proxy('soap.udp://239.255.255.250:3702/') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('WSDiscovery::Typemaps::WSDiscovery')
+    $_[0]->set_class_resolver('WSDiscovery10::Typemaps::WSDiscovery')
         if not $_[2]->{class_resolver};
 
     $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
@@ -22,7 +22,7 @@ sub ProbeOp {
     die "ProbeOp must be called as object method (\$self is <$self>)" if not blessed($self);
     return $self->SUPER::call({
         operation => 'ProbeOp',
-        soap_action => 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe',
+        soap_action => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe',
         style => 'document',
         body => {
             
@@ -30,7 +30,7 @@ sub ProbeOp {
            'use'            => 'literal',
             namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
             encodingStyle   => '',
-            parts           =>  [qw( WSDiscovery::Elements::Probe )],
+            parts           =>  [qw( WSDiscovery10::Elements::Probe )],
 
         },
         header => {
@@ -55,12 +55,12 @@ __END__
 
 =head1 NAME
 
-WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
+WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
 
 =head1 SYNOPSIS
 
- use WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
- my $interface = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new();
+ use WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+ my $interface = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new();
 
  my $response;
  $response = $interface->ProbeOp();
@@ -114,9 +114,9 @@ hash refs. See the respective class' documentation for additional information.
 
 
 
-Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatches> object.
+Returns a L<WSDiscovery10::Elements::ProbeMatches|WSDiscovery10::Elements::ProbeMatches> object.
 
- $response = $interface->ProbeOp( { # WSDiscovery::Types::ProbeType
+ $response = $interface->ProbeOp( { # WSDiscovery10::Types::ProbeType
     Types => $some_value, # QNameListType
     Scopes =>  { value => $some_value },
   },,
@@ -126,6 +126,6 @@ Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatc
 
 =head1 AUTHOR
 
-Generated by SOAP::WSDL on Wed Jul  2 11:45:24 2014
+Generated by SOAP::WSDL on Sat Mar 19 18:11:58 2016
 
 =cut
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
new file mode 100644
index 000000000..635a19393
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -0,0 +1,56 @@
+
+package WSDiscovery10::Typemaps::WSDiscovery;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Probe/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Probe/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'ProbeMatches/ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
+               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'ProbeMatches' => 'WSDiscovery10::Elements::ProbeMatches',
+               'ProbeMatches/ProbeMatch/EndpointReference/ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+               'Probe' => 'WSDiscovery10::Elements::Probe',
+               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery10::Types::AttributedURI',
+               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery10::Types::UriListType',
+               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery10::Types::EndpointReferenceType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+               'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Typemaps::WSDiscovery - typemap for WSDiscovery
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
index 18e8ea8c3..d000bba34 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::AppSequenceType;
+package WSDiscovery10::Types::AppSequenceType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,7 +15,7 @@ sub __get_attr_class {
 
 use base qw();
 
-package WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr;
+package WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -57,12 +57,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::AppSequenceType
+WSDiscovery10::Types::AppSequenceType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AppSequenceType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequenceType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -87,7 +87,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 
@@ -99,7 +99,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
similarity index 74%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
index dd2d1522c..057b02374 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedQNameType;
+package WSDiscovery10::Types::AttributedQName;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedQNameType
+WSDiscovery10::Types::AttributedQName
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedQNameType from the namespace http://www.w3.org/2005/08/addressing.
+AttributedQName from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
index 5cab1a8c9..841b730af 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedURIType;
+package WSDiscovery10::Types::AttributedURI;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedURIType
+WSDiscovery10::Types::AttributedURI
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedURIType from the namespace http://www.w3.org/2005/08/addressing.
+AttributedURI from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
index 9c384fb2a..1cedf9c30 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ByeType;
+package WSDiscovery10::Types::ByeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ByeType
+WSDiscovery10::Types::ByeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ByeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ByeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
new file mode 100644
index 000000000..9a96b103e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
@@ -0,0 +1,141 @@
+package WSDiscovery10::Types::EndpointReferenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %ReferenceProperties_of :ATTR(:get<ReferenceProperties>);
+my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
+my %PortType_of :ATTR(:get<PortType>);
+my %ServiceName_of :ATTR(:get<ServiceName>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        ReferenceProperties
+        ReferenceParameters
+        PortType
+        ServiceName
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'ReferenceProperties' => \%ReferenceProperties_of,
+        'ReferenceParameters' => \%ReferenceParameters_of,
+        'PortType' => \%PortType_of,
+        'ServiceName' => \%ServiceName_of,
+    },
+    {
+        'Address' => 'WSDiscovery10::Types::AttributedURI',
+        'ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+        'ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+        'PortType' => 'WSDiscovery10::Types::AttributedQName',
+        'ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+    },
+    {
+
+        'Address' => 'Address',
+        'ReferenceProperties' => 'ReferenceProperties',
+        'ReferenceParameters' => 'ReferenceParameters',
+        'PortType' => 'PortType',
+        'ServiceName' => 'ServiceName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::EndpointReferenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EndpointReferenceType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements). 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * ReferenceProperties
+
+
+=item * ReferenceParameters
+
+
+=item * PortType
+
+
+=item * ServiceName
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
index 52f5d2c8f..cd183e240 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeOpenType;
+package WSDiscovery10::Types::FaultCodeOpenType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by union
 # union is not fully supported yet - value space constraints are not
@@ -31,7 +31,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeOpenType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeOpenType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
similarity index 80%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
index 4cc63eb8b..13be77bdc 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeType;
+package WSDiscovery10::Types::FaultCodeType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by restriction
 use base qw(
@@ -23,7 +23,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
similarity index 71%
rename from onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
index 022f9b27e..f49d7d269 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
@@ -1,12 +1,12 @@
-package WSDiscovery::Types::RelationshipType;
+package WSDiscovery10::Types::FaultSubcodeValues;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
 
 # derivation by restriction
 use base qw(
-    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
 
 
 
@@ -23,14 +23,14 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-RelationshipType from the namespace http://www.w3.org/2005/08/addressing.
+FaultSubcodeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
 
 
 This clase is derived from 
-   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
 . SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
 like it's base type.
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
index 1842faf6a..8cca31e90 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::HelloType;
+package WSDiscovery10::Types::HelloType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::HelloType
+WSDiscovery10::Types::HelloType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-HelloType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+HelloType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
index 89d8704e8..45aab20e5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodesOpenEnumType;
+package WSDiscovery10::Types::OpenRelationshipType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by union
 # union is not fully supported yet - value space constraints are not
@@ -31,7 +31,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodesOpenEnumType from the namespace http://www.w3.org/2005/08/addressing.
+OpenRelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
index c85d98849..19bd18e88 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchType;
+package WSDiscovery10::Types::ProbeMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchType
+WSDiscovery10::Types::ProbeMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
index 200edc6a4..20f101d03 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchesType;
+package WSDiscovery10::Types::ProbeMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ProbeMatch' => \%ProbeMatch_of,
     },
     {
-        'ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
+        'ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchesType
+WSDiscovery10::Types::ProbeMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
index 60dfa0bf3..10c290e8e 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeType;
+package WSDiscovery10::Types::ProbeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -34,9 +34,9 @@ __PACKAGE__->_factory(
         'Scopes' => \%Scopes_of,
     },
     {
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
     },
     {
@@ -62,12 +62,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeType
+WSDiscovery10::Types::ProbeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -110,7 +110,7 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
index fef443675..79cffd694 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::QNameListType;
+package WSDiscovery10::Types::QNameListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-QNameListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+QNameListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
index d6569a66b..fd5987604 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ReferenceParametersType;
+package WSDiscovery10::Types::ReferenceParametersType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ReferenceParametersType
+WSDiscovery10::Types::ReferenceParametersType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ReferenceParametersType from the namespace http://www.w3.org/2005/08/addressing.
+ReferenceParametersType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ReferenceParametersType
+ { # WSDiscovery10::Types::ReferenceParametersType
  },
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
index 072161f78..9e3ba9add 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::MetadataType;
+package WSDiscovery10::Types::ReferencePropertiesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::MetadataType
+WSDiscovery10::Types::ReferencePropertiesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-MetadataType from the namespace http://www.w3.org/2005/08/addressing.
+ReferencePropertiesType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::MetadataType
+ { # WSDiscovery10::Types::ReferencePropertiesType
  },
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
similarity index 66%
rename from onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
index 068d00ce6..3521517a8 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::RelatesToType;
+package WSDiscovery10::Types::Relationship;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::Relationship::_Relationship::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -18,7 +18,7 @@ use base qw(
     SOAP::WSDL::XSD::Typelib::Builtin::anyURI
 );
 
-package WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr;
+package WSDiscovery10::Types::Relationship::_Relationship::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -34,7 +34,7 @@ __PACKAGE__->_factory(
         RelationshipType => \%RelationshipType_of,
     },
     {
-        RelationshipType => 'WSDiscovery::Types::RelationshipTypeOpenEnum',
+        RelationshipType => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
     }
 );
 
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::RelatesToType
+WSDiscovery10::Types::Relationship
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-RelatesToType from the namespace http://www.w3.org/2005/08/addressing.
+Relationship from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::Relationship::_Relationship::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
@@ -102,7 +102,7 @@ get_/set_ methods:
 
 
 
-This attribute is of type L<WSDiscovery::Types::RelationshipTypeOpenEnum|WSDiscovery::Types::RelationshipTypeOpenEnum>.
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
 
 
 =back
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
similarity index 80%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
index a042be3cf..b9d902573 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodesType;
+package WSDiscovery10::Types::RelationshipType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by restriction
 use base qw(
@@ -23,7 +23,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodesType from the namespace http://www.w3.org/2005/08/addressing.
+RelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
new file mode 100644
index 000000000..125c4f2cd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
@@ -0,0 +1,65 @@
+package WSDiscovery10::Types::RelationshipTypeValues;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipTypeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
similarity index 68%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
index c2a947795..3f0c3ecf1 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::AttributedUnsignedLongType;
+package WSDiscovery10::Types::ReplyAfterType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -16,7 +16,7 @@ sub __get_attr_class {
 
 use base qw(
     SOAP::WSDL::XSD::Typelib::ComplexType
-    SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
 );
 
 
@@ -30,12 +30,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedUnsignedLongType
+WSDiscovery10::Types::ReplyAfterType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AttributedUnsignedLongType from the namespace http://www.w3.org/2005/08/addressing.
+ReplyAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
index 03216f066..08e885408 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchType;
+package WSDiscovery10::Types::ResolveMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchType
+WSDiscovery10::Types::ResolveMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
index 3e0db0619..5ca08a7b1 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchesType;
+package WSDiscovery10::Types::ResolveMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ResolveMatch' => \%ResolveMatch_of,
     },
     {
-        'ResolveMatch' => 'WSDiscovery::Types::ResolveMatchType',
+        'ResolveMatch' => 'WSDiscovery10::Types::ResolveMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchesType
+WSDiscovery10::Types::ResolveMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
similarity index 66%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
index f1ddd13f5..87e8e8dbd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveType;
+package WSDiscovery10::Types::ResolveType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'EndpointReference' => \%EndpointReference_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveType
+WSDiscovery10::Types::ResolveType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,13 +95,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
new file mode 100644
index 000000000..a878dc46c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::RetryAfterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::RetryAfterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RetryAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
similarity index 73%
rename from onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
index 84cdfa057..c92029bcd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::ScopesType;
+package WSDiscovery10::Types::ScopesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,10 +15,10 @@ sub __get_attr_class {
 
 use base qw(
     SOAP::WSDL::XSD::Typelib::ComplexType
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
-package WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr;
+package WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ScopesType
+WSDiscovery10::Types::ScopesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ScopesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ScopesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
index 968033307..01b18d2df 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::SecurityType;
+package WSDiscovery10::Types::SecurityType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'Sig' => \%Sig_of,
     },
     {
-        'Sig' => 'WSDiscovery::Elements::Sig',
+        'Sig' => 'WSDiscovery10::Elements::Sig',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SecurityType
+WSDiscovery10::Types::SecurityType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SecurityType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SecurityType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,8 +95,8 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
new file mode 100644
index 000000000..d83e40608
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
@@ -0,0 +1,118 @@
+package WSDiscovery10::Types::ServiceNameType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+package WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %PortName_of :ATTR(:get<PortName>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        PortName
+    ) ],
+    {
+
+        PortName => \%PortName_of,
+    },
+    {
+        PortName => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ServiceNameType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ServiceNameType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * PortName
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
similarity index 83%
rename from onvif/proxy/lib/WSDiscovery/Types/SigType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
index 71eb613df..3db2ddcc5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::SigType;
+package WSDiscovery10::Types::SigType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::SigType::_SigType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::SigType::_SigType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -38,7 +38,7 @@ __PACKAGE__->_factory(
 
 
 
-package WSDiscovery::Types::SigType::_SigType::XmlAttr;
+package WSDiscovery10::Types::SigType::_SigType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -85,12 +85,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SigType
+WSDiscovery10::Types::SigType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SigType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SigType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -115,7 +115,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 
@@ -127,7 +127,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::SigType::_SigType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::SigType::_SigType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
index 1a04cfbee..c59a32f37 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::UriListType;
+package WSDiscovery10::Types::UriListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-UriListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+UriListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 8740fb7e6..b63f19a00 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -28,9 +28,9 @@ use Getopt::Std;
 
 require ONVIF::Client;
 
-require WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
-require WSDiscovery::Elements::Types;
-require WSDiscovery::Elements::Scopes;
+require WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+require WSDiscovery10::Elements::Types;
+require WSDiscovery10::Elements::Scopes;
 
 require WSDiscovery::TransportUDP;
 
@@ -163,7 +163,7 @@ sub discover
   if($verbose) {
     print "Probing for SOAP 1.1\n"
   }
-  my $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
+  my $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.1');
@@ -182,7 +182,7 @@ sub discover
   if($verbose) {
     print "Probing for SOAP 1.2\n"
   }
-  $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({
+  $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.2');

From 020731a89e92214fbacb22314495bfd77f72d703 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sun, 20 Mar 2016 16:10:49 +0000
Subject: [PATCH 331/362] Fix typo in ffmpeg options help: s/passwd/passed/

---
 web/lang/big5_big5.php | 4 ++--
 web/lang/cn_zh.php     | 4 ++--
 web/lang/cs_cz.php     | 4 ++--
 web/lang/de_de.php     | 4 ++--
 web/lang/dk_dk.php     | 4 ++--
 web/lang/en_gb.php     | 2 +-
 web/lang/es_ar.php     | 4 ++--
 web/lang/es_es.php     | 4 ++--
 web/lang/et_ee.php     | 4 ++--
 web/lang/fr_fr.php     | 4 ++--
 web/lang/he_il.php     | 4 ++--
 web/lang/hu_hu.php     | 4 ++--
 web/lang/it_it.php     | 4 ++--
 web/lang/ja_jp.php     | 4 ++--
 web/lang/nl_nl.php     | 4 ++--
 web/lang/pl_pl.php     | 4 ++--
 web/lang/pt_br.php     | 4 ++--
 web/lang/ro_ro.php     | 4 ++--
 web/lang/ru_ru.php     | 4 ++--
 web/lang/se_se.php     | 4 ++--
 20 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index 7f4b52d9b..e42616083 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -890,14 +890,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index 7b8232e1b..4c02c5cf3 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -885,14 +885,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index 88f7b05b7..61d90f029 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index 64477ecd2..c986097c2 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -889,14 +889,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 8ba852bd2..288f2b910 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -887,14 +887,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index d11cec179..91cbdfd14 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -894,7 +894,7 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index cb050361a..b21e44703 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -743,14 +743,14 @@ function zmVlang( $langVarArray, $count )
 
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index d33044ba8..0a95d780f 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -794,14 +794,14 @@ function zmVlang( $langVarArray, $count )
 
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index f6777bbf9..cbc12935d 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index 13986efec..bd4472ee2 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -893,14 +893,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index c452b52bc..002bd4bc8 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 564e9d1f6..caac9a2e7 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -929,14 +929,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 22b03ef40..9258c7ee0 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -891,14 +891,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index be18787e4..dfc6a28c5 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index 4c3f6a060..97e5d8c5c 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index 14688e189..dc09dfe4c 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -865,14 +865,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index 6ac24a837..cf02c8371 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -826,14 +826,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 761a24527..0a976ccc0 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -1317,14 +1317,14 @@ $OLANG = array(
     
 // Options on Monitor view
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index e12c857d2..a43b6e0f2 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index eaa712259..ea01e9a25 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -890,14 +890,14 @@ $OLANG = array(
         'Help' => "ZoneMinder kan anv�nda annat spr�k �n engelska i menyer och texter. V�lj h�r det spr�k du vill anv�nda till ZoneMinder."
     ),
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"

From 9c98ccbb756d3fa4f5fe864e5fb26ddd09f9e65d Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sun, 20 Mar 2016 16:13:53 +0000
Subject: [PATCH 332/362] Fix spelling in ffmpeg options help:
 s/verbosiy/verbosity/

---
 web/lang/big5_big5.php | 2 +-
 web/lang/cn_zh.php     | 2 +-
 web/lang/cs_cz.php     | 2 +-
 web/lang/de_de.php     | 2 +-
 web/lang/dk_dk.php     | 2 +-
 web/lang/en_gb.php     | 2 +-
 web/lang/es_ar.php     | 2 +-
 web/lang/es_es.php     | 2 +-
 web/lang/et_ee.php     | 2 +-
 web/lang/fr_fr.php     | 2 +-
 web/lang/he_il.php     | 2 +-
 web/lang/hu_hu.php     | 2 +-
 web/lang/it_it.php     | 2 +-
 web/lang/ja_jp.php     | 2 +-
 web/lang/nl_nl.php     | 2 +-
 web/lang/pl_pl.php     | 2 +-
 web/lang/pt_br.php     | 2 +-
 web/lang/ro_ro.php     | 2 +-
 web/lang/ru_ru.php     | 2 +-
 web/lang/se_se.php     | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index e42616083..631bdc1ce 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -894,7 +894,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index 4c02c5cf3..2a17f42ea 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -889,7 +889,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index 61d90f029..b4f26145b 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index c986097c2..d0f9d079d 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -893,7 +893,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 288f2b910..3ed0f1f7c 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -891,7 +891,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 91cbdfd14..df09358eb 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -898,7 +898,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index b21e44703..0f1b9b70d 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -747,7 +747,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index 0a95d780f..ff453bfe8 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -798,7 +798,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index cbc12935d..b48192507 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index bd4472ee2..504cf3926 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -897,7 +897,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index 002bd4bc8..ff6de4069 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index caac9a2e7..56f763ae4 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -933,7 +933,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 9258c7ee0..d456b3c48 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -895,7 +895,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index dfc6a28c5..24a85cf49 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index 97e5d8c5c..ad37c877b 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index dc09dfe4c..5f36dedac 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -869,7 +869,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index cf02c8371..f47882da5 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -830,7 +830,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 0a976ccc0..33d11aa0a 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -1321,7 +1321,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index a43b6e0f2..199785a56 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -890,7 +890,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index ea01e9a25..337737ca9 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -894,7 +894,7 @@ $OLANG = array(
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".

From bfd846bbffe88a00840b5e3a40d1a9cae142a525 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jburgess777@gmail.com>
Date: Sun, 20 Mar 2016 21:44:58 +0000
Subject: [PATCH 333/362] Add more logging to diagnose problems with applying
 ffmpeg options

---
 src/zm_ffmpeg_camera.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 9e3a2960c..380e4ba39 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -257,6 +257,10 @@ int FfmpegCamera::OpenFfmpeg() {
     	    }
     		  
     	}
+       else
+       {
+           Warning( "Unable to parse ffmpeg option %d '%s', expecting key=value", i, opVect[i].c_str() );
+       }
     }    
 	Debug ( 1, "Calling avformat_open_input" );
 
@@ -272,6 +276,11 @@ int FfmpegCamera::OpenFfmpeg() {
         return -1;
     }
 
+    AVDictionaryEntry *e;
+    if ((e = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX)) != NULL) {
+        Warning( "Option %s not recognized by ffmpeg", e->key);
+    }
+
     mIsOpening = false;
     Debug ( 1, "Opened input" );
 

From 2ede18a6141612ac03148b2b63f96448c717e11a Mon Sep 17 00:00:00 2001
From: Luke Cousins <luke@viovet.co.uk>
Date: Mon, 21 Mar 2016 22:47:45 +0000
Subject: [PATCH 334/362] Minor improvements to documentation

---
 docs/installationguide/ubuntu.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index bad2b651d..201ff8f64 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -181,7 +181,7 @@ Easy Way: Install ZoneMinder from a package (Ubuntu 14.x)
 
 **Step 4:**:Some tweaks that will be needed:
 
-Edit /etc/init.d/zoneminder:
+Edit ``/etc/init.d/zoneminder``:
 
 add a ``sleep 10`` right after line 25 that reads ``echo -n "Starting $prog:"``
 (The reason we need this sleep is to make sure ZM starts after mysqld starts)
@@ -198,7 +198,7 @@ As of Oct 3 2015, zm.conf is not readable by ZM. This is likely a bug and will g
 
 If you changed the  DB password **after** installing ZM, the APIs will not be able to connect to the DB.
 
-If you have, go to zoneminder/www/api/app/Config & Edit ``database.php``
+If you have, go to ``/usr/share/zoneminder/www/api/app/Config`` & Edit ``database.php``
 
 There is a class there called ``DATABASE_CONFIG`` - change the ``$default`` array to reflect your new details. Example:
 
@@ -224,7 +224,7 @@ We also need to install php5-gd (as of 1.28.107, this is not installed)
 
 **Step 6**: Edit Timezone in PHP
 
-vi /etc/php5/apache2/php.ini
+``sudo nano /etc/php5/apache2/php.ini``
 Look for [Date] and inside it you will see a date.timezone
 that is commented. remove the comment and specific your timezone.
 Please make sure the timezone is valid (see [this](http://php.net/manual/en/timezones.php))
@@ -247,7 +247,7 @@ restart:
 ::
 
 	sudo service apache2 restart
-	/etc/init.d/zoneminder restart
+	sudo service zoneminder restart
 
 **Step 8**: Making sure ZM and APIs work: (optional - only if you need APIs)
 

From 6d4d05184c75719353b4bf3a80b943eabe0b5121 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 23 Mar 2016 09:49:38 -0400
Subject: [PATCH 335/362] fix typo

---
 scripts/zmtelemetry.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index a5c2e00a3..c7bf4a3f3 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -76,7 +76,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
     while( 1 ) {
         my $now = time();
         if ( ($now-$lastCheck) > CHECK_INTERVAL ) {
-            Info( "Colleting data to send to ZoneMinder Telemetry server." );
+            Info( "Collecting data to send to ZoneMinder Telemetry server." );
             my $dbh = zmDbConnect();
             # Build the telemetry hash
             # We should keep *BSD systems in mind when calling system commands

From 56301b77e93e976927c17370d8b9e76b65bc9c5f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 23 Mar 2016 09:51:28 -0400
Subject: [PATCH 336/362] Add an example rules file for logcheck

---
 misc/logcheck | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 misc/logcheck

diff --git a/misc/logcheck b/misc/logcheck
new file mode 100644
index 000000000..28940a6cc
--- /dev/null
+++ b/misc/logcheck
@@ -0,0 +1,29 @@
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Capturing at [.[:digit:]]+ fps\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Processing at [.[:digit:]]+ fps\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[Got signal 15 \(Terminated\), exiting\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[Starting Capture\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: ERR \[(Connection dropped by remote end|Unable to read (sub)?header|Unable to get response(, disconnecting)?|Select error: Interrupted system call|Can't connect to remote camera: Interrupted system call|Unable to connect to (the remote )?camera(, aborting)?)\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: WAR \[(Unable to capture image, retrying|Select timed out)\]$
+zmaudit\[[[:digit:]]+\]: INF \[Deleted [[:digit:]]+ log table entries by time\]$
+zmdc\[[[:digit:]]+\]: INF \[Starting pending process, [. [:alnum:]-]+\]$
+zmdc\[[[:digit:]]+\]: INF \['[. [:alnum:]-]+' start(ed|ing) at [/: [:digit:]]+(, pid = [[:digit:]]+)?\]$
+zmwatch\[[[:digit:]]+\]: INF \[Watchdog starting\]$
+zmwatch\[[[:digit:]]+\]: INF \[Watchdog pausing for 30 seconds\]$
+zmc_m3\[[[:digit:]]+\]: ERR \[Can't connect to remote camera: (No route to host|Connection refused)\]$
+zmdc\[[[:digit:]]+\]: ERR \['zmc -m 3' exited abnormally, exit status 255\]$
+zmc_m1\[[[:digit:]]+\]: ERR-zm_remote_camera_rtsp.cpp/302 \[Error while decoding frame 0\]$
+zmc_m1\[[[:digit:]]+\]: ERR-zm_remote_camera_rtsp.cpp/303 \[256: [ [:xdigit:]]+\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone into alarm state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Opening new event [[:digit:]]+, alarm start\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone into alert state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: WAR \[Waiting for capture daemon\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone back into alarm state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Left alarm state \([[:digit:]]+\) - [[:digit:]]+\([[:digit:]]+\) images\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Closing event [[:digit:]]+, alarm end\]$
+zmaudit\[[[:digit:]]+\]: INF \[Filesystem event '[[:digit:]]+/[[:digit:]]+' does not exist in database\]$
+zmaudit\[[[:digit:]]+\]: INF \[deleting\]$
+zmaudit\[[[:digit:]]+\]: INF \[Found orphaned frame records for event '[[:digit:]]+'\]$
+zmfilter\[[[:digit:]]+\]: INF \[Deleting event [[:digit:]]+\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Telemetry data uploaded successfully.\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Sending data to ZoneMinder Telemetry server.\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Collec?ting data to send to ZoneMinder Telemetry server.\]$

From 71db9b84e68a5d8b7dbd93050dbd004245707579 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Thu, 24 Mar 2016 14:37:24 +0100
Subject: [PATCH 337/362] Allow spaces in monitor names

---
 web/skins/classic/views/js/monitor.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 1ceba3fff..833b8f441 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -59,7 +59,7 @@ function validateForm( form )
 {
     var errors = new Array();
 
-    if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
+    if ( form.elements['newMonitor[Name]'].value.search( /[^\w- ]/ ) >= 0 )
         errors[errors.length] = "<?php echo translate('BadNameChars') ?>";
     else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
         errors[errors.length] = "<?php echo translate('DuplicateMonitorName') ?>";

From b6ee4e422803bc876364e2c63c4e84fd1dbf0703 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 24 Mar 2016 09:43:15 -0400
Subject: [PATCH 338/362] move return up into #ifdef.

---
 src/zm_rtsp_auth.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp
index 10ecf3475..9521a81d1 100644
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@@ -201,8 +201,8 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
     return md5HexBuf;
 #else // HAVE_DECL_MD5
 	Error( "You need to build with gnutls or openssl installed to use digest authentication" );
-#endif // HAVE_DECL_MD5
     return( 0 );
+#endif // HAVE_DECL_MD5
 }
 
 void Authenticator::checkAuthResponse(std::string &response) {

From 1e52a8ad2c8fcff7512bde9cdab4f55baee57b74 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 24 Mar 2016 09:44:34 -0400
Subject: [PATCH 339/362] remove unused class member

---
 src/zm_monitor.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 8a9fb34c6..a9cd05674 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -301,9 +301,6 @@ protected:
 
 	const unsigned char	*privacy_bitmask;
 
-
-	int			iDoNativeMotDet;
-
 	int			n_linked_monitors;
 	MonitorLink		**linked_monitors;
 

From af68fd20a819e7206118fb8c45142d41fdc72b67 Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Thu, 24 Mar 2016 14:51:24 +0100
Subject: [PATCH 340/362] Some Translations for Monitor names with spaces

---
 web/lang/de_de.php | 2 +-
 web/lang/dk_dk.php | 2 +-
 web/lang/en_gb.php | 2 +-
 web/lang/es_es.php | 2 +-
 web/lang/fr_fr.php | 2 +-
 web/lang/he_il.php | 2 +-
 web/lang/ja_jp.php | 2 +-
 web/lang/nl_nl.php | 2 +-
 web/lang/ru_ru.php | 2 +-
 web/lang/se_se.php | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index 64477ecd2..a93802c52 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -146,7 +146,7 @@ $SLANG = array(
     'BadLabelY'            => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
     'BadMaxFPS'            => 'Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
     'BadMotionFrameSkip'   => 'Bewegungsrahmen Skip-Zählung muß eine ganze Zahl von null oder mehr betragen,',
-    'BadNameChars'         => 'Namen dürfen nur aus Buchstaben, Zahlen und Trenn- oder Unterstrichen bestehen',
+    'BadNameChars'         => 'Namen dürfen nur aus Buchstaben, Zahlen, Leerzeichen und Trenn- oder Unterstrichen bestehen',
     'BadPalette'           => 'Palette muss auf einen gültigen Wert gesetzt sein', // Added - 2009-03-31
     'BadPath'              => 'Der Pfad muss auf einen gültigen Wert eingestellt sein',
     'BadPort'              => 'Der Port muss auf eine gültige Zahl eingestellt sein',
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 8ba852bd2..cf1b79b14 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Navne m� kun indeholde alphanumeric karaktere plus hyphen og underscore',
+    'BadNameChars'         => 'Navne m� kun indeholde alphanumeric karaktere, rum plus hyphen og underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index d11cec179..cad729e57 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -156,7 +156,7 @@ $SLANG = array(
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
-    'BadNameChars'          => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'          => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore',
     'BadPalette'            => 'Palette must be set to a valid value',
     'BadColours'            => 'Target colour must be set to a valid value',
     'BadPath'               => 'Path must be set to a valid value',
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index d33044ba8..ecbea708b 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'             => 'La coordenada de la etiqueta Y debe ser un entero de cero o más',
     'BadMaxFPS'             => 'MPS máximos debe tener un valor entero positivo o de punto flotante',
     'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'          => 'Los nombre sólo pueden contener carácteres alfanuméricos además de guiones y guiones bajos',
+    'BadNameChars'          => 'Los nombre sólo pueden contener carácteres alfanuméricos, espacios además de guiones y guiones bajos',
     'BadPalette'            => 'La paleta debe tener un valor válido',
     'BadPath'               => 'La ruta debe tener un valo válido',
     'BadPort'               => 'El puerto debe ser un número válido',
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index 13986efec..bf3cc186c 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -150,7 +150,7 @@ $SLANG = array(
     'BadLabelY'            => 'La coordonnée Y pour l\'horodatage doit être un entier supérieur ou égal à 0',
     'BadMaxFPS'            => 'Le nombre maximum d\'i/s doit être un entier ou un nombre à virgule flottante supérieur à 0',
     'BadMotionFrameSkip'   => 'Le nombre d\'images à sauter en cas de détection doit être un entier supérieur ou égal à 0',
-    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, trait d\'union ou souligné',
+    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, les espaces, trait d\'union ou souligné',
     'BadPalette'           => 'La palette doit être définie', // Added - 2009-03-31
     'BadPath'              => 'Le chemin doit être défini',
     'BadPort'              => 'Le port doit être un nombre entier supérieur ou égal à 0',
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index c452b52bc..99650d663 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index be18787e4..51e8ae71d 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index 4c3f6a060..288e454a7 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate moet een nummer nul of groter zijn',
     'BadMaxFPS'            => 'Maximum FPS moet een positieve integer of floating point waarde zijn',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters bevatten plus hyphens en underscores',
+    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters, ruimten bevatten plus hyphens en underscores',
     'BadPalette'           => 'Palette moet een geldige waarde zijn', // Added - 2009-03-31
     'BadPath'              => 'Pad  moet een geldige waarde zijn',
     'BadPort'              => 'Port moet een geldige nummer zijn',
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index e12c857d2..c21f6f857 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index eaa712259..ac79632f3 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Etiketten f�r Y koordinaten m�ste s�ttas till ett heltal, 0 eller h�gre',
     'BadMaxFPS'            => 'Max. ramar/s m�ste vara ett positivt heltal eller ett flyttal',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Namn kan endast inneh�lla alfanumeriska tecken, bindestreck och understreck',
+    'BadNameChars'         => 'Namn kan endast inneh�lla alfanumeriska tecken, utrymmen, bindestreck och understreck',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'S�kv�gen m�ste inneh�lla ett giltigt v�rde',
     'BadPort'              => 'Porten m�ste inneh�lla ett giltigt nummer',

From a16c1746e52926a44be80552d5f7c89121853ae3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 24 Mar 2016 10:00:02 -0400
Subject: [PATCH 341/362] separate a failure to open versus failure to lock. 
 Quiets coverity because close can't handle a negative value

---
 src/zm_stream.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index c66638759..77c94e68c 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -294,7 +294,12 @@ void StreamBase::openComms()
 		snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
 
         lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
-        if (lock_fd <= 0 || flock(lock_fd, LOCK_EX) != 0)
+        if ( lock_fd <= 0 )
+		{
+            Error("Unable to open sock lock file %s: %s", sock_path_lock, strerror(errno) );
+            lock_fd = 0;
+		}
+		else if ( flock(lock_fd, LOCK_EX) != 0 )
         {
             Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );
 

From 0e5483107264dd3fb4c6ac743549a586ed61dc2a Mon Sep 17 00:00:00 2001
From: Luke Cousins <luke@viovet.co.uk>
Date: Thu, 24 Mar 2016 15:15:58 +0000
Subject: [PATCH 342/362] Swapping back to vi as default editor

---
 docs/installationguide/ubuntu.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 201ff8f64..80cb27552 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -224,7 +224,7 @@ We also need to install php5-gd (as of 1.28.107, this is not installed)
 
 **Step 6**: Edit Timezone in PHP
 
-``sudo nano /etc/php5/apache2/php.ini``
+``sudo vi /etc/php5/apache2/php.ini``
 Look for [Date] and inside it you will see a date.timezone
 that is commented. remove the comment and specific your timezone.
 Please make sure the timezone is valid (see [this](http://php.net/manual/en/timezones.php))

From d412e8dc5c0494e48fe47c5bf7759969a3609dbe Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Fri, 25 Mar 2016 07:54:37 -0500
Subject: [PATCH 343/362] Update redhat.rst

---
 docs/installationguide/redhat.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 98c911bbc..e15d58aa7 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -17,7 +17,7 @@ The ZoneMinder team will not provide support for systems which have had any core
 Background: Fedora
 ------------------------------------
 
-One can think of Fedora as RHEL or CentOS Beta. This is in fact, what it is. Fedora is primarily geared towards development and testing of newer, sometimes bleeding edge, packages. The ZoneMinder team uses this distro to determine the interoperability of ZoneMinder with the latest and greatest versions of packages like mysql, apache, systemd, and others. If a problem is detected, it will be addressed long before it makes it way into RHEL.
+One can think of Fedora as RHEL or CentOS Beta. This is, in fact, what it is. Fedora is primarily geared towards development and testing of newer, sometimes bleeding edge, packages. The ZoneMinder team uses this distro to determine the interoperability of ZoneMinder with the latest and greatest versions of packages like mysql, apache, systemd, and others. If a problem is detected, it will be addressed long before it makes it way into RHEL.
 
 Fedora has a short life-cycle of just 6 months. However, Fedora, and consequently ZoneMinder, is available on armv7 architecture. Rejoice, Raspberry Pi users!
 
@@ -28,7 +28,7 @@ Zmrepo – A ZoneMinder RPM Repository
 
 Zmrepo is a turn key solution. It will install all of ZoneMinder's dependencies for you. This is the easiest and the recommended way to install ZoneMinder on any system running a Redhat based distribution. 
 
-Zmrepo supports the two most recent, major, releases of each Redhat based distro.
+Zmrepo supports the two most recent, major releases of each Redhat based distro.
 
 The following notes are based on real problems which have occurred:
 
@@ -38,7 +38,7 @@ The following notes are based on real problems which have occurred:
 
 - Be advised that you need to start with a clean system before using zmrepo.
 
-- If you have previously installed ZoneMinder from-source, then your system is **NOT** clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You WILL have problems if you ignore this step.
+- If you have previously installed ZoneMinder from-source, then your system is **NOT** clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You **WILL** have problems if you ignore this step.
 
 - It is not necessary, and not recommended, to install a LAMP stack ahead of time.
 
@@ -196,8 +196,8 @@ Now build a new src.rpm:
 
     rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
 
-This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
+This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on the target distro.
 
-You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
+You should now have a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
 
 

From 38e3c9254673976bf144a8947656ce014c1a14be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1ndor=20Czettner?= <sandor@czettner.hu>
Date: Fri, 25 Mar 2016 13:18:43 +0000
Subject: [PATCH 344/362] Minor grammar fixes

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index d75a77e45..8c4ea5d95 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -345,10 +345,10 @@ our @options =
             already logged in. As authentication hashes are time and,
             optionally, IP limited this can allow short-term access to
             ZoneMinder screens from other web pages etc. In order to use
-            this the calling application will hae to generate the
+            this the calling application will have to generate the
             authentication hash itself and ensure it is valid. If you use
             this option you should ensure that you have modified the
-            ZM_AUTH_HASH_SECRET to somethign unique to your system.
+            ZM_AUTH_HASH_SECRET to something unique to your system.
         "),
         requires    => [
                             { name=>"ZM_OPT_USE_AUTH", value=>"yes" },

From 6eda3eff7223938db674277991f6799ee6a8b908 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sat, 26 Mar 2016 08:38:28 -0500
Subject: [PATCH 345/362] do not set maxfps fields during onvif probe

---
 web/skins/classic/views/onvifprobe.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index c15568eaf..700246936 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -242,8 +242,9 @@ else if($_REQUEST['step'] == "2")
        // copy technical details
        $monitor['Width']  = $profile['Width'];
        $monitor['Height'] = $profile['Height'];
-       $monitor['MaxFPS'] = $profile['MaxFPS'];
-       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
+// The maxfps fields do not work for ip streams. Can re-enable if that is fixed.
+//       $monitor['MaxFPS'] = $profile['MaxFPS'];
+//       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
        $monitor['Path'] = $profile['Path'];
 //       $sourceDesc = htmlspecialchars(serialize($monitor));
        $sourceDesc = base64_encode(serialize($monitor));

From ab05d52a0a7e38b94aea2a75abbc58017b0e47a0 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Mon, 28 Mar 2016 08:35:34 -0500
Subject: [PATCH 346/362] Update en_gb.php

typo
---
 web/lang/en_gb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index df09358eb..3dcb4e4e2 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -923,7 +923,7 @@ $OLANG = array(
                           " camera, instead. You can, however, use a value that is slightly higher than the frame rate in the camera. ".
 		          "In this case, this helps keep the cpu from being overtaxed in the event of a network problem.~~". 
 		          "Some, mostly older, IP cameras support snapshot mode. In this case ZoneMinder is actively polling the camera ".
-		          "for new images. In this case, it is safe to use thie field."
+		          "for new images. In this case, it is safe to use the field."
 	),
 	
 //    'LANG_DEFAULT' => array(

From 2365c2156fb1b77e27eb064d04b5f7c9672f3802 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 28 Mar 2016 09:53:57 -0500
Subject: [PATCH 347/362] remove $result from onvif error message

---
 onvif/scripts/zmonvif-probe.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 9fed0a958..6f318ef5e 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -106,7 +106,7 @@ sub interpret_messages
     my $result = deserialize_message($svc_discover, $response);
     if(not $result) {
       if($verbose) {
-        print "Error deserializing message:\n" . $result . "\n";
+        print "Error deserializing message. No message returned from deserializer.\n";
       }
       next;
     }

From c8c0586c6601be1a72299ba3b585a0537728a3ca Mon Sep 17 00:00:00 2001
From: Robin Daermann <robin.daermann@ruhr-uni-bochum.de>
Date: Tue, 29 Mar 2016 11:40:14 +0200
Subject: [PATCH 348/362] Trim monitor names

---
 web/skins/classic/views/monitor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index e716210ab..c55d77187 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -154,6 +154,8 @@ else
         $newX10Monitor = $x10Monitor;
 }
 
+$newMonitor['Name'] = trim($newMonitor['Name']);
+
 if ( $newMonitor['AnalysisFPS'] == '0.00' )
     $newMonitor['AnalysisFPS'] = '';
 if ( $newMonitor['MaxFPS'] == '0.00' )

From b81395843cf0b85acb1c66706bbc4719ba952a16 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 30 Mar 2016 10:56:10 -0400
Subject: [PATCH 349/362] fix spacing in control file

---
 distros/ubuntu1204/control | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index f8ea3272e..6e3fcab6b 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -3,41 +3,41 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), autoconf, automake, quilt, dh-autoreconf, libtool
-, libgnutls-dev
-, libmysqlclient-dev | libmariadbclient-dev
-, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
-, libpcre3-dev
-, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
-, libv4l-dev (>= 0.8.3)
-, libbz2-dev
-, libavdevice-dev
-, libvlccore-dev, libvlc-dev
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libgcrypt11-dev, libpolkit-gobject-1-dev
+    ,libgnutls-dev
+    ,libmysqlclient-dev | libmariadbclient-dev
+    ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
+    ,libpcre3-dev
+    ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+    ,libv4l-dev (>= 0.8.3)
+    ,libbz2-dev
+    ,libavdevice-dev
+    ,libvlccore-dev, libvlc-dev
+    ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    ,libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
-, mariadb-client|mysql-client|mysql-client-5.6
-, libpcre3
-, ffmpeg | libav-tools
-, rsyslog | system-log-daemon
-, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
-, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
-, libdbd-mysql-perl
-, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
-, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl
-, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
-, libsys-cpu-perl, libsys-meminfo-perl
-, libavdevice53 | libavdevice55
-, libjpeg8|libjpeg9|libjpeg62-turbo
-, zip
-, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libpolkit-gobject-1-0
-, php5-gd
+    ,apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd
+    ,mariadb-client|mysql-client|mysql-client-5.6
+    ,libpcre3
+    ,ffmpeg | libav-tools
+    ,rsyslog | system-log-daemon
+    ,libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+    ,libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+    ,libdbd-mysql-perl
+    ,libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    ,libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, liburi-encode-perl
+    ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    ,libsys-cpu-perl, libsys-meminfo-perl
+    ,libavdevice53 | libavdevice55
+    ,libjpeg8|libjpeg9|libjpeg62-turbo
+    ,zip
+    ,libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+    ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    ,libpolkit-gobject-1-0
+    ,php5-gd
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 

From 2f27818e5b46bb4f04ed0dfe6829a1bf9ad9af3b Mon Sep 17 00:00:00 2001
From: Laercio Motta <laerciomasala@gmail.com>
Date: Thu, 31 Mar 2016 09:23:01 -0300
Subject: [PATCH 350/362] Improve test multiserver restart cam.

Test if correct server from camera edit settings.
---
 web/includes/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 14a8d778e..3cab8366f 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -982,6 +982,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
+  if (ZM_SERVER_ID == $monitor['ServerId']) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -1007,10 +1008,12 @@ function zmcControl( $monitor, $mode=false )
         }
         daemonControl( "start", "zmc", $zmcArgs );
     }
+  }
 }
 
 function zmaControl( $monitor, $mode=false )
 {
+  if (ZM_SERVER_ID == $monitor['ServerId']) {
     if ( !is_array( $monitor ) )
     {
         $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
@@ -1055,6 +1058,7 @@ function zmaControl( $monitor, $mode=false )
             daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
         }
     }
+  }
 }
 
 function initDaemonStatus()

From ad912a6c6bd79cbaed3f9edee324a6af63e0981a Mon Sep 17 00:00:00 2001
From: Laercio Motta <laerciomasala@gmail.com>
Date: Thu, 31 Mar 2016 09:45:13 -0300
Subject: [PATCH 351/362] Improve test multiserver restart camera. (FIX)

Check if the server is correctly before restart cam and multiserver is activate.
---
 web/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 3cab8366f..800f03f4d 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -982,7 +982,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
-  if (ZM_SERVER_ID == $monitor['ServerId']) {
+  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -1013,7 +1013,7 @@ function zmcControl( $monitor, $mode=false )
 
 function zmaControl( $monitor, $mode=false )
 {
-  if (ZM_SERVER_ID == $monitor['ServerId']) {
+  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
     if ( !is_array( $monitor ) )
     {
         $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );

From a31660c1f6d8e8e32fc6ea6ac43eaf88756f5c31 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 10:45:58 -0400
Subject: [PATCH 352/362] Remove the code looks for zm.conf in the current dir.

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 0c5a82a30..3a226cdc8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -66,12 +66,6 @@ use Carp;
 BEGIN
 {
     my $config_file = ZM_CONFIG;
-    ( my $local_config_file = $config_file ) =~ s|^.*/|./|;
-    if ( -s $local_config_file and -r $local_config_file )
-    {
-        print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
-        $config_file = $local_config_file;
-    }
     open( my $CONFIG, "<", $config_file )
         or croak( "Can't open config file '$config_file': $!" );
     foreach my $str ( <$CONFIG> )

From 02eb36040a42f34c4b4bf3bcd7486ec1d7fd6e36 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 12:01:37 -0400
Subject: [PATCH 353/362] fix bad code

---
 web/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 800f03f4d..8b69926da 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -982,7 +982,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
+  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -1013,7 +1013,7 @@ function zmcControl( $monitor, $mode=false )
 
 function zmaControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
+  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
     if ( !is_array( $monitor ) )
     {
         $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );

From 0b13f9d76f07455ab6411615f1ffb40130a79406 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 14:58:07 -0400
Subject: [PATCH 354/362] reload stream on scale change

---
 web/skins/classic/views/js/watch.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 9c39c897a..c686ea430 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -37,9 +37,14 @@ function changeScale()
 
     /*Stream could be an applet so can't use moo tools*/ 
     var streamImg = document.getElementById('liveStream');
-    streamImg.style.width = newWidth + "px";
-    streamImg.style.height = newHeight + "px";
+    if ( streamImg ) {
+        streamImg.style.width = newWidth + "px";
+        streamImg.style.height = newHeight + "px";
 
+        streamImg.src = streamImg.src.replace(/scale=\d+/i,'scale='+scale);
+    } else {
+        console.error("No element found for liveStream.");
+    }
 }
 
 var alarmState = STATE_IDLE;

From 123a1a898a55b71b4aeccf82c1be622a4d4b4d68 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 15:04:09 -0400
Subject: [PATCH 355/362] try to reload the image stream on error.

---
 web/skins/classic/views/js/watch.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 9c39c897a..5f412e214 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -205,8 +205,13 @@ function getStreamCmdResponse( respObj, respText )
             $('enableDisableAlarms').removeClass( 'hidden' );
         }
     }
-    else
+    else {
         checkStreamForErrors("getStreamCmdResponse",respObj);//log them
+        // Try to reload the image stream.
+        var streamImg = document.getElementById('liveStream');
+        if ( streamImg )
+            streamImg.src = streamImg.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+    }
 
     var streamCmdTimeout = statusRefreshTimeout;
     if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )

From ed741687101c293d05868d8d16c32c41e27b3ca6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 15:14:14 -0400
Subject: [PATCH 356/362] increase the size of the Pid field in Logs to
 accomodate FreeBSD

---
 db/zm_create.sql.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 3614bfedd..029f20989 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -270,7 +270,7 @@ CREATE TABLE `Logs` (
   `TimeKey` decimal(16,6) NOT NULL,
   `Component` varchar(32) NOT NULL,
   `ServerId` int(10) unsigned,
-  `Pid` smallint(6) DEFAULT NULL,
+  `Pid` int(10) DEFAULT NULL,
   `Level` tinyint(3) NOT NULL,
   `Code` char(3) NOT NULL,
   `Message` text NOT NULL,

From 397eb1a01ba5340818ab3150cb68e01f46a08bbc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 15:14:42 -0400
Subject: [PATCH 357/362] increase the size of the Pid field in Logs to
 accomodate FreeBSD

---
 db/zm_update-1.29.1.sql | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 db/zm_update-1.29.1.sql

diff --git a/db/zm_update-1.29.1.sql b/db/zm_update-1.29.1.sql
new file mode 100644
index 000000000..8fd43c318
--- /dev/null
+++ b/db/zm_update-1.29.1.sql
@@ -0,0 +1,7 @@
+--
+-- This updates a 1.29.0 database to 1.29.1
+--
+--
+
+-- Increase the size of the Pid field for FreeBSD
+ALTER TABLE Logs MODIFY Pid int(10);

From 711343a5cc8e4d6ed48e9faf46e573a49f30022d Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 4 Apr 2016 16:34:21 -0400
Subject: [PATCH 358/362] fix ZM_SERVER_ID instead of ZM_SERVER

---
 web/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 8b69926da..25d81bb44 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -982,7 +982,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -1013,7 +1013,7 @@ function zmcControl( $monitor, $mode=false )
 
 function zmaControl( $monitor, $mode=false )
 {
-  if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
     if ( !is_array( $monitor ) )
     {
         $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );

From 0f1a53089137807196c39e0553cb08ee2304fad4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 5 Apr 2016 09:03:37 -0400
Subject: [PATCH 359/362] ciontrol files need spaces on multi-line lines

---
 distros/debian/control | 60 +++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/distros/debian/control b/distros/debian/control
index 538b24770..c7becfa64 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -3,41 +3,41 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
 Build-Depends: debhelper (>= 9), autoconf, automake, quilt , libtool, dh-autoreconf
-,libgnutls-dev|libgnutls28-dev
-,libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
-,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
-,libpcre3-dev
-,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
-,libv4l-dev (>= 0.8.3), libvlccore-dev, libvlc-dev
-,libbz2-dev
-,libsys-mmap-perl
-,libnetpbm10-dev
-,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-,libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
+    ,libgnutls-dev|libgnutls28-dev
+    ,libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
+    ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev
+    ,libpcre3-dev
+    ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+    ,libv4l-dev (>= 0.8.3), libvlccore-dev, libvlc-dev
+    ,libbz2-dev
+    ,libsys-mmap-perl
+    ,libnetpbm10-dev
+    ,libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    ,libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-, apache2, libapache2-mod-php5 | libapache2-mod-fcgid
-, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl
-, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
-, mariadb-client|mysql-client
-, libwww-perl, libarchive-tar-perl, libarchive-zip-perl
-, libdevice-serialport-perl, libpcre3
-, ffmpeg | libav-tools
-, rsyslog | system-log-daemon
-, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
-, netpbm
-, libavdevice53 | libavdevice55
-, libjpeg8|libjpeg9|libjpeg62-turbo
-, zip
-, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
-, libvlccore5 | libvlccore7 | libvlccore8, libvlc5
-, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
-, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
-, libsys-cpu-perl, libsys-meminfo-perl
+    , apache2, libapache2-mod-php5 | libapache2-mod-fcgid
+    , php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl
+    , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+    , mariadb-client|mysql-client
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl
+    , libdevice-serialport-perl, libpcre3
+    , ffmpeg | libav-tools
+    , rsyslog | system-log-daemon
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , netpbm
+    , libavdevice53 | libavdevice55
+    , libjpeg8|libjpeg9|libjpeg62-turbo
+    , zip
+    , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+    , libvlccore5 | libvlccore7 | libvlccore8, libvlc5
+    , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    , libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
 Recommends: mysql-server|mariadb-server
 Description: Video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security

From 9c5b47404dad74e5f6593263ff4689a711403609 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Wed, 6 Apr 2016 06:45:21 -0500
Subject: [PATCH 360/362] Update CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2014e1c1..11fffd2f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_WEB_GROUP "www")
 	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
 	set(ZM_CGIDIR "/srv/www/cgi-bin")
-elseif(ZM_TARGET_DISTRO STREQUAL "freeBSD")
+elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
 	set(ZM_RUNDIR "/var/run/zm")
         set(ZM_SOCKDIR "/var/run/zm")
 	set(ZM_TMPDIR "/var/tmp/zm")

From 25abe2aafd5d6ac845c4fecd111519135a135726 Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 7 Apr 2016 00:24:38 +1000
Subject: [PATCH 361/362] Fix score variable

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index af0f621d4..e777d62e1 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -3551,7 +3551,7 @@ unsigned int Monitor::DetectBlack(const Image &comp_image, Event::StringSet &zon
 unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &zoneSet, unsigned int &score )
 {
     bool alarm = false;
-    unsigned int score = 0;
+    score = 0;
 
     if ( n_zones <= 0 ) return( alarm );
 

From 8cec795cc230b89386b2603d52013a426d237c9c Mon Sep 17 00:00:00 2001
From: SteveGilvarry <SteveGilvarry@users.noreply.github.com>
Date: Thu, 7 Apr 2016 00:58:27 +1000
Subject: [PATCH 362/362] Fix library name from zoneminder to zm

---
 src/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64a24e547..0cba1db30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,11 +31,11 @@ add_executable(zmu zmu.cpp)
 add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
 
-target_link_libraries(zmc -ldl zoneminder ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zma -ldl zoneminder ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmu -ldl zoneminder ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmf -ldl zoneminder ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zms -ldl zoneminder ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmc -ldl zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zma -ldl zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmu -ldl zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmf -ldl zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zms -ldl zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
 # Generate man files for the binaries destined for the bin folder
 FOREACH(CBINARY zma zmc zmf zmu)