clean the binding unit

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1149 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2010-01-29 15:55:18 +00:00
parent 5bd5ea7644
commit e5deae64c9
3 changed files with 119 additions and 102 deletions
--- a/wst/trunk/samples/apache_module/mod_wst.lpi
+++ b/wst/trunk/samples/apache_module/mod_wst.lpi
@ -31,20 +31,20 @@
        <Filename Value="mod_wst.lpr"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="mod_wst"/>
-        <CursorPos X="44" Y="60"/>
-        <TopLine Value="43"/>
+        <CursorPos X="1" Y="64"/>
+        <TopLine Value="36"/>
        <EditorIndex Value="0"/>
-        <UsageCount Value="73"/>
+        <UsageCount Value="74"/>
        <Loaded Value="True"/>
      </Unit0>
      <Unit1>
        <Filename Value="wst_apache_binding.pas"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="wst_apache_binding"/>
-        <CursorPos X="3" Y="25"/>
-        <TopLine Value="70"/>
+        <CursorPos X="1" Y="510"/>
+        <TopLine Value="481"/>
        <EditorIndex Value="1"/>
-        <UsageCount Value="37"/>
+        <UsageCount Value="38"/>
        <Loaded Value="True"/>
      </Unit1>
      <Unit2>
@ -52,283 +52,283 @@
        <UnitName Value="metadata_wsdl"/>
        <CursorPos X="5" Y="82"/>
        <TopLine Value="67"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="32"/>
      </Unit2>
      <Unit3>
        <Filename Value="..\user_service_intf_imp.pas"/>
        <UnitName Value="user_service_intf_imp"/>
        <CursorPos X="8" Y="225"/>
        <TopLine Value="191"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
      </Unit3>
      <Unit4>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.pas"/>
        <UnitName Value="httpd"/>
        <CursorPos X="5" Y="26"/>
        <TopLine Value="25"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
      </Unit4>
      <Unit5>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-1.3\httpd.inc"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="75"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
      </Unit5>
      <Unit6>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.pas"/>
        <UnitName Value="httpd"/>
        <CursorPos X="35" Y="44"/>
        <TopLine Value="61"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
      </Unit6>
      <Unit7>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_protocol.inc"/>
        <CursorPos X="47" Y="799"/>
        <TopLine Value="777"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
      </Unit7>
      <Unit8>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\httpd.inc"/>
        <CursorPos X="5" Y="794"/>
        <TopLine Value="777"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit8>
      <Unit9>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_tables.inc"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="16"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit9>
      <Unit10>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\http_config.inc"/>
        <CursorPos X="71" Y="66"/>
        <TopLine Value="32"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit10>
      <Unit11>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.2\ap_mmn.inc"/>
        <CursorPos X="3" Y="111"/>
        <TopLine Value="96"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit11>
      <Unit12>
        <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\base\httpd\httpd-2.0\apr\apr_pools.inc"/>
        <CursorPos X="3" Y="48"/>
        <TopLine Value="678"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit12>
      <Unit13>
        <Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/>
        <UnitName Value="cursor_intf"/>
        <CursorPos X="16" Y="18"/>
        <TopLine Value="1"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
      </Unit13>
      <Unit14>
        <Filename Value="..\user_service_intf_binder.pas"/>
        <UnitName Value="user_service_intf_binder"/>
        <CursorPos X="3" Y="252"/>
        <TopLine Value="250"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="12"/>
      </Unit14>
      <Unit15>
        <Filename Value="..\imp_helper.pas"/>
        <UnitName Value="imp_helper"/>
        <CursorPos X="1" Y="76"/>
        <TopLine Value="33"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="19"/>
      </Unit15>
      <Unit16>
        <Filename Value="..\..\metadata_service_binder.pas"/>
        <UnitName Value="metadata_service_binder"/>
        <CursorPos X="29" Y="43"/>
        <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="24"/>
      </Unit16>
      <Unit17>
        <Filename Value="..\..\metadata_service.pas"/>
        <UnitName Value="metadata_service"/>
        <CursorPos X="71" Y="76"/>
        <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="24"/>
      </Unit17>
      <Unit18>
        <Filename Value="..\..\metadata_service_imp.pas"/>
        <UnitName Value="metadata_service_imp"/>
        <CursorPos X="61" Y="21"/>
        <TopLine Value="13"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="23"/>
      </Unit18>
      <Unit19>
        <Filename Value="..\..\library_imp_utils.pas"/>
        <UnitName Value="library_imp_utils"/>
        <CursorPos X="42" Y="35"/>
        <TopLine Value="73"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="23"/>
      </Unit19>
      <Unit20>
        <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.0\apr\apr.pas"/>
        <UnitName Value="apr"/>
        <CursorPos X="18" Y="182"/>
        <TopLine Value="173"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit20>
      <Unit21>
        <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"/>
        <TopLine Value="151"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit21>
      <Unit22>
        <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"/>
        <TopLine Value="778"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit22>
      <Unit23>
        <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"/>
        <TopLine Value="66"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit23>
      <Unit24>
        <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"/>
        <TopLine Value="192"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit24>
      <Unit25>
        <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"/>
        <TopLine Value="199"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit25>
      <Unit26>
        <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"/>
        <TopLine Value="329"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit26>
      <Unit27>
        <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"/>
        <TopLine Value="10"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
      </Unit27>
      <Unit28>
        <Filename Value="..\..\library_base_intf.pas"/>
        <UnitName Value="library_base_intf"/>
        <CursorPos X="29" Y="17"/>
        <TopLine Value="73"/>
