pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fix Apache module sample

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1148 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2010-01-29 15:30:24 +00:00
parent 469e43fa0e
commit 5bd5ea7644
7 changed files with 262 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

405
wst/trunk/samples/apache_module/mod_wst.lpi
View File

@ -2,12 +2,14 @@
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="5"/> <Version Value="7"/>
<General> <General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="3"/> <ActiveEditorIndexAtStart Value="0"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -24,24 +26,25 @@
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<Units Count="56"> <Units Count="57">
<Unit0> <Unit0>
<Filename Value="mod_wst.lpr"/> <Filename Value="mod_wst.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="mod_wst"/> <UnitName Value="mod_wst"/>
<CursorPos X="38" Y="11"/> <CursorPos X="44" Y="60"/>
<TopLine Value="1"/> <TopLine Value="43"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="68"/> <UsageCount Value="73"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="wst_apache_binding"/> <UnitName Value="wst_apache_binding"/>
<CursorPos X="19" Y="74"/> <CursorPos X="3" Y="25"/>
<TopLine Value="70"/> <TopLine Value="70"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="33"/> <UsageCount Value="37"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
@ -59,450 +62,477 @@
<UsageCount Value="21"/> <UsageCount Value="21"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.pas"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.pas"/>
<UnitName Value="httpd"/> <UnitName Value="httpd"/>
<CursorPos X="5" Y="26"/> <CursorPos X="5" Y="26"/>
<TopLine Value="25"/> <TopLine Value="25"/>
<UsageCount Value="6"/> <UsageCount Value="6"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="75"/> <TopLine Value="75"/>
<UsageCount Value="6"/> <UsageCount Value="6"/>
</Unit5> </Unit5>
<Unit6> <Unit6>
<Filename Value="..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.pas"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.pas"/>
<UnitName Value="httpd"/> <UnitName Value="httpd"/>
<CursorPos X="35" Y="44"/> <CursorPos X="35" Y="44"/>
<TopLine Value="61"/> <TopLine Value="61"/>
<UsageCount Value="6"/> <UsageCount Value="6"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_protocol.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_protocol.inc"/>
<CursorPos X="47" Y="799"/> <CursorPos X="47" Y="799"/>
<TopLine Value="777"/> <TopLine Value="777"/>
<UsageCount Value="9"/> <UsageCount Value="9"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.inc"/>
<CursorPos X="5" Y="794"/> <CursorPos X="5" Y="794"/>
<TopLine Value="777"/> <TopLine Value="777"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_tables.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_tables.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="16"/> <TopLine Value="16"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_config.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_config.inc"/>
<CursorPos X="71" Y="66"/> <CursorPos X="71" Y="66"/>
<TopLine Value="32"/> <TopLine Value="32"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.pas"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\ap_mmn.inc"/>
<UnitName Value="httpd"/>
<CursorPos X="41" Y="134"/>
<TopLine Value="117"/>
<UsageCount Value="8"/>
</Unit11>
<Unit12>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\ap_mmn.inc"/>
<CursorPos X="3" Y="111"/> <CursorPos X="3" Y="111"/>
<TopLine Value="96"/> <TopLine Value="96"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit12> </Unit11>
<Unit13> <Unit12>
<Filename Value="..\..\..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/> <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/>
<CursorPos X="3" Y="48"/> <CursorPos X="3" Y="48"/>
<TopLine Value="678"/> <TopLine Value="678"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit13> </Unit12>
<Unit14> <Unit13>
<Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/> <Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/>
<UnitName Value="cursor_intf"/> <UnitName Value="cursor_intf"/>
<CursorPos X="16" Y="18"/> <CursorPos X="16" Y="18"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="9"/> <UsageCount Value="9"/>
</Unit14> </Unit13>
<Unit15> <Unit14>
<Filename Value="..\user_service_intf_binder.pas"/> <Filename Value="..\user_service_intf_binder.pas"/>
<UnitName Value="user_service_intf_binder"/> <UnitName Value="user_service_intf_binder"/>
<CursorPos X="3" Y="252"/> <CursorPos X="3" Y="252"/>
<TopLine Value="250"/> <TopLine Value="250"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
</Unit15> </Unit14>
<Unit16> <Unit15>
<Filename Value="..\imp_helper.pas"/> <Filename Value="..\imp_helper.pas"/>
<UnitName Value="imp_helper"/> <UnitName Value="imp_helper"/>
<CursorPos X="1" Y="76"/> <CursorPos X="1" Y="76"/>
<TopLine Value="33"/> <TopLine Value="33"/>
<UsageCount Value="20"/> <UsageCount Value="20"/>
</Unit16> </Unit15>
<Unit17> <Unit16>
<Filename Value="..\..\metadata_service_binder.pas"/> <Filename Value="..\..\metadata_service_binder.pas"/>
<UnitName Value="metadata_service_binder"/> <UnitName Value="metadata_service_binder"/>
<CursorPos X="29" Y="43"/> <CursorPos X="29" Y="43"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="25"/> <UsageCount Value="25"/>
</Unit17> </Unit16>
<Unit18> <Unit17>
<Filename Value="..\..\metadata_service.pas"/> <Filename Value="..\..\metadata_service.pas"/>
<UnitName Value="metadata_service"/> <UnitName Value="metadata_service"/>
<CursorPos X="71" Y="76"/> <CursorPos X="71" Y="76"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="25"/> <UsageCount Value="25"/>
</Unit18> </Unit17>
<Unit19> <Unit18>
<Filename Value="..\..\metadata_service_imp.pas"/> <Filename Value="..\..\metadata_service_imp.pas"/>
<UnitName Value="metadata_service_imp"/> <UnitName Value="metadata_service_imp"/>
<CursorPos X="61" Y="21"/> <CursorPos X="61" Y="21"/>
<TopLine Value="13"/> <TopLine Value="13"/>
<UsageCount Value="24"/> <UsageCount Value="24"/>
</Unit19> </Unit18>
<Unit20> <Unit19>
<Filename Value="..\..\library_imp_utils.pas"/> <Filename Value="..\..\library_imp_utils.pas"/>
<UnitName Value="library_imp_utils"/> <UnitName Value="library_imp_utils"/>
<CursorPos X="42" Y="35"/> <CursorPos X="42" Y="35"/>
<TopLine Value="73"/> <TopLine Value="73"/>
<EditorIndex Value="7"/>
<UsageCount Value="24"/> <UsageCount Value="24"/>
<Loaded Value="True"/> </Unit19>
</Unit20> <Unit20>
<Unit21> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr.pas"/>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr.pas"/>
<UnitName Value="apr"/> <UnitName Value="apr"/>
<CursorPos X="18" Y="182"/> <CursorPos X="18" Y="182"/>
<TopLine Value="173"/> <TopLine Value="173"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit21> </Unit20>
<Unit22> <Unit21>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_file_info.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_file_info.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="151"/> <TopLine Value="151"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit22> </Unit21>
<Unit23> <Unit22>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_file_io.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_file_io.inc"/>
<CursorPos X="124" Y="665"/> <CursorPos X="124" Y="665"/>
<TopLine Value="778"/> <TopLine Value="778"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit23> </Unit22>
<Unit24> <Unit23>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_dso.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_dso.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="66"/> <TopLine Value="66"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit24> </Unit23>
<Unit25> <Unit24>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_lib.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_lib.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="192"/> <TopLine Value="192"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit25> </Unit24>
<Unit26> <Unit25>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_general.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_general.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="199"/> <TopLine Value="199"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit26> </Unit25>
<Unit27> <Unit26>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_strings.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_strings.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="329"/> <TopLine Value="329"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit27> </Unit26>
<Unit28> <Unit27>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\httpd.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\httpd.inc"/>
<CursorPos X="21" Y="23"/> <CursorPos X="21" Y="23"/>
<TopLine Value="10"/> <TopLine Value="10"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
</Unit28> </Unit27>
<Unit29> <Unit28>
<Filename Value="..\..\library_base_intf.pas"/> <Filename Value="..\..\library_base_intf.pas"/>
<UnitName Value="library_base_intf"/> <UnitName Value="library_base_intf"/>
<CursorPos X="29" Y="17"/> <CursorPos X="29" Y="17"/>
<TopLine Value="73"/> <TopLine Value="73"/>
<EditorIndex Value="5"/>
<UsageCount Value="23"/> <UsageCount Value="23"/>
<Loaded Value="True"/> </Unit28>
</Unit29> <Unit29>
<Unit30> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\ap_alloc.inc"/>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\ap_alloc.inc"/>
<CursorPos X="3" Y="45"/> <CursorPos X="3" Y="45"/>
<TopLine Value="30"/> <TopLine Value="30"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
</Unit30> </Unit29>
<Unit31> <Unit30>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="678"/> <TopLine Value="678"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit31> </Unit30>
<Unit32> <Unit31>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\httpd.pas"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\httpd.pas"/>
<UnitName Value="httpd"/> <UnitName Value="httpd"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="82"/> <TopLine Value="82"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit32> </Unit31>
<Unit33> <Unit32>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\http_log.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\http_log.inc"/>
<CursorPos X="11" Y="75"/> <CursorPos X="11" Y="75"/>
<TopLine Value="60"/> <TopLine Value="60"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit33> </Unit32>
<Unit34> <Unit33>
<Filename Value="..\..\server_service_xmlrpc.pas"/> <Filename Value="..\..\server_service_xmlrpc.pas"/>
<UnitName Value="server_service_xmlrpc"/> <UnitName Value="server_service_xmlrpc"/>
<CursorPos X="17" Y="57"/> <CursorPos X="17" Y="57"/>
<TopLine Value="42"/> <TopLine Value="42"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
</Unit34> </Unit33>
<Unit35> <Unit34>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/> <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<UnitName Value="base_xmlrpc_formatter"/> <UnitName Value="base_xmlrpc_formatter"/>
<CursorPos X="3" Y="29"/> <CursorPos X="3" Y="29"/>
<TopLine Value="14"/> <TopLine Value="14"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
</Unit35> </Unit34>
<Unit36> <Unit35>
<Filename Value="..\..\server_service_intf.pas"/> <Filename Value="..\..\server_service_intf.pas"/>
<UnitName Value="server_service_intf"/> <UnitName Value="server_service_intf"/>
<CursorPos X="5" Y="18"/> <CursorPos X="5" Y="18"/>
<TopLine Value="3"/> <TopLine Value="3"/>
<UsageCount Value="21"/> <UsageCount Value="21"/>
</Unit36> </Unit35>
<Unit37> <Unit36>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\win32\classes.pp"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\win32\classes.pp"/>
<UnitName Value="Classes"/> <UnitName Value="Classes"/>
<CursorPos X="8" Y="46"/> <CursorPos X="8" Y="46"/>
<TopLine Value="21"/> <TopLine Value="21"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit37> </Unit36>
<Unit38> <Unit37>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\objpas\classes\classes.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\objpas\classes\classes.inc"/>
<CursorPos X="11" Y="1674"/> <CursorPos X="11" Y="1674"/>
<TopLine Value="1665"/> <TopLine Value="1665"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit38> </Unit37>
<Unit39> <Unit38>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\http_config.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\http_config.inc"/>
<CursorPos X="24" Y="165"/> <CursorPos X="24" Y="165"/>
<TopLine Value="150"/> <TopLine Value="150"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit39> </Unit38>
<Unit40> <Unit39>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\apr\apr_pools.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\apr\apr_pools.inc"/>
<CursorPos X="3" Y="48"/> <CursorPos X="3" Y="48"/>
<TopLine Value="33"/> <TopLine Value="33"/>
<UsageCount Value="8"/> <UsageCount Value="8"/>
</Unit40> </Unit39>
<Unit41> <Unit40>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\http_config.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\http_config.inc"/>
<CursorPos X="25" Y="154"/> <CursorPos X="25" Y="154"/>
<TopLine Value="117"/> <TopLine Value="117"/>
<UsageCount Value="17"/> <UsageCount Value="17"/>
</Unit41> </Unit40>
<Unit42> <Unit41>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\httpd.pas"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\httpd.pas"/>
<UnitName Value="httpd"/> <UnitName Value="httpd"/>
<CursorPos X="3" Y="70"/> <CursorPos X="3" Y="70"/>
<TopLine Value="55"/> <TopLine Value="55"/>
<UsageCount Value="15"/> <UsageCount Value="15"/>
</Unit42> </Unit41>
<Unit43> <Unit42>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\httpd.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\httpd.inc"/>
<CursorPos X="5" Y="1029"/> <CursorPos X="5" Y="1029"/>
<TopLine Value="1014"/> <TopLine Value="1014"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
</Unit43> </Unit42>
<Unit44> <Unit43>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\http_log.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\http_log.inc"/>
<CursorPos X="15" Y="34"/> <CursorPos X="15" Y="34"/>
<TopLine Value="17"/> <TopLine Value="17"/>
<UsageCount Value="11"/> <UsageCount Value="11"/>
</Unit44> </Unit43>
<Unit45> <Unit44>
<Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\http_config.inc"/> <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\http_config.inc"/>
<CursorPos X="1" Y="136"/> <CursorPos X="1" Y="136"/>
<TopLine Value="113"/> <TopLine Value="113"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
</Unit45> </Unit44>
<Unit46> <Unit45>
<Filename Value="..\..\wst.inc"/> <Filename Value="..\..\wst.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="9"/> <UsageCount Value="9"/>
</Unit46> </Unit45>
<Unit47> <Unit46>
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="..\..\base_service_intf.pas"/>
<UnitName Value="base_service_intf"/> <UnitName Value="base_service_intf"/>
<CursorPos X="25" Y="1252"/> <CursorPos X="3" Y="1880"/>
<TopLine Value="1237"/> <TopLine Value="1862"/>
<EditorIndex Value="6"/> <UsageCount Value="14"/>
<UsageCount Value="13"/> </Unit46>
<Loaded Value="True"/> <Unit47>
</Unit47>
<Unit48>
<Filename Value="..\..\imp_utils.pas"/> <Filename Value="..\..\imp_utils.pas"/>
<UnitName Value="imp_utils"/> <UnitName Value="imp_utils"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="38"/> <TopLine Value="38"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit48> </Unit47>
<Unit49> <Unit48>
<Filename Value="..\..\wst_resources_imp.pas"/> <Filename Value="..\..\wst_resources_imp.pas"/>
<UnitName Value="wst_resources_imp"/> <UnitName Value="wst_resources_imp"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="13"/> <TopLine Value="13"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit49> </Unit48>
<Unit50> <Unit49>
<Filename Value="..\..\record_rtti.pas"/> <Filename Value="..\..\record_rtti.pas"/>
<UnitName Value="record_rtti"/> <UnitName Value="record_rtti"/>
<CursorPos X="5" Y="66"/> <CursorPos X="5" Y="66"/>
<TopLine Value="51"/> <TopLine Value="51"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit50> </Unit49>
<Unit51> <Unit50>
<Filename Value="..\..\server_service_imputils.pas"/> <Filename Value="..\..\server_service_imputils.pas"/>
<UnitName Value="server_service_imputils"/> <UnitName Value="server_service_imputils"/>
<CursorPos X="5" Y="18"/> <CursorPos X="5" Y="18"/>
<TopLine Value="3"/> <TopLine Value="3"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit51> </Unit50>
<Unit52> <Unit51>
<Filename Value="..\..\server_service_soap.pas"/> <Filename Value="..\..\server_service_soap.pas"/>
<UnitName Value="server_service_soap"/> <UnitName Value="server_service_soap"/>
<CursorPos X="15" Y="22"/> <CursorPos X="15" Y="22"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="2"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> </Unit51>
</Unit52> <Unit52>
<Unit53>
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="..\..\base_soap_formatter.pas"/>
<UnitName Value="base_soap_formatter"/> <UnitName Value="base_soap_formatter"/>
<CursorPos X="5" Y="356"/> <CursorPos X="5" Y="356"/>
<TopLine Value="342"/> <TopLine Value="342"/>
<EditorIndex Value="3"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> </Unit52>
</Unit53> <Unit53>
<Unit54>
<Filename Value="..\..\server_binary_formatter.pas"/> <Filename Value="..\..\server_binary_formatter.pas"/>
<UnitName Value="server_binary_formatter"/> <UnitName Value="server_binary_formatter"/>
<CursorPos X="5" Y="18"/> <CursorPos X="5" Y="18"/>
<TopLine Value="3"/> <TopLine Value="3"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit54> </Unit53>
<Unit55> <Unit54>
<Filename Value="..\..\metadata_repository.pas"/> <Filename Value="..\..\metadata_repository.pas"/>
<UnitName Value="metadata_repository"/> <UnitName Value="metadata_repository"/>
<CursorPos X="5" Y="117"/> <CursorPos X="5" Y="117"/>
<TopLine Value="102"/> <TopLine Value="102"/>
<EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> </Unit54>
<Unit55>
<Filename Value="E:\fpc_dev\packages\httpd13\src\http_protocol.inc"/>
<CursorPos X="31" Y="75"/>
<TopLine Value="60"/>
<UsageCount Value="10"/>
</Unit55> </Unit55>
<Unit56>
<Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
<CursorPos X="16" Y="181"/>
<TopLine Value="164"/>
<EditorIndex Value="2"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit56>
</Units> </Units>
<JumpHistory Count="22" HistoryIndex="21"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="72" Column="16" TopLine="70"/> <Caret Line="448" Column="34" TopLine="424"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="504" Column="66" TopLine="480"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="20" Column="5" TopLine="5"/> <Caret Line="493" Column="62" TopLine="481"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="1252" Column="25" TopLine="1237"/> <Caret Line="500" Column="25" TopLine="493"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="73" Column="19" TopLine="70"/> <Caret Line="499" Column="23" TopLine="490"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="73" Column="34" TopLine="70"/> <Caret Line="491" Column="42" TopLine="478"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="74" Column="22" TopLine="70"/> <Caret Line="177" Column="71" TopLine="170"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\..\server_service_soap.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="489" Column="5" TopLine="460"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\..\server_service_soap.pas"/> <Filename Value="mod_wst.lpr"/>
<Caret Line="22" Column="18" TopLine="3"/> <Caret Line="56" Column="20" TopLine="32"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="58" Column="45" TopLine="43"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
<Caret Line="18" Column="5" TopLine="3"/> <Caret Line="64" Column="25" TopLine="49"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="mod_wst.lpr"/>
<Caret Line="74" Column="41" TopLine="70"/> <Caret Line="56" Column="16" TopLine="32"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="74" Column="56" TopLine="70"/> <Caret Line="58" Column="50" TopLine="43"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
<Caret Line="75" Column="22" TopLine="70"/> <Caret Line="64" Column="28" TopLine="49"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\..\metadata_repository.pas"/> <Filename Value="mod_wst.lpr"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="54" Column="8" TopLine="32"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\..\metadata_repository.pas"/> <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
<Caret Line="18" Column="5" TopLine="3"/> <Caret Line="215" Column="16" TopLine="200"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="mod_wst.lpr"/>
<Caret Line="75" Column="36" TopLine="70"/> <Caret Line="54" Column="32" TopLine="32"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="76" Column="12" TopLine="70"/> <Caret Line="58" Column="3" TopLine="43"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="wst_apache_binding.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="74" Column="19" TopLine="70"/> <Caret Line="23" Column="33" TopLine="10"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="..\..\server_service_soap.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="22" Column="15" TopLine="1"/> <Caret Line="90" Column="18" TopLine="82"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="1" Column="1" TopLine="7"/> <Caret Line="502" Column="5" TopLine="373"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="wst_apache_binding.pas"/>
<Caret Line="18" Column="58" TopLine="3"/> <Caret Line="133" Column="41" TopLine="115"/>
</Position22> </Position22>
<Position23>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="485" Column="35" TopLine="472"/>
</Position23>
<Position24>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="381" Column="10" TopLine="387"/>
</Position24>
<Position25>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="6" Column="13" TopLine="1"/>
</Position25>
<Position26>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="485" Column="21" TopLine="472"/>
</Position26>
<Position27>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="403" Column="86" TopLine="390"/>
</Position27>
<Position28>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="46" Column="25" TopLine="31"/>
</Position28>
<Position29>
<Filename Value="mod_wst.lpr"/>
<Caret Line="54" Column="32" TopLine="32"/>
</Position29>
<Position30>
<Filename Value="wst_apache_binding.pas"/>
<Caret Line="402" Column="1" TopLine="394"/>
</Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="8"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="mod_wst.so"/> <Filename Value="mod_wst.so"/>
@ -513,9 +543,6 @@
<UnitOutputDirectory Value="obj"/> <UnitOutputDirectory Value="obj"/>
<SrcPath Value="$(FPCSrcDir)\packages\base\httpd\httpd-2.0\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\apr\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\apriconv\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\aprutil\"/> <SrcPath Value="$(FPCSrcDir)\packages\base\httpd\httpd-2.0\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\apr\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\apriconv\;$(FPCSrcDir)\packages\base\httpd\httpd-2.0\aprutil\"/>
</SearchPaths> </SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
<Linking> <Linking>
<Debugging> <Debugging>
<UseLineInfoUnit Value="False"/> <UseLineInfoUnit Value="False"/>

6
wst/trunk/samples/apache_module/mod_wst.lpr
View File

@ -8,7 +8,8 @@ library mod_wst;
uses uses
SysUtils, SysUtils,
httpd, apr, apriconv, aprutil, wst_apache_binding; httpd, apr, apriconv, aprutil, wst_apache_binding,
user_service_intf, user_service_intf_binder, user_service_intf_imp;
var var
wst_module: module; {$ifdef Unix} public name 'wst_module'; {$endif} wst_module: module; {$ifdef Unix} public name 'wst_module'; {$endif}
@ -54,4 +55,7 @@ begin
end; end;
WstCommandStructArray[0].cmd_data := @WstConfigData^.BasePath; WstCommandStructArray[0].cmd_data := @WstConfigData^.BasePath;
FillChar(WstCommandStructArray[1],SizeOf(command_rec),#0); FillChar(WstCommandStructArray[1],SizeOf(command_rec),#0);
RegisterUserServiceImplementationFactory();
Server_service_RegisterUserServiceService();
end. end.

35
wst/trunk/samples/apache_module/wst_apache_binding.pas
View File

@ -1,4 +1,5 @@
{$UNDEF WST_DBG} //{$UNDEF WST_DBG}
//{$DEFINE WST_DBG}
(*WST_BROKER enable the service brokering : (*WST_BROKER enable the service brokering :
if enabled, this module just forwards the request to the if enabled, this module just forwards the request to the
@ -21,7 +22,7 @@
UserService : the target service UserService : the target service
wst/services : constant. wst/services : constant.
*) *)
{$DEFINE WST_BROKER} //{$DEFINE WST_BROKER}
unit wst_apache_binding; unit wst_apache_binding;
@ -42,7 +43,7 @@ const
sCONTENT_TYPE = 'Content-Type'; sCONTENT_TYPE = 'Content-Type';
sWstRootPath = 'WstRootPath'; // The WST local file system path configure in apache sWstRootPath = 'WstRootPath'; // The WST local file system path configure in apache
sWST_LIBRARY_EXTENSION = '.wml'; sWST_LIBRARY_EXTENSION = '.dll';
type type
PWstConfigData = ^TWstConfigData; PWstConfigData = ^TWstConfigData;
@ -370,12 +371,8 @@ begin
outStream.Free(); outStream.Free();
inStream.Free(); inStream.Free();
{$IFDEF WST_DBG} {$IFDEF WST_DBG}
SaveStringToFile('RequestInfo.ContentType=' + ARequestInfo.Arguments + LineEnding,'c:\log.log',False); SaveStringToFile('RequestInfo.Arguments=' + ARequestInfo.Arguments + LineEnding,'c:\log.log',False);
{SaveStringToFile('RequestInfo.Buffer=' + ARequestInfo.Buffer + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True); SaveStringToFile('ResponseInfo.ContentText=' + AResponseInfo.ContentText + LineEnding,'c:\log.log',False);
SaveStringToFile('RequestInfo.URI=' + ARequestInfo.URI + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
SaveStringToFile('ResponseInfo.ContentType=' + AResponseInfo.ContentType + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
SaveStringToFile('ResponseInfo.ContentText=' + AResponseInfo.ContentText + LineEnding,'E:\Inoussa\Sources\lazarus\wst\v0.3\tests\apache_module\log.log',True);
}
{$ENDIF} {$ENDIF}
end; end;
end; end;
@ -402,7 +399,7 @@ begin
FillChar(AResponseInfo,SizeOf(TResponseInfo),#0); FillChar(AResponseInfo,SizeOf(TResponseInfo),#0);
loc_path := ARequestInfo.URI; loc_path := ARequestInfo.URI;
targetModuleName := ExtractNextPathElement(loc_path); targetModuleName := ExtractNextPathElement(loc_path);
Result := False; Result := False; SaveStringToFile(GetWstPath() + targetModuleName + sWST_LIBRARY_EXTENSION,'C:\log.txt',True);
targetModule := LibraryManager.Get(GetWstPath() + targetModuleName + sWST_LIBRARY_EXTENSION); targetModule := LibraryManager.Get(GetWstPath() + targetModuleName + sWST_LIBRARY_EXTENSION);
handlerProc := TwstLibraryHandlerFunction(targetModule.GetProc(WST_LIB_HANDLER)); handlerProc := TwstLibraryHandlerFunction(targetModule.GetProc(WST_LIB_HANDLER));
if not Assigned(handlerProc) then if not Assigned(handlerProc) then
@ -419,10 +416,10 @@ begin
try try
wrtr := CreateBinaryWriter(buffStream); wrtr := CreateBinaryWriter(buffStream);
wrtr.WriteInt32S(0); wrtr.WriteInt32S(0);
wrtr.WriteStr(targetService); wrtr.WriteAnsiStr(targetService);
wrtr.WriteStr(ARequestInfo.ContentType); wrtr.WriteAnsiStr(ARequestInfo.ContentType);
wrtr.WriteStr(targetFormat); wrtr.WriteAnsiStr(targetFormat);
wrtr.WriteStr(ARequestInfo.Buffer); wrtr.WriteAnsiStr(ARequestInfo.Buffer);
buffStream.Position := 0; buffStream.Position := 0;
wrtr.WriteInt32S(buffStream.Size-4); wrtr.WriteInt32S(buffStream.Size-4);
@ -472,8 +469,6 @@ function wst_RequestHandler(r: Prequest_rec): Integer;
end; end;
var var
sInputBuffer : string;
iRet, iLen : Integer;
loc_RequestInfo : TRequestInfo; loc_RequestInfo : TRequestInfo;
loc_ResponseInfo : TResponseInfo; loc_ResponseInfo : TResponseInfo;
begin begin
@ -498,13 +493,14 @@ begin
end; end;
ap_set_content_type(r, PCHAR(loc_ResponseInfo.ContentType)); ap_set_content_type(r, PCHAR(loc_ResponseInfo.ContentType));
if AnsiSameText(sHTTP_BINARY_CONTENT_TYPE,loc_ResponseInfo.ContentType) then begin // if AnsiSameText(sHTTP_BINARY_CONTENT_TYPE,loc_ResponseInfo.ContentType) then begin
ap_set_content_length(r,Length(loc_ResponseInfo.ContentText)); ap_set_content_length(r,Length(loc_ResponseInfo.ContentText));
ap_rwrite(@(loc_ResponseInfo.ContentText[1]),Length(loc_ResponseInfo.ContentText),r); ap_rwrite(@(loc_ResponseInfo.ContentText[1]),Length(loc_ResponseInfo.ContentText),r);
ap_rflush(r); ap_rflush(r);
end else begin { end else begin
ap_rputs(PCHAR(loc_ResponseInfo.ContentText), r); ap_rputs(PCHAR(loc_ResponseInfo.ContentText), r);
end; ap_rflush(r);
end;}
Result := OK; Result := OK;
except except
on e : Exception do begin on e : Exception do begin
@ -512,6 +508,7 @@ begin
ap_rputs('<HTML><HEAD> <TITLE>Error</TITLE></HEAD>' + LineEnding, r); ap_rputs('<HTML><HEAD> <TITLE>Error</TITLE></HEAD>' + LineEnding, r);
ap_rputs('<BODY></BODY></HTML>',r); ap_rputs('<BODY></BODY></HTML>',r);
ap_rprintf(r, '<BODY><H1>"%s"</H1></BODY></HTML>' + LineEnding, [PCHAR(e.Message)]); ap_rprintf(r, '<BODY><H1>"%s"</H1></BODY></HTML>' + LineEnding, [PCHAR(e.Message)]);
ap_rflush(r);
Exit; Exit;
end; end;
end; end;

2
wst/trunk/samples/user_client_console/user_client_console.pas
View File

@ -148,7 +148,7 @@ const ADDRESS_MAP : array[TTransportType] of string = (
//'TCP:Address=172.16.82.31;Port=1234;target=UserService', //'TCP:Address=172.16.82.31;Port=1234;target=UserService',
'TCP:Address=127.0.0.1;Port=1234;target=UserService', 'TCP:Address=127.0.0.1;Port=1234;target=UserService',
//'http:Address=http://127.0.0.1:8888/wst/services/lib_server/UserService' //'http:Address=http://127.0.0.1:8888/wst/services/lib_server/UserService'
'http:Address=http://127.0.0.1:8000/services/UserService' 'http:Address=http://127.0.0.1:8080/wst/services/UserService'
); );
FORMAT_MAP : array[TFormatType] of string =( 'binary', 'soap', 'xmlrpc', 'json', 'json' ); FORMAT_MAP : array[TFormatType] of string =( 'binary', 'soap', 'xmlrpc', 'json', 'json' );
var var

23
wst/trunk/samples/user_service_intf.pas
View File

@ -2,7 +2,7 @@
This unit has been produced by ws_helper. This unit has been produced by ws_helper.
Input unit name : "user_service_intf". Input unit name : "user_service_intf".
This unit name : "user_service_intf". This unit name : "user_service_intf".
Date : "25/05/2009 01:53:09". Date : "29/01/2010 14:54:18".
} }
unit user_service_intf; unit user_service_intf;
{$IFDEF FPC} {$IFDEF FPC}
@ -39,7 +39,7 @@ type
FNote : TNote; FNote : TNote;
public public
constructor Create();override; constructor Create();override;
destructor Destroy();override; procedure FreeObjectProperties();override;
published published
property Category : TUserCategory read FCategory write FCategory; property Category : TUserCategory read FCategory write FCategory;
property UserName : string read FUserName write FUserName; property UserName : string read FUserName write FUserName;
@ -68,7 +68,7 @@ type
end; end;
UserService = interface(IInvokable) UserService = interface(IInvokable)
['{F49D8FA4-9BBC-4321-9869-5BA745070ABC}'] ['{2F9B181F-BA33-4148-A2A3-42CB450C43CE}']
function GetList():TUserArray; function GetList():TUserArray;
procedure Add( procedure Add(
const AUser : TUser const AUser : TUser
@ -97,11 +97,11 @@ begin
FNote := TNote.Create(); FNote := TNote.Create();
end; end;
destructor TUser.Destroy(); procedure TUser.FreeObjectProperties();
begin begin
if Assigned(FNote) then if Assigned(FNote) then
FreeAndNil(FNote); FreeAndNil(FNote);
inherited Destroy(); inherited FreeObjectProperties();
end; end;
{ TUserArray } { TUserArray }
@ -279,15 +279,14 @@ end;
var var
typeRegistryIntance : TTypeRegistry = nil; typeRegistryInstance : TTypeRegistry = nil;
initialization initialization
typeRegistryIntance := GetTypeRegistry(); typeRegistryInstance := GetTypeRegistry();
typeRegistryIntance.Register(sNAME_SPACE,TypeInfo(TUserCategory),'TUserCategory'); typeRegistryInstance.Register(sNAME_SPACE,TypeInfo(TUserCategory),'TUserCategory');
typeRegistryIntance.Register(sNAME_SPACE,TypeInfo(TUser),'TUser'); typeRegistryInstance.Register(sNAME_SPACE,TypeInfo(TUser),'TUser');
typeRegistryIntance.Register(sNAME_SPACE,TypeInfo(TNote),'TNote'); typeRegistryInstance.Register(sNAME_SPACE,TypeInfo(TNote),'TNote');
typeRegistryIntance.Register(sNAME_SPACE,TypeInfo(TUserArray),'TUserArray'); typeRegistryInstance.Register(sNAME_SPACE,TypeInfo(TUserArray),'TUserArray');
typeRegistryIntance.ItemByTypeInfo[TypeInfo(TUserArray)].RegisterExternalPropertyName(sARRAY_ITEM,'item');

24
wst/trunk/samples/user_service_intf_binder.pas
View File

@ -2,7 +2,7 @@
This unit has been produced by ws_helper. This unit has been produced by ws_helper.
Input unit name : "user_service_intf". Input unit name : "user_service_intf".
This unit name : "user_service_intf_binder". This unit name : "user_service_intf_binder".
Date : "29/12/2007 00:43:35". Date : "29/01/2010 14:54:30".
} }
unit user_service_intf_binder; unit user_service_intf_binder;
{$IFDEF FPC} {$mode objfpc}{$H+} {$ENDIF} {$IFDEF FPC} {$mode objfpc}{$H+} {$ENDIF}
@ -10,9 +10,8 @@ interface
uses SysUtils, Classes, base_service_intf, server_service_intf, user_service_intf; uses SysUtils, Classes, base_service_intf, server_service_intf, user_service_intf;
type type
TUserService_ServiceBinder = class(TBaseServiceBinder) TUserService_ServiceBinder = class(TBaseServiceBinder)
protected protected
procedure GetListHandler(AFormatter : IFormatterResponse; AContext : ICallContext); procedure GetListHandler(AFormatter : IFormatterResponse; AContext : ICallContext);
@ -24,6 +23,7 @@ type
constructor Create(); constructor Create();
end; end;
type
TUserService_ServiceBinderFactory = class(TInterfacedObject,IItemFactory) TUserService_ServiceBinderFactory = class(TInterfacedObject,IItemFactory)
private private
FInstance : IInterface; FInstance : IInterface;
@ -47,7 +47,7 @@ var
hasObjCntrl : Boolean; hasObjCntrl : Boolean;
tmpObj : UserService; tmpObj : UserService;
callCtx : ICallContext; callCtx : ICallContext;
strPrmName : string; locStrPrmName : string;
procName,trgName : string; procName,trgName : string;
returnVal : TUserArray; returnVal : TUserArray;
begin begin
@ -88,14 +88,14 @@ var
hasObjCntrl : Boolean; hasObjCntrl : Boolean;
tmpObj : UserService; tmpObj : UserService;
callCtx : ICallContext; callCtx : ICallContext;
strPrmName : string; locStrPrmName : string;
procName,trgName : string; procName,trgName : string;
AUser : TUser; AUser : TUser;
begin begin
callCtx := AContext; callCtx := AContext;
Fillchar(AUser,SizeOf(TUser),#0); Fillchar(AUser,SizeOf(TUser),#0);
strPrmName := 'AUser'; AFormatter.Get(TypeInfo(TUser),strPrmName,AUser); locStrPrmName := 'AUser'; AFormatter.Get(TypeInfo(TUser),locStrPrmName,AUser);
if Assigned(Pointer(AUser)) then if Assigned(Pointer(AUser)) then
callCtx.AddObjectToFree(TObject(AUser)); callCtx.AddObjectToFree(TObject(AUser));
@ -129,14 +129,14 @@ var
hasObjCntrl : Boolean; hasObjCntrl : Boolean;
tmpObj : UserService; tmpObj : UserService;
callCtx : ICallContext; callCtx : ICallContext;
strPrmName : string; locStrPrmName : string;
procName,trgName : string; procName,trgName : string;
AUser : TUser; AUser : TUser;
begin begin
callCtx := AContext; callCtx := AContext;
Fillchar(AUser,SizeOf(TUser),#0); Fillchar(AUser,SizeOf(TUser),#0);
strPrmName := 'AUser'; AFormatter.Get(TypeInfo(TUser),strPrmName,AUser); locStrPrmName := 'AUser'; AFormatter.Get(TypeInfo(TUser),locStrPrmName,AUser);
if Assigned(Pointer(AUser)) then if Assigned(Pointer(AUser)) then
callCtx.AddObjectToFree(TObject(AUser)); callCtx.AddObjectToFree(TObject(AUser));
@ -170,7 +170,7 @@ var
hasObjCntrl : Boolean; hasObjCntrl : Boolean;
tmpObj : UserService; tmpObj : UserService;
callCtx : ICallContext; callCtx : ICallContext;
strPrmName : string; locStrPrmName : string;
procName,trgName : string; procName,trgName : string;
AName : string; AName : string;
returnVal : TUser; returnVal : TUser;
@ -178,7 +178,7 @@ begin
callCtx := AContext; callCtx := AContext;
Fillchar(returnVal,SizeOf(TUser),#0); Fillchar(returnVal,SizeOf(TUser),#0);
strPrmName := 'AName'; AFormatter.Get(TypeInfo(string),strPrmName,AName); locStrPrmName := 'AName'; AFormatter.Get(TypeInfo(string),locStrPrmName,AName);
tmpObj := Self.GetFactory().CreateInstance() as UserService; tmpObj := Self.GetFactory().CreateInstance() as UserService;
if Supports(tmpObj,ICallControl,cllCntrl) then if Supports(tmpObj,ICallControl,cllCntrl) then
@ -213,14 +213,14 @@ var
hasObjCntrl : Boolean; hasObjCntrl : Boolean;
tmpObj : UserService; tmpObj : UserService;
callCtx : ICallContext; callCtx : ICallContext;
strPrmName : string; locStrPrmName : string;
procName,trgName : string; procName,trgName : string;
AName : string; AName : string;
returnVal : boolean; returnVal : boolean;
begin begin
callCtx := AContext; callCtx := AContext;
strPrmName := 'AName'; AFormatter.Get(TypeInfo(string),strPrmName,AName); locStrPrmName := 'AName'; AFormatter.Get(TypeInfo(string),locStrPrmName,AName);
tmpObj := Self.GetFactory().CreateInstance() as UserService; tmpObj := Self.GetFactory().CreateInstance() as UserService;
if Supports(tmpObj,ICallControl,cllCntrl) then if Supports(tmpObj,ICallControl,cllCntrl) then

2
wst/trunk/samples/user_service_intf_proxy.pas
View File

@ -2,7 +2,7 @@
This unit has been produced by ws_helper. This unit has been produced by ws_helper.
Input unit name : "user_service_intf". Input unit name : "user_service_intf".
This unit name : "user_service_intf_proxy". This unit name : "user_service_intf_proxy".
Date : "25/05/2009 01:53:09". Date : "29/01/2010 14:54:18".
} }
Unit user_service_intf_proxy; Unit user_service_intf_proxy;