View Directory | Revision Log | View Changeset
/hippo/hippo-components/jcrdiff
Revision 37113 - Directory Listing - [select for diffs]
Modified Fri Nov 23 11:18:43 2012 UTC (7 years, 7 months ago) by fvlankvelt
Diff to previous 37112 , to selected 32254
CMS7-6704: prepare for next development iteration
Revision 37112 - Directory Listing - [select for diffs]
Modified Fri Nov 23 11:18:40 2012 UTC (7 years, 7 months ago) by fvlankvelt
Diff to previous 37111 , to selected 32254
CMS7-6704:  copy for tag jcrdiff-1.01.02
Revision 37111 - Directory Listing - [select for diffs]
Modified Fri Nov 23 11:18:37 2012 UTC (7 years, 7 months ago) by fvlankvelt
Diff to previous 37109 , to selected 32254
CMS7-6704: prepare release jcrdiff-1.01.02
Revision 37109 - Directory Listing - [select for diffs]
Modified Fri Nov 23 11:18:16 2012 UTC (7 years, 7 months ago) by fvlankvelt
Diff to previous 37022 , to selected 32254
CMS7-6704: bump to 7.8.0 dependencies
Revision 37022 - Directory Listing - [select for diffs]
Modified Tue Nov 20 16:12:50 2012 UTC (7 years, 7 months ago) by uhommes
Diff to previous 36819 , to selected 32254
CMS7-6607 only try to order children if they are orderable
Revision 36819 - Directory Listing - [select for diffs]
Modified Wed Nov 7 16:27:51 2012 UTC (7 years, 8 months ago) by uhommes
Diff to previous 36251 , to selected 32254
CMS7-6607 set multiple if property is multiple and single if single
Revision 36251 - Directory Listing - [select for diffs]
Modified Wed Sep 19 11:13:07 2012 UTC (7 years, 9 months ago) by mnour
Diff to previous 36059 , to selected 32254
CMS7-6404: As a Developer, I want to be able to read and edit my patches for the new updater console features in an easy format
Revision 36059 - Directory Listing - [select for diffs]
Modified Wed Sep 5 13:22:09 2012 UTC (7 years, 10 months ago) by mdenburger
Diff to previous 35953 , to selected 32254
CMS7-6456: bumped project pom to version 15-SNAPSHOT
Revision 35953 - Directory Listing - [select for diffs]
Modified Thu Aug 30 14:46:17 2012 UTC (7 years, 10 months ago) by mnour
Diff to previous 35952 , to selected 32254
CMS7-6404: As a Developer, I want to be able to read and edit my patches for the new updater console features in an easy format 
  - Applied the second review comment from Frank
Revision 35952 - Directory Listing - [select for diffs]
Modified Thu Aug 30 14:08:09 2012 UTC (7 years, 10 months ago) by mnour
Diff to previous 35943 , to selected 32254
CMS7-6404: As a Developer, I want to be able to read and edit my patches for the new updater console features in an easy format 
  - Applying the 1st comment from Frank
  - Also removed some warnings indicated by IntelliJ
Revision 35943 - Directory Listing - [select for diffs]
Modified Thu Aug 30 11:56:31 2012 UTC (7 years, 10 months ago) by uhommes
Diff to previous 35874 , to selected 32254
CMS7-6430 bump project pom to latest tagged version
Revision 35874 - Directory Listing - [select for diffs]
Modified Mon Aug 27 09:30:45 2012 UTC (7 years, 10 months ago) by mnour
Diff to previous 35867 , to selected 32254
CMS7-6404: As a Developer, I want to be able to read and edit my patches for the new updater console features in an easy format 
  - Fixed the path problem
Revision 35867 - Directory Listing - [select for diffs]
Modified Fri Aug 24 16:22:08 2012 UTC (7 years, 10 months ago) by mnour
Diff to previous 35778 , to selected 32254
CMS7-6404: As a Developer, I want to be able to read and edit my patches for the new updater console features in an easy format 
  - Fixed the updates problem
  - Added tests for that
  - 1 down one to go (the paths problem)
Revision 35778 - Directory Listing - [select for diffs]
Modified Mon Aug 20 10:28:22 2012 UTC (7 years, 10 months ago) by uhommes
Diff to previous 35713 , to selected 32254
CMS7-6380 remove redefinition of dependencies inherited from project pom
Revision 35713 - Directory Listing - [select for diffs]
Modified Mon Aug 13 14:02:55 2012 UTC (7 years, 11 months ago) by mdenburger
Diff to previous 35540 , to selected 32254
CMS7-6380: changed scope of easymock dependencies to 'test'

