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 2014/10/15 17:05:45 UTC
svn commit: r1632075 - in /manifoldcf/trunk: CHANGES.txt
framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Author: kwright
Date: Wed Oct 15 15:05:44 2014
New Revision: 1632075
URL: http://svn.apache.org/r1632075
Log:
Fix for CONNECTORS-1072.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1632075&r1=1632074&r2=1632075&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 15 15:05:44 2014
@@ -3,6 +3,10 @@ $Id$
======================= 2.0-dev =====================
+CONNECTORS-1072: Remove 1.x-related import fallback code, since
+2.0 is not backwards compatible with 1.x.
+(Karl Wright)
+
CONNECTORS-1073: Remove 1.x-related upgrade code, since schema
for 2.0 is not backwards compatible with 1.x anyhow.
(Karl Wright)
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java?rev=1632075&r1=1632074&r2=1632075&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java Wed Oct 15 15:05:44 2014
@@ -185,7 +185,7 @@ public class AuthorityConnectionManager
{
IAuthorityGroupManager authMgr = AuthorityGroupManagerFactory.make(threadContext);
int version = ManifoldCF.readDword(is);
- if (version < 1 || version > 2)
+ if (version < 3 || version > 3)
throw new java.io.IOException("Unknown authority configuration version: "+Integer.toString(version));
int count = ManifoldCF.readDword(is);
int i = 0;
@@ -199,35 +199,9 @@ public class AuthorityConnectionManager
conn.setClassName(ManifoldCF.readString(is));
conn.getConfigParams().fromXML(ManifoldCF.readString(is));
conn.setMaxConnections(ManifoldCF.readDword(is));
- if (version >= 2)
- {
- conn.setPrerequisiteMapping(ManifoldCF.readString(is));
- if (version >= 3)
- {
- conn.setAuthDomain(ManifoldCF.readString(is));
- conn.setAuthGroup(ManifoldCF.readString(is));
- }
- }
- // For importing older than MCF 1.5 import files...
- if (conn.getAuthGroup() == null || conn.getAuthGroup().length() == 0)
- {
- // Attempt to create a matching auth group. This will fail if the group
- // already exists
- IAuthorityGroup grp = authMgr.create();
- grp.setName(name);
- grp.setDescription(description);
- try
- {
- authMgr.save(grp);
- }
- catch (ManifoldCFException e)
- {
- if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
- throw e;
- // Fall through; the row exists already
- }
- conn.setAuthGroup(name);
- }
+ conn.setPrerequisiteMapping(ManifoldCF.readString(is));
+ conn.setAuthDomain(ManifoldCF.readString(is));
+ conn.setAuthGroup(ManifoldCF.readString(is));
// Attempt to save this connection
save(conn);
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1632075&r1=1632074&r2=1632075&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Wed Oct 15 15:05:44 2014
@@ -121,7 +121,7 @@ public class JobManager implements IJobM
throws java.io.IOException, ManifoldCFException
{
// Write a version indicator
- ManifoldCF.writeDword(os,4);
+ ManifoldCF.writeDword(os,5);
// Get the job list
IJobDescription[] list = getAllJobs();
// Write the number of authorities
@@ -169,9 +169,6 @@ public class JobManager implements IJobM
ManifoldCF.writeLong(os,hopcount);
}
- // Write forced metadata information
- ManifoldCF.writeDword(os,0);
-
// Write pipeline information
ManifoldCF.writeDword(os,job.countPipelineStages());
for (int j = 0; j < job.countPipelineStages(); j++)
@@ -208,19 +205,14 @@ public class JobManager implements IJobM
throws java.io.IOException, ManifoldCFException
{
int version = ManifoldCF.readDword(is);
- if (version != 2 && version != 3 && version != 4)
+ if (version != 5)
throw new java.io.IOException("Unknown job configuration version: "+Integer.toString(version));
int count = ManifoldCF.readDword(is);
for (int i = 0; i < count; i++)
{
IJobDescription job = createJob();
- String outputConnectionName = null;
- String outputSpecification = null;
-
job.setConnectionName(ManifoldCF.readString(is));
- if (version < 4)
- outputConnectionName = ManifoldCF.readString(is);
job.setDescription(ManifoldCF.readString(is));
job.setType(ManifoldCF.readDword(is));
job.setStartMethod(ManifoldCF.readDword(is));
@@ -230,8 +222,6 @@ public class JobManager implements IJobM
job.setPriority(ManifoldCF.readDword(is));
job.setHopcountMode(ManifoldCF.readDword(is));
job.getSpecification().fromXML(ManifoldCF.readString(is));
- if (version < 4)
- outputSpecification = ManifoldCF.readString(is);
// Read schedule
int recCount = ManifoldCF.readDword(is);
@@ -245,11 +235,7 @@ public class JobManager implements IJobM
EnumeratedValues minutesOfHour = readEnumeratedValues(is);
String timezone = ManifoldCF.readString(is);
Long duration = ManifoldCF.readLong(is);
- boolean requestMinimum;
- if (version >= 3)
- requestMinimum = (ManifoldCF.readByte(is) != 0);
- else
- requestMinimum = false;
+ boolean requestMinimum = (ManifoldCF.readByte(is) != 0);
ScheduleRecord sr = new ScheduleRecord(dayOfWeek, monthOfYear, dayOfMonth, year,
hourOfDay, minutesOfHour, timezone, duration, requestMinimum);
@@ -265,38 +251,16 @@ public class JobManager implements IJobM
job.addHopCountFilter(linkType,hopcount);
}
- if (version >= 4)
- {
- // Read forced metadata information
- int paramCount = ManifoldCF.readDword(is);
- for (int j = 0; j < paramCount; j++)
- {
- String key = ManifoldCF.readString(is);
- int valueCount = ManifoldCF.readDword(is);
- for (int k = 0; k < valueCount; k++)
- {
- String value = ManifoldCF.readString(is);
- // Discard it; we don't support this anymore
- }
- }
-
- // Read pipeline information
- int pipelineCount = ManifoldCF.readDword(is);
- for (int j = 0; j < pipelineCount; j++)
- {
- int prerequisite = ManifoldCF.readSdword(is);
- int isOutput = ManifoldCF.readByte(is);
- String connectionName = ManifoldCF.readString(is);
- String description = ManifoldCF.readString(is);
- String specification = ManifoldCF.readString(is);
- job.addPipelineStage(prerequisite,isOutput == 0x1,connectionName,description).fromXML(specification);
- }
- }
-
- if (outputConnectionName != null)
- {
- // Add a single pipeline stage for the output connection
- job.addPipelineStage(-1,true,outputConnectionName,"").fromXML(outputSpecification);
+ // Read pipeline information
+ int pipelineCount = ManifoldCF.readDword(is);
+ for (int j = 0; j < pipelineCount; j++)
+ {
+ int prerequisite = ManifoldCF.readSdword(is);
+ int isOutput = ManifoldCF.readByte(is);
+ String connectionName = ManifoldCF.readString(is);
+ String description = ManifoldCF.readString(is);
+ String specification = ManifoldCF.readString(is);
+ job.addPipelineStage(prerequisite,isOutput == 0x1,connectionName,description).fromXML(specification);
}
// Attempt to save this job