IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 5, 2013, 2:23:09 PM (13 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20130207/ippToPsps
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20130207/ippToPsps

  • branches/eam_branches/ipp-20130207/ippToPsps/config/settings.xml

    r35097 r35235  
    1010  <!-- local scratch Db section (REAL version) -->
    1111  <localdatabase>
    12     <name>ipptopsps_scratch</name>
    13     <host>ipp005</host>
    14     <user>dvo</user>
    15     <password>dvo</password>
     12    <loader mach="ipp006">
     13      <name>ipptopsps_scratch</name>
     14      <host>ipp006</host>
     15      <user>dvo</user>
     16      <password>dvo</password>
     17    </loader>
     18    <loader mach="ipp007">
     19      <name>ipptopsps_scratch</name>
     20      <host>ipp007</host>
     21      <user>dvo</user>
     22      <password>dvo</password>
     23    </loader>
     24    <loader mach="ipp008">
     25      <name>ipptopsps_scratch</name>
     26      <host>ipp008</host>
     27      <user>dvo</user>
     28      <password>dvo</password>
     29    </loader>
     30    <loader mach="ipp009">
     31      <name>ipptopsps_scratch</name>
     32      <host>ipp009</host>
     33      <user>dvo</user>
     34      <password>dvo</password>
     35    </loader>
     36    <loader mach="ipp010">
     37      <name>ipptopsps_scratch</name>
     38      <host>ipp010</host>
     39      <user>dvo</user>
     40      <password>dvo</password>
     41    </loader>
     42    <loader mach="generic">
     43      <name>ipptopsps_scratch</name>
     44      <host>localhost</host>
     45      <user>dvo</user>
     46      <password>dvo</password>
     47    </loader>
    1648  </localdatabase>
    1749
    … …  
    2759  <ipptopspsdatabase>
    2860    <name>ipptopsps</name>
    29     <host>localhost</host>
     61    <host>ipp006</host>
    3062    <user>dvo</user>
    3163    <password>dvo</password>
    … …  
    3466  <!-- local scratch Db section (TEST VERSION) -->
    3567  <localdatabase_test>
    36     <name>ipptopsps_test_scratch</name>
    37     <host>localhost</host>
    38     <user>dvo</user>
    39     <password>dvo</password>
     68    <loader mach="ipp006">
     69      <name>ipptopsps_test_scratch</name>
     70      <host>ipp006</host>
     71      <user>dvo</user>
     72      <password>dvo</password>
     73    </loader>
     74    <loader mach="pikake">
     75      <name>ipptopsps_test_scratch</name>
     76      <host>pikake</host>
     77      <user>dvo</user>
     78      <password>dvo</password>
     79    </loader>
     80    <loader mach="generic">
     81      <name>ipptopsps_test_scratch</name>
     82      <host>localhost</host>
     83      <user>dvo</user>
     84      <password>dvo</password>
     85    </loader>
    4086  </localdatabase_test>
    4187
    42   <!-- GPC1 Db section (TEST VERSION) -->
     88  <!-- GPC1 Db section (REAL VERSION) -->
     89  <gpc1database_test>
     90    <name>gpc1</name>
     91    <host>ippdb01</host>
     92    <user>ipp</user>
     93    <password>ipp</password>
     94  </gpc1database_test>
     95
     96  <!-- GPC1 Db section (TEST VERSION)
    4397  <gpc1database_test>
    4498    <name>gpc1test</name>
    … …  
    46100    <user>dvo</user>
    47101    <password>dvo</password>
    48   </gpc1database_test>
     102  </gpc1database_test> -->
    49103
    50104  <!-- ippToPsps Db section (TEST VERSION)  -->
    … …  
    59113  <czardatabase>
    60114    <name>czardb</name>
    61     <host>none</host>
     115    <host>ippdb01</host>
    62116    <user>ipp</user>
    63117    <password>ipp</password>
Note: See TracChangeset for help on using the changeset viewer.