From 20bf9efaa09c4e772427f1e26e3d06b28a67106f Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <jfiat@eiffel.com>
Date: Tue, 5 Jul 2011 12:07:49 +0200
Subject: [PATCH] cosmetic, license, copyright

---
 doc/wiki                                      |  2 +-
 library/ewsgi/COPYRIGHT                       |  9 +++
 library/ewsgi/library/gw_application.e        |  2 +-
 library/ewsgi/library/gw_cookie.e             |  3 +-
 library/ewsgi/library/gw_environment.e        | 63 ++++++++++---------
 library/ewsgi/library/gw_environment_names.e  |  2 +-
 .../ewsgi/library/gw_execution_variables.e    |  2 +-
 library/ewsgi/library/gw_input_stream.e       | 13 ++--
 library/ewsgi/library/gw_output_stream.e      | 21 +++++--
 library/ewsgi/library/gw_request_context.e    |  2 +-
 library/ewsgi/library/gw_request_variables.e  |  2 +-
 library/ewsgi/library/gw_variables.e          | 39 +++++++-----
 library/ewsgi/license.lic                     | 11 +++-
 13 files changed, 110 insertions(+), 61 deletions(-)
 create mode 100644 library/ewsgi/COPYRIGHT

diff --git a/doc/wiki b/doc/wiki
index 1782fc9f..d9b52d26 160000
--- a/doc/wiki
+++ b/doc/wiki
@@ -1 +1 @@
-Subproject commit 1782fc9f4debcc3583c6392f8a224b6ac268cf4c
+Subproject commit d9b52d2691da3a66819ea64d793a3a00a1d44ebb
diff --git a/library/ewsgi/COPYRIGHT b/library/ewsgi/COPYRIGHT
new file mode 100644
index 00000000..efd9d759
--- /dev/null
+++ b/library/ewsgi/COPYRIGHT
@@ -0,0 +1,9 @@
+Copyright: 2011-2011, Eiffel Software and others
+License: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+Source: 
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+
diff --git a/library/ewsgi/library/gw_application.e b/library/ewsgi/library/gw_application.e
index 39ccdc29..3f49b571 100644
--- a/library/ewsgi/library/gw_application.e
+++ b/library/ewsgi/library/gw_application.e
@@ -16,7 +16,7 @@ feature -- Execution
 		end
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_cookie.e b/library/ewsgi/library/gw_cookie.e
index 052c500c..b14b637c 100644
--- a/library/ewsgi/library/gw_cookie.e
+++ b/library/ewsgi/library/gw_cookie.e
@@ -3,6 +3,7 @@ note
 		Contains all information of a rfc2109 cookie that was read from the request header
 	]"
 	legal: "See notice at end of class."
+	status: "See notice at end of class."
 	date: "$Date$"
 	revision: "$Revision$"
 
@@ -63,7 +64,7 @@ invariant
 	value_attached: value /= Void
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_environment.e b/library/ewsgi/library/gw_environment.e
index 212b913e..dc9e74a7 100644
--- a/library/ewsgi/library/gw_environment.e
+++ b/library/ewsgi/library/gw_environment.e
@@ -1,8 +1,37 @@
 note
