Removed a few obsolete usages, and benefit from new classes from EiffelStudio >= 7.2
This commit is contained in:
@@ -12,13 +12,18 @@ inherit
|
|||||||
undefine
|
undefine
|
||||||
requires_proxy
|
requires_proxy
|
||||||
end
|
end
|
||||||
|
|
||||||
WSF_URI_TEMPLATE_HELPER_FOR_ROUTED_SERVICE
|
WSF_URI_TEMPLATE_HELPER_FOR_ROUTED_SERVICE
|
||||||
|
|
||||||
WSF_SERVICE
|
WSF_SERVICE
|
||||||
|
|
||||||
WSF_NO_PROXY_POLICY
|
WSF_NO_PROXY_POLICY
|
||||||
|
|
||||||
|
SHARED_EXECUTION_ENVIRONMENT
|
||||||
|
export
|
||||||
|
{NONE} all
|
||||||
|
end
|
||||||
|
|
||||||
create
|
create
|
||||||
make_and_launch
|
make_and_launch
|
||||||
|
|
||||||
@@ -42,14 +47,20 @@ feature {NONE} -- Initialization
|
|||||||
on_launched (conn: WGI_CONNECTOR)
|
on_launched (conn: WGI_CONNECTOR)
|
||||||
local
|
local
|
||||||
e: EXECUTION_ENVIRONMENT
|
e: EXECUTION_ENVIRONMENT
|
||||||
|
cmd: STRING_32
|
||||||
do
|
do
|
||||||
if attached {WGI_NINO_CONNECTOR} conn as nino then
|
if attached {WGI_NINO_CONNECTOR} conn as nino then
|
||||||
create e
|
e := execution_environment
|
||||||
if attached e.get ("COMSPEC") as l_comspec then
|
create cmd.make (32)
|
||||||
e.launch (l_comspec + " /C start " + "http://localhost:" + nino.port.out + "/")
|
if attached e.item ("COMSPEC") as l_comspec then
|
||||||
else
|
cmd.append (l_comspec)
|
||||||
e.launch ("http://localhost:" + nino.port.out + "/")
|
cmd.append ({STRING_32} " /C start ")
|
||||||
end
|
end
|
||||||
|
cmd.append ("http://localhost:")
|
||||||
|
cmd.append_integer (nino.port)
|
||||||
|
cmd.append_character ({CHARACTER_32} '/')
|
||||||
|
|
||||||
|
e.launch (cmd)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ feature {OPENID_CONSUMER_VALIDATION} -- Implementation
|
|||||||
sess: HTTP_CLIENT_SESSION
|
sess: HTTP_CLIENT_SESSION
|
||||||
ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT
|
ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT
|
||||||
xrds_location: detachable READABLE_STRING_8
|
xrds_location: detachable READABLE_STRING_8
|
||||||
xml: XML_LITE_PARSER
|
xml: XML_STANDARD_PARSER
|
||||||
tree: XML_CALLBACKS_DOCUMENT
|
tree: XML_CALLBACKS_DOCUMENT
|
||||||
xelt: detachable XML_ELEMENT
|
xelt: detachable XML_ELEMENT
|
||||||
s: READABLE_STRING_32
|
s: READABLE_STRING_32
|
||||||
|
|||||||
@@ -19,21 +19,21 @@ feature {NONE} -- Initialization
|
|||||||
|
|
||||||
feature -- Access
|
feature -- Access
|
||||||
|
|
||||||
updated_environ_variables: HASH_TABLE [STRING, STRING]
|
updated_environ_variables: STRING_TABLE [READABLE_STRING_8]
|
||||||
local
|
local
|
||||||
i: INTEGER
|
i: INTEGER
|
||||||
p, v, null: POINTER
|
p, v, null: POINTER
|
||||||
do
|
do
|
||||||
p := fcgi_environ
|
p := fcgi_environ
|
||||||
create Result.make (50)
|
create Result.make_equal (50)
|
||||||
if p /= null then
|
if p /= null then
|
||||||
from
|
from
|
||||||
i := 0
|
i := 0
|
||||||
v := fcgi_i_th_environ (i,p)
|
v := fcgi_i_th_environ (i, p)
|
||||||
until
|
until
|
||||||
v = null
|
v = null
|
||||||
loop
|
loop
|
||||||
if attached separated_variables (create {STRING}.make_from_c (v)) as t then
|
if attached separated_variables (create {STRING_8}.make_from_c (v)) as t then
|
||||||
Result.force (t.value, t.key)
|
Result.force (t.value, t.key)
|
||||||
end
|
end
|
||||||
i := i + 1
|
i := i + 1
|
||||||
@@ -196,7 +196,7 @@ feature {NONE} -- Implementation: Environment
|
|||||||
"return ((char **)$p)[$i];"
|
"return ((char **)$p)[$i];"
|
||||||
end
|
end
|
||||||
|
|
||||||
separated_variables (a_var: STRING): detachable TUPLE [value: STRING; key: STRING]
|
separated_variables (a_var: READABLE_STRING_8): detachable TUPLE [value: READABLE_STRING_8; key: READABLE_STRING_8]
|
||||||
-- Given an environment variable `a_var' in form of "key=value",
|
-- Given an environment variable `a_var' in form of "key=value",
|
||||||
-- return separated key and value.
|
-- return separated key and value.
|
||||||
-- Return Void if `a_var' is in incorrect format.
|
-- Return Void if `a_var' is in incorrect format.
|
||||||
@@ -224,7 +224,7 @@ feature {NONE} -- Implementation: Environment
|
|||||||
end
|
end
|
||||||
|
|
||||||
note
|
note
|
||||||
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
|
copyright: "Copyright (c) 1984-2013, Eiffel Software and others"
|
||||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
source: "[
|
source: "[
|
||||||
Eiffel Software
|
Eiffel Software
|
||||||
|
|||||||
@@ -24,6 +24,11 @@ inherit
|
|||||||
initialize
|
initialize
|
||||||
end
|
end
|
||||||
|
|
||||||
|
SHARED_EXECUTION_ENVIRONMENT
|
||||||
|
export
|
||||||
|
{NONE} all
|
||||||
|
end
|
||||||
|
|
||||||
create
|
create
|
||||||
make,
|
make,
|
||||||
make_and_launch,
|
make_and_launch,
|
||||||
@@ -37,15 +42,19 @@ feature {NONE} -- Initialization
|
|||||||
l_env: EXECUTION_ENVIRONMENT
|
l_env: EXECUTION_ENVIRONMENT
|
||||||
do
|
do
|
||||||
Precursor
|
Precursor
|
||||||
create l_env
|
l_env := execution_environment
|
||||||
|
|
||||||
if attached l_env.get (Openshift_ip) as l_ip then
|
if attached l_env.item (Openshift_ip) as l_ip then
|
||||||
server_name := l_ip.to_string_8
|
if l_ip.is_valid_as_string_8 then
|
||||||
|
server_name := l_ip.to_string_8
|
||||||
|
else
|
||||||
|
die ("could not parse " + Openshift_ip)
|
||||||
|
end
|
||||||
else
|
else
|
||||||
die (Openshift_ip + " is not defined")
|
die (Openshift_ip + " is not defined")
|
||||||
end
|
end
|
||||||
|
|
||||||
if attached l_env.get (Openshift_port) as l_port then
|
if attached l_env.item (Openshift_port) as l_port then
|
||||||
if l_port.is_integer then
|
if l_port.is_integer then
|
||||||
port_number := l_port.to_integer
|
port_number := l_port.to_integer
|
||||||
else
|
else
|
||||||
@@ -77,7 +86,7 @@ feature {NONE} -- Implementation
|
|||||||
|
|
||||||
|
|
||||||
;note
|
;note
|
||||||
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
|
||||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||||
source: "[
|
source: "[
|
||||||
Eiffel Software
|
Eiffel Software
|
||||||
|
|||||||
Reference in New Issue
Block a user