Finish CONNECTORS-485.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/trunk@1354462 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index dbc5d6c..887f0e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
======================= 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)
diff --git a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
index 3311c6e..13f09a0 100644
--- a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
+++ b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
@@ -159,7 +159,7 @@
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);
}