-	description : "Objects that ..."
-	author      : "$Author$"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description: "[
+	
+		Interface for a request environment
+		It includes CGI interface and a few extra values that are usually valuable
+
+
+		--   A `Script URI' can be defined; this describes the resource identified
+		--   by the environment variables. Often, this URI will be the same as the
+		--   URI requested by the client (the `Client URI'); however, it need not
+		--   be. Instead, it could be a URI invented by the server, and so it can
+		--   only be used in the context of the server and its CGI interface.
+		--
+		--   The script URI has the syntax of generic-RL as defined in section 2.1
+		--   of RFC 1808 [7], with the exception that object parameters and
+		--   fragment identifiers are not permitted:
+		--
+		--      <scheme>://<host>:<port>/<path>?<query>
+		--
+		--   The various components of the script URI are defined by some of the
+		--   environment variables (see below);
+		--
+		--      script-uri = protocol "://" SERVER_NAME ":" SERVER_PORT enc-script
+		--                   enc-path-info "?" QUERY_STRING
+		--
+		--   where `protocol' is found from SERVER_PROTOCOL, `enc-script' is a
+		--   URL-encoded version of SCRIPT_NAME and `enc-path-info' is a
+		--   URL-encoded version of PATH_INFO.	
+
+	]"
+	legal: "See notice at end of class."
+	status: "See notice at end of class."
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred
 class
@@ -59,30 +88,6 @@ feature -- Access: table
 			create Result.make (table)
 		end
 
-feature -- Script URI
-
---   A `Script URI' can be defined; this describes the resource identified
---   by the environment variables. Often, this URI will be the same as the
---   URI requested by the client (the `Client URI'); however, it need not
---   be. Instead, it could be a URI invented by the server, and so it can
---   only be used in the context of the server and its CGI interface.
---
---   The script URI has the syntax of generic-RL as defined in section 2.1
---   of RFC 1808 [7], with the exception that object parameters and
---   fragment identifiers are not permitted:
---
---      <scheme>://<host>:<port>/<path>?<query>
---
---   The various components of the script URI are defined by some of the
---   environment variables (see below);
---
---      script-uri = protocol "://" SERVER_NAME ":" SERVER_PORT enc-script
---                   enc-path-info "?" QUERY_STRING
---
---   where `protocol' is found from SERVER_PROTOCOL, `enc-script' is a
---   URL-encoded version of SCRIPT_NAME and `enc-path-info' is a
---   URL-encoded version of PATH_INFO.
-
 feature -- Common Gateway Interface - 1.1       8 January 1996
 
 	auth_type: detachable STRING
@@ -397,7 +402,7 @@ feature -- Extra
 		end
 
 ;note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_environment_names.e b/library/ewsgi/library/gw_environment_names.e
index 28d044a1..84360f79 100644
--- a/library/ewsgi/library/gw_environment_names.e
+++ b/library/ewsgi/library/gw_environment_names.e
@@ -77,7 +77,7 @@ feature -- Extra names
 	orig_path_info: STRING = "ORIG_PATH_INFO"
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_execution_variables.e b/library/ewsgi/library/gw_execution_variables.e
index 9f74d5c9..8d0f02fa 100644
--- a/library/ewsgi/library/gw_execution_variables.e
+++ b/library/ewsgi/library/gw_execution_variables.e
@@ -57,7 +57,7 @@ feature -- Element change
 		end
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_input_stream.e b/library/ewsgi/library/gw_input_stream.e
index 7632c067..ef5ddb30 100644
--- a/library/ewsgi/library/gw_input_stream.e
+++ b/library/ewsgi/library/gw_input_stream.e
@@ -1,8 +1,11 @@
 note
-	description : "Objects that ..."
-	author      : "$Author$"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description : "[
+			Objects that represents the input stream
+		]"
+	legal: "See notice at end of class."
+	status: "See notice at end of class."
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	GW_INPUT_STREAM
@@ -23,7 +26,7 @@ feature -- Basic operation
 		end
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_output_stream.e b/library/ewsgi/library/gw_output_stream.e
index 83208972..5c906761 100644
--- a/library/ewsgi/library/gw_output_stream.e
+++ b/library/ewsgi/library/gw_output_stream.e
@@ -1,8 +1,11 @@
 note
-	description : "Objects that ..."
-	author      : "$Author$"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description : "[
+			Objects that represents the output stream
+		]"
+	legal: "See notice at end of class."
+	status: "See notice at end of class."
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	GW_OUTPUT_STREAM
@@ -15,4 +18,14 @@ feature -- Basic operation
 		deferred
 		end
 
+note
+	copyright: "2011-2011, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
diff --git a/library/ewsgi/library/gw_request_context.e b/library/ewsgi/library/gw_request_context.e
index 6a9cba15..d4bb4966 100644
--- a/library/ewsgi/library/gw_request_context.e
+++ b/library/ewsgi/library/gw_request_context.e
@@ -201,7 +201,7 @@ feature {NONE} -- Temporary File handling
 		end
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_request_variables.e b/library/ewsgi/library/gw_request_variables.e
index 3acee8cc..a3f6850c 100644
--- a/library/ewsgi/library/gw_request_variables.e
+++ b/library/ewsgi/library/gw_request_variables.e
@@ -125,7 +125,7 @@ feature {NONE} -- Implementation
 --		end
 
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/library/gw_variables.e b/library/ewsgi/library/gw_variables.e
index f01ef183..69f32e07 100644
--- a/library/ewsgi/library/gw_variables.e
+++ b/library/ewsgi/library/gw_variables.e
@@ -1,13 +1,34 @@
 note
-	description: "Summary description for {GW_VARIABLES}."
+	description : "[
+			Interface to access the variable stored in a container
+		]"
+	legal: "See notice at end of class."
+	status: "See notice at end of class."
 	date: "$Date$"
 	revision: "$Revision$"
-
+	
 deferred class
 	GW_VARIABLES [G -> STRING_GENERAL]
 
+feature -- Status report
+
+	has_variable (a_name: STRING): BOOLEAN
+			-- Has variable associated with `a_name'
+		require
+			a_name_not_empty: a_name /= Void and then not a_name.is_empty
+		deferred
+		end
+
 feature -- Access
 
+	variable (a_name: STRING): detachable G
+			-- Value for variable associated with `a_name'
+			-- If not found, return Void
+		require
+			a_name_not_empty: a_name /= Void and then not a_name.is_empty
+		deferred
+		end
+
 	variable_or_default (a_name: STRING; a_default: G): G
 			-- Value for variable `a_name'
 			-- If not found, return `a_default'
@@ -21,20 +42,8 @@ feature -- Access
 			end
 		end
 
-	variable (a_name: STRING): detachable G
-		require
-			a_name_not_empty: a_name /= Void and then not a_name.is_empty
-		deferred
-		end
-
-	has_variable (a_name: STRING): BOOLEAN
-		require
-			a_name_not_empty: a_name /= Void and then not a_name.is_empty
-		deferred
-		end
-
 note
-	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	copyright: "2011-2011, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/ewsgi/license.lic b/library/ewsgi/license.lic
index c929225f..cf2d1ed9 100644
--- a/library/ewsgi/license.lic
+++ b/library/ewsgi/license.lic
@@ -1 +1,10 @@
-reference:forum2
+${NOTE_KEYWORD}
+	copyright: "2011-${YEAR}, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"