Changeset 3459

Show
Ignore:
Timestamp:
01/10/12 15:36:10
Author:
douglm
Message:

Update to httpclient 4.1 from 3.0

Allows changes to enable use of outbound ssl

Added a service to allow tracking and limiting of numbers of outbound connections. Installed in synch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/.defaults/synch-config.xml

    r3396 r3459  
    3737              value="http://128.113.124.225:8080/synch/" /> 
    3838               
    39     <!-- Path to keystore - comment out to use default. Used for ssl etc. -->           
     39    <!-- Path to keystore - comment out to use default. Used for ssl etc.       
    4040    <property name="keystore" 
    4141              value="@APPSERVER-DATA-DIR@/synchcerts" /> 
     42               -->     
    4243 
    4344    <!-- Public/private key locations --> 

  • trunk/deployment/bw-core-appjars.xml

    r3415 r3459  
    200200              libcache="${org.bedework.libcache.dir}" 
    201201              name="commons-fileupload" /> 
    202        
    203       <getJar lib="${org.bedework.temp.extrajars.dir}" 
    204               libcache="${org.bedework.libcache.dir}" 
    205               name="commons-httpclient" version="3.0"/> 
    206202 
    207203      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    208204              libcache="${org.bedework.libcache.dir}" 
    209205              name="commons-lang" version="2.6"/> 
    210  
    211       <getJar lib="${org.bedework.temp.extrajars.dir}" 
    212               libcache="${org.bedework.libcache.dir}" 
    213               name="commons-ssl" /> 
    214206       
    215207      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    …… 
    222214              name="commons-logging" /> 
    223215              --> 
     216 
     217      <!-- ======================= httpclient jars ============================ --> 
     218       
     219      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     220              libcache="${org.bedework.libcache.dir}" 
     221              name="httpclient" version="4.1.2"/> 
     222       
     223      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     224              libcache="${org.bedework.libcache.dir}" 
     225              name="httpcore" version="4.1.2"/> 
    224226 
    225227      <!-- ======================= Hibernate jars ========================== -->