| View Changeset
/hippo
Jump to revision: Previous Next
Author: fvlankvelt
Date: Sat Dec 17 14:13:09 2011 UTC (8 years, 9 months ago)
Log Message:
CMS7-5688: match properties more accurately

- ignore hippo:paths
  we don't depend on uuid's, and they will be updated anyway.  They only mess
  up the hash code calculation.
- set subtree hash for properties too
  since those are used in the top-down; they should be there
- ignore the child position when comparing
- when finding the best match, use all ancestors to determine whether a match is good
 

Changed paths

Path Details
Directoryhippo-components/jcrdiff/trunk/client/src/main/java/org/onehippo/cms7/jcrdiff/match/Candidates.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/client/src/main/java/org/onehippo/cms7/jcrdiff/match/Matcher.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/client/src/main/java/org/onehippo/cms7/jcrdiff/match/PatchFactory.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/client/src/main/java/org/onehippo/cms7/jcrdiff/patch/Patcher.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/client/src/test/java/org/onehippo/cms7/jcrdiff/match/CandidatesTest.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/client/src/test/java/org/onehippo/cms7/jcrdiff/patch/PatcherTest.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/main/java/org/onehippo/cms7/jcrdiff/content/Property.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/main/java/org/onehippo/cms7/jcrdiff/content/Value.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/main/java/org/onehippo/cms7/jcrdiff/content/jcr/JcrTreeNode.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/main/java/org/onehippo/cms7/jcrdiff/match/ItemInfo.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/main/java/org/onehippo/cms7/jcrdiff/match/MatcherItemInfo.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/test/java/org/onehippo/cms7/jcrdiff/match/MatcherNodeInfoTest.java modified , text changed
Directoryhippo-components/jcrdiff/trunk/core/src/test/resources/log4j.dtd added
Directoryhippo-components/jcrdiff/trunk/core/src/test/resources/log4j.xml added