[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch bugfix/REPO-1638

[Ate Douma]

Ate Douma deleted branch bugfix/REPO-1638 at cms-community / hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1638 Synchronize on systemSession to avoid concurrent access to one and the same jcr session

[Ate Douma]

Ate Douma pushed to branch master at cms-community / hippo-repository


Commits:
0d9553e8 by Ard Schrijvers at 2017-03-23T15:50:24+01:00
REPO-1638 Synchronize on systemSession to avoid concurrent access to one and 
the same jcr session

- - - - -


1 changed file:

- 
api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java


Changes:

=
api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
=
--- 
a/api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
+++ 
b/api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2013-2017 Hippo B.V. (http://www.onehippo.com)
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class RepositoryJobExecutionContext {
  */
 @Deprecated
 public Session getSession(Credentials credentials) throws LoginException, 
RepositoryException {
-return systemSession.impersonate(credentials);
+return createSession(credentials);
 }
 
 /**
@@ -56,7 +56,11 @@ public class RepositoryJobExecutionContext {
  * Caller must log out the returned session after use.
  */
 public Session createSession(Credentials credentials) throws 
LoginException, RepositoryException {
-return systemSession.impersonate(credentials);
+// since the backing systemSession can be shared by different 
RepositoryJobExecutionContext's and there can
+// be multiple threads involved, we need to synchronize on 
systemSession during impersonation
+synchronized (systemSession) {
+return systemSession.impersonate(credentials);
+}
 }
 
 /**



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/0d9553e86d90dc6af4ab5afc07837ec2c024fbd1
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 8804ef: CMS-10666 Copy resources to 'optimized' directory ...

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  Commit: 8804ef6a4ee2e13b8c24ce50f338e2c18c879c14
  
https://github.com/onehippo/ckeditor/commit/8804ef6a4ee2e13b8c24ce50f338e2c18c879c14
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M config/pom.xml

  Log Message:
  ---
  CMS-10666 Copy resources to 'optimized' directory and run jslint


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1639

[Ard Schrijvers]

Ard Schrijvers pushed new branch bugfix/REPO-1639 at cms-community / 
hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9245

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CMS-9245 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9245] CMS-9245 Move question panel to the top

[Arthur Bogaart]

Arthur Bogaart pushed to branch bugfix/CMS-9245 at cms-community / hippo-cms


Commits:
762b3105 by Arthur Bogaart at 2017-03-23T15:56:44+01:00
CMS-9245 Move question panel to the top

- add factory method for question panel

- - - - -


3 changed files:

- api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.html
- api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.java
- api/src/main/styling/styles/_modal_destination.scss


Changes:

=
api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.html
=
--- a/api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.html
+++ b/api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.html
@@ -15,6 +15,9 @@
 -->
 http://wicket.apache.org/;>
   
-
+
+  
+  
+
   
 


=
api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.java
=
--- a/api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.java
+++ b/api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog.java
@@ -21,6 +21,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -69,9 +70,7 @@ public abstract class DestinationDialog extends Dialog 
implements IWorkflo
 this.destination = destination;
 this.intialPath = getDestinationPath();
 
-if (question != null && answer != null) {
-addOrReplace(new QuestionPanel(Dialog.BOTTOM_LEFT_ID, question, 
answer));
-}
+add(createQuestionPanel("question", question, answer));
 
 IPluginConfigService pluginConfigService = 
context.getService(IPluginConfigService.class.getName(),
   
IPluginConfigService.class);
@@ -136,6 +135,14 @@ public abstract class DestinationDialog extends 
Dialog implements IWorkflo
 super.render(target);
 }
 
+protected Panel createQuestionPanel(final String id, final IModel 
question, final IModel answer) {
+if (question != null && answer != null) {
+return new QuestionPanel(id, question, answer);
+} else {
+return new EmptyPanel(id);
+}
+}
+
 @Override
 protected void onOk() {
 try {


=
api/src/main/styling/styles/_modal_destination.scss
=
--- a/api/src/main/styling/styles/_modal_destination.scss
+++ b/api/src/main/styling/styles/_modal_destination.scss
@@ -1,22 +1,25 @@
-.hippo-dialog-bottom-left .question-answer {
-  margin-left: 16px;
-  height: 100%;
+.hippo-dialog-body .question-answer {
   display: flex;
-  justify-content: center;
+  height: 100%;
+  justify-content: flex-start;
+  margin-left: 16px;
+  padding-bottom: 8px;
+  padding-top: 8px;
 
   .question{
-line-height: 32px;
-margin-right: 8px;
 align-self: center;
+line-height: 30px;
+margin-right: 8px;
   }
 
   .answer {
-display: flex;
 align-items: center;
+display: flex;
 
 input {
+  height: 28px;
+  line-height: 28px;
   padding-left: 4px;
-  line-height: 30px;
   width: 320px;
 }
   }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/762b310581ea3650ba7be112d10f3d0ec87161de
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository][bugfix/REPO-1638] REPO-1638 Synchronize on systemSession to avoid concurrent access to one and the same jcr session

[Ard Schrijvers]

Ard Schrijvers pushed to branch bugfix/REPO-1638 at cms-community / 
hippo-repository


Commits:
0d9553e8 by Ard Schrijvers at 2017-03-23T15:50:24+01:00
REPO-1638 Synchronize on systemSession to avoid concurrent access to one and 
the same jcr session

- - - - -


1 changed file:

- 
api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java


Changes:

=
api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
=
--- 
a/api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
+++ 
b/api/src/main/java/org/onehippo/repository/scheduling/RepositoryJobExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2013 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2013-2017 Hippo B.V. (http://www.onehippo.com)
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class RepositoryJobExecutionContext {
  */
 @Deprecated
 public Session getSession(Credentials credentials) throws LoginException, 
RepositoryException {
-return systemSession.impersonate(credentials);
+return createSession(credentials);
 }
 
 /**
@@ -56,7 +56,11 @@ public class RepositoryJobExecutionContext {
  * Caller must log out the returned session after use.
  */
 public Session createSession(Credentials credentials) throws 
LoginException, RepositoryException {
-return systemSession.impersonate(credentials);
+// since the backing systemSession can be shared by different 
RepositoryJobExecutionContext's and there can
+// be multiple threads involved, we need to synchronize on 
systemSession during impersonation
+synchronized (systemSession) {
+return systemSession.impersonate(credentials);
+}
 }
 
 /**



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/0d9553e86d90dc6af4ab5afc07837ec2c024fbd1
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1638

[Ard Schrijvers]

Ard Schrijvers pushed new branch bugfix/REPO-1638 at cms-community / 
hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9288

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CMS-9288 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9289

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CMS-9289 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 2 commits: CMS-9288 Use new Dialog in (de)publish all dialogs

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / hippo-cms


Commits:
10402b46 by Arthur Bogaart at 2017-03-17T16:19:38+01:00
CMS-9288 Use new Dialog in (de)publish all dialogs

Use auto-height dialog. Remove left-padding on table-data and add
a bit of vertical spacing between message and table-data

- - - - -
e52249e2 by Arthur Bogaart at 2017-03-23T15:11:06+01:00
CMS-9288 Reintegrate bugfix/CMS-9288

- - - - -


3 changed files:

- api/src/main/styling/styles/_modal.scss
- 
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin$ConfirmBulkWorkflowDialog.html
- 
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin.java


Changes:

=
api/src/main/styling/styles/_modal.scss
=
--- a/api/src/main/styling/styles/_modal.scss
+++ b/api/src/main/styling/styles/_modal.scss
@@ -517,6 +517,17 @@ table.hippo-window-form {
   padding: 5px;
 }
 
+.hippo-window-form.no-left-padding {
+  padding-left: 0;
+  td {
+padding-left: 0;
+  }
+}
+
+.hippo-window-form.top-margin {
+  margin-top: 12px;
+}
+
 .hippo-window-form .hippo-form-select {
   width: 300px;
 }


=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin$ConfirmBulkWorkflowDialog.html
=
--- 
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin$ConfirmBulkWorkflowDialog.html
+++ 
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin$ConfirmBulkWorkflowDialog.html
@@ -1,5 +1,5 @@
 
 http://wicket.apache.org/;>
   
-
-
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+  
+
   
 


=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin.java
=
--- 
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin.java
+++ 
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/ExtendedFolderWorkflowPlugin.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2009-2017 Hippo B.V. (http://www.onehippo.com)
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,11 +32,10 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.value.IValueMap;
-import org.hippoecm.addon.workflow.AbstractWorkflowDialog;
 import org.hippoecm.addon.workflow.IWorkflowInvoker;
 import org.hippoecm.addon.workflow.StdWorkflow;
 import org.hippoecm.addon.workflow.WorkflowDescriptorModel;
+import org.hippoecm.addon.workflow.WorkflowDialog;
 import org.hippoecm.frontend.dialog.DialogConstants;
 import org.hippoecm.frontend.dialog.IDialogService.Dialog;
 import org.hippoecm.frontend.plugin.IPluginContext;
@@ -48,6 +47,7 @@ import org.hippoecm.frontend.skin.Icon;
 import org.hippoecm.repository.api.HippoNode;
 import org.hippoecm.repository.api.HippoWorkspace;
 import org.hippoecm.repository.api.Workflow;
+import org.hippoecm.repository.api.WorkflowDescriptor;
 import org.hippoecm.repository.api.WorkflowException;
 import org.hippoecm.repository.api.WorkflowManager;
 import org.hippoecm.repository.util.NodeIterable;
@@ -176,16 +176,18 @@ public class ExtendedFolderWorkflowPlugin extends 
RenderPlugin {
 return (WorkflowDescriptorModel) super.getModel();
 }
 
-public class ConfirmBulkWorkflowDialog extends AbstractWorkflowDialog {
+public class ConfirmBulkWorkflowDialog extends 
WorkflowDialog {
 
-private IModel title;
 private Label affectedComponent;
 private final String workflowAction;
 
-public ConfirmBulkWorkflowDialog(IWorkflowInvoker action, 
IModel dialogTitle, IModel dialogText,
+public ConfirmBulkWorkflowDialog(IWorkflowInvoker invoker, 
IModel dialogTitle, IModel dialogText,
  IModel dialogSubText, IModel 
folderName, Set documents, String workflowAction) {
-super(ExtendedFolderWorkflowPlugin.this.getModel(), action);
-this.title = dialogTitle;
+super(invoker, ExtendedFolderWorkflowPlugin.this.getModel());
+
+setTitle(dialogTitle);
+setSize(DialogConstants.MEDIUM_AUTO);
+
   

[HippoCMS-scm] [onehippo/urlrewritefilter] 1483d9: HIPPLUG-1452 set version to next SNAPSHOT after re...

[GitHub]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 1483d9d87ca6bf13601d86073c0e932666104358
  
https://github.com/onehippo/urlrewritefilter/commit/1483d9d87ca6bf13601d86073c0e932666104358
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  HIPPLUG-1452 set version to next SNAPSHOT after release


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9963

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CMS-9963 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9295

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CMS-9295 at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter]

[GitHub]

  Branch: refs/tags/4.0.4-h1
  Home:   https://github.com/onehippo/urlrewritefilter
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] ebc81e: [maven-release-plugin] prepare release urlrewritef...

[GitHub]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: ebc81ef41346a338a40cb912c23119f31e3d5efd
  
https://github.com/onehippo/urlrewritefilter/commit/ebc81ef41346a338a40cb912c23119f31e3d5efd
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  [maven-release-plugin] prepare release urlrewritefilter-4.0.4-h1


  Commit: a992510638d8c20a70d54017f05cee124c13b596
  
https://github.com/onehippo/urlrewritefilter/commit/a992510638d8c20a70d54017f05cee124c13b596
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  [maven-release-plugin] rollback the release of urlrewritefilter-4.0.4-h1


  Commit: 674648234c9206bb6f0b1c31bcbeaf6448fc7c90
  
https://github.com/onehippo/urlrewritefilter/commit/674648234c9206bb6f0b1c31bcbeaf6448fc7c90
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  HIPPLUG-1452 set version for release


Compare: 
https://github.com/onehippo/urlrewritefilter/compare/b01f9d63390e...674648234c92___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10661] CMS-10661 extend unit test for hst-preview distinction

[Bert Leunis]

Bert Leunis pushed to branch feature/CMS-10661 at cms-community / hippo-cms


Commits:
05e610fd by Bert Leunis at 2017-03-23T14:42:59+01:00
CMS-10661 extend unit test for hst-preview distinction

- - - - -


1 changed file:

- 
console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java


Changes:

=
console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java
=
--- 
a/console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java
+++ 
b/console/frontend/src/test/java/org/hippoecm/frontend/plugins/console/browser/JcrNodeIconTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com)
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import javax.jcr.RepositoryException;
 import org.hippoecm.frontend.plugins.console.icons.JcrNodeIcon;
 import org.hippoecm.repository.api.WorkflowException;
 import org.junit.Test;
+import org.onehippo.repository.mock.MockNode;
 import org.onehippo.repository.testutils.RepositoryTestCase;
 
 import static org.junit.Assert.assertEquals;
@@ -78,4 +79,20 @@ public class JcrNodeIconTest extends RepositoryTestCase {
 public void testNodeIsNull() {
 assertEquals(JcrNodeIcon.getIconCssClass(null), "fa 
fa-exclamation-circle jcrnode-default");
 }
+
+@Test
+public void testHstPreview() throws RepositoryException {
+MockNode hstHst = MockNode.root().addNode("hst:hst", "hst:hst");
+assertEquals(JcrNodeIcon.getIconCssClass(hstHst), "fa fa-cloud 
jcrnode-hst");
+
+MockNode hstConfigurations = hstHst.addNode("hst:configurations", 
"hst:configurations");
+assertEquals(JcrNodeIcon.getIconCssClass(hstConfigurations), "fa 
fa-cogs jcrnode-hst");
+
+MockNode hstConfigurationPreview = 
hstConfigurations.addNode("myhippoproject-preview", "hst:configuration");
+assertEquals(JcrNodeIcon.getIconCssClass(hstConfigurationPreview), "fa 
fa-cog jcrnode-hst-preview");
+
+MockNode hstConfiguration = 
hstConfigurations.addNode("myhippoproject", "hst:configuration");
+assertEquals(JcrNodeIcon.getIconCssClass(hstConfiguration), "fa fa-cog 
jcrnode-hst");
+}
+
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/05e610fd36969e1272e2693b2893e25f20553863
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] b01f9d: HIPPLUG-1452 use org.onehippo.cms7:hippo-cms7-proj...

[GitHub]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: b01f9d63390e56ebbea6de915eaccdcd7c739635
  
https://github.com/onehippo/urlrewritefilter/commit/b01f9d63390e56ebbea6de915eaccdcd7c739635
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M FORK_INFO.md
M pom.xml

  Log Message:
  ---
  HIPPLUG-1452 use org.onehippo.cms7:hippo-cms7-project` as parent pom for 
plugin version management and 


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] 2bbd5b: HIPPLUG-1452 add to be ab...

[GitHub]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 2bbd5b2e304fa6e3e828239386444182dce8fcdc
  
https://github.com/onehippo/urlrewritefilter/commit/2bbd5b2e304fa6e3e828239386444182dce8fcdc
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  HIPPLUG-1452 add  to be able to release to Hippo 
Repository


  Commit: a7113b19a8724624ce4ac1b70bf48b3ac5b330e2
  
https://github.com/onehippo/urlrewritefilter/commit/a7113b19a8724624ce4ac1b70bf48b3ac5b330e2
  Author: Jeroen Hoffman 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M FORK_INFO.md

  Log Message:
  ---
  HIPPLUG-1452 release date is today


Compare: 
https://github.com/onehippo/urlrewritefilter/compare/33aea3bb1434...a7113b19a872___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/HSTTWO-3922] HSTTWO-3922 make sure to keep the orderBy elements in the correct order

[Bert Leunis]

Bert Leunis pushed to branch feature/HSTTWO-3922 at cms-community / 
hippo-site-toolkit


Commits:
897bd9a7 by Bert Leunis at 2017-03-23T13:49:10+01:00
HSTTWO-3922 make sure to keep the orderBy elements in the correct order

- - - - -


1 changed file:

- 
components/restapi/src/main/java/org/hippoecm/hst/restapi/content/DocumentsResource.java


Changes:

=
components/restapi/src/main/java/org/hippoecm/hst/restapi/content/DocumentsResource.java
=
--- 
a/components/restapi/src/main/java/org/hippoecm/hst/restapi/content/DocumentsResource.java
+++ 
b/components/restapi/src/main/java/org/hippoecm/hst/restapi/content/DocumentsResource.java
@@ -142,7 +142,12 @@ public class DocumentsResource extends AbstractResource {
 }
 
 private List parseOrderBy(final String orderBy) {
-return Arrays.asList(StringUtils.split(orderBy, ','));
+final List orderBys = new LinkedList<>();
+final List strings = Arrays.asList(StringUtils.split(orderBy, 
','));
+for(String string : strings) {
+orderBys.add(string);
+}
+return orderBys;
 }
 
 private List parseSortOrder(final String sortOrder) {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/897bd9a7bfd8186e3ca00a98b16ada3d0d0b66c8
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-9963 Reload-on-startup for cms-static

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / hippo-cms


Commits:
aa4096a4 by Arthur Bogaart at 2017-03-23T13:32:37+01:00
CMS-9963 Reload-on-startup for cms-static

- - - - -


1 changed file:

- config/src/main/resources/hippoecm-extension.xml


Changes:

=
config/src/main/resources/hippoecm-extension.xml
=
--- a/config/src/main/resources/hippoecm-extension.xml
+++ b/config/src/main/resources/hippoecm-extension.xml
@@ -333,7 +333,7 @@
   true
 
 
-  4.0.0
+  5.0.0
 
   
   



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/aa4096a400e93cbc304e2ab40b90d14fbcf052d7
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-9963 Collapse to previous width instead of configured width

[Arthur Bogaart]

Arthur Bogaart pushed to branch master at cms-community / hippo-cms


Commits:
4405df00 by Arthur Bogaart at 2017-03-17T13:02:58+01:00
CMS-9963 Collapse to previous width instead of configured width

When enabling resizing for the second column of the content
perspective, the expand/collapse action should collapse back to
the previous width instead of the configured width, as the user
might have changed it.

To sync the UI during window resize, expanded units will be
expanded again, so only store the previous collapsed width when
unit is collapsed.

- - - - -
03df0942 by Arthur Bogaart at 2017-03-23T13:15:59+01:00
CMS-9963 Make left panel of browsePerspective resizeable by default

- - - - -
06650211 by Arthur Bogaart at 2017-03-23T13:20:45+01:00
CMS-9963 Reintegrate bugfix/CMS-9963

- - - - -


3 changed files:

- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager-debug.js
- 
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager.js
- config/src/main/resources/cms-static.xml


Changes:

=
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager-debug.js
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager-debug.js
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager-debug.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
  *
  * Licensed under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
@@ -607,6 +607,10 @@ if (!YAHOO.hippo.LayoutManager) { // Ensure only one 
layout manager exists
   expandUnit: function (position) {
 var unit = this.layout.getUnitByPosition(position);
 if (unit !== null) {
+  if (this.unitExpanded === null) {
+// store collapsedWidth only if collapsed
+this.unitCollapsedWidth = unit.get('width');
+  }
   this.unitExpanded = position;
   unit.set('width', this.layout.getSizes().doc.w);
   Dom.replaceClass(unit.body, 'yui-layout-collapsed', 
'yui-layout-expanded');
@@ -614,14 +618,16 @@ if (!YAHOO.hippo.LayoutManager) { // Ensure only one 
layout manager exists
   },
 
   collapseUnit: function (position) {
-var unit, config;
+var unit, config, width;
 
 unit = this.layout.getUnitByPosition(position);
 if (unit !== null) {
   config = this.getUnitConfigByPosition(position);
   if (config !== null) {
 this.unitExpanded = null;
-unit.set('width', Number(config.width));
+width = this.unitCollapsedWidth || config.width;
+this.unitCollapsedWidth = null;
+unit.set('width', Number(width));
 Dom.replaceClass(unit.body, 'yui-layout-expanded', 
'yui-layout-collapsed');
 this.children.forEach(this, function (k, v) {
   v.checkSizes();


=
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager.js
=
--- 
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager.js
+++ 
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/layoutmanager/layoutmanager.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2017 Hippo B.V. (http://www.onehippo.com)
  *
  * Licensed under the Apache License, Version 2.0 (the  "License");
  * you may not use this file except in compliance with the License.
@@ -589,6 +589,10 @@ if (!YAHOO.hippo.LayoutManager) { // Ensure only one 
layout manager exists
   expandUnit: function (position) {
 var unit = this.layout.getUnitByPosition(position);
 if (unit !== null) {
+  if (this.unitExpanded === null) {
+// store collapsedWidth only if collapsed
+this.unitCollapsedWidth = unit.get('width');
+  }
   this.unitExpanded = position;
   unit.set('width', this.layout.getSizes().doc.w);
   Dom.replaceClass(unit.body, 'yui-layout-collapsed', 
'yui-layout-expanded');
@@ -596,14 +600,16 @@ if (!YAHOO.hippo.LayoutManager) { // Ensure only one 
layout manager exists
   },
 
   collapseUnit: function (position) {
-var unit, config;
+var unit, config, width;
 
 unit = this.layout.getUnitByPosition(position);
 if (unit !== null) {
   config = this.getUnitConfigByPosition(position);
   if (config !== null) {
 this.unitExpanded = null;
-unit.set('width', Number(config.width));
+width = this.unitCollapsedWidth || config.width;
+

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/10.2] CMS-10672 Bump affected dependency versions.

[Tobias Jeger]

Tobias Jeger pushed to branch release/10.2 at cms-community / hippo-cms-release


Commits:
524df508 by Tobias Jeger at 2017-03-23T13:19:54+01:00
CMS-10672 Bump affected dependency versions.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,12 @@
 
 
2.2.1
 
3.2.3
-
2.2.0
+
2.2.1-SNAPSHOT
 2.2.0
-3.2.8
+3.2.9-SNAPSHOT
 2.2.0
 2.2.2
-3.2.5
+3.2.6-SNAPSHOT
 3.2.0
 3.2.7
 2.2.1
@@ -71,7 +71,7 @@
 3.2.1
 2.2.0
 2.2.1
-2.2.1
+
2.2.2-SNAPSHOT
 
   
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/524df5080dd3ed70a0d02d6c32b61b55b7ea084f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.2 at cms-community / hippo-cms


Commits:
13ff2945 by Tobias Jeger at 2017-03-23T13:18:49+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
 
 
 1.4
-3.1
+3.2.2
 1.7.0
 2.6
 1.4



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/13ff2945b40526b0da8637c86bc23d57cad71585
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/3.2] HSTTWO-3941 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.2 at cms-community / hippo-site-toolkit


Commits:
dc95ae4b by Tobias Jeger at 2017-03-23T13:18:09+01:00
HSTTWO-3941 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 2.4.1
 
 2.6
-3.2.1
+3.2.2
 1.4
 1.5.4
 1.8.0



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/dc95ae4b390781a2aa5a16c73b92eede3570b12e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][release/2.2] HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/2.2 at cms-community / 
hippo-plugin-taxonomy


Commits:
04bbf5e4 by Tobias Jeger at 2017-03-23T13:15:37+01:00
HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
 3.2.0
 3.2.0
 
-3.2.1
+3.2.2
 
 2.2
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/04bbf5e4589c0f6feb63e2b91febfbdb173d1b7c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9963] CMS-9963 Make left panel of browsePerspective resizeable by default

[Arthur Bogaart]

Arthur Bogaart pushed to branch bugfix/CMS-9963 at cms-community / hippo-cms


Commits:
03df0942 by Arthur Bogaart at 2017-03-23T13:15:59+01:00
CMS-9963 Make left panel of browsePerspective resizeable by default

- - - - -


1 changed file:

- config/src/main/resources/cms-static.xml


Changes:

=
config/src/main/resources/cms-static.xml
=
--- a/config/src/main/resources/cms-static.xml
+++ b/config/src/main/resources/cms-static.xml
@@ -161,7 +161,7 @@
 left
   
   
-
id=browse-perspective-left,body=browse-perspective-left-body,scroll=false,width=400,gutter=0px
 0px 0px 0px,expand.collapse.enabled=true
+
id=browse-perspective-left,body=browse-perspective-left-body,scroll=false,width=400,gutter=0px
 0px 0px 0px,expand.collapse.enabled=true,resize=true
   
   
 true



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/03df094200a4e106ebd0a8aad9b5e93769ba51a0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][release/2.2] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/2.2 at cms-community / 
hippo-addon-search-service


Commits:
39c654f2 by Tobias Jeger at 2017-03-23T13:14:11+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 3.0
 
 2.6
-3.2.1
+3.2.2
 1.8.0
 1.4
 1.7



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/39c654f2b92b27e3a31e5676026dfa565b8774d8
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.2] CMS-10672 Bump affected dependency versions.

[Tobias Jeger]

Tobias Jeger pushed to branch release/11.2 at cms-community / hippo-cms-release


Commits:
20781058 by Tobias Jeger at 2017-03-23T12:36:52+01:00
CMS-10672 Bump affected dependency versions.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,12 @@
 
 
3.2.0
 
4.2.0
-
3.2.0
+
3.2.1-SNAPSHOT
 3.2.0
-4.2.1
+4.2.2-SNAPSHOT
 3.2.0
 3.2.0
-4.2.0
+4.2.1-SNAPSHOT
 4.2.0
 4.2.0
 3.2.0
@@ -71,7 +71,7 @@
 4.2.0
 3.2.0
 3.2.0
-3.2.0
+
3.2.1-SNAPSHOT
 
 1.0.3
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/207810582231431ee10a25d1b6f4ece60c1184c3
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/wpm-refactoring] 2 commits: Revert "CMS-10670 Rename wicket resource bundle"

[Michiel Eggermont]

Michiel Eggermont pushed to branch feature/wpm-refactoring at cms-community / 
hippo-cms


Commits:
fee73353 by Michiel Eggermont at 2017-03-23T11:10:17+01:00
Revert CMS-10670 Rename wicket resource bundle

Aparently wicket does not look for a resource bundle of the
superclass if it cannot find a bundle for a class.
This reverts commit 15659325c75a75d326ceaa22f80238db33c664c0.

- - - - -
b2e0335c by Michiel Eggermont at 2017-03-23T12:33:20+01:00
CMS-10670 Add translation for scheduledpublishdepublish action

- - - - -


2 changed files:

- 
perspectives/src/main/resources/org/hippoecm/frontend/plugins/cms/dashboard/todo/TodoPlugin.properties
- 
workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/AbstractDocumentWorkflowImpl.properties
 → 
workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/DocumentWorkflowImpl.properties


Changes:

=
perspectives/src/main/resources/org/hippoecm/frontend/plugins/cms/dashboard/todo/TodoPlugin.properties
=
--- 
a/perspectives/src/main/resources/org/hippoecm/frontend/plugins/cms/dashboard/todo/TodoPlugin.properties
+++ 
b/perspectives/src/main/resources/org/hippoecm/frontend/plugins/cms/dashboard/todo/TodoPlugin.properties
@@ -3,5 +3,6 @@ publish=requested publication for
 depublish=requested to take offline
 scheduledpublish=requested scheduled publication for
 scheduleddepublish=requested scheduled depublication 
for
+scheduledpublishdepublish=requested scheduled 
publication/depublication for
 delete=requested deletion for
 collection=bulk operation


=
workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/AbstractDocumentWorkflowImpl.properties
 → 
workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/DocumentWorkflowImpl.properties
=
--- 
a/workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/AbstractDocumentWorkflowImpl.properties
+++ 
b/workflow/frontend/src/main/java/org/onehippo/repository/documentworkflow/DocumentWorkflowImpl.properties



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/compare/15659325c75a75d326ceaa22f80238db33c664c0...b2e0335c1b15f22df1e801007bdb098d16b8146d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.1] CMS-10672 Bump affected artifact versions

[Tobias Jeger]

Tobias Jeger pushed to branch release/11.1 at cms-community / hippo-cms-release


Commits:
3f61e5fa by Tobias Jeger at 2017-03-23T12:32:14+01:00
CMS-10672 Bump affected artifact versions

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,12 @@
 
 
3.1.0
 
4.1.2-SNAPSHOT
-
3.1.0
+
3.1.1-SNAPSHOT
 3.1.0
-4.1.3
+4.1.4-SNAPSHOT
 3.1.0
 3.1.0
-4.1.2
+4.1.3-SNAPSHOT
 4.1.0
 4.1.1
 3.1.0
@@ -71,7 +71,7 @@
 4.1.0
 3.1.0
 3.1.0
-3.1.1
+
3.1.2-SNAPSHOT
 
 1.0.2
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/3f61e5faa7b59498404456810e50b87cdb5faafe
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][release/3.1] HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.1 at cms-community / 
hippo-plugin-taxonomy


Commits:
2457ce9e by Tobias Jeger at 2017-03-23T12:26:03+01:00
HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 4.1.0
 4.1.0
 
-3.2.1
+3.2.2
 
 2.2
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/2457ce9eb0f6681f730ef0a0fd0dfd11033f6a6a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/4.1] HSTTWO-3941 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/4.1 at cms-community / hippo-site-toolkit


Commits:
85eb31df by Tobias Jeger at 2017-03-23T12:25:15+01:00
HSTTWO-3941 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 2.4.1
 
 2.6
-3.2.1
+3.2.2
 1.4
 1.5.4
 1.8.0



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/85eb31df057543e66e2102dba56dc798342b9923
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.1] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/4.1 at cms-community / hippo-cms


Commits:
6f8acdc8 by Tobias Jeger at 2017-03-23T12:24:26+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 
 
 1.4
-3.1
+3.2.2
 1.7.0
 2.6
 1.4



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/6f8acdc88824ac7fe5482572b497ac5cdf2249d6
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][release/3.1] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.1 at cms-community / 
hippo-addon-search-service


Commits:
7e1c7a40 by Tobias Jeger at 2017-03-23T12:23:59+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 3.0
 
 2.6
-3.2.1
+3.2.2
 1.8.0
 1.4
 1.7



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/7e1c7a4020d94d1eebb2e28e14854affd005ea3e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/urlrewritefilter] 33aea3: - fix status overview

[GitHub]

  Branch: refs/heads/urlrewritefilter-4.0.x
  Home:   https://github.com/onehippo/urlrewritefilter
  Commit: 33aea3bb14348deed6f487bda8c1b465bb91a752
  
https://github.com/onehippo/urlrewritefilter/commit/33aea3bb14348deed6f487bda8c1b465bb91a752
  Author: Marijan Milicevic 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M src/main/java/org/tuckey/web/filters/urlrewrite/RuleBase.java
M src/main/java/org/tuckey/web/filters/urlrewrite/Status.java

  Log Message:
  ---
  - fix status overview


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.2] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/4.2 at cms-community / hippo-cms


Commits:
a1aee5e3 by Tobias Jeger at 2017-03-23T12:06:05+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 
 
 1.4
-3.1
+3.2.2
 1.7.0
 2.6
 1.4



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms/commit/a1aee5e35bcf85fa3a78781f503488685e6c824a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][release/4.2] HSTTWO-3941 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/4.2 at cms-community / hippo-site-toolkit


Commits:
2fd7eabe by Tobias Jeger at 2017-03-23T12:05:34+01:00
HSTTWO-3941 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 2.4.1
 
 2.6
-3.2.1
+3.2.2
 1.4
 1.5.4
 1.8.0



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2fd7eabe407f84fccd20c052faaf5a1fe6ec1548
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][release/3.2] CMS-10672 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.2 at cms-community / 
hippo-addon-search-service


Commits:
777f312e by Tobias Jeger at 2017-03-23T12:04:41+01:00
CMS-10672 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 3.0
 
 2.6
-3.2.1
+3.2.2
 1.8.0
 1.4
 1.7



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/777f312e2d333bf527b7b307c816407d788c6e26
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][release/3.2] HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

[Tobias Jeger]

Tobias Jeger pushed to branch release/3.2 at cms-community / 
hippo-plugin-taxonomy


Commits:
c07bcaf5 by Tobias Jeger at 2017-03-23T12:03:50+01:00
HIPPLUG-1451 Update commons-collections dependency to 3.2.2.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 4.2.0
 4.2.0
 
-3.2.1
+3.2.2
 
 2.2
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/c07bcaf5de350f6690453307ae615b4e28be198f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp2-CHANNELMGR-1043] CHANNELMGR-1043 Explain default max values in test

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2-CHANNELMGR-1043 
at cms-community / hippo-addon-channel-manager


Commits:
c92e4048 by Mathijs den Burger at 2017-03-23T12:03:09+01:00
CHANNELMGR-1043 Explain default max values in test

- - - - -


1 changed file:

- 
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java


Changes:

=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
=
--- 
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
+++ 
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java
@@ -178,6 +178,7 @@ public class RichTextFieldTypeTest {
 
 @Test(expected = BadRequestException.class)
 public void writeMoreValuesThanMaximum() throws Exception {
+// default maximum is 1
 FieldValue newValue1 = new FieldValue("one");
 FieldValue newValue2 = new FieldValue("two");
 type.writeTo(document, Optional.of(Arrays.asList(newValue1, 
newValue2)));



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c92e4048c99368b5988745f99a5fc2faef452b4b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp2-CHANNELMGR-1210

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CHANNELMGR-1210 
at cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release] Deleted branch feature/visual-editing-psp2-CMS-10666

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CMS-10666 at 
cms-community / hippo-cms-release
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms-release][feature/visual-editing-psp2] CMS-10666 Add CKEditor version and artifacts

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/visual-editing-psp2 at 
cms-community / hippo-cms-release


Commits:
c2890193 by Mathijs den Burger at 2017-03-22T09:36:23+01:00
CMS-10666 Add CKEditor version and artifacts

CKEditor is now used by both the CMS and the Channel Manager, so
its artifacts should be managed in a central place to make
sure theyre in sync.

- - - - -


1 changed file:

- pom.xml


Changes:

=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
 
4.0.0-SNAPSHOT
 
5.0.0-visual-editing-psp2-SNAPSHOT
 
4.0.0-SNAPSHOT
+
4.5.11-h2-visual-editing-psp2-SNAPSHOT
 4.0.0-SNAPSHOT
 5.0.0-visual-editing-psp2-SNAPSHOT
 
4.0.0-SNAPSHOT
@@ -825,6 +826,25 @@
 distribution
 zip
   
+  
+org.onehippo.cms7
+hippo-ckeditor
+optimized
+${hippo.ckeditor.version}
+runtime
+  
+  
+org.onehippo.cms7
+hippo-ckeditor
+sources
+${hippo.ckeditor.version}
+runtime
+  
+  
+org.onehippo.cms7
+hippo-ckeditor-config
+${hippo.ckeditor.version}
+  
 
 
   



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-cms-release/commit/c289019337a91ca6afd96a6c6b9ba5a1de139ce0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp2-CHANNELMGR-1035

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CHANNELMGR-1035 
at cms-community / hippo-addon-channel-manager
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/visual-editing-psp2-CHANNELMGR-1035

[Mathijs den Burger]

Mathijs den Burger deleted branch feature/visual-editing-psp2-CHANNELMGR-1035 
at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor]

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CMS-10666
  Home:   https://github.com/onehippo/ckeditor
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] a2db22: CMS-10666 Add config module with default editor co...

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2
  Home:   https://github.com/onehippo/ckeditor
  Commit: a2db22b80164bc2a396f67521cf753e89ca1657c
  
https://github.com/onehippo/ckeditor/commit/a2db22b80164bc2a396f67521cf753e89ca1657c
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
A config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A config/src/main/resources/ckeditor/hippocontents.css
A config/src/main/resources/ckeditor/hippostyles.js
A config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M pom.xml

  Log Message:
  ---
  CMS-10666 Add config module with default editor config for Hippo CMS

Also moved the hippostyles.js and hippocontents.css files that are
referenced in the config.


  Commit: 6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  
https://github.com/onehippo/ckeditor/commit/6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java

  Log Message:
  ---
  CMS-10666 Add constants for CKEditor config properties


  Commit: e1536e0df918d108b92cf5516dc2ce80da2688ac
  
https://github.com/onehippo/ckeditor/commit/e1536e0df918d108b92cf5516dc2ce80da2688ac
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M .gitignore

  Log Message:
  ---
  CMS-10666 Add trailing slash to ignored directories


  Commit: 3a12e8b6909947a76f5e46ff545d1df77063b221
  
https://github.com/onehippo/ckeditor/commit/3a12e8b6909947a76f5e46ff545d1df77063b221
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10666 Cleanup root pom


  Commit: 39cc78193bbcfc75218d9dea44d3ebf44973e89a
  
https://github.com/onehippo/ckeditor/commit/39cc78193bbcfc75218d9dea44d3ebf44973e89a
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M .gitignore
A config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A config/src/main/resources/ckeditor/hippocontents.css
A config/src/main/resources/ckeditor/hippostyles.js
A config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M pom.xml

  Log Message:
  ---
  CMS-10666 Reintegrate feature/visual-editing-psp2-CMS-10666


Compare: 
https://github.com/onehippo/ckeditor/compare/cfd79080099f...39cc78193bbc___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] 3a12e8: CMS-10666 Cleanup root pom

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CMS-10666
  Home:   https://github.com/onehippo/ckeditor
  Commit: 3a12e8b6909947a76f5e46ff545d1df77063b221
  
https://github.com/onehippo/ckeditor/commit/3a12e8b6909947a76f5e46ff545d1df77063b221
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M pom.xml

  Log Message:
  ---
  CMS-10666 Cleanup root pom


___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor]

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CHANNELMGR-1035
  Home:   https://github.com/onehippo/ckeditor
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] a2db22: CMS-10666 Add config module with default editor co...

[GitHub]

  Branch: refs/heads/feature/visual-editing-psp2-CMS-10666
  Home:   https://github.com/onehippo/ckeditor
  Commit: a2db22b80164bc2a396f67521cf753e89ca1657c
  
https://github.com/onehippo/ckeditor/commit/a2db22b80164bc2a396f67521cf753e89ca1657c
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
A config/pom.xml
A config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java
A config/src/main/resources/ckeditor/hippocontents.css
A config/src/main/resources/ckeditor/hippostyles.js
A config/src/test/java/org/onehippo/ckeditor/CKEditorConfigTest.java
M pom.xml

  Log Message:
  ---
  CMS-10666 Add config module with default editor config for Hippo CMS

Also moved the hippostyles.js and hippocontents.css files that are
referenced in the config.


  Commit: 6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  
https://github.com/onehippo/ckeditor/commit/6251dd63dafd04c2dcaba3b2373489ac9bbd8a33
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M config/src/main/java/org/onehippo/ckeditor/CKEditorConfig.java

  Log Message:
  ---
  CMS-10666 Add constants for CKEditor config properties


  Commit: e1536e0df918d108b92cf5516dc2ce80da2688ac
  
https://github.com/onehippo/ckeditor/commit/e1536e0df918d108b92cf5516dc2ce80da2688ac
  Author: Mathijs den Burger 
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
M .gitignore

  Log Message:
  ---
  CMS-10666 Add trailing slash to ignored directories


Compare: 
https://github.com/onehippo/ckeditor/compare/a2db22b80164^...e1536e0df918___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/wpm

[Michiel Eggermont]

Michiel Eggermont deleted branch feature/wpm at cms-community / hippo-cms
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/wpm-refactoring

[Michiel Eggermont]

Michiel Eggermont pushed new branch feature/wpm-refactoring at cms-community / 
hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/wpm

[Michiel Eggermont]

Michiel Eggermont deleted branch feature/wpm at cms-community / hippo-repository
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn