svn commit: r1697690 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

Author: mduerig Date: Tue Aug 25 14:55:59 2015 New Revision: 1697690 URL: http://svn.apache.org/r1697690 Log: OAK-3239: Port RepositoryUpgrade features to the RepositorySidegrade Missing license header Modified:

svn commit: r1697686 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java

Author: mduerig Date: Tue Aug 25 14:40:07 2015 New Revision: 1697686 URL: http://svn.apache.org/r1697686 Log: OAK-3293: SegmentOverflowExceptionIT runs forever unless it fails Allow timeout via -Dtimeout. Defaults to 1h Modified:

svn commit: r1697677 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java test/java/org/apache/jackrabbit/oak/plugins/document/Cluster

Author: stefanegli Date: Tue Aug 25 13:58:35 2015 New Revision: 1697677 URL: http://svn.apache.org/r1697677 Log: OAK-3289 : store longs not integers as RDBMK otherwise auto-returns longs anyway Modified:

svn commit: r1697676 - in /jackrabbit/oak/trunk/oak-core: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java

Author: stefanegli Date: Tue Aug 25 13:54:32 2015 New Revision: 1697676 URL: http://svn.apache.org/r1697676 Log: OAK-3292 : temporarily disabling redirectTestOutputToFile to easy debugging of failing DocumentDiscoveryLiteServiceTest Modified: jackrabbit/oak/trunk/oak-core/pom.xml

svn commit: r1697589 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java

Author: mreutegg Date: Tue Aug 25 07:41:15 2015 New Revision: 1697589 URL: http://svn.apache.org/r1697589 Log: OAK-3282: DataStoreBlobStore cache ignores key for memory calculation Modified:

svn commit: r1697592 - in /jackrabbit/oak/branches/1.0: ./ oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/pack

Author: mreutegg Date: Tue Aug 25 07:53:13 2015 New Revision: 1697592 URL: http://svn.apache.org/r1697592 Log: OAK-3279: Create StringUtils.estimateMemoryUsage(String) Merge revision 1697582 from trunk Modified: jackrabbit/oak/branches/1.0/ (props changed)

svn commit: r1697591 - in /jackrabbit/oak/branches/1.2: ./ oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/pack

Author: mreutegg Date: Tue Aug 25 07:46:43 2015 New Revision: 1697591 URL: http://svn.apache.org/r1697591 Log: OAK-3279: Create StringUtils.estimateMemoryUsage(String) Merge revision 1697582 from trunk Modified: jackrabbit/oak/branches/1.2/ (props changed)

svn commit: r1697596 - in /jackrabbit/oak/branches/1.2: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java

Author: mreutegg Date: Tue Aug 25 08:05:38 2015 New Revision: 1697596 URL: http://svn.apache.org/r1697596 Log: OAK-3282: DataStoreBlobStore cache ignores key for memory calculation Merge revision 1697589 from trunk Modified: jackrabbit/oak/branches/1.2/ (props changed)

svn commit: r1697582 - in /jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons: StringUtils.java package-info.java

Author: mreutegg Date: Tue Aug 25 07:20:06 2015 New Revision: 1697582 URL: http://svn.apache.org/r1697582 Log: OAK-3279: Create StringUtils.estimateMemoryUsage(String) Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java

svn commit: r1697583 - /jackrabbit/oak/trunk/oak-commons/

Author: mreutegg Date: Tue Aug 25 07:24:31 2015 New Revision: 1697583 URL: http://svn.apache.org/r1697583 Log: Ignore IntelliJ project and workspace files Modified: jackrabbit/oak/trunk/oak-commons/ (props changed) Propchange: jackrabbit/oak/trunk/oak-commons/

svn commit: r1697587 - /jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java

Author: mduerig Date: Tue Aug 25 07:28:12 2015 New Revision: 1697587 URL: http://svn.apache.org/r1697587 Log: OAK-3281: Test failures on trunk: SolrIndexQueryTestIT.sql2 Disable test until fixed Modified:

svn commit: r1697586 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java

Author: stefanegli Date: Tue Aug 25 07:27:57 2015 New Revision: 1697586 URL: http://svn.apache.org/r1697586 Log: OAK-2844 : increasing fiesta timeout from 2 to 6ms to see if this was the reason it failed on travis Modified:

svn commit: r1697585 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: DocumentNodeState.java util/Utils.java

Author: mreutegg Date: Tue Aug 25 07:27:33 2015 New Revision: 1697585 URL: http://svn.apache.org/r1697585 Log: OAK-3280: Remove Utils.estimateMemoryUsage(String) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java

svn commit: r1697598 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java

Author: mreutegg Date: Tue Aug 25 08:11:05 2015 New Revision: 1697598 URL: http://svn.apache.org/r1697598 Log: OAK-3282: DataStoreBlobStore cache ignores key for memory calculation Merge revision 1697589 from trunk Modified: jackrabbit/oak/branches/1.0/ (props changed)

svn commit: r1697567 - in /jackrabbit/oak/branches/1.2: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/

