gmane.comp.cms.hippocms.scm

[39390] hippo-cms7/addons/addon-channel-manager: CMS7-7122: backport - resetting the original variant on cancel is not necessary; cancel triggers the hide of the window, which will then reset the original variant

mdenburger — 2013-05-17T13:54:16

Revision: 39390
Author:   mdenburger
Date:     2013-05-17 15:54:14 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7122: backport - resetting the original variant on cancel is not necessary; cancel triggers the hide of the window, which will then reset the original variant

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js

Modified: hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js
===================================================================
--- hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js2013-05-17 13:52:55 UTC (rev 39389)
+++ hippo-cms7/addons/a

[39389] hippo-cms7/addons/addon-channel-manager: CMS7-7119: resetting the original variant on cancel is not necessary; cancel triggers the hide of the window, which will then reset the original variant

mdenburger — 2013-05-17T13:52:58

Revision: 39389
Author:   mdenburger
Date:     2013-05-17 15:52:55 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7119: resetting the original variant on cancel is not necessary; cancel triggers the hide of the window, which will then reset the original variant 

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js

Modified: hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js
===================================================================
--- hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.js2013-05-17 12:57:17 UTC (rev 39388)
+++ hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PropertiesPanel.

[39388] hippo-cms7/site-toolkit: HSTTWO-2564: backport - do not remove render variant when editing a channel

mdenburger — 2013-05-17T12:57:20

Revision: 39388
Author:   mdenburger
Date:     2013-05-17 14:57:17 +0200 (Fri, 17 May 2013)
Log Message:
-----------
HSTTWO-2564: backport - do not remove render variant when editing a channel

Modified Paths:
--------------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java

Modified: hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
===================================================================
--- hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java2013-05-17 12:55:21 UTC (rev 39387)
+++ hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java2013-05-17 12:57:17 UTC (rev 39388)
< at >< at > -158,8 +158,6 < at >< at >
     pu

[39387] hippo-cms7/site-toolkit: HSTTWO-2563: do not remove render variant when editing a channel

mdenburger — 2013-05-17T12:55:23

Revision: 39387
Author:   mdenburger
Date:     2013-05-17 14:55:21 +0200 (Fri, 17 May 2013)
Log Message:
-----------
HSTTWO-2563: do not remove render variant when editing a channel

Modified Paths:
--------------
    hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java

