Index: trunk/ippToPsps/config/settings.xml
===================================================================
--- trunk/ippToPsps/config/settings.xml	(revision 36697)
+++ trunk/ippToPsps/config/settings.xml	(revision 36699)
@@ -6,345 +6,13 @@
   <!-- path for storing logs -->
   <!-- XXX Need to make this different for tests and real, also for different installations -->
-  <logPath>SAS15</logPath>
+  <logPath>ipptopsps_pv2_logs</logPath>
   <!-- local scratch Db section (REAL version) -->
   <localdatabase>
     <loader mach="ipp006">
-      <name>ipptopsps_scratch</name>
+      <name>ipptopsps2_scratch</name>
       <host>ipp006</host>
       <user>dvo</user>
       <password>dvo</password>
       <memory>16</memory>
-    </loader>
-    <loader mach="ipp007">
-      <name>ipptopsps_scratch</name>
-      <host>ipp007</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp008">
-      <name>ipptopsps_scratch</name>
-      <host>ipp008</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp009">
-      <name>ipptopsps_scratch</name>
-      <host>ipp009</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp010">
-      <name>ipptopsps_scratch</name>
-      <host>ipp010</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp011">
-      <name>ipptopsps_scratch</name>
-      <host>ipp011</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-    <loader mach="ipp012">
-      <name>ipptopsps_scratch</name>
-      <host>ipp012</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-
-
-    <loader mach="ipp013">
-      <name>ipptopsps_scratch</name>
-      <host>ipp013</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-
-    <loader mach="ipp014">
-      <name>ipptopsps_scratch</name>
-      <host>ipp014</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-    <loader mach="ipp015">
-      <name>ipptopsps_scratch</name>
-      <host>ipp015</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp016">
-      <name>ipptopsps_scratch</name>
-      <host>ipp016</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp018">
-      <name>ipptopsps_scratch</name>
-      <host>ipp018</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-    <loader mach="ipp019">
-      <name>ipptopsps_scratch</name>
-      <host>ipp019</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-    <loader mach="ipp020">
-      <name>ipptopsps_scratch</name>
-      <host>ipp020</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-    <loader mach="ipp021">
-      <name>ipptopsps_scratch</name>
-      <host>ipp021</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-    <loader mach="ipp025">
-      <name>ipptopsps_scratch</name>
-      <host>ipp025</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-
-
-
-   <loader mach="ipp037">
-      <name>ipptopsps_scratch</name>
-      <host>ipp037</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>16</memory>
-    </loader>
-
-
-    <loader mach="ipp038">
-      <name>ipptopsps_scratch</name>
-      <host>ipp038</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp039">
-      <name>ipptopsps_scratch</name>
-      <host>ipp039</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-
-
-    <loader mach="ipp040">
-      <name>ipptopsps_scratch</name>
-      <host>ipp040</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp041">
-      <name>ipptopsps_scratch</name>
-      <host>ipp041</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp042">
-      <name>ipptopsps_scratch</name>
-      <host>ipp042</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp043">
-      <name>ipptopsps_scratch</name>
-      <host>ipp043</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp044">
-      <name>ipptopsps_scratch</name>
-      <host>ipp044</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>20</memory>
-    </loader>
-    <loader mach="ipp045">
-      <name>ipptopsps_scratch</name>
-      <host>ipp045</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp046">
-      <name>ipptopsps_scratch</name>
-      <host>ipp046</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp047">
-      <name>ipptopsps_scratch</name>
-      <host>ipp047</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp048">
-      <name>ipptopsps_scratch</name>
-      <host>ipp048</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp049">
-      <name>ipptopsps_scratch</name>
-      <host>ipp049</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp050">
-      <name>ipptopsps_scratch</name>
-      <host>ipp050</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp051">
-      <name>ipptopsps_scratch</name>
-      <host>ipp051</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp052">
-      <name>ipptopsps_scratch</name>
-      <host>ipp052</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp053">
-      <name>ipptopsps_scratch</name>
-      <host>ipp053</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp054">
-      <name>ipptopsps_scratch</name>
-      <host>ipp054</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp055">
-      <name>ipptopsps_scratch</name>
-      <host>ipp055</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp056">
-      <name>ipptopsps_scratch</name>
-      <host>ipp056</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp057">
-      <name>ipptopsps_scratch</name>
-      <host>ipp057</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp058">
-      <name>ipptopsps_scratch</name>
-      <host>ipp058</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp059">
-      <name>ipptopsps_scratch</name>
-      <host>ipp059</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp060">
-      <name>ipptopsps_scratch</name>
-      <host>ipp060</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp061">
-      <name>ipptopsps_scratch</name>
-      <host>ipp061</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp062">
-      <name>ipptopsps_scratch</name>
-      <host>ipp062</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp063">
-      <name>ipptopsps_scratch</name>
-      <host>ipp063</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp064">
-      <name>ipptopsps_scratch</name>
-      <host>ipp064</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp065">
-      <name>ipptopsps_scratch</name>
-      <host>ipp065</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
-    </loader>
-    <loader mach="ipp066">
-      <name>ipptopsps_scratch</name>
-      <host>ipp066</host>
-      <user>dvo</user>
-      <password>dvo</password>
-      <memory>32</memory>
     </loader>
     <loader mach="stare00">