You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2017/03/10 15:03:09 UTC
svn commit: r1786362 - in /jackrabbit/branches/2.8: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java
Author: reschke
Date: Fri Mar 10 15:03:09 2017
New Revision: 1786362
URL: http://svn.apache.org/viewvc?rev=1786362&view=rev
Log:
JCR-4118: RepositoryChecker creates invalid node names (ported to 2.8)
create valid names / do sanity check in test case
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 10 15:03:09 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773591,1773745,1774443,1775657,1779166,1779460,1780208
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772444,1772457,1772530,1772544,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java?rev=1786362&r1=1786361&r2=1786362&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java Fri Mar 10 15:03:09 2017
@@ -28,6 +28,7 @@ import static org.apache.jackrabbit.spi.
import java.util.Calendar;
import java.util.HashSet;
import java.util.Set;
+import java.util.TimeZone;
import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
@@ -47,7 +48,6 @@ import org.apache.jackrabbit.core.versio
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.NameFactory;
import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
-import org.apache.jackrabbit.util.ISO8601;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -304,9 +304,10 @@ class RepositoryChecker {
modifiedParent = new NodeState(vhrParentState, NodeState.STATUS_EXISTING_MODIFIED, true);
}
- Calendar now = Calendar.getInstance();
- String appendme = " (disconnected by RepositoryChecker on "
- + ISO8601.format(now) + ")";
+ Calendar now = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ String appendme = String.format(" (disconnected by RepositoryChecker on %04d%02d%02dT%02d%02d%02dZ)",
+ now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1, now.get(Calendar.DAY_OF_MONTH),
+ now.get(Calendar.HOUR_OF_DAY), now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
modifiedParent.renameChildNodeEntry(vhid,
nf.create(vhrname.getNamespaceURI(), vhrname.getLocalName() + appendme));
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java?rev=1786362&r1=1786361&r2=1786362&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/persistence/AutoFixCorruptNode.java Fri Mar 10 15:03:09 2017
@@ -30,14 +30,15 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-
-import junit.framework.TestCase;
+import javax.jcr.nodetype.ConstraintViolationException;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.TestHelper;
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.jackrabbit.core.persistence.check.ConsistencyReport;
+import junit.framework.TestCase;
+
/**
* Tests that a corrupt node is automatically fixed.
*/
@@ -123,7 +124,6 @@ public class AutoFixCorruptNode extends
// now retry with lost+found functionality
ConsistencyReport report2 = TestHelper.checkConsistency(s, true, lnfid);
assertTrue("Report should have reported broken nodes", !report2.getItems().isEmpty());
-
s.logout();
s = openSession(rep, false);
@@ -265,9 +265,11 @@ public class AutoFixCorruptNode extends
Node test = root.addNode("test", "nt:file");
test.addNode("jcr:content", "nt:unstructured");
test.addMixin("mix:versionable");
-
s.save();
+ s.getWorkspace().getVersionManager().checkout(test.getPath());
+ s.getWorkspace().getVersionManager().checkin(test.getPath());
+
Node vhr = s.getWorkspace().getVersionManager()
.getVersionHistory(test.getPath());
@@ -354,6 +356,7 @@ public class AutoFixCorruptNode extends
s.getWorkspace().getVersionManager().checkout(test.getPath());
s.getWorkspace().getVersionManager().checkin(test.getPath());
+ validateDisconnectedVHR(oldVHR);
} finally {
s.logout();
System.setProperty("org.apache.jackrabbit.version.recovery",
@@ -435,6 +438,8 @@ public class AutoFixCorruptNode extends
// try a checkout / checkin
s.getWorkspace().getVersionManager().checkout(test.getPath());
s.getWorkspace().getVersionManager().checkin(test.getPath());
+
+ validateDisconnectedVHR(oldVHR);
} finally {
s.logout();
System.setProperty("org.apache.jackrabbit.version.recovery",
@@ -575,4 +580,27 @@ public class AutoFixCorruptNode extends
}
return rep.login(cred);
}
+
+ // JCR-4118: check that the old VHR can be retrieved
+ private void validateDisconnectedVHR(Node oldVHR) throws RepositoryException {
+ Session s = oldVHR.getSession();
+ Node old = s.getNode(oldVHR.getPath());
+ assertNotNull("disconnected VHR should be accessible", old);
+
+ assertEquals("nt:versionHistory", old.getPrimaryNodeType().getName());
+ NodeIterator ni = old.getNodes();
+ while (ni.hasNext()) {
+ Node n = ni.nextNode();
+ String type = n.getPrimaryNodeType().getName();
+ assertTrue("node type of VHR child nodes should be nt:version or nt:versionLabels",
+ "nt:version".equals(type) || "nt:versionLabels".equals(type));
+ }
+
+ try {
+ old.remove();
+ s.save();
+ fail("removal of node using remove() should throw because it's in the versioning workspace");
+ } catch (ConstraintViolationException expected) {
+ }
+ }
}