From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Exceptions/TErrorHandler.php     | 1 -
 framework/Exceptions/TException.php        | 1 -
 framework/Exceptions/messages/messages.txt | 7 +++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'framework/Exceptions')

diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 589e841c..fa8e6d4a 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -362,4 +362,3 @@ class TErrorHandler extends TModule
 	}
 }
 
-?>
diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php
index 4173a04e..c6a87b4d 100644
--- a/framework/Exceptions/TException.php
+++ b/framework/Exceptions/TException.php
@@ -417,4 +417,3 @@ class THttpException extends TSystemException
 	}
 }
 
-?>
diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt
index 3edd5d49..fc2b63f1 100644
--- a/framework/Exceptions/messages/messages.txt
+++ b/framework/Exceptions/messages/messages.txt
@@ -408,6 +408,11 @@ soapservice_serverid_duplicated			= SOAP server ID '{0}' is duplicated.
 soapserver_id_invalid					= Invalid SOAP server ID '{0}'. It should not end with '.wsdl'.
 soapserver_version_invalid				= Invalid SOAP version '{0}'. It must be either '1.1' or '1.2'.
 
+jsonservice_id_required				= TJsonService requires 'id' attribute in its JSON elements.
+jsonservice_response_type_invalid		= JSON class {0} is invalid. It should be TJsonResponse or extend from TJsonResponse.
+jsonservice_class_required			= TJsonService requires 'class' attribute in its JSON elements.
+jsonservice_provider_unknown			= Unknown JSON provider '{0}' requested.
+
 dbusermanager_userclass_required		= TDbUserManager.UserClass is required.
 dbusermanager_userclass_invalid			= TDbUserManager.UserClass '{0}' is not a valid user class. The class must extend TDbUser.
 dbusermanager_connectionid_invalid		= TDbUserManager.ConnectionID '{0}' does not point to a valid TDataSourceConfig module.
@@ -466,3 +471,5 @@ datasource_dbconnection_invalid			= TDataSourceConfig.DbConnection '{0}' is inva
 
 response_status_reason_missing			= HTTP 1.1 need reason for extended status-codes
 response_status_reason_badchars			= For HTTP 1.1 header, the token status-reason must not contain token CR or LF
+
+activefileupload_temppath_invalid		= TActiveFileUpload TempPath path '{0}' does not exist or is not writable by Web server process.
-- 
cgit v1.2.3