Also moved all dependencies to the dependencyManagement section of the root pom, and defined all versions as properties. Reused properties from the project pom where possible.
Revision 35540 - Directory Listing - [select for diffs]
Modified Thu Aug 2 14:12:00 2012 UTC (7 years, 11 months ago) by uhommes
Diff to previous 35476 , to selected 32254
CMS7-6339 make PatchFilter interface instead
Revision 35476 - Directory Listing - [select for diffs]
Modified Mon Jul 30 15:13:58 2012 UTC (7 years, 11 months ago) by uhommes
Diff to previous 35475 , to selected 32254
CMS7-6339 add ability to filter items from patch
Revision 35475 - Directory Listing - [select for diffs]
Modified Mon Jul 30 14:46:14 2012 UTC (7 years, 11 months ago) by uhommes
Diff to previous 35466 , to selected 32254
CMS7-6338 make jaxb happy
Revision 35466 - Directory Listing - [select for diffs]
Modified Mon Jul 30 12:34:10 2012 UTC (7 years, 11 months ago) by uhommes
Diff to previous 35463 , to selected 32254
CMS7-6338 add getters for source and target fields; return null instead of UOE
Revision 35463 - Directory Listing - [select for diffs]
Modified Mon Jul 30 12:12:06 2012 UTC (7 years, 11 months ago) by uhommes
Diff to previous 33952 , to selected 32254
CMS7-6338 add source and target path information to the patch
Revision 33952 - Directory Listing - [select for diffs]
Modified Wed Apr 4 12:52:03 2012 UTC (8 years, 3 months ago) by fvlankvelt
Diff to previous 33951 , to selected 32254
CMS7-6043: prepare for next development iteration
Revision 33951 - Directory Listing - [select for diffs]
Modified Wed Apr 4 12:52:02 2012 UTC (8 years, 3 months ago) by fvlankvelt
Diff to previous 33950 , to selected 32254
CMS7-6043:  copy for tag jcrdiff-1.01.01
Revision 33950 - Directory Listing - [select for diffs]
Modified Wed Apr 4 12:52:01 2012 UTC (8 years, 3 months ago) by fvlankvelt
Diff to previous 33658 , to selected 32254
CMS7-6043: prepare release jcrdiff-1.01.01
Revision 33658 - Directory Listing - [select for diffs]
Modified Fri Mar 23 08:25:43 2012 UTC (8 years, 3 months ago) by fvlankvelt
Diff to previous 32729 , to selected 32254
CMS7-5997: allow root node to be removed

Revision 32729 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:06:48 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32728 , to selected 32254
CMS7-5825: provide distribution management

Revision 32728 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:05:52 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32727 , to selected 32254
CMS7-5825: provide distribution management section for deploying

Revision 32727 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:03:27 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32726 , to selected 32254
CMS7-5825: prepare for next development iteration
Revision 32726 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:03:26 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32725 , to selected 32254
CMS7-5825:  copy for tag jcrdiff-1.01.00
Revision 32725 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:03:24 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32724 , to selected 32254
CMS7-5825: prepare release jcrdiff-1.01.00
Revision 32724 - Directory Listing - [select for diffs]
Modified Wed Jan 25 12:02:40 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32723 , to selected 32254
CMS7-5825: use jcrdiff for the parent project name, provide names for modules

Revision 32723 - Directory Listing - [select for diffs]
Modified Wed Jan 25 11:56:53 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32722 , to selected 32254
CMS7-5825: provide scm information

Revision 32722 - Directory Listing - [select for diffs]
Modified Wed Jan 25 11:53:44 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32650 , to selected 32254
CMS7-5825: remove obsolete distribution management section

Revision 32650 - Directory Listing - [select for diffs]
Modified Wed Jan 25 08:55:09 2012 UTC (8 years, 5 months ago) by fvlankvelt
Diff to previous 32340 , to selected 32254
CMS7-5822: more detailed verification of delete/insert handling by patcher

The tree decorator is more generic and allow easy subclassing to trace
operations made on the tree.

Revision 32340 - Directory Listing - [select for diffs]
Modified Wed Jan 4 16:51:36 2012 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32339 , to selected 32254
CMS7-5688: improve output format

Revision 32339 - Directory Listing - [select for diffs]
Modified Wed Jan 4 16:41:16 2012 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32333 , to selected 32254
CMS7-5688: return root node when path is empty


Revision 32333 - Directory Listing - [select for diffs]
Modified Wed Jan 4 15:17:41 2012 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32282 , to selected 32254
CMS7-5688: turn JcrDiffException into a checked exception

The new PatchLog interface allows custom logging during application of patches.


