pnever 2004/12/06 03:23:26
Modified:
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer
Tag: TWS421_BRANCH ContentCheck.java
RepairHandler.java UniqueContentIdCheck.java
Log:
Fixing problems in the repair tool ...
Revision Changes Path
No revision
No revision
1.1.4.2 +4 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentCheck.java
Index: ContentCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentCheck.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- ContentCheck.java 3 Dec 2004 17:32:54 -0000 1.1.4.1
+++ ContentCheck.java 6 Dec 2004 11:23:25 -0000 1.1.4.2
@@ -146,7 +146,6 @@
versionContent = new
XContent(versionContent.getContent(),
versionDesc.getRevisionDescriptor(versionNumber));
versionContent.setContentId(versionContentId);
}
- System.out.println("@@@");
}
if (versionContent == null) {
1.1.4.2 +7 -6
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/RepairHandler.java
Index: RepairHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/RepairHandler.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- RepairHandler.java 3 Dec 2004 17:32:54 -0000 1.1.4.1
+++ RepairHandler.java 6 Dec 2004 11:23:26 -0000 1.1.4.2
@@ -511,10 +511,11 @@
checks.add(new MissingMetadataCheck(taminoClient, rootUri,
rootUuri, createNaming()));
checks.add(new ValidDescriptorsCheck(taminoClient));
- checks.add(new UniqueContentIdCheck(group, taminoClient));
+// checks.add(new UniqueContentIdCheck(group, taminoClient));
checks.add(new UniqueDescriptorsIdCheck(taminoClient));
checks.add(new ContentCheck(group, taminoClient));
- checks.add(new NamespaceConsistencyCheck(taminoClient));
+ checks.add(new UniqueContentIdCheck(group, taminoClient));
+// checks.add(new NamespaceConsistencyCheck(taminoClient));
// checks.add(new GarbageCheck(main, taminoClient));
break;
default:
1.1.4.2 +5 -4
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/UniqueContentIdCheck.java
Index: UniqueContentIdCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/UniqueContentIdCheck.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- UniqueContentIdCheck.java 3 Dec 2004 17:32:54 -0000 1.1.4.1
+++ UniqueContentIdCheck.java 6 Dec 2004 11:23:26 -0000 1.1.4.2
@@ -87,6 +87,7 @@
}
users.add(descId);
if (users.size() > 1) {
+ // try to read the content
logAndApplyPatch(new CopyContent(group.getMainStore(),
descId, contentId));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
