Index: trunk/config/bwbuild/.defaults/cal.options.xml
===================================================================
--- trunk/config/bwbuild/.defaults/cal.options.xml (revision 3447)
+++ trunk/config/bwbuild/.defaults/cal.options.xml (revision 3535)
@@ -118,4 +118,6 @@
 
             <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <securityAuthentication>simple</securityAuthentication>
+            <securityProtocol>NONE</securityProtocol>
             <providerUrl>ldap://localhost:10389/</providerUrl>
             <baseDn>dc=bedework, dc=org</baseDn>
@@ -163,4 +165,6 @@
 
             <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>
@@ -193,4 +197,6 @@
 
             <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <securityAuthentication>simple</securityAuthentication>
+            <securityProtocol>NONE</securityProtocol>
             <providerUrl>ldap://localhost:10389/</providerUrl>
 
@@ -225,4 +231,6 @@
 
             <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <securityAuthentication>simple</securityAuthentication>
+            <securityProtocol>NONE</securityProtocol>
             <providerUrl>ldap://localhost:10389/</providerUrl>
 
@@ -258,4 +266,6 @@
             <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>
@@ -302,4 +312,6 @@
 
             <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <securityAuthentication>simple</securityAuthentication>
+            <securityProtocol>NONE</securityProtocol>
             <providerUrl>ldap://localhost:10389/</providerUrl>
 
@@ -334,4 +346,6 @@
 
             <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>
@@ -366,4 +380,6 @@
 
             <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <securityAuthentication>simple</securityAuthentication>
+            <securityProtocol>NONE</securityProtocol>
             <providerUrl>ldap://localhost:10389/</providerUrl>
 
@@ -451,5 +467,5 @@
            
            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">
@@ -502,4 +518,14 @@
 
         <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>
Index: trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml (revision 3447)
+++ trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml (revision 3535)
@@ -502,4 +502,14 @@
 
         <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>
Index: trunk/deployment/bw-core-appjars.xml
===================================================================
--- trunk/deployment/bw-core-appjars.xml (revision 3531)
+++ trunk/deployment/bw-core-appjars.xml (revision 3535)
@@ -352,4 +352,8 @@
               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 -->
Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3527)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3535)
@@ -6301,4 +6301,44 @@
         </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>
Index: trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3515)
+++ trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3535)
@@ -747,4 +747,12 @@
   <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>
Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3521)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3535)
@@ -6279,4 +6279,44 @@
         </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>
Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3515)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3535)
@@ -747,4 +747,12 @@
   <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>