Modified: hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java
===================================================================
--- hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java2013-05-17 12:23:07 UTC (rev 39386)
+++ hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/MountResource.java2013-05-17 12:55:21 UTC (rev 39387)
< at >< at > -158,8 +158,6 < at >< at >
     public Response startEdit(< at >Context HttpServletRequest servletRequest) {

[39386] hippo-cms7/project: :CMS7-7125 add repo. bootstrap to cargo system properties

aschrijvers — 2013-05-17T12:23:09

Revision: 39386
Author:   aschrijvers
Date:     2013-05-17 14:23:07 +0200 (Fri, 17 May 2013)
Log Message:
-----------
:CMS7-7125 add repo.bootstrap to cargo system properties

Modified Paths:
--------------
    hippo-cms7/project/trunk/pom.xml

Modified: hippo-cms7/project/trunk/pom.xml
===================================================================
--- hippo-cms7/project/trunk/pom.xml2013-05-17 10:41:04 UTC (rev 39385)
+++ hippo-cms7/project/trunk/pom.xml2013-05-17 12:23:07 UTC (rev 39386)
< at >< at > -999,6 +999,7 < at >< at >
               <container>
                 <systemProperties>
                   <repo.path>${repo.path}</repo.path>
+                  <repo.bootstrap>${repo.bootstrap}</repo.bootstrap>
                   <hippoecm.export.dir>${hippoecm.export.dir}</hippoecm.export.dir>
                 </systemProperties>
                 <zipUrlInstaller>

[39385] hippo-cms7/repository: REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

fvlankvelt — 2013-05-17T10:41:07

Revision: 39385
Author:   fvlankvelt
Date:     2013-05-17 12:41:04 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

Modified Paths:
--------------
    hippo-cms7/repository/branches/hippo-repository-2.22.xx/engine/pom.xml

Modified: hippo-cms7/repository/branches/hippo-repository-2.22.xx/engine/pom.xml
===================================================================
--- hippo-cms7/repository/branches/hippo-repository-2.22.xx/engine/pom.xml2013-05-17 10:32:09 UTC (rev 39384)
+++ hippo-cms7/repository/branches/hippo-repository-2.22.xx/engine/pom.xml2013-05-17 10:41:04 UTC (rev 39385)
< at >< at > -98,6 +98,12 < at >< at >
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-parsers</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>boilerpipe</artifactId>
+          <groupId>de.l3s.boilerpipe</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependen

[39384] hippo-cms7/repository: REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

fvlankvelt — 2013-05-17T10:32:11

Revision: 39384
Author:   fvlankvelt
Date:     2013-05-17 12:32:09 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

Modified Paths:
--------------
    hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/pom.xml

Modified: hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/pom.xml
===================================================================
--- hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/pom.xml2013-05-17 10:31:27 UTC (rev 39383)
+++ hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/pom.xml2013-05-17 10:32:09 UTC (rev 39384)
< at >< at > -108,6 +108,12 < at >< at >
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-parsers</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>boilerpipe</artifactId>
+          <groupId>de.l3s.boilerpipe</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <depend

[39383] hippo-cms7/repository: REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

fvlankvelt — 2013-05-17T10:31:29

Revision: 39383
Author:   fvlankvelt
Date:     2013-05-17 12:31:27 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-661: exclude boilerpipe, it breaks other usages of nekohtml with its forked classes

Modified Paths:
--------------
    hippo-cms7/repository/trunk/engine/pom.xml

Modified: hippo-cms7/repository/trunk/engine/pom.xml
===================================================================
--- hippo-cms7/repository/trunk/engine/pom.xml2013-05-17 09:15:27 UTC (rev 39382)
+++ hippo-cms7/repository/trunk/engine/pom.xml2013-05-17 10:31:27 UTC (rev 39383)
< at >< at > -108,6 +108,12 < at >< at >
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-parsers</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>boilerpipe</artifactId>
+          <groupId>de.l3s.boilerpipe</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

[39382] hippo-cms7/addons/addon-channel-manager: CMS7-7122: backport CMS7 7119 - various variant-related improvements

mdenburger — 2013-05-17T09:15:29

Revision: 39382
Author:   mdenburger
Date:     2013-05-17 11:15:27 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7122: backport CMS7 7119 - various variant-related improvements
                                
- In the combobox, the chosen variant is now displayed as "<name>", or "<name>, the <group>" when a group is available 
  for that variant. Its tooltip also contains its description, when available. 
- The variant selection combo can now be used in both view and edit mode. 
- The selected variant is no longer reset, but remembered when switching back to view mode, and when switching channels. 
- When selecting a component, the tab for the currently rendered variant is auto-selected. It's either the explicitly 
  rendered one (the 'HST render variant') or the first matching page request variant.

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/PageEdit

[39381] hippo-cms7/addons/addon-channel-manager: CMS7-7123: backport CMS7 6959 - confirm clicks on external links and open them in a new tab

mdenburger — 2013-05-17T09:11:17

Revision: 39381
Author:   mdenburger
Date:     2013-05-17 11:11:15 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7123: backport CMS7 6959 - confirm clicks on external links and open them in a new tab
                                
An external link has a URL that does not start with the CMS host + template composer context path + CMS preview prefix 
(e.g. 'http://localhost:8080/site/_cmsinternal'). For each of these URLs the target is set to _blank, and an onclick 
handler is registered to confirm the click.

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/PageEditor.properties
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/PageEditor_de.properties
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/fronten

[39380] hippo-cms7/site-toolkit: HSTTWO-2565 add repository not available exception again but now as deprecated

aschrijvers — 2013-05-17T09:06:09

Revision: 39380
Author:   aschrijvers
Date:     2013-05-17 11:06:06 +0200 (Fri, 17 May 2013)
Log Message:
-----------
HSTTWO-2565 add repository not available exception again but now as deprecated

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

Added: hippo-cms7/site-toolkit/branches/hst-2.26.xx/api/src/main/java/org/hippoecm/hst/core/container/RepositoryNotAvailableException.java
===================================================================
--- hippo-cms7/site-toolkit/branches/hst-2.26.xx/api/src/main/java/org/hippoecm/hst/core/container/RepositoryNotAvailableException.java                        (rev 0)
+++ hippo-cms7/site-toolkit/branches/hst-2.26.xx/api/src/main/java/org/hippoecm/hst/core/container/RepositoryNotAvailableException.java2013-05-17 09:06:06 UTC (rev 39380)
< at >< at > -0,0 +1,73 < at >< at >
+/*
+ * Copyright 2013 Hippo B.V. (http://www.onehippo.com)
+ *
+ * Licensed under the Apache Licen

[39379] hippo-cms7/addons/addon-channel-manager: CMS7-7121: backport CMS7 7013 - use HSTSESSIONID cookie to verify session validity

mdenburger — 2013-05-17T08:31:09

Revision: 39379
Author:   mdenburger
Date:     2013-05-17 10:31:07 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7121: backport CMS7 7013 - use HSTSESSIONID cookie to verify session validity

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/IFramePanel.js
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/PageContainer.js

Modified: hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/pageeditor/IFramePanel.js
===================================================================
--- hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templ

[39378] hippo-cms7/addons/addon-channel-manager: CMS7-7120: backport CMS7 6849 - allow pages in the template composer to return an error status

mdenburger — 2013-05-17T08:23:39

Revision: 39378
Author:   mdenburger
Date:     2013-05-17 10:23:36 +0200 (Fri, 17 May 2013)
Log Message:
-----------
CMS7-7120: backport CMS7 6849 - allow pages in the template composer to return an error status
                      
When a page returns an HTTP error status, we still try to initialize the page context. This allows, for example, editing of '404' pages. Only when a page returns a status code of 500 or higher, or the response is missing vital information to initialize the page context, we show an error message 'This page returned an error, going back.'. After clicking OK the previous page is then opened again. If no previous page is available, we go back to the channel manager overview.

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/PageEditor.properties
    hippo-cms7/addons/addon-channel-manager/branches/hippo-addon-channel-manager-2.24.xx/fronten

[39377] hippo-cms7/repository: REPO-660: unregister the RepositoryLogger at shutdown

adouma — 2013-05-17T08:19:22

Revision: 39377
Author:   adouma
Date:     2013-05-17 10:19:19 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-660: unregister the RepositoryLogger at shutdown

Modified Paths:
--------------
    hippo-cms7/repository/branches/hippo-repository-2.24.xx/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java

Modified: hippo-cms7/repository/branches/hippo-repository-2.24.xx/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java
===================================================================
--- hippo-cms7/repository/branches/hippo-repository-2.24.xx/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java2013-05-17 08:18:59 UTC (rev 39376)
+++ hippo-cms7/repository/branches/hippo-repository-2.24.xx/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java2013-05-17 08:19:19 UTC (rev 39377)
< at >< at > -195,5 +195,6 < at >< at >
 
     < at >Override
     public void shutdown() {
+        HippoServiceRegistry.unregisterService(this, HippoEventBu

[39376] hippo-cms7/repository: REPO-660: unregister the RepositoryLogger at shutdown

adouma — 2013-05-17T08:19:02

Revision: 39376
Author:   adouma
Date:     2013-05-17 10:18:59 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-660: unregister the RepositoryLogger at shutdown

Modified Paths:
--------------
    hippo-cms7/repository/trunk/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java

Modified: hippo-cms7/repository/trunk/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java
===================================================================
--- hippo-cms7/repository/trunk/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java2013-05-17 07:49:25 UTC (rev 39375)
+++ hippo-cms7/repository/trunk/modules/src/main/java/org/hippoecm/repository/logging/RepositoryLogger.java2013-05-17 08:18:59 UTC (rev 39376)
< at >< at > -195,5 +195,6 < at >< at >
 
     < at >Override
     public void shutdown() {
+        HippoServiceRegistry.unregisterService(this, HippoEventBus.class);
     }
 }

[39375] hippo-cms7/repository: REPO-660: don' t remove listeners if session is no longer live.

adouma — 2013-05-17T07:49:28

Revision: 39375
Author:   adouma
Date:     2013-05-17 09:49:25 +0200 (Fri, 17 May 2013)
Log Message:
-----------
REPO-660: don't remove listeners if session is no longer live. this fixes an issue during shutdown of the hst where NoClassDefFound exceptions would occur because the repository classloader already had been decommissioned

Modified Paths:
--------------
    hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/impl/WorkspaceDecorator.java

Modified: hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/impl/WorkspaceDecorator.java
===================================================================
--- hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/impl/WorkspaceDecorator.java2013-05-16 18:17:03 UTC (rev 39374)
+++ hippo-cms7/repository/branches/hippo-repository-2.24.xx/engine/src/main/java/org/hippoecm/repository/impl/WorkspaceDecorator.java2013-05-1

[39374] hippo-cms7/site-toolkit: : HSTTWO-2559 also show the sitemenuitems regardless its role in case that the request is a cmsrequest and that the hst is marked to skip authorization in channel manager mode

aschrijvers — 2013-05-16T18:17:05

Revision: 39374
Author:   aschrijvers
Date:     2013-05-16 20:17:03 +0200 (Thu, 16 May 2013)
Log Message:
-----------
:HSTTWO-2559 also show the sitemenuitems regardless its role in case that the request is a cmsrequest and that the hst is marked to skip authorization in channel manager mode

Modified Paths:
--------------
    hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java
    hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuItemImpl.java

Modified: hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java
===================================================================
--- hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java2013-05-16 18:14:13 UTC (rev 39373)
+++ hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java201

[39373] hippo-cms7/site-toolkit: HSTTWO-2560 also show the sitemenuitems regardless its role in case that the request is a cmsrequest and that the hst is marked to skip authorization in channel manager mode

aschrijvers — 2013-05-16T18:14:16

Revision: 39373
Author:   aschrijvers
Date:     2013-05-16 20:14:13 +0200 (Thu, 16 May 2013)
Log Message:
-----------
HSTTWO-2560 also show the sitemenuitems regardless its role in case that the request is a cmsrequest and that the hst is marked to skip authorization in channel manager mode

Modified Paths:
--------------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuItemImpl.java

Modified: hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java
===================================================================
--- hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/core/src/main/java/org/hippoecm/hst/core/sitemenu/HstSiteMenuImpl.java2013-05-16 16:51:26 UTC (rev 39372)
+++ hippo-cms7/site-toolkit/branches/hst-2.26.xx/components/

[39372] hippo-cms7/addons/addon-channel-manager: CMS7-7119: various variant-related improvements

mdenburger — 2013-05-16T16:51:28

Revision: 39372
Author:   mdenburger
Date:     2013-05-16 18:51:26 +0200 (Thu, 16 May 2013)
Log Message:
-----------
CMS7-7119: various variant-related improvements

- In the combobox, the chosen variant is now displayed as "<name>", or "<name>, the <group>" when a group is available for that variant. 
  It's tooltip also contains its description, when available. 
- The variant selection combo can now be used in both view and edit mode. 
- The selected variant no longer reset, but remembered when switching back to view mode, and when switching channels. 
- When selecting a component, the tab for the currently rendered variant is auto-selected. It's either the explicitly 
  rendered one (the 'HST render variant') or the first matching page request variant.

Modified Paths:
--------------
    hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/onehippo/cms7/channelmanager/templatecomposer/PageEditor.properties
    hippo-cms7/addons/addon-channel-manager/trunk/frontend/src/main/java/org/one

[39371] hippo-cms7/site-toolkit: HSTTWO-2564: backport - do not remove render variant when changing to composermode

mdenburger — 2013-05-16T16:35:34

Revision: 39371
Author:   mdenburger
Date:     2013-05-16 18:35:32 +0200 (Thu, 16 May 2013)
Log Message:
-----------
HSTTWO-2564: backport - do not remove render variant when changing to composermode

Modified Paths:
--------------
    hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java

Modified: hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
===================================================================
--- hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java2013-05-16 16:33:58 UTC (rev 39370)
+++ hippo-cms7/site-toolkit/branches/hst-2.26.xx/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java2013-05-16 16:35:32 UTC (rev 39371)
< at >< at > -63,7 +63,6 < at >< at >

[39370] hippo-cms7/site-toolkit: HSTTWO-2563: do not remove render variant when changing to composermode

mdenburger — 2013-05-16T16:34:01

Revision: 39370
Author:   mdenburger
Date:     2013-05-16 18:33:58 +0200 (Thu, 16 May 2013)
Log Message:
-----------
HSTTWO-2563: do not remove render variant when changing to composermode

Modified Paths:
--------------
    hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java

Modified: hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java
===================================================================
--- hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java2013-05-16 16:30:32 UTC (rev 39369)
+++ hippo-cms7/site-toolkit/trunk/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/services/RootResource.java2013-05-16 16:33:58 UTC (rev 39370)
< at >< at > -63,7 +63,6 < at >< at >
         HttpSession session = servletRequest.getSession(true);
         sess