ROO-3079: adding solr functionality to an entity breaks application

spring-attic · Mar 31, 2012 · 566af23 · 566af23
1 parent 7b3373b
commit 566af23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/addon-solr/src/main/java/org/springframework/roo/addon/solr/SolrOperationsImpl.java b/addon-solr/src/main/java/org/springframework/roo/addon/solr/SolrOperationsImpl.java
@@ -10,6 +10,7 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
@@ -28,7 +29,6 @@
 import org.springframework.roo.project.Path;
 import org.springframework.roo.project.ProjectOperations;
 import org.springframework.roo.support.util.DomUtils;
-import org.apache.commons.io.IOUtils;
 import org.springframework.roo.support.util.XmlElementBuilder;
 import org.springframework.roo.support.util.XmlUtils;
 import org.w3c.dom.Document;
@@ -120,10 +120,11 @@ public void setupConfig(final String solrServerUrl) {
                 root.setAttribute(
                         "xsi:schemaLocation",
                         root.getAttribute("xsi:schemaLocation")
-                                + "  http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd");
+                                + "  http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd");
             }
             root.appendChild(new XmlElementBuilder("task:annotation-driven",
-                    appCtx).addAttribute("executor", "asyncExecutor").build());
+                    appCtx).addAttribute("executor", "asyncExecutor")
+                    .addAttribute("mode", "aspectj").build());
             root.appendChild(new XmlElementBuilder("task:executor", appCtx)
                     .addAttribute("id", "asyncExecutor")
                     .addAttribute("pool-size", "${executor.poolSize}").build());

diff --git a/addon-solr/src/main/resources/org/springframework/roo/addon/solr/schema-template.xml b/addon-solr/src/main/resources/org/springframework/roo/addon/solr/schema-template.xml
@@ -40,7 +40,6 @@
          All other components are mandatory.
       -->
     <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
-
     <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
@@ -67,13 +66,8 @@
       </analyzer>
     </fieldType>
  </types>
-
-
  <fields>
-
  </fields>
-
-
  <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
  <solrQueryParser defaultOperator="OR"/>
 </schema>