-        <UsageCount Value="23"/>
+        <UsageCount Value="22"/>
      </Unit28>
      <Unit29>
        <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"/>
        <TopLine Value="30"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
      </Unit29>
      <Unit30>
        <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"/>
        <TopLine Value="678"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
      </Unit30>
      <Unit31>
        <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-1.3\httpd.pas"/>
        <UnitName Value="httpd"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="82"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit31>
      <Unit32>
        <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"/>
        <TopLine Value="60"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit32>
      <Unit33>
        <Filename Value="..\..\server_service_xmlrpc.pas"/>
        <UnitName Value="server_service_xmlrpc"/>
        <CursorPos X="17" Y="57"/>
        <TopLine Value="42"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="12"/>
      </Unit33>
      <Unit34>
        <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
        <UnitName Value="base_xmlrpc_formatter"/>
        <CursorPos X="3" Y="29"/>
        <TopLine Value="14"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="12"/>
      </Unit34>
      <Unit35>
        <Filename Value="..\..\server_service_intf.pas"/>
        <UnitName Value="server_service_intf"/>
        <CursorPos X="5" Y="18"/>
        <TopLine Value="3"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
      </Unit35>
      <Unit36>
        <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\win32\classes.pp"/>
        <UnitName Value="Classes"/>
        <CursorPos X="8" Y="46"/>
        <TopLine Value="21"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit36>
      <Unit37>
        <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\objpas\classes\classes.inc"/>
        <CursorPos X="11" Y="1674"/>
        <TopLine Value="1665"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit37>
      <Unit38>
        <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"/>
        <TopLine Value="150"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit38>
      <Unit39>
        <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"/>
        <TopLine Value="33"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
      </Unit39>
      <Unit40>
        <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"/>
        <TopLine Value="117"/>
-        <UsageCount Value="17"/>
+        <UsageCount Value="16"/>
      </Unit40>
      <Unit41>
        <Filename Value="..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\base\httpd\httpd-2.2\httpd.pas"/>
        <UnitName Value="httpd"/>
        <CursorPos X="3" Y="70"/>
        <TopLine Value="55"/>
