svoortman | 18 Jun 2013 16:20

[39640] hippo-cms7/cms: CMS7-6963: Changed "Overeving" to "Ge?\195?\171rfd"

Revision: 39640
Author:   svoortman
Date:     2013-06-18 16:20:21 +0200 (Tue, 18 Jun 2013)
Log Message:
-----------
CMS7-6963: Changed "Overeving" to "Ge?\195?\171rfd"

Modified Paths:
--------------
    hippo-cms7/cms/trunk/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin_nl.properties

Modified: hippo-cms7/cms/trunk/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin_nl.properties
===================================================================
---
hippo-cms7/cms/trunk/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin_nl.properties	2013-06-18
12:16:46 UTC (rev 39639)
+++
hippo-cms7/cms/trunk/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/TemplateListPlugin_nl.properties	2013-06-18
14:20:21 UTC (rev 39640)
 <at>  <at>  -2,4 +2,4  <at>  <at> 
 compound=Samengesteld veld
 custom=Eigen samenstelling
 mixins=Mixins
-inherited=Overeving
\ No newline at end of file
+inherited=Ge\u00EBrfd
\ No newline at end of file
fvlankvelt | 18 Jun 2013 14:16

[39639] hippo-cms7/repository/trunk: REPO-674: check whether folder is empty when deleting it

Revision: 39639
Author:   fvlankvelt
Date:     2013-06-18 14:16:46 +0200 (Tue, 18 Jun 2013)
Log Message:
-----------
REPO-674: check whether folder is empty when deleting it

Modified Paths:
--------------
    hippo-cms7/repository/trunk/config/src/test/java/org/hippoecm/repository/FolderWorkflowTest.java
    hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/standardworkflow/FolderWorkflowImpl.java

Modified: hippo-cms7/repository/trunk/config/src/test/java/org/hippoecm/repository/FolderWorkflowTest.java
===================================================================
---
hippo-cms7/repository/trunk/config/src/test/java/org/hippoecm/repository/FolderWorkflowTest.java	2013-06-17
14:24:51 UTC (rev 39638)
+++
hippo-cms7/repository/trunk/config/src/test/java/org/hippoecm/repository/FolderWorkflowTest.java	2013-06-18
12:16:46 UTC (rev 39639)
 <at>  <at>  -49,7 +49,6  <at>  <at> 
 import org.hippoecm.repository.api.Workflow;
 import org.hippoecm.repository.api.WorkflowException;
 import org.hippoecm.repository.api.WorkflowManager;
-import org.hippoecm.repository.standardworkflow.DefaultWorkflow;
 import org.hippoecm.repository.standardworkflow.FolderWorkflow;
 import org.junit.After;
 import org.junit.Before;
 <at>  <at>  -140,17 +139,24  <at>  <at> 
         assertEquals("/test/aap/noot/mies", iter.nextNode().getPath());
(Continue reading)

svoortman | 17 Jun 2013 16:24

[39638] hippo-cms7/release: REPO-669: Bumped repository and hst versions in release pom

Revision: 39638
Author:   svoortman
Date:     2013-06-17 16:24:51 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
REPO-669: Bumped repository and hst versions in release pom

Modified Paths:
--------------
    hippo-cms7/release/branches/hippo-cms7-release-7.8.xx/pom.xml

Modified: hippo-cms7/release/branches/hippo-cms7-release-7.8.xx/pom.xml
===================================================================
--- hippo-cms7/release/branches/hippo-cms7-release-7.8.xx/pom.xml	2013-06-17 13:26:14 UTC (rev 39637)
+++ hippo-cms7/release/branches/hippo-cms7-release-7.8.xx/pom.xml	2013-06-17 14:24:51 UTC (rev 39638)
 <at>  <at>  -44,10 +44,10  <at>  <at> 
     <hippo.addon-search-service.version>1.01.00</hippo.addon-search-service.version>
     <hippo.commons.version>1.02.02</hippo.commons.version>
     <hippo.cms.version>2.24.03</hippo.cms.version>
-    <hippo.hst.version>2.26.03</hippo.hst.version>
+    <hippo.hst.version>2.26.04-SNAPSHOT</hippo.hst.version>
     <hippo.packages.version>2.24.01</hippo.packages.version>
     <hippo.release.version>7.8.4-SNAPSHOT</hippo.release.version>
-    <hippo.repository.version>2.24.04</hippo.repository.version>
+    <hippo.repository.version>2.24.05-SNAPSHOT</hippo.repository.version>
     <hippo.services.version>1.02.03</hippo.services.version>
     <hippo.utilities.version>1.01.03</hippo.utilities.version>
tgountchev | 17 Jun 2013 15:26

[39637] hippo-cms7/site-toolkit: HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Revision: 39637
Author:   tgountchev
Date:     2013-06-17 15:26:14 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Modified Paths:
--------------
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/commons/src/main/java/org/hippoecm/hst/core/internal/CollectionOptimizer.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/components/HstComponentConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/components/HstComponentsConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/hosting/MountService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/hosting/VirtualHostService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstNodeImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemap/HstSiteMapItemService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemap/HstSiteMapService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemapitemhandler/HstSiteMapItemHandlerConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemenu/HstSiteMenuConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemenu/HstSiteMenuItemConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapTreeImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapTreeItemImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/content-beans/src/main/java/org/hippoecm/hst/provider/jcr/JCRValueProviderImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/content-beans/src/main/java/org/hippoecm/hst/provider/jcr/PropertyMapImpl.java

Added Paths:
-----------
    hippo-cms7/site-toolkit/branches/hst-2.24.xx/commons/src/main/java/org/hippoecm/hst/core/internal/

(Continue reading)

svoortman | 17 Jun 2013 15:04

[39636] hippo-demos/hippo-go-green: GOGREEN-34: Bumping parent pom version to 7.8.4-SNAPSHOT

Revision: 39636
Author:   svoortman
Date:     2013-06-17 15:04:05 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
GOGREEN-34: Bumping parent pom version to 7.8.4-SNAPSHOT

Modified Paths:
--------------
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml

Modified: hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml
===================================================================
--- hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml	2013-06-17 12:29:06 UTC
(rev 39635)
+++ hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml	2013-06-17 13:04:05 UTC
(rev 39636)
 <at>  <at>  -20,7 +20,7  <at>  <at> 
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>7.8.3</version>
+    <version>7.8.4-SNAPSHOT</version>
   </parent>

   <name>Hippo Go Green</name>
tgountchev | 17 Jun 2013 14:29

[39635] hippo-cms7/site-toolkit: HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Revision: 39635
Author:   tgountchev
Date:     2013-06-17 14:29:06 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Modified Paths:
--------------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/commons/src/main/java/org/hippoecm/hst/core/internal/CollectionOptimizer.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/components/HstComponentConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/components/HstComponentsConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/hosting/MountService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/hosting/VirtualHostService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstManagerImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/model/HstNodeImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemap/HstSiteMapItemService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemap/HstSiteMapService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemapitemhandler/HstSiteMapItemHandlerConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemenu/HstSiteMenuConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/configuration/sitemenu/HstSiteMenuItemConfigurationService.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapTreeImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/linking/LocationMapTreeItemImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/content-beans/src/main/java/org/hippoecm/hst/provider/jcr/JCRValueProviderImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/content-beans/src/main/java/org/hippoecm/hst/provider/jcr/PropertyMapImpl.java

Added Paths:
-----------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/commons/src/main/java/org/hippoecm/hst/core/internal/

(Continue reading)

jsheriff | 17 Jun 2013 14:18

[39634] hippo-demos/hippo-go-green: GOGREEN-1142prepare for next development iteration

Revision: 39634
Author:   jsheriff
Date:     2013-06-17 14:18:36 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
GOGREEN-1142prepare for next development iteration

Modified Paths:
--------------
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/content/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/dist/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/integration-tests/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/rating-plugin/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/acct-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/prod-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/test-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/site/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/site-assembly/pom.xml

Modified: hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml
===================================================================
--- hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml	2013-06-17 12:18:31
UTC (rev 39633)
+++ hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml	2013-06-17 12:18:36
UTC (rev 39634)
 <at>  <at>  -20,7 +20,7  <at>  <at> 
   <parent>
(Continue reading)

jsheriff | 17 Jun 2013 14:18

