You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/10/04 16:32:28 UTC
svn commit: r1004255 [15/24] - in /incubator/lcf/trunk:
modules/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/
modules/connectors/documentum/connector/src/main/java/org/apache/manifoldc...
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/documentstatus.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editauthority.jsp Mon Oct 4 14:32:19 2010
@@ -455,7 +455,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editconnection.jsp Mon Oct 4 14:32:19 2010
@@ -608,7 +608,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editjob.jsp Mon Oct 4 14:32:19 2010
@@ -1176,7 +1176,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/editoutput.jsp Mon Oct 4 14:32:19 2010
@@ -456,7 +456,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/execute.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/execute.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/execute.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/execute.jsp Mon Oct 4 14:32:19 2010
@@ -157,7 +157,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -173,13 +173,13 @@
{
String connectionName = variableContext.getParameter("connname");
if (connectionName == null)
- throw new ACFException("Missing connection parameter");
+ throw new ManifoldCFException("Missing connection parameter");
connManager.delete(connectionName);
%>
<jsp:forward page="listconnections.jsp"/>
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -266,7 +266,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -282,13 +282,13 @@
{
String connectionName = variableContext.getParameter("connname");
if (connectionName == null)
- throw new ACFException("Missing connection parameter");
+ throw new ManifoldCFException("Missing connection parameter");
authConnManager.delete(connectionName);
%>
<jsp:forward page="listauthorities.jsp"/>
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -375,7 +375,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -391,13 +391,13 @@
{
String connectionName = variableContext.getParameter("connname");
if (connectionName == null)
- throw new ACFException("Missing connection parameter");
+ throw new ManifoldCFException("Missing connection parameter");
outputManager.delete(connectionName);
%>
<jsp:forward page="listoutputs.jsp"/>
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -419,13 +419,13 @@
{
String connectionName = variableContext.getParameter("connname");
if (connectionName == null)
- throw new ACFException("Missing connection parameter");
- org.apache.manifoldcf.agents.system.ACF.signalOutputConnectionRedo(threadContext,connectionName);
+ throw new ManifoldCFException("Missing connection parameter");
+ org.apache.manifoldcf.agents.system.ManifoldCF.signalOutputConnectionRedo(threadContext,connectionName);
%>
<jsp:forward page="listoutputs.jsp"/>
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -769,7 +769,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -785,13 +785,13 @@
{
String jobID = variableContext.getParameter("jobid");
if (jobID == null)
- throw new ACFException("Missing job parameter");
+ throw new ManifoldCFException("Missing job parameter");
manager.deleteJob(new Long(jobID));
%>
<jsp:forward page="listjobs.jsp"/>
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
@@ -922,7 +922,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listauthorities.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listauthorities.jsp Mon Oct 4 14:32:19 2010
@@ -116,7 +116,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listconnections.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listconnections.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listconnections.jsp Mon Oct 4 14:32:19 2010
@@ -117,7 +117,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listjobs.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listjobs.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listjobs.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listjobs.jsp Mon Oct 4 14:32:19 2010
@@ -120,7 +120,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/listoutputs.jsp Mon Oct 4 14:32:19 2010
@@ -118,7 +118,7 @@
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/queuestatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/queuestatus.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/queuestatus.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/queuestatus.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
@@ -216,7 +216,7 @@ if (maintenanceUnderway == false)
<%
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
out.println("Error: "+e.getMessage());
e.printStackTrace();
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ACF.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewauthority.jsp Mon Oct 4 14:32:19 2010
@@ -71,7 +71,7 @@
IAuthorityConnection connection = manager.load(connectionName);
if (connection == null)
{
- throw new ACFException("No such authority: '"+connectionName+"'");
+ throw new ManifoldCFException("No such authority: '"+connectionName+"'");
}
else
{
@@ -110,7 +110,7 @@
}
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -157,7 +157,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewconnection.jsp Mon Oct 4 14:32:19 2010
@@ -72,7 +72,7 @@
IRepositoryConnection connection = connManager.load(connectionName);
if (connection == null)
{
- throw new ACFException("No such connection: '"+connectionName+"'");
+ throw new ManifoldCFException("No such connection: '"+connectionName+"'");
}
else
{
@@ -113,7 +113,7 @@
}
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -211,7 +211,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewjob.jsp Mon Oct 4 14:32:19 2010
@@ -74,7 +74,7 @@
IJobDescription job = manager.load(new Long(jobID));
if (job == null)
{
- throw new ACFException("No such job: "+jobID);
+ throw new ManifoldCFException("No such job: "+jobID);
}
else
{
@@ -599,7 +599,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/viewoutput.jsp Mon Oct 4 14:32:19 2010
@@ -82,7 +82,7 @@
IOutputConnection connection = connManager.load(connectionName);
if (connection == null)
{
- throw new ACFException("No such connection: '"+connectionName+"'");
+ throw new ManifoldCFException("No such connection: '"+connectionName+"'");
}
else
{
@@ -119,7 +119,7 @@
}
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -169,7 +169,7 @@
<%
}
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/Connectors.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/Connectors.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/Connectors.java (original)
+++ incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/Connectors.java Mon Oct 4 14:32:19 2010
@@ -40,7 +40,7 @@ public class Connectors extends Configur
*@param xmlStream is the input XML stream.
*/
public Connectors(InputStream xmlStream)
- throws ACFException
+ throws ManifoldCFException
{
super("connectors");
fromXML(xmlStream);
Added: incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java?rev=1004255&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java (added)
+++ incubator/lcf/trunk/modules/framework/jetty-runner/src/main/java/org/apache/manifoldcf/jettyrunner/ManifoldCFJettyRunner.java Mon Oct 4 14:32:19 2010
@@ -0,0 +1,450 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.manifoldcf.jettyrunner;
+
+import java.io.*;
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.agents.interfaces.*;
+import org.apache.manifoldcf.crawler.interfaces.*;
+import org.apache.manifoldcf.authorities.interfaces.*;
+import org.apache.manifoldcf.agents.system.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.mortbay.jetty.Handler;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.FilterHolder;
+import org.mortbay.log.Logger;
+
+/**
+ * Run ManifoldCF with jetty.
+ *
+ */
+public class ManifoldCFJettyRunner
+{
+
+ public static final String _rcsid = "@(#)$Id: ManifoldCFJettyRunner.java 989983 2010-08-27 00:10:12Z kwright $";
+
+ public static final String agentShutdownSignal = org.apache.manifoldcf.agents.AgentRun.agentShutdownSignal;
+
+ // Configuration parameters
+ public static final String connectorsConfigurationFile = "org.apache.manifoldcf.connectorsconfigurationfile";
+
+ // Connectors configuration file
+ public static final String NODE_OUTPUTCONNECTOR = "outputconnector";
+ public static final String NODE_AUTHORITYCONNECTOR = "authorityconnector";
+ public static final String NODE_REPOSITORYCONNECTOR = "repositoryconnector";
+ public static final String ATTRIBUTE_NAME = "name";
+ public static final String ATTRIBUTE_CLASS = "class";
+
+ protected Server server;
+
+ public ManifoldCFJettyRunner( int port, String crawlerWarPath, String authorityServiceWarPath, String apiWarPath )
+ {
+ server = new Server( port );
+ server.setStopAtShutdown( true );
+
+ // Initialize the servlets
+ WebAppContext lcfCrawlerUI = new WebAppContext(crawlerWarPath,"/acf-crawler-ui");
+ // This will cause jetty to ignore all of the framework and jdbc jars in the war, which is what we want.
+ lcfCrawlerUI.setParentLoaderPriority(true);
+ server.addHandler(lcfCrawlerUI);
+ WebAppContext lcfAuthorityService = new WebAppContext(authorityServiceWarPath,"/acf-authority-service");
+ // This will cause jetty to ignore all of the framework and jdbc jars in the war, which is what we want.
+ lcfAuthorityService.setParentLoaderPriority(true);
+ server.addHandler(lcfAuthorityService);
+ WebAppContext lcfApi = new WebAppContext(apiWarPath,"/acf-api-service");
+ lcfApi.setParentLoaderPriority(true);
+ server.addHandler(lcfApi);
+ }
+
+ public void start()
+ throws ManifoldCFException
+ {
+ if(!server.isRunning() )
+ {
+ try
+ {
+ server.start();
+ }
+ catch (Exception e)
+ {
+ throw new ManifoldCFException("Couldn't start: "+e.getMessage(),e);
+ }
+ }
+ }
+
+ public void stop()
+ throws ManifoldCFException
+ {
+ if( server.isRunning() )
+ {
+ try
+ {
+ server.stop();
+ }
+ catch (Exception e)
+ {
+ throw new ManifoldCFException("Couldn't stop: "+e.getMessage(),e);
+ }
+ try
+ {
+ server.join();
+ }
+ catch (InterruptedException e)
+ {
+ throw new ManifoldCFException(e.getMessage(),e,ManifoldCFException.INTERRUPTED);
+ }
+ }
+ }
+
+ /**
+ * Returns the Local Port of the first Connector found for the jetty Server.
+ * @return the port number.
+ */
+ public int getLocalPort()
+ throws ManifoldCFException
+ {
+ Connector[] conns = server.getConnectors();
+ if (0 == conns.length) {
+ throw new ManifoldCFException("Jetty Server has no Connectors");
+ }
+ return conns[0].getLocalPort();
+ }
+
+ /**
+ * A main class that starts jetty+acf
+ */
+ public static void main( String[] args )
+ {
+ if (args.length != 4 && args.length != 1 && args.length != 0)
+ {
+ System.err.println("Usage: ManifoldCFJettyRunner [<port> [<crawler-war-path> <authority-service-war-path> <api-war-path>]]");
+ System.exit(1);
+ }
+
+ int jettyPort = 8345;
+ if (args.length > 0)
+ {
+ try
+ {
+ jettyPort = Integer.parseInt(args[0]);
+ }
+ catch (NumberFormatException e)
+ {
+ e.printStackTrace(System.err);
+ System.exit(1);
+ }
+ }
+
+ String crawlerWarPath = "war/acf-crawler-ui.war";
+ String authorityserviceWarPath = "war/acf-authority-service.war";
+ String apiWarPath = "war/acf-api-service.war";
+ if (args.length == 4)
+ {
+ crawlerWarPath = args[1];
+ authorityserviceWarPath = args[2];
+ apiWarPath = args[3];
+ }
+
+ // Ready to begin in earnest...
+ System.setProperty(ManifoldCF.lcfConfigFileProperty,"./properties.xml");
+ try
+ {
+ ManifoldCF.initializeEnvironment();
+ IThreadContext tc = ThreadContextFactory.make();
+
+ // Clear the agents shutdown signal.
+ ILockManager lockManager = LockManagerFactory.make(tc);
+ lockManager.clearGlobalFlag(agentShutdownSignal);
+
+ // Grab a database handle, so we can use transactions later.
+ IDBInterface database = DBInterfaceFactory.make(tc,
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
+
+ // Do the basic initialization of the database and its schema
+ ManifoldCF.createSystemDatabase(tc,"","");
+ ManifoldCF.installTables(tc);
+ IAgentManager agentMgr = AgentManagerFactory.make(tc);
+ agentMgr.registerAgent("org.apache.manifoldcf.crawler.system.CrawlerAgent");
+
+ // Read connectors configuration file (to figure out what we need to register)
+ Connectors c = null;
+ File connectorConfigFile = ManifoldCF.getFileProperty(connectorsConfigurationFile);
+ if (connectorConfigFile != null)
+ {
+ try
+ {
+ // Open the file, read it, and attempt to do the connector registrations
+ InputStream is = new FileInputStream(connectorConfigFile);
+ try
+ {
+ c = new Connectors(is);
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+ catch (FileNotFoundException e)
+ {
+ throw new ManifoldCFException("Couldn't find connector configuration file: "+e.getMessage(),e);
+ }
+ catch (IOException e)
+ {
+ throw new ManifoldCFException("Error reading connector configuration file: "+e.getMessage(),e);
+ }
+ }
+
+ // Unregister all connectors.
+
+ // Output connectors...
+ {
+ IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
+ IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
+ IResultSet classNames = mgr.getConnectors();
+ int i = 0;
+ while (i < classNames.getRowCount())
+ {
+ IResultRow row = classNames.getRow(i++);
+ String className = (String)row.getValue("classname");
+ // Deregistration should be done in a transaction
+ database.beginTransaction();
+ try
+ {
+ // Find the connection names that come with this class
+ String[] connectionNames = connManager.findConnectionsForConnector(className);
+ // For all connection names, notify all agents of the deregistration
+ AgentManagerFactory.noteOutputConnectorDeregistration(tc,connectionNames);
+ // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
+ mgr.unregisterConnector(className);
+ }
+ catch (ManifoldCFException e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ database.endTransaction();
+ }
+ }
+ System.err.println("Successfully unregistered all output connectors");
+ }
+
+ // Authority connectors...
+ {
+ IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
+ IResultSet classNames = mgr.getConnectors();
+ int i = 0;
+ while (i < classNames.getRowCount())
+ {
+ IResultRow row = classNames.getRow(i++);
+ mgr.unregisterConnector((String)row.getValue("classname"));
+ }
+ System.err.println("Successfully unregistered all authority connectors");
+ }
+
+ // Repository connectors...
+ {
+ IConnectorManager mgr = ConnectorManagerFactory.make(tc);
+ IJobManager jobManager = JobManagerFactory.make(tc);
+ IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
+ IResultSet classNames = mgr.getConnectors();
+ int i = 0;
+ while (i < classNames.getRowCount())
+ {
+ IResultRow row = classNames.getRow(i++);
+ String className = (String)row.getValue("classname");
+ // Deregistration should be done in a transaction
+ database.beginTransaction();
+ try
+ {
+ // Find the connection names that come with this class
+ String[] connectionNames = connManager.findConnectionsForConnector(className);
+ // For each connection name, modify the jobs to note that the connector is no longer installed
+ jobManager.noteConnectorDeregistration(connectionNames);
+ // Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
+ mgr.unregisterConnector(className);
+ }
+ catch (ManifoldCFException e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ database.endTransaction();
+ }
+ }
+ System.err.println("Successfully unregistered all repository connectors");
+ }
+
+ if (c != null)
+ {
+
+ // Other code will go here to discover and register various connectors that exist in the classpath
+ int i = 0;
+ while (i < c.getChildCount())
+ {
+ ConfigurationNode cn = c.findChild(i++);
+ if (cn.getType().equals(NODE_OUTPUTCONNECTOR))
+ {
+ String name = cn.getAttributeValue(ATTRIBUTE_NAME);
+ String className = cn.getAttributeValue(ATTRIBUTE_CLASS);
+ IOutputConnectorManager mgr = OutputConnectorManagerFactory.make(tc);
+ IOutputConnectionManager connManager = OutputConnectionManagerFactory.make(tc);
+ // Registration should be done in a transaction
+ database.beginTransaction();
+ try
+ {
+ // First, register connector
+ mgr.registerConnector(name,className);
+ // Then, signal to all jobs that might depend on this connector that they can switch state
+ // Find the connection names that come with this class
+ String[] connectionNames = connManager.findConnectionsForConnector(className);
+ // For all connection names, notify all agents of the registration
+ AgentManagerFactory.noteOutputConnectorRegistration(tc,connectionNames);
+ }
+ catch (ManifoldCFException e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ database.endTransaction();
+ }
+ System.err.println("Successfully registered output connector '"+className+"'");
+ }
+ else if (cn.getType().equals(NODE_AUTHORITYCONNECTOR))
+ {
+ String name = cn.getAttributeValue(ATTRIBUTE_NAME);
+ String className = cn.getAttributeValue(ATTRIBUTE_CLASS);
+ IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
+ mgr.registerConnector(name,className);
+ System.err.println("Successfully registered authority connector '"+className+"'");
+ }
+ else if (cn.getType().equals(NODE_REPOSITORYCONNECTOR))
+ {
+ String name = cn.getAttributeValue(ATTRIBUTE_NAME);
+ String className = cn.getAttributeValue(ATTRIBUTE_CLASS);
+ IConnectorManager mgr = ConnectorManagerFactory.make(tc);
+ IJobManager jobManager = JobManagerFactory.make(tc);
+ IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
+ // Deregistration should be done in a transaction
+ database.beginTransaction();
+ try
+ {
+ // First, register connector
+ mgr.registerConnector(name,className);
+ // Then, signal to all jobs that might depend on this connector that they can switch state
+ // Find the connection names that come with this class
+ String[] connectionNames = connManager.findConnectionsForConnector(className);
+ // For each connection name, modify the jobs to note that the connector is now installed
+ jobManager.noteConnectorRegistration(connectionNames);
+ }
+ catch (ManifoldCFException e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ database.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ database.endTransaction();
+ }
+ System.err.println("Successfully registered repository connector '"+className+"'");
+ }
+ else
+ throw new ManifoldCFException("Unrecognized connectors node type '"+cn.getType()+"'");
+ }
+ }
+
+ System.err.println("Starting jetty...");
+
+ // Create a jetty instance
+ ManifoldCFJettyRunner jetty = new ManifoldCFJettyRunner(jettyPort,crawlerWarPath,authorityserviceWarPath,apiWarPath);
+ // This will register a shutdown hook as well.
+ jetty.start();
+
+ System.err.println("Jetty started.");
+
+ System.err.println("Starting crawler...");
+ while (true)
+ {
+ // Any shutdown signal yet?
+ if (lockManager.checkGlobalFlag(agentShutdownSignal))
+ break;
+
+ // Start whatever agents need to be started
+ ManifoldCF.startAgents(tc);
+
+ try
+ {
+ ManifoldCF.sleep(5000);
+ }
+ catch (InterruptedException e)
+ {
+ break;
+ }
+ }
+ System.err.println("Shutting down crawler...");
+ }
+ catch (ManifoldCFException e)
+ {
+ if (Logging.root != null)
+ Logging.root.error("Exception: "+e.getMessage(),e);
+ e.printStackTrace(System.err);
+ System.exit(1);
+ }
+ }
+
+}
+
+
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/BaseAuthoritiesInitializationCommand.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/BaseAuthoritiesInitializationCommand.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/BaseAuthoritiesInitializationCommand.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/BaseAuthoritiesInitializationCommand.java Mon Oct 4 14:32:19 2010
@@ -2,10 +2,10 @@ package org.apache.manifoldcf.authoritie
import org.apache.manifoldcf.authorities.interfaces.AuthorityConnectorManagerFactory;
import org.apache.manifoldcf.authorities.interfaces.IAuthorityConnectorManager;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
import org.apache.manifoldcf.core.InitializationCommand;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
-import org.apache.manifoldcf.core.interfaces.ACFException;
+import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.core.interfaces.ThreadContextFactory;
/**
@@ -13,14 +13,14 @@ import org.apache.manifoldcf.core.interf
*/
public abstract class BaseAuthoritiesInitializationCommand implements InitializationCommand
{
- public void execute() throws ACFException
+ public void execute() throws ManifoldCFException
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
doExecute(mgr);
}
- protected abstract void doExecute(IAuthorityConnectorManager mgr) throws ACFException;
+ protected abstract void doExecute(IAuthorityConnectorManager mgr) throws ManifoldCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/ChangeAuthSpec.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/ChangeAuthSpec.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/ChangeAuthSpec.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/ChangeAuthSpec.java Mon Oct 4 14:32:19 2010
@@ -48,7 +48,7 @@ public class ChangeAuthSpec
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectionManager connManager = AuthorityConnectionManagerFactory.make(tc);
IAuthorityConnection conn = connManager.load(connectionName);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckAll.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckAll.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckAll.java Mon Oct 4 14:32:19 2010
@@ -44,7 +44,7 @@ public class CheckAll
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
// Now, get a list of the authority connections
IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc);
@@ -85,7 +85,7 @@ public class CheckAll
else
connectionStatus = "Connector not installed";
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
connectionStatus = "Threw exception: '"+e.getMessage()+"'";
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckConfigured.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckConfigured.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckConfigured.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckConfigured.java Mon Oct 4 14:32:19 2010
@@ -44,7 +44,7 @@ public class CheckConfigured
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
// Now, get a list of the authority connections
IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DefineAuthorityConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DefineAuthorityConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DefineAuthorityConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DefineAuthorityConnection.java Mon Oct 4 14:32:19 2010
@@ -51,7 +51,7 @@ public class DefineAuthorityConnection
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc);
IAuthorityConnection conn = mgr.create();
@@ -67,7 +67,7 @@ public class DefineAuthorityConnection
// Parse
int pos = arg.indexOf("=");
if (pos == -1)
- throw new ACFException("Argument missing =");
+ throw new ManifoldCFException("Argument missing =");
String name = arg.substring(0,pos);
String value = arg.substring(pos+1);
if (name.endsWith("assword"))
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DeleteAuthorityConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DeleteAuthorityConnection.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DeleteAuthorityConnection.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/DeleteAuthorityConnection.java Mon Oct 4 14:32:19 2010
@@ -46,7 +46,7 @@ public class DeleteAuthorityConnection
String connectionName = args[0];
try
{
- ACF.initializeEnvironment();
+ ManifoldCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc);
mgr.delete(connectionName);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/RegisterAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/RegisterAuthority.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/RegisterAuthority.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/RegisterAuthority.java Mon Oct 4 14:32:19 2010
@@ -35,7 +35,7 @@ public class RegisterAuthority extends B
this.description = description;
}
- protected void doExecute(IAuthorityConnectorManager mgr) throws ACFException
+ protected void doExecute(IAuthorityConnectorManager mgr) throws ManifoldCFException
{
mgr.registerConnector(description,className);
Logging.root.info("Successfully registered connector '"+className+"'");
@@ -58,7 +58,7 @@ public class RegisterAuthority extends B
registerAuthority.execute();
System.err.println("Successfully registered connector '"+className+"'");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/SynchronizeAuthorities.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/SynchronizeAuthorities.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/SynchronizeAuthorities.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/SynchronizeAuthorities.java Mon Oct 4 14:32:19 2010
@@ -32,7 +32,7 @@ public class SynchronizeAuthorities exte
}
- protected void doExecute(IAuthorityConnectorManager mgr) throws ACFException
+ protected void doExecute(IAuthorityConnectorManager mgr) throws ManifoldCFException
{
IResultSet classNames = mgr.getConnectors();
int i = 0;
@@ -44,7 +44,7 @@ public class SynchronizeAuthorities exte
{
AuthorityConnectorFactory.getConnectorNoCheck(classname);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
mgr.removeConnector(classname);
}
@@ -68,7 +68,7 @@ public class SynchronizeAuthorities exte
synchronizeAuthorities.execute();
System.err.println("Successfully synchronized all authorities");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAllAuthorities.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAllAuthorities.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAllAuthorities.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAllAuthorities.java Mon Oct 4 14:32:19 2010
@@ -31,7 +31,7 @@ public class UnRegisterAllAuthorities ex
{
}
- protected void doExecute(IAuthorityConnectorManager mgr) throws ACFException
+ protected void doExecute(IAuthorityConnectorManager mgr) throws ManifoldCFException
{
IResultSet classNames = mgr.getConnectors();
int i = 0;
@@ -59,7 +59,7 @@ public class UnRegisterAllAuthorities ex
unRegisterAllAuthorities.execute();
System.err.println("Successfully unregistered all connectors");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAuthority.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAuthority.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/UnRegisterAuthority.java Mon Oct 4 14:32:19 2010
@@ -34,7 +34,7 @@ public class UnRegisterAuthority extends
this.className = className;
}
- protected void doExecute(IAuthorityConnectorManager mgr) throws ACFException
+ protected void doExecute(IAuthorityConnectorManager mgr) throws ManifoldCFException
{
mgr.unregisterConnector(className);
Logging.root.info("Successfully unregistered connector '"+className+"'");
@@ -56,7 +56,7 @@ public class UnRegisterAuthority extends
unRegisterAuthority.execute();
System.err.println("Successfully unregistered connector '"+className+"'");
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java Mon Oct 4 14:32:19 2010
@@ -41,7 +41,7 @@ public class AuthorityConnectorManager e
*@param database is the database handle.
*/
public AuthorityConnectorManager(IThreadContext threadContext, IDBInterface database)
- throws ACFException
+ throws ManifoldCFException
{
super(database,"authconnectors");
this.threadContext = threadContext;
@@ -51,7 +51,7 @@ public class AuthorityConnectorManager e
/** Install or upgrade.
*/
public void install()
- throws ACFException
+ throws ManifoldCFException
{
// Always use a loop, in case there's upgrade retries needed.
while (true)
@@ -100,7 +100,7 @@ public class AuthorityConnectorManager e
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -119,7 +119,7 @@ public class AuthorityConnectorManager e
}
performDrop(invKeys);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -141,7 +141,7 @@ public class AuthorityConnectorManager e
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -168,7 +168,7 @@ public class AuthorityConnectorManager e
// Either way, we must do the install/upgrade itself.
AuthorityConnectorFactory.install(threadContext,className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -189,7 +189,7 @@ public class AuthorityConnectorManager e
*@param className is the class name of the connector to unregister.
*/
public void unregisterConnector(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -200,7 +200,7 @@ public class AuthorityConnectorManager e
removeConnector(className);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -221,7 +221,7 @@ public class AuthorityConnectorManager e
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
ArrayList list = new ArrayList();
@@ -234,7 +234,7 @@ public class AuthorityConnectorManager e
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -247,7 +247,7 @@ public class AuthorityConnectorManager e
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws ACFException
+ throws ManifoldCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -266,7 +266,7 @@ public class AuthorityConnectorManager e
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws ACFException
+ throws ManifoldCFException
{
// Use the global table key; that's good enough because we don't expect stuff to change out from under very often.
StringSet invKeys = new StringSet(getCacheKey());
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java Mon Oct 4 14:32:19 2010
@@ -40,7 +40,7 @@ public abstract class BaseAuthorityConne
* (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
*/
public AuthorizationResponse getAuthorizationResponse(String userName)
- throws ACFException
+ throws ManifoldCFException
{
// Implementation for old-style behavior. Override this method for new-style behavior.
try
@@ -50,7 +50,7 @@ public abstract class BaseAuthorityConne
return new AuthorizationResponse(new String[0],AuthorizationResponse.RESPONSE_USERNOTFOUND);
return new AuthorizationResponse(accessTokens,AuthorizationResponse.RESPONSE_OK);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
// There's an authorization failure of some kind.
String[] defaultAccessTokens = getDefaultAccessTokens(userName);
@@ -82,7 +82,7 @@ public abstract class BaseAuthorityConne
* (Throw an exception if access is denied, usually because the authority is down).
*/
public String[] getAccessTokens(String userName)
- throws ACFException
+ throws ManifoldCFException
{
return null;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java Mon Oct 4 14:32:19 2010
@@ -22,7 +22,7 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.authorities.interfaces.*;
import java.util.*;
import org.apache.manifoldcf.authorities.interfaces.CacheKeyFactory;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
import org.apache.manifoldcf.crawler.interfaces.IRepositoryConnectionManager;
import org.apache.manifoldcf.crawler.interfaces.RepositoryConnectionManagerFactory;
@@ -51,7 +51,7 @@ public class AuthorityConnectionManager
*@param threadContext is the thread context.
*/
public AuthorityConnectionManager(IThreadContext threadContext, IDBInterface database)
- throws ACFException
+ throws ManifoldCFException
{
super(database,"authconnections");
@@ -62,7 +62,7 @@ public class AuthorityConnectionManager
/** Install the manager.
*/
public void install()
- throws ACFException
+ throws ManifoldCFException
{
// Always do a loop, in case upgrade needs it.
while (true)
@@ -93,51 +93,51 @@ public class AuthorityConnectionManager
/** Uninstall the manager.
*/
public void deinstall()
- throws ACFException
+ throws ManifoldCFException
{
performDrop(null);
}
/** Export configuration */
public void exportConfiguration(java.io.OutputStream os)
- throws java.io.IOException, ACFException
+ throws java.io.IOException, ManifoldCFException
{
// Write a version indicator
- ACF.writeDword(os,1);
+ ManifoldCF.writeDword(os,1);
// Get the authority list
IAuthorityConnection[] list = getAllConnections();
// Write the number of authorities
- ACF.writeDword(os,list.length);
+ ManifoldCF.writeDword(os,list.length);
// Loop through the list and write the individual authority info
int i = 0;
while (i < list.length)
{
IAuthorityConnection conn = list[i++];
- ACF.writeString(os,conn.getName());
- ACF.writeString(os,conn.getDescription());
- ACF.writeString(os,conn.getClassName());
- ACF.writeString(os,conn.getConfigParams().toXML());
- ACF.writeDword(os,conn.getMaxConnections());
+ ManifoldCF.writeString(os,conn.getName());
+ ManifoldCF.writeString(os,conn.getDescription());
+ ManifoldCF.writeString(os,conn.getClassName());
+ ManifoldCF.writeString(os,conn.getConfigParams().toXML());
+ ManifoldCF.writeDword(os,conn.getMaxConnections());
}
}
/** Import configuration */
public void importConfiguration(java.io.InputStream is)
- throws java.io.IOException, ACFException
+ throws java.io.IOException, ManifoldCFException
{
- int version = ACF.readDword(is);
+ int version = ManifoldCF.readDword(is);
if (version != 1)
throw new java.io.IOException("Unknown authority configuration version: "+Integer.toString(version));
- int count = ACF.readDword(is);
+ int count = ManifoldCF.readDword(is);
int i = 0;
while (i < count)
{
IAuthorityConnection conn = create();
- conn.setName(ACF.readString(is));
- conn.setDescription(ACF.readString(is));
- conn.setClassName(ACF.readString(is));
- conn.getConfigParams().fromXML(ACF.readString(is));
- conn.setMaxConnections(ACF.readDword(is));
+ conn.setName(ManifoldCF.readString(is));
+ conn.setDescription(ManifoldCF.readString(is));
+ conn.setClassName(ManifoldCF.readString(is));
+ conn.getConfigParams().fromXML(ManifoldCF.readString(is));
+ conn.setMaxConnections(ManifoldCF.readDword(is));
// Attempt to save this connection
save(conn);
i++;
@@ -148,7 +148,7 @@ public class AuthorityConnectionManager
*@return an array of connection objects.
*/
public IAuthorityConnection[] getAllConnections()
- throws ACFException
+ throws ManifoldCFException
{
beginTransaction();
try
@@ -169,7 +169,7 @@ public class AuthorityConnectionManager
}
return loadMultiple(names);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -190,7 +190,7 @@ public class AuthorityConnectionManager
*@return the loaded connection object, or null if not found.
*/
public IAuthorityConnection load(String name)
- throws ACFException
+ throws ManifoldCFException
{
return loadMultiple(new String[]{name})[0];
}
@@ -200,7 +200,7 @@ public class AuthorityConnectionManager
*@return the loaded connection objects.
*/
public IAuthorityConnection[] loadMultiple(String[] names)
- throws ACFException
+ throws ManifoldCFException
{
// Build description objects
AuthorityConnectionDescription[] objectDescriptions = new AuthorityConnectionDescription[names.length];
@@ -223,7 +223,7 @@ public class AuthorityConnectionManager
*@return the new object.
*/
public IAuthorityConnection create()
- throws ACFException
+ throws ManifoldCFException
{
AuthorityConnection rval = new AuthorityConnection();
return rval;
@@ -234,7 +234,7 @@ public class AuthorityConnectionManager
*@return true if the object is created, false otherwise.
*/
public boolean save(IAuthorityConnection object)
- throws ACFException
+ throws ManifoldCFException
{
StringSetBuffer ssb = new StringSetBuffer();
ssb.add(getAuthorityConnectionsKey());
@@ -247,7 +247,7 @@ public class AuthorityConnectionManager
try
{
performLock();
- ACF.noteConfigurationChange();
+ ManifoldCF.noteConfigurationChange();
// See whether the instance exists
ArrayList params = new ArrayList();
params.add(object.getName());
@@ -281,7 +281,7 @@ public class AuthorityConnectionManager
cacheManager.invalidateKeys(ch);
return isCreated;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -307,7 +307,7 @@ public class AuthorityConnectionManager
* name does not exist, no error is returned.
*/
public void delete(String name)
- throws ACFException
+ throws ManifoldCFException
{
// Grab repository connection manager handle, to check on legality of deletion.
IRepositoryConnectionManager repoManager = RepositoryConnectionManagerFactory.make(threadContext);
@@ -324,14 +324,14 @@ public class AuthorityConnectionManager
{
// Check if anything refers to this connection name
if (repoManager.isReferenced(name))
- throw new ACFException("Can't delete authority connection '"+name+"': existing repository connections refer to it");
- ACF.noteConfigurationChange();
+ throw new ManifoldCFException("Can't delete authority connection '"+name+"': existing repository connections refer to it");
+ ManifoldCF.noteConfigurationChange();
ArrayList params = new ArrayList();
params.add(name);
performDelete("WHERE "+nameField+"=?",params,null);
cacheManager.invalidateKeys(ch);
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -388,7 +388,7 @@ public class AuthorityConnectionManager
*@return the corresponding repository connection objects.
*/
protected AuthorityConnection[] getAuthorityConnectionsMultiple(String[] connectionNames)
- throws ACFException
+ throws ManifoldCFException
{
AuthorityConnection[] rval = new AuthorityConnection[connectionNames.length];
HashMap returnIndex = new HashMap();
@@ -432,7 +432,7 @@ public class AuthorityConnectionManager
signalRollback();
throw e;
}
- catch (ACFException e)
+ catch (ManifoldCFException e)
{
signalRollback();
throw e;
@@ -450,7 +450,7 @@ public class AuthorityConnectionManager
*@param params is the set of parameters.
*/
protected void getAuthorityConnectionsChunk(AuthorityConnection[] rval, Map returnIndex, String idList, ArrayList params)
- throws ACFException
+ throws ManifoldCFException
{
IResultSet set;
set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+
@@ -571,7 +571,7 @@ public class AuthorityConnectionManager
* @return the newly created objects to cache, or null, if any object cannot be created.
* The order of the returned objects must correspond to the order of the object descriptinos.
*/
- public Object[] create(ICacheDescription[] objectDescriptions) throws ACFException
+ public Object[] create(ICacheDescription[] objectDescriptions) throws ManifoldCFException
{
// Turn the object descriptions into the parameters for the ToolInstance requests
String[] connectionNames = new String[objectDescriptions.length];
@@ -594,7 +594,7 @@ public class AuthorityConnectionManager
* @param objectDescription is the unique identifier of the object.
* @param cachedObject is the cached object.
*/
- public void exists(ICacheDescription objectDescription, Object cachedObject) throws ACFException
+ public void exists(ICacheDescription objectDescription, Object cachedObject) throws ManifoldCFException
{
// Cast what came in as what it really is
AuthorityConnectionDescription objectDesc = (AuthorityConnectionDescription)objectDescription;
@@ -612,7 +612,7 @@ public class AuthorityConnectionManager
/** Perform the desired operation. This method is called after either createGetObject()
* or exists() is called for every requested object.
*/
- public void execute() throws ACFException
+ public void execute() throws ManifoldCFException
{
// Does nothing; we only want to fetch objects in this cacher.
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectionManagerFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectionManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectionManagerFactory.java Mon Oct 4 14:32:19 2010
@@ -20,7 +20,7 @@ package org.apache.manifoldcf.authoritie
import org.apache.manifoldcf.core.interfaces.*;
import java.util.*;
-import org.apache.manifoldcf.authorities.system.ACF;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
/** This is the factory class for authority connection manager objects.
*/
@@ -38,15 +38,15 @@ public class AuthorityConnectionManagerF
*@return the handle.
*/
public static IAuthorityConnectionManager make(IThreadContext tc)
- throws ACFException
+ throws ManifoldCFException
{
Object o = tc.get(objectName);
if (o == null || !(o instanceof IAuthorityConnectionManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- ACF.getMasterDatabaseName(),
- ACF.getMasterDatabaseUsername(),
- ACF.getMasterDatabasePassword());
+ ManifoldCF.getMasterDatabaseName(),
+ ManifoldCF.getMasterDatabaseUsername(),
+ ManifoldCF.getMasterDatabasePassword());
o = new org.apache.manifoldcf.authorities.authority.AuthorityConnectionManager(tc,database);
tc.save(objectName,o);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java?rev=1004255&r1=1004254&r2=1004255&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java Mon Oct 4 14:32:19 2010
@@ -19,7 +19,7 @@
package org.apache.manifoldcf.authorities.interfaces;
import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.core.system.ACF;
+import org.apache.manifoldcf.core.system.ManifoldCF;
import java.util.*;
import java.io.*;
import java.lang.reflect.*;
@@ -40,7 +40,7 @@ public class AuthorityConnectorFactory
*@param className is the class name.
*/
public static void install(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IAuthorityConnector connector = getConnectorNoCheck(className);
connector.install(threadContext);
@@ -50,7 +50,7 @@ public class AuthorityConnectorFactory
*@param className is the class name.
*/
public static void deinstall(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IAuthorityConnector connector = getConnectorNoCheck(className);
connector.deinstall(threadContext);
@@ -59,7 +59,7 @@ public class AuthorityConnectorFactory
/** Get the default response from a connector. Called if the connection attempt fails.
*/
public static AuthorizationResponse getDefaultAuthorizationResponse(IThreadContext threadContext, String className, String userName)
- throws ACFException
+ throws ManifoldCFException
{
IAuthorityConnector connector = getConnector(threadContext,className);
if (connector == null)
@@ -70,7 +70,7 @@ public class AuthorityConnectorFactory
/** Output the configuration header section.
*/
public static void outputConfigurationHeader(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -81,7 +81,7 @@ public class AuthorityConnectorFactory
/** Output the configuration body section.
*/
public static void outputConfigurationBody(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, String tabName)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -92,7 +92,7 @@ public class AuthorityConnectorFactory
/** Process configuration post data for a connector.
*/
public static String processConfigurationPost(IThreadContext threadContext, String className, IPostParameters variableContext, ConfigParams configParams)
- throws ACFException
+ throws ManifoldCFException
{
IAuthorityConnector connector = getConnector(threadContext, className);
if (connector == null)
@@ -103,7 +103,7 @@ public class AuthorityConnectorFactory
/** View connector configuration.
*/
public static void viewConfiguration(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams configParams)
- throws ACFException, IOException
+ throws ManifoldCFException, IOException
{
IAuthorityConnector connector = getConnector(threadContext, className);
// We want to be able to view connections even if they have unregistered connectors.
@@ -117,18 +117,18 @@ public class AuthorityConnectorFactory
*@return the instance.
*/
public static IAuthorityConnector getConnectorNoCheck(String className)
- throws ACFException
+ throws ManifoldCFException
{
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new ACFException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IAuthorityConnector.");
return (IAuthorityConnector)o;
}
catch (InvocationTargetException e)
@@ -137,41 +137,41 @@ public class AuthorityConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
- throw new ACFException("No authority connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No authority connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx().",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
@@ -182,7 +182,7 @@ public class AuthorityConnectorFactory
*@return the instance.
*/
protected static IAuthorityConnector getConnector(IThreadContext threadContext, String className)
- throws ACFException
+ throws ManifoldCFException
{
IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadContext);
if (connMgr.isInstalled(className) == false)
@@ -190,14 +190,14 @@ public class AuthorityConnectorFactory
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new ACFException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IAuthorityConnector.");
return (IAuthorityConnector)o;
}
catch (InvocationTargetException e)
@@ -206,7 +206,7 @@ public class AuthorityConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -214,37 +214,37 @@ public class AuthorityConnectorFactory
if (connMgr.isInstalled(className) == false)
return null;
- throw new ACFException("No authority connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No authority connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx().",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
@@ -259,7 +259,7 @@ public class AuthorityConnectorFactory
*/
public static IAuthorityConnector grab(IThreadContext threadContext,
String className, ConfigParams configInfo, int maxPoolSize)
- throws ACFException
+ throws ManifoldCFException
{
// System.out.println("In AuthorityConnectorManager.grab()");
@@ -290,7 +290,7 @@ public class AuthorityConnectorFactory
*@param connector is the connector to release.
*/
public static void release(IAuthorityConnector connector)
- throws ACFException
+ throws ManifoldCFException
{
if (connector == null)
return;
@@ -312,7 +312,7 @@ public class AuthorityConnectorFactory
* This method polls all inactive handles.
*/
public static void pollAllConnectors(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
// Go through the whole pool and notify everyone
synchronized (poolHash)
@@ -333,7 +333,7 @@ public class AuthorityConnectorFactory
*@param threadContext is the local thread context.
*/
public static void closeAllConnectors(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
// Go through the whole pool and clean it out
synchronized (poolHash)
@@ -425,7 +425,7 @@ public class AuthorityConnectorFactory
*@return the connector.
*/
public synchronized IAuthorityConnector getConnector(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
while (numFree == 0)
{
@@ -435,7 +435,7 @@ public class AuthorityConnectorFactory
}
catch (InterruptedException e)
{
- throw new ACFException("Interrupted",e,ACFException.INTERRUPTED);
+ throw new ManifoldCFException("Interrupted",e,ManifoldCFException.INTERRUPTED);
}
}
@@ -451,14 +451,14 @@ public class AuthorityConnectorFactory
try
{
- Class theClass = ACF.findClass(className);
+ Class theClass = ManifoldCF.findClass(className);
Class[] argumentClasses = new Class[0];
// Look for a constructor
Constructor c = theClass.getConstructor(argumentClasses);
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new ACFException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new ManifoldCFException("Class '"+className+"' does not implement IAuthorityConnector.");
// System.out.println("Authority connector instantiated");
rc = (IAuthorityConnector)o;
rc.connect(configParams);
@@ -470,7 +470,7 @@ public class AuthorityConnectorFactory
if (z instanceof Error)
throw (Error)z;
else
- throw (ACFException)z;
+ throw (ManifoldCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -478,37 +478,37 @@ public class AuthorityConnectorFactory
if (connMgr.isInstalled(className) == false)
return null;
- throw new ACFException("No authority connector class '"+className+"' was found.",
+ throw new ManifoldCFException("No authority connector class '"+className+"' was found.",
e);
}
catch (NoSuchMethodException e)
{
- throw new ACFException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new ManifoldCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new ACFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new ACFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new ACFException("Shouldn't happen!!!",e);
+ throw new ManifoldCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new ACFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new ACFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new ManifoldCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
}
@@ -528,7 +528,7 @@ public class AuthorityConnectorFactory
*@param connector is the connector.
*/
public synchronized void releaseConnector(IAuthorityConnector connector)
- throws ACFException
+ throws ManifoldCFException
{
if (connector == null)
return;
@@ -544,7 +544,7 @@ public class AuthorityConnectorFactory
/** Notify all free connectors.
*/
public synchronized void pollAll(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
int i = 0;
while (i < stack.size())
@@ -560,7 +560,7 @@ public class AuthorityConnectorFactory
/** Release all free connectors.
*/
public synchronized void releaseAll(IThreadContext threadContext)
- throws ACFException
+ throws ManifoldCFException
{
while (stack.size() > 0)
{