-        <UsageCount Value="15"/>
+        <UsageCount Value="14"/>
      </Unit41>
      <Unit42>
        <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"/>
        <TopLine Value="1014"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
      </Unit42>
      <Unit43>
        <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"/>
        <TopLine Value="17"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
      </Unit43>
      <Unit44>
        <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"/>
        <TopLine Value="113"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="12"/>
      </Unit44>
      <Unit45>
        <Filename Value="..\..\wst.inc"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="1"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
      </Unit45>
      <Unit46>
        <Filename Value="..\..\base_service_intf.pas"/>
@ -342,56 +342,56 @@
        <UnitName Value="imp_utils"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="38"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit47>
      <Unit48>
        <Filename Value="..\..\wst_resources_imp.pas"/>
        <UnitName Value="wst_resources_imp"/>
        <CursorPos X="1" Y="1"/>
        <TopLine Value="13"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit48>
      <Unit49>
        <Filename Value="..\..\record_rtti.pas"/>
        <UnitName Value="record_rtti"/>
        <CursorPos X="5" Y="66"/>
        <TopLine Value="51"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit49>
      <Unit50>
        <Filename Value="..\..\server_service_imputils.pas"/>
        <UnitName Value="server_service_imputils"/>
        <CursorPos X="5" Y="18"/>
        <TopLine Value="3"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit50>
      <Unit51>
        <Filename Value="..\..\server_service_soap.pas"/>
        <UnitName Value="server_service_soap"/>
        <CursorPos X="15" Y="22"/>
        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit51>
      <Unit52>
        <Filename Value="..\..\base_soap_formatter.pas"/>
        <UnitName Value="base_soap_formatter"/>
        <CursorPos X="5" Y="356"/>
        <TopLine Value="342"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit52>
      <Unit53>
        <Filename Value="..\..\server_binary_formatter.pas"/>
        <UnitName Value="server_binary_formatter"/>
        <CursorPos X="5" Y="18"/>
        <TopLine Value="3"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit53>
      <Unit54>
        <Filename Value="..\..\metadata_repository.pas"/>
        <UnitName Value="metadata_repository"/>
        <CursorPos X="5" Y="117"/>
        <TopLine Value="102"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
      </Unit54>
      <Unit55>
        <Filename Value="E:\fpc_dev\packages\httpd13\src\http_protocol.inc"/>
@ -403,131 +403,129 @@
        <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>
    <JumpHistory Count="30" HistoryIndex="29">
      <Position1>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="448" Column="34" TopLine="424"/>
+        <Caret Line="133" Column="41" TopLine="115"/>
      </Position1>
      <Position2>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="504" Column="66" TopLine="480"/>
+        <Caret Line="485" Column="35" TopLine="472"/>
      </Position2>
      <Position3>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="493" Column="62" TopLine="481"/>
+        <Caret Line="381" Column="10" TopLine="387"/>
      </Position3>
      <Position4>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="500" Column="25" TopLine="493"/>
+        <Caret Line="6" Column="13" TopLine="1"/>
      </Position4>
      <Position5>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="499" Column="23" TopLine="490"/>
+        <Caret Line="485" Column="21" TopLine="472"/>
      </Position5>
      <Position6>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="491" Column="42" TopLine="478"/>
+        <Caret Line="403" Column="86" TopLine="390"/>
      </Position6>
      <Position7>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="177" Column="71" TopLine="170"/>
+        <Caret Line="46" Column="25" TopLine="31"/>
      </Position7>
      <Position8>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="489" Column="5" TopLine="460"/>
+        <Filename Value="mod_wst.lpr"/>
+        <Caret Line="54" Column="32" TopLine="32"/>
      </Position8>
      <Position9>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="56" Column="20" TopLine="32"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="402" Column="1" TopLine="394"/>
      </Position9>
      <Position10>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="58" Column="45" TopLine="43"/>
+        <Caret Line="25" Column="3" TopLine="70"/>
      </Position10>
      <Position11>
