svn commit: r1354462 - in /manifoldcf/integration/solr-4.x/trunk: CHANGES.txt mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

[kw...@apache.org]

Author: kwright
Date: Wed Jun 27 12:39:48 2012
New Revision: 1354462

URL: http://svn.apache.org/viewvc?rev=1354462&view=rev
Log:
Finish CONNECTORS-485.

Modified:
    manifoldcf/integration/solr-4.x/trunk/CHANGES.txt
    manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

Modified: manifoldcf/integration/solr-4.x/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/CHANGES.txt?rev=1354462&r1=1354461&r2=1354462&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-4.x/trunk/CHANGES.txt Wed Jun 27 12:39:48 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.2-incubating-dev =====================
 
+CONNECTORS-485: Port to the latest 4.x code.
+(Karl Wright)
+
 CONNECTORS-354: Add a parameter to allow the maximum connection pool
 size to be configurated in solrconfig.xml.
 (Karl Wright)

Modified: manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java?rev=1354462&r1=1354461&r2=1354462&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java (original)
+++ manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java Wed Jun 27 12:39:48 2012
@@ -159,7 +159,7 @@ public class ManifoldCFSearchComponentTe
       ContextHandlerCollection contexts = new ContextHandlerCollection();
       server.setHandler(contexts);
 
-      ServletContextHandler asContext = new ServletContextHandler(contexts,"/mcf-as",ServletContextHandler.SESSIONS);
+      ServletContextHandler asContext = new ServletContextHandler(contexts,"/mcf-authority-service",ServletContextHandler.SESSIONS);
       asContext.addServlet(new ServletHolder(new UserACLServlet()), "/UserACLs");
       contexts.addHandler(asContext);
     }