[Bedework-commit] bedework r3535 - in trunk:
config/bwbuild/.defaults
config/bwbuild/jboss-postgresql-devel deployment
deployment/webadmin/webapp/resources/default/default
deployment/webadmin/webapp/resources/es_ES/default
svnadmin at bedework.org
svnadmin at bedework.org
Fri Apr 27 15:55:31 EDT 2012
Author: douglm
Date: 2012-04-27 15:55:30 -0400 (Fri, 27 Apr 2012)
New Revision: 3535
Modified:
trunk/config/bwbuild/.defaults/cal.options.xml
trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml
trunk/deployment/bw-core-appjars.xml
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
Log:
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.
Modified: trunk/config/bwbuild/.defaults/cal.options.xml
===================================================================
--- trunk/config/bwbuild/.defaults/cal.options.xml 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/config/bwbuild/.defaults/cal.options.xml 2012-04-27 19:55:30 UTC (rev 3535)
@@ -117,6 +117,8 @@
<className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>dc=bedework, dc=org</baseDn>
@@ -162,6 +164,8 @@
<className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=accounts,dc=bedework,dc=org</baseDn>
@@ -192,6 +196,8 @@
<className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=groups,dc=bedework,dc=org</baseDn>
@@ -224,6 +230,8 @@
<className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=locations,dc=bedework,dc=org</baseDn>
@@ -257,6 +265,8 @@
<!-- manufacture an owner for public entities -->
<ownerHref>/principals/users/admin</ownerHref>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn>
<queryLimit>1000</queryLimit>
@@ -301,6 +311,8 @@
<className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn>
@@ -333,6 +345,8 @@
<ownerHref>/principals/users/admin</ownerHref>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn>
@@ -365,6 +379,8 @@
<ownerHref>/principals/users/admin</ownerHref>
<initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <securityAuthentication>simple</securityAuthentication>
+ <securityProtocol>NONE</securityProtocol>
<providerUrl>ldap://localhost:10389/</providerUrl>
<baseDn>ou=public,dc=bedework,dc=org</baseDn>
@@ -450,7 +466,7 @@
restore or a first time build of the data.
Values in the database take precedence after that and need to be
- changed via the admin console on teh system parameters page.
+ changed via the admin console on the system parameters page.
-->
<syspars classname="org.bedework.calfacade.BwSystem">
<!-- name must match the global system name
@@ -501,6 +517,16 @@
<directoryBrowsingDisallowed>true</directoryBrowsingDisallowed>
<indexRoot>lucene/indexroot</indexRoot>
+
+ <useSolr>true</useSolr>
+ <solrURL>http://localhost:8080/solr/</solrURL>
+
+ <!-- Path to the core admin handlers. Configured into solr.xml -->
+ <solrCoreAdmin>admin/cores/</solrCoreAdmin>
+
+ <!-- The name of the default index we use in solr for public indexing.
+ As we switch cores we use this as the base. -->
+ <solrDefaultCore>bwpublic</solrDefaultCore>
<rootUsers>admin</rootUsers>
</syspars>
Modified: trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml 2012-04-27 19:55:30 UTC (rev 3535)
@@ -501,6 +501,16 @@
<directoryBrowsingDisallowed>true</directoryBrowsingDisallowed>
<indexRoot>lucene/indexroot</indexRoot>
+
+ <useSolr>true</useSolr>
+ <solrURL>http://localhost:8080/solr/</solrURL>
+
+ <!-- Path to the core admin handlers. Configured into solr.xml -->
+ <solrCoreAdmin>admin/cores/</solrCoreAdmin>
+
+ <!-- The name of the default index we use in solr for public indexing.
+ As we switch cores we use this as the base. -->
+ <solrDefaultCore>bwpublic</solrDefaultCore>
<rootUsers>admin</rootUsers>
</syspars>
Modified: trunk/deployment/bw-core-appjars.xml
===================================================================
--- trunk/deployment/bw-core-appjars.xml 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/deployment/bw-core-appjars.xml 2012-04-27 19:55:30 UTC (rev 3535)
@@ -351,6 +351,10 @@
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
name="lucene-misc" version="2.0.0"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="solr-solrj" version="3.6.0"/>
<!-- Might be able to get rid of this if we use system xalan -->
<getJar lib="${org.bedework.temp.extrajars.dir}"
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2012-04-27 19:55:30 UTC (rev 3535)
@@ -6300,6 +6300,46 @@
</td>
</tr>
<tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-UseSolr"/></th>
+ <td>
+ <xsl:variable name="useSolr" select="/bedework/system/useSolr"/>
+ <input value="{$useSolr}" name="useSolr" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-UseSolrNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrURL"/></th>
+ <td>
+ <xsl:variable name="solrURL" select="/bedework/system/solrURL"/>
+ <input value="{$solrURL}" name="solrURL" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrURLNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrCoreAdmin"/></th>
+ <td>
+ <xsl:variable name="solrCoreAdmin" select="/bedework/system/solrCoreAdmin"/>
+ <input value="{$solrCoreAdmin}" name="solrCoreAdmin" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrCoreAdminNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrDefaultCore"/></th>
+ <td>
+ <xsl:variable name="solrDefaultCore" select="/bedework/system/solrDefaultCore"/>
+ <input value="{$solrDefaultCore}" name="solrDefaultCore" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrDefaultCoreNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
<th><xsl:copy-of select="$bwStr-MdSP-SupportedLocales"/></th>
<td>
<xsl:variable name="localeList" select="/bedework/system/localeList"/>
Modified: trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl 2012-04-27 19:55:30 UTC (rev 3535)
@@ -746,6 +746,14 @@
<xsl:variable name="bwStr-MdSP-DirBrowseDisallowedNote">True if the server hosting the xsl disallows directory browsing.</xsl:variable>
<xsl:variable name="bwStr-MdSP-IndexRoot">Index root:</xsl:variable>
<xsl:variable name="bwStr-MdSP-IndexRootNote">Root for the event indexes. Should only be changed if the indexes are moved/copied</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-UseSolr">Use Solr for public indexing:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-UseSolrNote">Use Solr for public indexing:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrURL">Solr Server URL:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrURLNote">Solr Server URL:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrCoreAdmin">Solr Server core admin path:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrCoreAdminNote">Solr Server core admin path:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrDefaultCore">Solr Server Default Core:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrDefaultCoreNote">Solr Server Default Core:</xsl:variable>
<xsl:variable name="bwStr-MdSP-SupportedLocales">Supported Locales:</xsl:variable>
<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>
<xsl:variable name="bwStr-MdSP-Update">Update</xsl:variable>
Modified: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl 2012-04-27 19:55:30 UTC (rev 3535)
@@ -6278,6 +6278,46 @@
</td>
</tr>
<tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-UseSolr"/></th>
+ <td>
+ <xsl:variable name="useSolr" select="/bedework/system/useSolr"/>
+ <input value="{$useSolr}" name="useSolr" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-UseSolrNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrURL"/></th>
+ <td>
+ <xsl:variable name="solrURL" select="/bedework/system/solrURL"/>
+ <input value="{$solrURL}" name="solrURL" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrURLNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrCoreAdmin"/></th>
+ <td>
+ <xsl:variable name="solrCoreAdmin" select="/bedework/system/solrCoreAdmin"/>
+ <input value="{$solrCoreAdmin}" name="solrCoreAdmin" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrCoreAdminNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <th><xsl:copy-of select="$bwStr-MdSP-SolrDefaultCore"/></th>
+ <td>
+ <xsl:variable name="solrDefaultCore" select="/bedework/system/solrDefaultCore"/>
+ <input value="{$solrDefaultCore}" name="solrDefaultCore" class="wide"/>
+ <div class="desc">
+ <xsl:copy-of select="$bwStr-MdSP-SolrDefaultCoreNote"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
<th><xsl:copy-of select="$bwStr-MdSP-SupportedLocales"/></th>
<td>
<xsl:variable name="localeList" select="/bedework/system/localeList"/>
Modified: trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2012-04-27 19:55:19 UTC (rev 3534)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl 2012-04-27 19:55:30 UTC (rev 3535)
@@ -746,6 +746,14 @@
<xsl:variable name="bwStr-MdSP-DirBrowseDisallowedNote">Verdadero si el servidor que alberga el xsl deshabilita la navegación de directorios.</xsl:variable>
<xsl:variable name="bwStr-MdSP-IndexRoot">Raíz del índice (indexado):</xsl:variable>
<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>
+ <xsl:variable name="bwStr-MdSP-UseSolr">Use Solr for public indexing:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-UseSolrNote">Use Solr for public indexing:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrURL">Solr Server URL:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrURLNote">Solr Server URL:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrCoreAdmin">Solr Server core admin path:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrCoreAdminNote">Solr Server core admin path:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrDefaultCore">Solr Server Default Core:</xsl:variable>
+ <xsl:variable name="bwStr-MdSP-SolrDefaultCoreNote">Solr Server Default Core:</xsl:variable>
<xsl:variable name="bwStr-MdSP-SupportedLocales">Locales soportados:</xsl:variable>
<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>
<xsl:variable name="bwStr-MdSP-Update">Actualizar</xsl:variable>
More information about the Bedework-commit
mailing list