-        <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
-        <Caret Line="64" Column="25" TopLine="49"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="2" Column="19" TopLine="1"/>
      </Position11>
      <Position12>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="56" Column="16" TopLine="32"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="374" Column="7" TopLine="358"/>
      </Position12>
      <Position13>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="58" Column="50" TopLine="43"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
      </Position13>
      <Position14>
-        <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
-        <Caret Line="64" Column="28" TopLine="49"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="174" Column="27" TopLine="159"/>
      </Position14>
      <Position15>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="54" Column="8" TopLine="32"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="374" Column="23" TopLine="359"/>
      </Position15>
      <Position16>
-        <Filename Value="E:\fpc_dev\packages\httpd13\src\http_config.inc"/>
-        <Caret Line="215" Column="16" TopLine="200"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="375" Column="23" TopLine="359"/>
      </Position16>
      <Position17>
-        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="54" Column="32" TopLine="32"/>
+        <Filename Value="wst_apache_binding.pas"/>
+        <Caret Line="399" Column="104" TopLine="387"/>
      </Position17>
      <Position18>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="58" Column="3" TopLine="43"/>
+        <Caret Line="17" Column="1" TopLine="16"/>
      </Position18>
      <Position19>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="23" Column="33" TopLine="10"/>
+        <Caret Line="173" Column="27" TopLine="159"/>
      </Position19>
      <Position20>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="90" Column="18" TopLine="82"/>
+        <Caret Line="174" Column="27" TopLine="159"/>
      </Position20>
      <Position21>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="502" Column="5" TopLine="373"/>
+        <Caret Line="373" Column="5" TopLine="359"/>
      </Position21>
      <Position22>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="133" Column="41" TopLine="115"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
      </Position22>
      <Position23>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="485" Column="35" TopLine="472"/>
+        <Caret Line="167" Column="59" TopLine="163"/>
      </Position23>
      <Position24>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="381" Column="10" TopLine="387"/>
+        <Caret Line="4" Column="13" TopLine="1"/>
      </Position24>
      <Position25>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="6" Column="13" TopLine="1"/>
+        <Caret Line="25" Column="22" TopLine="16"/>
      </Position25>
      <Position26>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="485" Column="21" TopLine="472"/>
+        <Caret Line="486" Column="20" TopLine="477"/>
      </Position26>
      <Position27>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="403" Column="86" TopLine="390"/>
+        <Caret Line="93" Column="7" TopLine="92"/>
      </Position27>
      <Position28>
        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="46" Column="25" TopLine="31"/>
+        <Caret Line="45" Column="15" TopLine="31"/>
      </Position28>
      <Position29>
        <Filename Value="mod_wst.lpr"/>
-        <Caret Line="54" Column="32" TopLine="32"/>
+        <Caret Line="53" Column="35" TopLine="32"/>
      </Position29>
      <Position30>
-        <Filename Value="wst_apache_binding.pas"/>
-        <Caret Line="402" Column="1" TopLine="394"/>
+        <Filename Value="mod_wst.lpr"/>
+        <Caret Line="55" Column="8" TopLine="32"/>
      </Position30>
    </JumpHistory>
  </ProjectOptions>
--- a/wst/trunk/samples/apache_module/mod_wst.lpr
+++ b/wst/trunk/samples/apache_module/mod_wst.lpr
@ -50,12 +50,18 @@ begin
    name := MODULE_NAME;
    magic := MODULE_MAGIC_COOKIE;
    register_hooks := @RegisterHooks;
+{$IF DECLARED(wst_create_dir_config)}    
    create_dir_config := @wst_create_dir_config;
+{$IFEND}
+{$IF DECLARED(WstCommandStructArray)}    
    cmds := WstCommandStructArray;
+{$IFEND}
  end;