Author: mreutegg Date: Tue Aug 25 06:26:33 2015 New Revision: 1697567 URL: http://svn.apache.org/r1697567 Log: OAK-3259: Optimize NodeDocument.getNewestRevision() Merged revisions 1697373,1697410 from trunk Modified: jackrabbit/oak/branches/1.2/ (props changed)

svn commit: r1697579 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document: VersionGarbageCollectorIT.java VersionGarbageCollectorTest.java

Author: mreutegg Date: Tue Aug 25 07:02:10 2015 New Revision: 1697579 URL: http://svn.apache.org/r1697579 Log: OAK-3277: Turn VersionGarbageCollectorTest into an integration test Added:

svn commit: r1697631 - in /jackrabbit/oak/trunk/oak-solr-core: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java

Author: mduerig Date: Tue Aug 25 09:41:19 2015 New Revision: 1697631 URL: http://svn.apache.org/r1697631 Log: OAK-3281: Test failures on trunk: SolrIndexQueryTestIT.sql2 Disable test until fixed Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml

svn commit: r1697623 - in /jackrabbit/oak/branches/1.2: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Author: mreutegg Date: Tue Aug 25 09:19:23 2015 New Revision: 1697623 URL: http://svn.apache.org/r1697623 Log: OAK-3283: Background read does not close StringSort Merge revision 1697616 from trunk Modified: jackrabbit/oak/branches/1.2/ (props changed)

svn commit: r1697616 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Author: mreutegg Date: Tue Aug 25 09:09:14 2015 New Revision: 1697616 URL: http://svn.apache.org/r1697616 Log: OAK-3283: Background read does not close StringSort Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

svn commit: r1697630 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Author: mreutegg Date: Tue Aug 25 09:33:31 2015 New Revision: 1697630 URL: http://svn.apache.org/r1697630 Log: OAK-3283: Background read does not close StringSort Merge revision 1697616 from trunk Modified: jackrabbit/oak/branches/1.0/ (props changed)

svn commit: r1697658 - in /jackrabbit/oak/trunk/oak-solr-core: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java

Author: mduerig Date: Tue Aug 25 12:08:44 2015 New Revision: 1697658 URL: http://svn.apache.org/r1697658 Log: OAK-3281: Test failures on trunk: SolrIndexQueryTestIT.sql2 Disable the right test Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml

svn commit: r1697655 - in /jackrabbit/oak/trunk/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/version/ test/java/org/apache/jackrabbit/oak/u

Author: mreutegg Date: Tue Aug 25 11:53:08 2015 New Revision: 1697655 URL: http://svn.apache.org/r1697655 Log: OAK-3239: Port RepositoryUpgrade features to the RepositorySidegrade Apply patch provided by Tomek Rękawek Modified:

svn commit: r1697656 - in /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade: CopyVersionHistorySidegradeTest.java IncludeExcludeSidegradeTest.java RepeatedRepositorySid

Author: mreutegg Date: Tue Aug 25 11:54:11 2015 New Revision: 1697656 URL: http://svn.apache.org/r1697656 Log: OAK-3239: Port RepositoryUpgrade features to the RepositorySidegrade Apply patch provided by Tomek Rękawek Added:

svn commit: r1697657 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java

Author: mreutegg Date: Tue Aug 25 12:06:46 2015 New Revision: 1697657 URL: http://svn.apache.org/r1697657 Log: OAK-3163: Improve binary comparison during repeated upgrades Applied patch provided by Julian Sedding. Modified:

svn commit: r1697580 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/

Author: mreutegg Date: Tue Aug 25 07:05:44 2015 New Revision: 1697580 URL: http://svn.apache.org/r1697580 Log: OAK-3259: Optimize NodeDocument.getNewestRevision() Merged revisions 1697373,1697410 from trunk Modified: jackrabbit/oak/branches/1.0/ (props changed)

svn commit: r1697669 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java test/java/org/apache/jackrabbit/oak/plugins/document/DocumentN

Author: mreutegg Date: Tue Aug 25 13:11:53 2015 New Revision: 1697669 URL: http://svn.apache.org/r1697669 Log: OAK-3247: DocumentNodeStore.retrieve() should not throw IllegalArgumentException Modified:

svn commit: r1697660 - in /jackrabbit/oak/trunk/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.j

Author: mreutegg Date: Tue Aug 25 12:17:50 2015 New Revision: 1697660 URL: http://svn.apache.org/r1697660 Log: OAK-3249: Some version copy settings conflicts with the earlyShutdown Applied patch provided by Tomek Rękawek. Modified:

svn commit: r1697671 - /jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogLevelModifier.java

Author: stefanegli Date: Tue Aug 25 13:32:17 2015 New Revision: 1697671 URL: http://svn.apache.org/r1697671 Log: OAK-3291 : add newConsoleAppender method - this allows to temporarily add a console for individual tests - this can be used together with LogDumper to have log output written to eg

svn commit: r1697672 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java

Author: reschke Date: Tue Aug 25 13:32:42 2015 New Revision: 1697672 URL: http://svn.apache.org/r1697672 Log: OAK-3261: consider existing locks when creating new ones Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml