--- solr-conf/solr-3.x/solrconfig.xml	2012-10-16 14:33:32.000000000 +0200
+++ solr-conf/solr-4.x/solrconfig.xml	2012-10-16 14:47:20.000000000 +0200
@@ -16,14 +16,14 @@
  limitations under the License.
 -->
 
-<config name="drupal-3.0-0-solr3">
+<config name="drupal-3.0-0-solr4">
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
   <!-- Set this to 'false' if you want solr to continue working after it has
        encountered an severe configuration error.  In a production environment,
        you may want solr to keep working even if one handler is mis-configured.
@@ -40,7 +40,7 @@
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
 -->
 
-  <indexDefaults>
+  <indexConfig>
    <!-- Values here affect all index writers and act as a default unless overridden. -->
     <useCompoundFile>false</useCompoundFile>
 
@@ -102,9 +102,7 @@
        if not specified.)
     -->
     <lockType>single</lockType>
-  </indexDefaults>
 
-  <mainIndex>
     <!-- options specific to the main on-disk lucene index -->
     <useCompoundFile>false</useCompoundFile>
     <ramBufferSizeMB>32</ramBufferSizeMB>
@@ -147,7 +145,7 @@
       -->
     </deletionPolicy>
 
-  </mainIndex>
+  </indexConfig>
 
   <!--	Enables JMX if and only if an existing MBeanServer is found, use
   		this if you want to configure JMX through JVM parameters. Remove
@@ -606,13 +604,6 @@
     -->
   <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
 
-  <!--
-   Analysis request handler.  Since Solr 1.3.  Use to returnhow a document is analyzed.  Useful
-   for debugging and as a token server for other types of applications
-   -->
-  <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" />
-
-
   <!-- CSV update handler, loaded on demand -->
   <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" />
 
@@ -719,7 +710,7 @@
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
        every xsltCacheLifetimeSeconds.
    -->
-  <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
+  <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
   </queryResponseWriter>