+{$IF DECLARED(WstCommandStructArray)}  
  WstCommandStructArray[0].cmd_data := @WstConfigData^.BasePath;
  FillChar(WstCommandStructArray[1],SizeOf(command_rec),#0);
-  
+{$IFEND}   
+
  RegisterUserServiceImplementationFactory();
  Server_service_RegisterUserServiceService();  
 end.
--- a/wst/trunk/samples/apache_module/wst_apache_binding.pas
+++ b/wst/trunk/samples/apache_module/wst_apache_binding.pas
@ -42,6 +42,7 @@ const
  sHTTP_BINARY_CONTENT_TYPE = 'application/octet-stream';
  sCONTENT_TYPE = 'Content-Type';
  
+{$IFDEF WST_BROKER}  
  sWstRootPath = 'WstRootPath'; // The WST local file system path configure in apache
  sWST_LIBRARY_EXTENSION = '.dll';
  
@ -51,9 +52,11 @@ type
    Dir : PChar;
    BasePath : PChar;
  end;
+{$ENDIF WST_BROKER}
  
 var
  wst_module_ptr : Pmodule = nil;
+{$IFDEF WST_BROKER}  
  WstConfigData : PWstConfigData = nil;
  WstCommandStructArray : array[0..1] of command_rec = (
    ( name    : sWstRootPath;
@ -65,10 +68,14 @@ var
    ),
    ()
  );
+{$ENDIF WST_BROKER}

  function wst_RequestHandler(r: Prequest_rec): Integer;
-  function wst_create_dir_config(p: Papr_pool_t; dir: PChar) : Pointer;cdecl;

+{$IFDEF WST_BROKER}    
+  function wst_create_dir_config(p: Papr_pool_t; dir: PChar) : Pointer;cdecl;
+{$ENDIF WST_BROKER}
+  
 implementation
 uses base_service_intf,
     server_service_intf, server_service_imputils,
@ -89,6 +96,7 @@ begin
  Server_service_RegisterWSTMetadataServiceService();
 end;

+{$IFDEF WST_BROKER}  
 function wst_create_dir_config(p: Papr_pool_t; dir: PChar) : Pointer; cdecl;
 begin
  WstConfigData := PWstConfigData(apr_palloc(p,SizeOf(TWstConfigData)));
@ -101,6 +109,7 @@ function GetWstPath(): PChar;inline;
 begin
  Result := WstConfigData^.BasePath;
 end;
+{$ENDIF WST_BROKER}  

 type
  PRequestArgument = ^TRequestArgument;
@ -171,6 +180,7 @@ begin
  end;
 end;

+{$IFDEF WST_DBG}
 procedure SaveStringToFile(const AStr,AFile:string;const AKeepExisting : Boolean);
 begin
  with TMemoryStream.Create() do try
@ -185,6 +195,7 @@ begin
    Free();
  end;
 end;
+{$ENDIF WST_DBG}

 function ReadBuffer(r : Prequest_rec; out rbuf : string ) : Integer;
 var
@ -377,6 +388,7 @@ begin
  end;
 end;

+{$IFDEF WST_BROKER}  
 const MAX_ERR_LEN = 500;
 function ProcessServiceRequestLibrary(
  const ARequestInfo    : TRequestInfo;
@ -399,7 +411,7 @@ begin
    FillChar(AResponseInfo,SizeOf(TResponseInfo),#0);
    loc_path := ARequestInfo.URI;
    targetModuleName := ExtractNextPathElement(loc_path);
-    Result := False; SaveStringToFile(GetWstPath() + targetModuleName + sWST_LIBRARY_EXTENSION,'C:\log.txt',True);
+    Result := False; 
    targetModule := LibraryManager.Get(GetWstPath() + targetModuleName + sWST_LIBRARY_EXTENSION);
    handlerProc := TwstLibraryHandlerFunction(targetModule.GetProc(WST_LIB_HANDLER));
    if not Assigned(handlerProc) then
@ -454,6 +466,7 @@ begin
    end;
  end;
 end;
+{$ENDIF WST_BROKER}  

 function wst_RequestHandler(r: Prequest_rec): Integer;