[39633] hippo-demos/hippo-go-green/tags/hippogogreen-3.07.05/: ' GOGREEN-1142' copy for tag hippogogreen-3.07.05

Revision: 39633
Author:   jsheriff
Date:     2013-06-17 14:18:31 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
'GOGREEN-1142' copy for tag hippogogreen-3.07.05

Added Paths:
-----------
    hippo-demos/hippo-go-green/tags/hippogogreen-3.07.05/

Index: hippo-demos/hippo-go-green/tags/hippogogreen-3.07.05
===================================================================
--- hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx	2013-06-17 12:18:27 UTC (rev 39632)
+++ hippo-demos/hippo-go-green/tags/hippogogreen-3.07.05	2013-06-17 12:18:31 UTC (rev 39633)

Property changes on: hippo-demos/hippo-go-green/tags/hippogogreen-3.07.05
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,3 ##
+/hippo-demos/hippo-go-green/branches/hippogogreen-3.03.xx:28473-28474
+/hippo-demos/hippo-go-green/branches/hippogogreen-3.05.xx:33857
+/hippo-demos/hippo-go-green/trunk:38995,39002,39063,39138
\ No newline at end of property
Added: svn:ignore
## -0,0 +1,15 ##
+.classpath
+.project
+target
+.settings
(Continue reading)

jsheriff | 17 Jun 2013 14:18

[39632] hippo-demos/hippo-go-green: GOGREEN-1142prepare release hippogogreen-3.07.05

Revision: 39632
Author:   jsheriff
Date:     2013-06-17 14:18:27 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
GOGREEN-1142prepare release hippogogreen-3.07.05

Modified Paths:
--------------
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/content/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/dist/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/integration-tests/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/rating-plugin/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/acct-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/prod-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/server-config/test-server-config/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/site/pom.xml
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/site-assembly/pom.xml

Modified: hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml
===================================================================
--- hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml	2013-06-17 12:07:12
UTC (rev 39631)
+++ hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/cms/pom.xml	2013-06-17 12:18:27
UTC (rev 39632)
 <at>  <at>  -20,7 +20,7  <at>  <at> 
   <parent>
(Continue reading)

tgountchev | 17 Jun 2013 14:07

[39631] hippo-cms7/site-toolkit: HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Revision: 39631
Author:   tgountchev
Date:     2013-06-17 14:07:12 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
HSTTWO-2586 Backport: Reduce memory consumption of HST configuration model

Property Changed:
----------------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/

Index: hippo-cms7/site-toolkit/branches/hst-2.26.xx
===================================================================
--- hippo-cms7/site-toolkit/branches/hst-2.26.xx	2013-06-17 11:36:01 UTC (rev 39630)
+++ hippo-cms7/site-toolkit/branches/hst-2.26.xx	2013-06-17 12:07:12 UTC (rev 39631)

Property changes on: hippo-cms7/site-toolkit/branches/hst-2.26.xx
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /ecm/site-toolkit/branches/Branch-HSTTWO-v2_05_xx:23990,23995-24004,24130
 /hippo-cms7/site-toolkit/branches/hst-2.22.xx:29950
-/hippo-cms7/site-toolkit/trunk:39548,39583,39585,39587
+/hippo-cms7/site-toolkit/trunk:39548,39583,39585,39587,39621,39628
\ No newline at end of property
jsheriff | 17 Jun 2013 13:36

[39630] hippo-demos/hippo-go-green: GOGREEN-1142 Reverted release version to 7.8. 3 to make a go green tag based on it.

Revision: 39630
Author:   jsheriff
Date:     2013-06-17 13:36:01 +0200 (Mon, 17 Jun 2013)
Log Message:
-----------
GOGREEN-1142    Reverted release version to 7.8.3 to make a go green tag based on it.

Modified Paths:
--------------
    hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml

Modified: hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml
===================================================================
--- hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml	2013-06-17 10:17:43 UTC
(rev 39629)
+++ hippo-demos/hippo-go-green/branches/hippogogreen-3.07.xx/pom.xml	2013-06-17 11:36:01 UTC
(rev 39630)
 <at>  <at>  -20,7 +20,7  <at>  <at> 
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>7.8.4-SNAPSHOT</version>
+    <version>7.8.3</version>
   </parent>

   <name>Hippo Go Green</name>

Gmane