19. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 2/9/2017 12:58:03 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

19.1 Files compared

# Location File Last Modified
1 Genisis2Services-2.0.zip\Genisis2Services-master\src\main\resources springldap.xml Fri Jan 27 23:02:14 2017 UTC
2 Genisis2Services-2.0.zip\Genisis2Services-master\src\main\resources springldap.xml Wed Feb 8 20:16:30 2017 UTC

19.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 134
Changed 2 6
Inserted 0 0
Removed 0 0

19.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

19.4 Active regular expressions

No regular expressions were active.

19.5 Comparison detail

  1   <?xml 
  2     version="1 .0" 
  3     encoding=" UTF-8"
  4   ?>
  5   <!DOCTYPE  beans PUBL IC "-//SPR ING//DTD B EAN 2.0//E N" "http:/ /www.sprin gframework .org/dtd/s pring-bean s-2.0.dtd" >
  6   <beans>
  7     <!--    <b ean id="co ntextSourc e"
  8                      clas s="org.spr ingframewo rk.ldap.co re.support .LdapConte xtSource">
  9                       <property  name="url"  value="ld ap:// IP                 9" />
  10                      <pro perty name ="base" va lue="dc=jb pm,dc=work flow" />
  11                       <property  name="user Name" valu e=" AI ,ou=system " />
  12                       <property  name="pass word" valu e=" AI " />
  13             </ bean> -->
  14             
  15                      
  16     <bean 
  17      id="contex tSource"
  18                      
  19      class="org .springfra mework.lda p.core.sup port.LdapC ontextSour ce"
  20     >
  21                       
  22      <property 
  23       name="url"  
  24       value="${s ervices.ld ap.url}" 
  25      /> 
  26                       
  27      <property 
  28       name="base
  29       value="${s ervices.ld ap.base}" 
  30      /> 
  31                       
  32      <property 
  33       name="user Name" 
  34       value="${s ervices.ld ap.usernam e}" 
  35      /> 
  36                       
  37      <property 
  38       name="pass word" 
  39       value="${s ervices.ld ap.passwor d}" 
  40      /> 
  41              
  42     </bean>
  43             
  44             
  45             
  46     <bean 
  47      id="ldapTe mplate" 
  48      class="org .springfra mework.lda p.core.Lda pTemplate"
  49     >
  50                       
  51      <construct or-arg 
  52       ref="conte xtSource" 
  53      />
  54              
  55     </bean>
  56    
  57         
  58             
  59     <bean 
  60      id="ldapUs er" 
  61      class="gov .va.genisi s2.dao.imp l.LdapDao"
  62     >
  63                       
  64      <property 
  65       name="ldap Template" 
  66       ref="ldapT emplate" 
  67      />
  68              
  69     </bean>
  70   </beans>