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 2011/12/19 08:35:00 UTC
svn commit: r1220632 [9/9] - in /incubator/lcf/branches/CONNECTORS-314: ./
connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/
connectors/cmis/connector/src/main/java/org/apache/manifoldcf/c...
Modified: incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewconnection.jsp Mon Dec 19 07:34:58 2011
@@ -1,3 +1,4 @@
+<%@ page import="org.apache.manifoldcf.core.i18n.*" %>
<%@ include file="adminHeaders.jsp" %>
<%
@@ -29,7 +30,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
<title>
- Apache ManifoldCF: View Repository Connection Status
+ <fmt:message key='viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus' />
</title>
<script type="text/javascript">
@@ -37,7 +38,7 @@
function Delete(connectionName)
{
- if (confirm("Delete connection '"+connectionName+"'?"))
+ if (confirm("<fmt:message key='viewconnection.DeleteConnection' /> '"+connectionName+"'?"))
{
document.viewconnection.op.value="Delete";
document.viewconnection.connname.value=connectionName;
@@ -56,7 +57,7 @@
<tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
<tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
<td class="window">
- <p class="windowtitle">View Repository Connection Status</p>
+ <p class="windowtitle"><fmt:message key='viewconnection.ViewRepositoryConnectionStatus' /></p>
<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
<input type="hidden" name="op" value="Continue"/>
<input type="hidden" name="type" value="connection"/>
@@ -85,7 +86,7 @@
connectorName = className + "(uninstalled)";
String authorityName = connection.getACLAuthority();
if (authorityName == null)
- authorityName = "None (global authority)";
+ authorityName = Messages.getString("viewconnection.NoneGlobalAuthority");
int maxCount = connection.getMaxConnections();
String[] throttles = connection.getThrottles();
ConfigParams parameters = connection.getConfigParams();
@@ -123,24 +124,24 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Name:</nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Description:</nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Name' /></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Description' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection type:</nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Max connections:</nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.ConnectionType' /></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.MaxConnections' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Authority:</nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Authority' /></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Throttling:</nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.Throttling' /></nobr></td>
<td class="boxcell" colspan="3">
<table class="formtable">
<tr class="formheaderrow">
@@ -178,7 +179,7 @@
if (j == 0)
{
%>
- <tr class="formrow"><td colspan="3" class="formmessage"><nobr>No throttles</nobr></td></tr>
+ <tr class="formrow"><td colspan="3" class="formmessage"><nobr><fmt:message key='viewconnection.NoThrottles' /></nobr></td></tr>
<%
}
%>
@@ -199,12 +200,12 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection status:</nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewconnection.ConnectionStatus' /></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
- <tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh">Refresh</a> <a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Edit this connection">Edit</a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this connection">Delete</a>
+ <tr><td class="message" colspan="4"><a href='<%="viewconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh"><fmt:message key='viewconnection.Refresh' /></a> <a href='<%="editconnection.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewconnection.EditThisConnection' />"><fmt:message key='viewconnection.Edit' /></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this connection"><fmt:message key='viewconnection.Delete' /></a>
</td></tr>
</table>
Modified: incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewjob.jsp Mon Dec 19 07:34:58 2011
@@ -29,7 +29,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
<title>
- Apache ManifoldCF: View Job
+ <fmt:message key='viewjob.ApacheManifoldCFViewJob' />
</title>
<script type="text/javascript">
@@ -56,7 +56,7 @@
<tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
<tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
<td class="window">
- <p class="windowtitle">View a Job</p>
+ <p class="windowtitle"><fmt:message key='viewjob.ViewAJob' /></p>
<form class="standardform" name="viewjob" action="execute.jsp" method="POST">
<input type="hidden" name="op" value="Continue"/>
@@ -135,23 +135,23 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Name:</nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewjob.Name' /></nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description"><nobr>Output connection:</nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.OutputConnection' /></nobr></td>
<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getOutputConnectionName())%></td>
- <td class="description"><nobr>Repository connection:</nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.RepositoryConnection' /></nobr></td>
<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getConnectionName())%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description"><nobr>Priority:</nobr></td><td class="value"><%=priority%></td>
- <td class="description"><nobr>Start method:</nobr></td><td class="value"><%=startMethod%></td>
+ <td class="description"><nobr><fmt:message key='viewjob.Priority' /></nobr></td><td class="value"><%=priority%></td>
+ <td class="description"><nobr><fmt:message key='viewjob.StartMethod' /></nobr></td><td class="value"><%=startMethod%></td>
</tr>
<%
if (model != -1 && model != IRepositoryConnector.MODEL_ADD_CHANGE_DELETE)
@@ -161,13 +161,13 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description"><nobr>Schedule type:</nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
- <td class="description"><nobr>Minimum recrawl interval:</nobr></td><td class="value"><nobr><%=intervalString%></nobr>
+ <td class="description"><nobr><fmt:message key='viewjob.ScheduleType' /></nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.MinimumRecrawlInterval' /></nobr></td><td class="value"><nobr><%=intervalString%></nobr>
</td>
</tr>
<tr>
- <td class="description"><nobr>Expiration interval:</nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
- <td class="description"><nobr>Reseed interval:</nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.ExpirationInterval' /></nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.ReseedInterval' /></nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
</tr>
<%
}
@@ -180,7 +180,7 @@
if (job.getScheduleRecordCount() == 0)
{
%>
- <tr><td class="message" colspan="4">No scheduled run times</td></tr>
+ <tr><td class="message" colspan="4"><fmt:message key='viewjob.NoScheduledRunTimes' /></td></tr>
<%
}
else
@@ -208,7 +208,7 @@
}
%>
<tr>
- <td class="description"><nobr>Scheduled time:</nobr></td>
+ <td class="description"><nobr><fmt:message key='viewjob.ScheduledTime' /></nobr></td>
<td class="value" colspan="3">
<%
if (srDayOfWeek == null)
@@ -490,7 +490,7 @@
</td>
</tr>
<tr>
- <td class="description">Maximum run time:</td><td class="value" colspan="3">
+ <td class="description"><fmt:message key='viewjob.MaximumRunTime' /></td><td class="value" colspan="3">
<%
if (srDuration == null)
out.println("No limit");
@@ -519,7 +519,7 @@
Long value = (Long)hopCountFilters.get(relationshipType);
%>
<tr>
- <td class="description" colspan="1"><nobr>Maximum hop count for link type '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewjob.MaximumHopCountForLinkType' /> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr></td>
<td class="value" colspan="3"><%=((value==null)?"Unlimited":value.toString())%></td>
</tr>
@@ -530,7 +530,7 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Hop count mode:</nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewjob.HopCountMode' /></nobr></td>
<td class="value" colspan="3"><nobr><%=(hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"Delete unreachable documents":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"No deletes, for now":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NEVERDELETE)?"No deletes, forever":""%></nobr></td>
</tr>
<%
@@ -572,6 +572,7 @@
if (connection != null)
{
IRepositoryConnector repositoryConnector = RepositoryConnectorFactory.grab(threadContext,connection.getClassName(),connection.getConfigParams(),
+
connection.getMaxConnections());
if (repositoryConnector != null)
{
@@ -591,8 +592,8 @@
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
- <tr><td class="message" colspan="4"><a href='<%="editjob.jsp?jobid="+jobID%>' alt="Edit this job">Edit</a>
- <a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="Delete this job">Delete</a> <a href='<%="editjob.jsp?origjobid="+jobID%>' alt="Copy this job">Copy</a></td>
+ <tr><td class="message" colspan="4"><a href='<%="editjob.jsp?jobid="+jobID%>' alt="<fmt:message key='viewjob.EditThisJob' />"><fmt:message key='viewjob.Edit' /></a>
+ <a href='<%="javascript:Delete(\""+jobID+"\")"%>' alt="<fmt:message key='viewjob.DeleteThisJob' />"><fmt:message key='viewjob.Delete' /></a> <a href='<%="editjob.jsp?origjobid="+jobID%>' alt="<fmt:message key='viewjob.CopyThisJob' />"><fmt:message key='viewjob.Copy' /></a></td>
</tr>
</table>
Modified: incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewoutput.jsp Mon Dec 19 07:34:58 2011
@@ -29,7 +29,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
<title>
- Apache ManifoldCF: View Output Connection Status
+ <fmt:message key='viewoutput.ApacheManifoldCFViewOutputConnectionStatus' />
</title>
<script type="text/javascript">
@@ -66,7 +66,7 @@
<tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
<tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
<td class="window">
- <p class="windowtitle">View Output Connection Status</p>
+ <p class="windowtitle"><fmt:message key='viewoutput.ViewOutputConnectionStatus' /></p>
<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
<input type="hidden" name="op" value="Continue"/>
<input type="hidden" name="type" value="output"/>
@@ -129,15 +129,15 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Name:</nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Description:</nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewoutput.Name' /></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewoutput.Description' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection type:</nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr>Max connections:</nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewoutput.ConnectionType' /></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewoutput.MaxConnections' /></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
@@ -153,15 +153,15 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr>Connection status:</nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+ <td class="description" colspan="1"><nobr><fmt:message key='viewoutput.ConnectionStatus' /></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
<td class="message" colspan="4">
- <nobr><a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Refresh">Refresh</a> <a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="Edit this output connection">Edit</a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Delete this output connection">Delete</a></nobr><br/>
- <nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="Re-ingest all documents associated with this output connection">Re-ingest all associated documents</a></nobr>
+ <nobr><a href='<%="viewoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewoutput.Refresh' />"><fmt:message key='viewoutput.Refresh' /></a> <a href='<%="editoutput.jsp?connname="+java.net.URLEncoder.encode(connectionName,"UTF-8")%>' alt="<fmt:message key='viewoutput.EditThisOutputConnection' />"><fmt:message key='viewoutput.Edit' /></a> <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<fmt:message key='viewoutput.DeleteThisOutputConnection' />"><fmt:message key='viewoutput.Delete' /></a></nobr><br/>
+ <nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<fmt:message key='viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection' />"><fmt:message key='viewoutput.ReIngestAllAssociatedDocuments' /></a></nobr>
</td>
</tr>
</table>
Modified: incubator/lcf/branches/CONNECTORS-314/framework/jetty-example/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/jetty-example/properties.xml?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/jetty-example/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/jetty-example/properties.xml Mon Dec 19 07:34:58 2011
@@ -18,8 +18,12 @@
<configuration>
<!-- Select Derby as the database implementation, and specify where the database will be stored -->
- <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
- <property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
+ <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceMySQL"/>
+ <property name="org.apache.manifoldcf.mysql.database.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="org.apache.manifoldcf.database.name" value="manifoldcf"/>
+ <property name="org.apache.manifoldcf.mysql.database.url" value="jdbc:mysql://localhost/"/>
+ <property name="org.apache.manifoldcf.dbsuperusername" value="user"/>
+ <property name="org.apache.manifoldcf.dbsuperuserpassword" value="password"/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
<property name="org.apache.manifoldcf.crawler.threads" value="50"/>
<!-- Point to a specific logging file -->
Modified: incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml Mon Dec 19 07:34:58 2011
@@ -18,8 +18,12 @@
<configuration>
<!-- Select Derby as the database implementation, and specify where the database will be stored -->
- <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
- <property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
+ <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceMySQL"/>
+ <property name="org.apache.manifoldcf.mysql.database.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="org.apache.manifoldcf.database.name" value="manifoldcf"/>
+ <property name="org.apache.manifoldcf.mysql.database.url" value="jdbc:mysql://localhost/"/>
+ <property name="org.apache.manifoldcf.dbsuperusername" value="user"/>
+ <property name="org.apache.manifoldcf.dbsuperuserpassword" value="password"/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
<property name="org.apache.manifoldcf.crawler.threads" value="50"/>
<!-- Point to a specific logging file -->
Added: incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.derby
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.derby?rev=1220632&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.derby (added)
+++ incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.derby Mon Dec 19 07:34:58 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+
+<configuration>
+ <!-- Select Derby as the database implementation, and specify where the database will be stored -->
+ <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceDerby"/>
+ <property name="org.apache.manifoldcf.derbydatabasepath" value="."/>
+ <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
+ <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
+ <!-- Point to a specific logging file -->
+ <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+ <!-- Specify the connectors to be loaded -->
+ <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="./connectors.xml"/>
+ <!-- Tell LCF where to find the connector jars -->
+ <!--libdir path="./connector-lib"/-->
+ <!-- WSDD references -->
+ <!-- Any additional properties go here -->
+</configuration>
Added: incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.mysql
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.mysql?rev=1220632&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.mysql (added)
+++ incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.mysql Mon Dec 19 07:34:58 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+
+<configuration>
+ <!-- Select Derby as the database implementation, and specify where the database will be stored -->
+ <property name="org.apache.manifoldcf.databaseimplementationclass" value="org.apache.manifoldcf.core.database.DBInterfaceMySQL"/>
+ <property name="org.apache.manifoldcf.mysql.database.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="org.apache.manifoldcf.database.name" value="manifoldcf"/>
+ <property name="org.apache.manifoldcf.mysql.database.url" value="jdbc:mysql://localhost/"/>
+ <property name="org.apache.manifoldcf.dbsuperusername" value="user"/>
+ <property name="org.apache.manifoldcf.dbsuperuserpassword" value="password"/>
+ <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
+ <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
+ <!-- Point to a specific logging file -->
+ <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+ <!-- Specify the connectors to be loaded -->
+ <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="./connectors.xml"/>
+ <!-- Tell LCF where to find the connector jars -->
+ <libdir path="./connector-lib"/>
+ <!-- WSDD references -->
+ <!-- Any additional properties go here -->
+</configuration>
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java Mon Dec 19 07:34:58 2011
@@ -86,6 +86,7 @@ public class AuthorityConnectorManager e
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -98,7 +99,7 @@ public class AuthorityConnectorManager e
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (descriptionIndex != null)
performAddIndex(null,descriptionIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java Mon Dec 19 07:34:58 2011
@@ -82,6 +82,7 @@ public class ConnectorManager extends or
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -94,7 +95,7 @@ public class ConnectorManager extends or
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (descriptionIndex != null)
performAddIndex(null,descriptionIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java Mon Dec 19 07:34:58 2011
@@ -122,6 +122,7 @@ public class Carrydown extends org.apach
IndexDescription newIndex = new IndexDescription(false,new String[]{newField});
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -138,7 +139,7 @@ public class Carrydown extends org.apach
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Create the indexes we are missing
if (jobChildDataIndex != null)
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java Mon Dec 19 07:34:58 2011
@@ -195,6 +195,7 @@ public class HopCount extends org.apache
IndexDescription jobDeathIndex = new IndexDescription(false,new String[]{jobIDField,markForDeathField,parentIDHashField,linkTypeField});
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -209,7 +210,7 @@ public class HopCount extends org.apache
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
if (jobLinktypeParentIndex != null)
performAddIndex(null,jobLinktypeParentIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java Mon Dec 19 07:34:58 2011
@@ -92,6 +92,7 @@ public class HopDeleteDeps extends org.a
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -106,7 +107,7 @@ public class HopDeleteDeps extends org.a
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (completeIndex != null)
performAddIndex(null,completeIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopFilterManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopFilterManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopFilterManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopFilterManager.java Mon Dec 19 07:34:58 2011
@@ -87,6 +87,7 @@ public class HopFilterManager extends or
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -99,7 +100,7 @@ public class HopFilterManager extends or
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (ownerIndex != null)
performAddIndex(null,ownerIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java Mon Dec 19 07:34:58 2011
@@ -112,6 +112,7 @@ public class IntrinsicLink extends org.a
IndexDescription newIndex = new IndexDescription(false,new String[]{newField});
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -128,7 +129,7 @@ public class IntrinsicLink extends org.a
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Create the indexes we are still missing
if (jobChildNewIndex != null)
performAddIndex(null,jobChildNewIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Mon Dec 19 07:34:58 2011
@@ -6532,7 +6532,8 @@ public class JobManager implements IJobM
ArrayList list = new ArrayList();
sb.append(JobQueue.jobIDField).append(",")
- .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+// .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+ .append("COUNT(").append(JobQueue.docHashField).append(") AS doccount")
.append(" FROM ").append(jobQueue.getTableName()).append(" t1");
if (whereClause != null)
@@ -6553,7 +6554,8 @@ public class JobManager implements IJobM
list.clear();
sb.append(JobQueue.jobIDField).append(",")
- .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+// .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+ .append("COUNT(").append(JobQueue.docHashField).append(") AS doccount")
.append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
.append(database.buildConjunctionClause(list,new ClauseDescription[]{
new MultiClause(JobQueue.statusField,new Object[]{
@@ -6581,7 +6583,8 @@ public class JobManager implements IJobM
list.clear();
sb.append(JobQueue.jobIDField).append(",")
- .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+// .append("CAST(COUNT(").append(JobQueue.docHashField).append(") AS BIGINT) AS doccount")
+ .append("COUNT(").append(JobQueue.docHashField).append(") AS doccount")
.append(" FROM ").append(jobQueue.getTableName()).append(" t1 WHERE ")
.append(database.buildConjunctionClause(list,new ClauseDescription[]{
new MultiClause(JobQueue.statusField,new Object[]{
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java Mon Dec 19 07:34:58 2011
@@ -212,6 +212,7 @@ public class JobQueue extends org.apache
// Get rid of unused indexes
Map indexes = getTableIndexes(null,null);
+if (indexes != null){
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -236,7 +237,7 @@ public class JobQueue extends org.apache
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Build missing indexes
if (jobStatusIndex != null)
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java Mon Dec 19 07:34:58 2011
@@ -319,6 +319,7 @@ public class Jobs extends org.apache.man
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -335,7 +336,7 @@ public class Jobs extends org.apache.man
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (statusIndex != null)
performAddIndex(null,statusIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java Mon Dec 19 07:34:58 2011
@@ -81,6 +81,7 @@ public class PrereqEventManager extends
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -93,7 +94,7 @@ public class PrereqEventManager extends
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (ownerIndex != null)
performAddIndex(null,ownerIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java Mon Dec 19 07:34:58 2011
@@ -120,6 +120,7 @@ public class ScheduleManager extends org
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -132,7 +133,7 @@ public class ScheduleManager extends org
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (ownerIndex != null)
performAddIndex(null,ownerIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java Mon Dec 19 07:34:58 2011
@@ -127,6 +127,7 @@ public class RepositoryConnectionManager
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -141,7 +142,7 @@ public class RepositoryConnectionManager
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (authorityIndex != null)
performAddIndex(null,authorityIndex);
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java Mon Dec 19 07:34:58 2011
@@ -115,6 +115,7 @@ public class RepositoryHistoryManager ex
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -133,7 +134,7 @@ public class RepositoryHistoryManager ex
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (ownerIndex != null)
performAddIndex(null,ownerIndex);
@@ -412,6 +413,7 @@ public class RepositoryHistoryManager ex
.append(" AND t1a.").append(endTimeField).append(">t0a.").append(endTimeField).append("-").append(intervalString);
addCriteria(sb,list,"t1a.",connectionName,filterCriteria,true);
sb.append(") t6a GROUP BY bucket,windowstart,windowend) t2");
+System.out.println("RepositoryHistoryManager #422 sb:" + sb.toString());
Map otherColumns = new HashMap();
otherColumns.put("idbucket","bucket");
Modified: incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java Mon Dec 19 07:34:58 2011
@@ -100,6 +100,7 @@ public class ThrottleSpecManager extends
// Get rid of indexes that shouldn't be there
Map indexes = getTableIndexes(null,null);
+if (indexes != null) {
Iterator iter = indexes.keySet().iterator();
while (iter.hasNext())
{
@@ -112,7 +113,7 @@ public class ThrottleSpecManager extends
// This index shouldn't be here; drop it
performRemoveIndex(indexName);
}
-
+}
// Add the ones we didn't find
if (ownerIndex != null)
performAddIndex(null,ownerIndex);