--- parser3/src/main/pa_globals.C	2001/03/19 17:42:16	1.16
+++ parser3/src/main/pa_globals.C	2001/03/19 22:48:37	1.21
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.C,v 1.16 2001/03/19 17:42:16 paf Exp $
+	$Id: pa_globals.C,v 1.21 2001/03/19 22:48:37 paf Exp $
 */
 
 #include "pa_globals.h"
@@ -14,10 +14,9 @@
 #include "_int.h"
 #include "_table.h"
 #include "_form.h"
-#include "_env.h"
 #include "_request.h"
 #include "_response.h"
-#include "_cookie.h"
+#include "_file.h"
 
 Service_funcs service_funcs;
 
@@ -26,6 +25,9 @@ String *body_name;
 String *value_name;
 String *expires_name;
 String *path_name;
+String *name_name;
+String *size_name;
+String *text_name;
 
 String *exception_method_name;
 
@@ -94,6 +96,9 @@ void globals_init(Pool& pool) {
 	value_name=new(pool) String(pool, VALUE_NAME);
 	expires_name=new(pool) String(pool, EXPIRES_NAME);
 	path_name=new(pool) String(pool, PATH_NAME);
+	name_name=new(pool) String(pool, NAME_NAME);
+	size_name=new(pool) String(pool, SIZE_NAME);
+	text_name=new(pool) String(pool, TEXT_NAME);
 
 	exception_method_name=new(pool) String(pool, EXCEPTION_METHOD_NAME);
 
@@ -144,11 +149,10 @@ void globals_init(Pool& pool) {
 	initialize_double_class(pool, *(double_class=new(pool) VStateless_class(pool)));  double_class->freeze();
 	initialize_int_class(pool, *(int_class=new(pool) VStateless_class(pool)));  int_class->freeze();
 	initialize_table_class(pool, *(table_class=new(pool) VStateless_class(pool)));  table_class->freeze();
+	initialize_file_class(pool, *(file_class=new(pool) VStateless_class(pool)));  file_class->freeze();
+	initialize_response_class(pool, *(response_class=new(pool) VStateless_class(pool)));  response_class->freeze();
 
 	// read-only stateless base classes
-	initialize_env_base_class(pool, *(env_base_class=new(pool) VStateless_class(pool)));  env_base_class->set_name(*env_class_name);  env_base_class->freeze();
 	initialize_form_base_class(pool, *(form_base_class=new(pool) VStateless_class(pool)));  form_base_class->set_name(*form_class_name);  form_base_class->freeze();
 	initialize_request_base_class(pool, *(request_base_class=new(pool) VStateless_class(pool)));  request_base_class->set_name(*request_class_name);  request_base_class->freeze();
-	initialize_response_base_class(pool, *(response_base_class=new(pool) VStateless_class(pool)));  response_base_class->set_name(*response_class_name);  response_base_class->freeze();
-	initialize_cookie_base_class(pool, *(cookie_base_class=new(pool) VStateless_class(pool)));  cookie_base_class->set_name(*cookie_class_name);  cookie_base_class->freeze();
 }