commit - 4656edd7873f1ce192b022db1fa5c73ccbc3fc21
commit + 9e3ff41709ff61749c8fb60f90a28256f6051ee9
blob - 5292c6c029d8257bac4cb4b533edfb95c8a0fcc5
blob + 2396d0997283802998523c6ed5cbd588fafa8dff
--- src/org/snipsnap/net/SnipSearchServlet.java
+++ src/org/snipsnap/net/SnipSearchServlet.java
@@ -30,6 +30,8 @@ import org.snipsnap.snip.SnipSpace;
 import org.snipsnap.snip.SnipSpaceFactory;
 import org.snipsnap.config.Configuration;
 import org.snipsnap.app.Application;
+import org.snipsnap.components.SearchService;
+import org.snipsnap.container.Components;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -48,11 +50,12 @@ public class SnipSearchServlet extends HttpServlet {
 
   public void doPost(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
+
     String query = request.getParameter("query");
     if (query != null && query.length() > 0) {
       HttpSession session = request.getSession();
-      SnipSpace space = SnipSpaceFactory.getInstance();
-      Hits hits = space.search(query);
+      SearchService searchService = (SearchService) Components.getComponent(SearchService.class);
+      Hits hits = searchService.search(query);
       session.setAttribute("query", query);
       session.setAttribute("hits", hits);
       session.setAttribute("startIndex", new Integer(0));
blob - 1be667ca43228ed471fe02e9219c7be4f82bd280
blob + d23daff7f968b3aef825b46028fbb615bf7d4f61
--- src/org/snipsnap/render/macro/SnipXrefMacro.java
+++ src/org/snipsnap/render/macro/SnipXrefMacro.java
@@ -37,6 +37,7 @@ import org.snipsnap.snip.SnipLink;
 import org.snipsnap.snip.SnipSpace;
 import org.snipsnap.snip.SnipSpaceFactory;
 import org.snipsnap.user.AuthenticationService;
+import org.snipsnap.components.SearchService;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -51,10 +52,10 @@ import java.text.MessageFormat;
  */
 
 public class SnipXrefMacro extends BaseMacro {
-  private SnipSpace space;
+  private SearchService searchService;
 
   public SnipXrefMacro() {
-    space = SnipSpaceFactory.getInstance();
+    searchService = (SearchService) Components.getComponent(SearchService.class);
   }
 
   public String getName() {
@@ -81,7 +82,7 @@ public class SnipXrefMacro extends BaseMacro {
 
       Hits hits = null;
       try {
-        hits = space.search("reference:\"" + searchString + "\"");
+        hits = searchService.search("reference:\"" + searchString + "\"");
       } catch (Exception e) {
         Logger.warn("SnipXrefMacro: exception while searching: " + e);
       }