Changeset 3535

Show
Ignore:
Timestamp:
04/27/12 15:55:30
Author:
douglm
Message:

Allow enabling of solr as public events indexer.

Requires the jboss data directory to be set up correctly and an appropriately configured solr to be deployed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/.defaults/cal.options.xml

    r3447 r3535  
    118118 
    119119            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     120            <securityAuthentication>simple</securityAuthentication> 
     121            <securityProtocol>NONE</securityProtocol> 
    120122            <providerUrl>ldap://localhost:10389/</providerUrl> 
    121123            <baseDn>dc=bedework, dc=org</baseDn> 
    …… 
    163165 
    164166            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     167            <securityAuthentication>simple</securityAuthentication> 
     168            <securityProtocol>NONE</securityProtocol> 
    165169            <providerUrl>ldap://localhost:10389/</providerUrl> 
    166170            <baseDn>ou=accounts,dc=bedework,dc=org</baseDn> 
    …… 
    193197 
    194198            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     199            <securityAuthentication>simple</securityAuthentication> 
     200            <securityProtocol>NONE</securityProtocol> 
    195201            <providerUrl>ldap://localhost:10389/</providerUrl> 
    196202 
    …… 
    225231 
    226232            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     233            <securityAuthentication>simple</securityAuthentication> 
     234            <securityProtocol>NONE</securityProtocol> 
    227235            <providerUrl>ldap://localhost:10389/</providerUrl> 
    228236 
    …… 
    258266            <ownerHref>/principals/users/admin</ownerHref> 
    259267            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     268            <securityAuthentication>simple</securityAuthentication> 
     269            <securityProtocol>NONE</securityProtocol> 
    260270            <providerUrl>ldap://localhost:10389/</providerUrl> 
    261271            <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn> 
    …… 
    302312 
    303313            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     314            <securityAuthentication>simple</securityAuthentication> 
     315            <securityProtocol>NONE</securityProtocol> 
    304316            <providerUrl>ldap://localhost:10389/</providerUrl> 
    305317 
    …… 
    334346 
    335347            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     348            <securityAuthentication>simple</securityAuthentication> 
     349            <securityProtocol>NONE</securityProtocol> 
    336350            <providerUrl>ldap://localhost:10389/</providerUrl> 
    337351            <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn> 
    …… 
    366380 
    367381            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     382            <securityAuthentication>simple</securityAuthentication> 
     383            <securityProtocol>NONE</securityProtocol> 
    368384            <providerUrl>ldap://localhost:10389/</providerUrl> 
    369385 
    …… 
    451467            
    452468           Values in the database take precedence after that and need to be  
    453            changed via the admin console on teh system parameters page. 
     469           changed via the admin console on the system parameters page. 
    454470       --> 
    455471      <syspars classname="org.bedework.calfacade.BwSystem"> 
    …… 
    502518 
    503519        <indexRoot>lucene/indexroot</indexRoot> 
     520         
     521        <useSolr>true</useSolr> 
     522        <solrURL>http://localhost:8080/solr/</solrURL> 
     523         
     524        <!-- Path to the core admin handlers. Configured into solr.xml --> 
     525        <solrCoreAdmin>admin/cores/</solrCoreAdmin> 
     526         
     527        <!-- The name of the default index we use in solr for public indexing. 
     528             As we switch cores we use this as the base.  -->  
     529        <solrDefaultCore>bwpublic</solrDefaultCore> 
    504530 
    505531        <rootUsers>admin</rootUsers> 

  • trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml

    r3447 r3535  
    502502 
    503503        <indexRoot>lucene/indexroot</indexRoot> 
     504         
     505        <useSolr>true</useSolr> 
     506        <solrURL>http://localhost:8080/solr/</solrURL> 
     507         
     508        <!-- Path to the core admin handlers. Configured into solr.xml --> 
     509        <solrCoreAdmin>admin/cores/</solrCoreAdmin> 
     510         
     511        <!-- The name of the default index we use in solr for public indexing. 
     512             As we switch cores we use this as the base.  -->  
     513        <solrDefaultCore>bwpublic</solrDefaultCore> 
    504514 
    505515        <rootUsers>admin</rootUsers> 

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

    r3531 r3535  
    352352              libcache="${org.bedework.libcache.dir}" 
    353353              name="lucene-misc" version="2.0.0"/> 
     354 
     355      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     356              libcache="${org.bedework.libcache.dir}" 
     357              name="solr-solrj" version="3.6.0"/> 
    354358       
    355359      <!-- Might be able to get rid of this if we use system xalan --> 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3527 r3535  
    63016301        </tr> 
    63026302        <tr> 
     6303          <th><xsl:copy-of select="$bwStr-MdSP-UseSolr"/></th> 
     6304          <td> 
     6305            <xsl:variable name="useSolr" select="/bedework/system/useSolr"/> 
     6306            <input value="{$useSolr}" name="useSolr" class="wide"/> 
     6307            <div class="desc"> 
     6308              <xsl:copy-of select="$bwStr-MdSP-UseSolrNote"/> 
     6309            </div> 
     6310          </td> 
     6311        </tr> 
     6312        <tr> 
     6313          <th><xsl:copy-of select="$bwStr-MdSP-SolrURL"/></th> 
     6314          <td> 
     6315            <xsl:variable name="solrURL" select="/bedework/system/solrURL"/> 
     6316            <input value="{$solrURL}" name="solrURL" class="wide"/> 
     6317            <div class="desc"> 
     6318              <xsl:copy-of select="$bwStr-MdSP-SolrURLNote"/> 
     6319            </div> 
     6320          </td> 
     6321        </tr> 
     6322        <tr> 
     6323          <th><xsl:copy-of select="$bwStr-MdSP-SolrCoreAdmin"/></th> 
     6324          <td> 
     6325            <xsl:variable name="solrCoreAdmin" select="/bedework/system/solrCoreAdmin"/> 
     6326            <input value="{$solrCoreAdmin}" name="solrCoreAdmin" class="wide"/> 
     6327            <div class="desc"> 
     6328              <xsl:copy-of select="$bwStr-MdSP-SolrCoreAdminNote"/> 
     6329            </div> 
     6330          </td> 
     6331        </tr> 
     6332        <tr> 
     6333          <th><xsl:copy-of select="$bwStr-MdSP-SolrDefaultCore"/></th> 
     6334          <td> 
     6335            <xsl:variable name="solrDefaultCore" select="/bedework/system/solrDefaultCore"/> 
     6336            <input value="{$solrDefaultCore}" name="solrDefaultCore" class="wide"/> 
     6337            <div class="desc"> 
     6338              <xsl:copy-of select="$bwStr-MdSP-SolrDefaultCoreNote"/> 
     6339            </div> 
     6340          </td> 
     6341        </tr> 
     6342        <tr> 
    63036343          <th><xsl:copy-of select="$bwStr-MdSP-SupportedLocales"/></th> 
    63046344          <td> 

  • trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl

    r3515 r3535  
    747747  <xsl:variable name="bwStr-MdSP-IndexRoot">Index root:</xsl:variable> 
    748748  <xsl:variable name="bwStr-MdSP-IndexRootNote">Root for the event indexes. Should only be changed if the indexes are moved/copied</xsl:variable> 
     749  <xsl:variable name="bwStr-MdSP-UseSolr">Use Solr for public indexing:</xsl:variable> 
     750  <xsl:variable name="bwStr-MdSP-UseSolrNote">Use Solr for public indexing:</xsl:variable> 
     751  <xsl:variable name="bwStr-MdSP-SolrURL">Solr Server URL:</xsl:variable> 
     752  <xsl:variable name="bwStr-MdSP-SolrURLNote">Solr Server URL:</xsl:variable> 
     753  <xsl:variable name="bwStr-MdSP-SolrCoreAdmin">Solr Server core admin path:</xsl:variable> 
     754  <xsl:variable name="bwStr-MdSP-SolrCoreAdminNote">Solr Server core admin path:</xsl:variable> 
     755  <xsl:variable name="bwStr-MdSP-SolrDefaultCore">Solr Server Default Core:</xsl:variable> 
     756  <xsl:variable name="bwStr-MdSP-SolrDefaultCoreNote">Solr Server Default Core:</xsl:variable> 
    749757  <xsl:variable name="bwStr-MdSP-SupportedLocales">Supported Locales:</xsl:variable> 
    750758  <xsl:variable name="bwStr-MdSP-ListOfSupportedLocales">List of supported locales. The format is a rigid, comma separated list of 2 letter language, underscore, 2 letter country. No spaces. Example: en_US,fr_CA</xsl:variable> 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl

    r3521 r3535  
    62796279        </tr> 
    62806280        <tr> 
     6281          <th><xsl:copy-of select="$bwStr-MdSP-UseSolr"/></th> 
     6282          <td> 
     6283            <xsl:variable name="useSolr" select="/bedework/system/useSolr"/> 
     6284            <input value="{$useSolr}" name="useSolr" class="wide"/> 
     6285            <div class="desc"> 
     6286              <xsl:copy-of select="$bwStr-MdSP-UseSolrNote"/> 
     6287            </div> 
     6288          </td> 
     6289        </tr> 
     6290        <tr> 
     6291          <th><xsl:copy-of select="$bwStr-MdSP-SolrURL"/></th> 
     6292          <td> 
     6293            <xsl:variable name="solrURL" select="/bedework/system/solrURL"/> 
     6294            <input value="{$solrURL}" name="solrURL" class="wide"/> 
     6295            <div class="desc"> 
     6296              <xsl:copy-of select="$bwStr-MdSP-SolrURLNote"/> 
     6297            </div> 
     6298          </td> 
     6299        </tr> 
     6300        <tr> 
     6301          <th><xsl:copy-of select="$bwStr-MdSP-SolrCoreAdmin"/></th> 
     6302          <td> 
     6303            <xsl:variable name="solrCoreAdmin" select="/bedework/system/solrCoreAdmin"/> 
     6304            <input value="{$solrCoreAdmin}" name="solrCoreAdmin" class="wide"/> 
     6305            <div class="desc"> 
     6306              <xsl:copy-of select="$bwStr-MdSP-SolrCoreAdminNote"/> 
     6307            </div> 
     6308          </td> 
     6309        </tr> 
     6310        <tr> 
     6311          <th><xsl:copy-of select="$bwStr-MdSP-SolrDefaultCore"/></th> 
     6312          <td> 
     6313            <xsl:variable name="solrDefaultCore" select="/bedework/system/solrDefaultCore"/> 
     6314            <input value="{$solrDefaultCore}" name="solrDefaultCore" class="wide"/> 
     6315            <div class="desc"> 
     6316              <xsl:copy-of select="$bwStr-MdSP-SolrDefaultCoreNote"/> 
     6317            </div> 
     6318          </td> 
     6319        </tr> 
     6320        <tr> 
    62816321          <th><xsl:copy-of select="$bwStr-MdSP-SupportedLocales"/></th> 
    62826322          <td> 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl

    r3515 r3535  
    747747  <xsl:variable name="bwStr-MdSP-IndexRoot">Raíz del índice (indexado):</xsl:variable> 
    748748  <xsl:variable name="bwStr-MdSP-IndexRootNote">Raíz de los índices de eventos. Podría cambiarse sólo si los índices son movidos/copiados</xsl:variable> 
     749  <xsl:variable name="bwStr-MdSP-UseSolr">Use Solr for public indexing:</xsl:variable> 
     750  <xsl:variable name="bwStr-MdSP-UseSolrNote">Use Solr for public indexing:</xsl:variable> 
     751  <xsl:variable name="bwStr-MdSP-SolrURL">Solr Server URL:</xsl:variable> 
     752  <xsl:variable name="bwStr-MdSP-SolrURLNote">Solr Server URL:</xsl:variable> 
     753  <xsl:variable name="bwStr-MdSP-SolrCoreAdmin">Solr Server core admin path:</xsl:variable> 
     754  <xsl:variable name="bwStr-MdSP-SolrCoreAdminNote">Solr Server core admin path:</xsl:variable> 
     755  <xsl:variable name="bwStr-MdSP-SolrDefaultCore">Solr Server Default Core:</xsl:variable> 
     756  <xsl:variable name="bwStr-MdSP-SolrDefaultCoreNote">Solr Server Default Core:</xsl:variable> 
    749757  <xsl:variable name="bwStr-MdSP-SupportedLocales">Locales soportados:</xsl:variable> 
    750758  <xsl:variable name="bwStr-MdSP-ListOfSupportedLocales">Lista de los locales soportados. El formato es una estricta, separado por comas, lista de lenguas de 2 letras, guión bajo, dos letras de país. Sin espacios. Ejemplo: en_US,fr_CA</xsl:variable>