Revision 32282 - Directory Listing - [select for diffs]
Modified Tue Jan 3 10:18:39 2012 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32254
CMS7-5688: log complete path, not just last tree item name
Revision 32254 - Directory Listing - [selected]
Modified Fri Dec 30 10:55:49 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32242
CMS7-5688: simplify move sort algorithm

fix unit tests using in-mem tree.

Revision 32242 - Directory Listing - [select for diffs]
Modified Thu Dec 29 16:27:32 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32241 , to selected 32254
CMS7-5688: support child node ordering

After applying the patch, nodes will be ordered

Revision 32241 - Directory Listing - [select for diffs]
Modified Thu Dec 29 15:14:44 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 32208 , to selected 32254
CMS7-5688: use attic when deleting items

When a deleted item is replaced by an inserted item at the same location, move
the deleted item to the attic to prevent same-name-sibling problems.

When an item is no longer found when the patch is processed, only throw a
JcrDiffException, as that's expected when a patch cannot be applied.


Revision 32208 - Directory Listing - [select for diffs]
Modified Tue Dec 27 14:15:42 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 31945 , to selected 32254
CMS7-5688: order inserts & moves

The algorithm to sort the moves is not particularly efficient, but it should
make sure that an insert (that is serialized with the target path) is applied
at the correct time & location.  (i.e. if the insert replaces an item that's
been moved by a move action, it should be applied after the move)

In the matcher top-down phase, only candidates that share an ancestor with the
item are considered.

Revision 31945 - Directory Listing - [select for diffs]
Modified Sat Dec 17 14:13:09 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 31926 , to selected 32254
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
 

Revision 31926 - Directory Listing - [select for diffs]
Modified Fri Dec 16 15:09:28 2011 UTC (8 years, 6 months ago) by fvlankvelt
Diff to previous 31861 , to selected 32254
CMS7-5688: support updates

Much improved patch generation & application.  Is able to diff & patch matched
trees with random matching (tested up to 1700 matches, using random trees of
3400 nodes).  The patcher now maintains a map of target paths to target items.

Same-name-siblings and node ordering are not yet supported, property updates are.

Inserts now only serialize the inserted content.  It's offspring can be moved
in from existing locations.

Revision 31861 - Directory Listing - [select for diffs]
Modified Wed Dec 14 08:07:38 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31825 , to selected 32254
CMS7-5688: support property move
Revision 31825 - Directory Listing - [select for diffs]
Modified Mon Dec 12 08:27:36 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31820 , to selected 32254
CMS7-5688: miscellaneous

- better support for same-name-siblings and autocreated child nodes
- deserialize with no child nodes or properties (Node) or empty list of values (Property)
- specific runtime exception to allow clients to handle those separately

Revision 31820 - Directory Listing - [select for diffs]
Modified Sun Dec 11 07:33:40 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31768 , to selected 32254
CMS7-5688: type info on nodes and properties

- store type (primary + mixins) on nodes
  a type is not required, in which case the jcr implementation will fall back to nt:unstructured
  the in-memory implementation does not do any validation, but can store this type information
- type info on properties is stored as a string value


Revision 31768 - Directory Listing - [select for diffs]
Modified Fri Dec 9 09:30:45 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31764 , to selected 32254
CMS7-5688: use multiple flag correctly when setting property values; more lenient matching when applying patch

Revision 31764 - Directory Listing - [select for diffs]
Modified Thu Dec 8 21:13:43 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31763 , to selected 32254
CMS7-5688: support single and multi-valued properties

Revision 31763 - Directory Listing - [select for diffs]
Modified Thu Dec 8 20:31:44 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31762 , to selected 32254
HGGE-17: use placeholder (in-mem treenode) while primary type is unknown

Revision 31762 - Directory Listing - [select for diffs]
Modified Thu Dec 8 20:27:18 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31730 , to selected 32254
HGGE-17: children element has been renamed to child

Revision 31730 - Directory Listing - [select for diffs]
Modified Thu Dec 8 10:38:30 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31679 , to selected 32254
CMS7-5688: use child id to identify child in move operation
Revision 31679 - Directory Listing - [select for diffs]
Modified Tue Dec 6 14:54:26 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31677 , to selected 32254
CMS7-5688: add copyright headers

Revision 31677 - Directory Listing - [select for diffs]
Modified Tue Dec 6 14:40:05 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to previous 31676 , to selected 32254
CMS7-5688: import jcr diff utilities

Revision 31676 - Directory Listing - [select for diffs]
Added Tue Dec 6 14:38:00 2011 UTC (8 years, 7 months ago) by fvlankvelt
Diff to selected 32254
CMS7-5688: create placeholder for jcr diff tool

(Current path doesn't exist after revision 38099)

Convenience Links