[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4206: Switch to official OSGi versioning annotations
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
1fde1e92 by Julian Reschke at 2017-10-23T21:13:43+00:00
JCR-4206: Switch to official OSGi versioning annotations
Part 3: other annotations in jackrabbit-api
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1813098
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
8 changed files:
- jackrabbit-api/pom.xml
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/UserManager.java
-
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/package-info.java
Changes:
=
jackrabbit-api/pom.xml
=
--- a/jackrabbit-api/pom.xml
+++ b/jackrabbit-api/pom.xml
@@ -59,12 +59,6 @@
jcr
- biz.aQute
- bndlib
- 1.43.0
- provided
-
-
org.osgi
org.osgi.annotation
provided
=
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java
=
---
a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java
+++
b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlEntry.java
@@ -21,7 +21,7 @@ import javax.jcr.Value;
import javax.jcr.ValueFormatException;
import javax.jcr.security.AccessControlEntry;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* JackrabbitAccessControlEntry is a Jackrabbit specific extension
=
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
=
---
a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
+++
b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
@@ -27,7 +27,7 @@ import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.Privilege;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* JackrabbitAccessControlList is an extension of the
AccessControlList.
=
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
=
---
a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
+++
b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
@@ -24,10 +24,11 @@ import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.Privilege;
+
import java.security.Principal;
import java.util.Set;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* JackrabbitAccessControlManager provides extensions to the
=
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java
=
---
a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java
+++
b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlPolicy.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.api.security;
import javax.jcr.security.AccessControlPolicy;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* JackrabbitAccessControlPolicy is an extension of the
=
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java
=
---
a/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java
+++
b/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authentication/token/package-info.java
@@ -19,5 +19,4 @@
* Token credentials.
*/
@org.osgi.annotation.versioning.Version("2.3")
-@aQute.bnd.annotation.Export(optional = "provide:=true")
package org.apache.jackrabbit.api.security.authentication.token;
=
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/projectdocs] CHANNELMGR-1534 Make workflow call user context aware
Michiel Rop pushed to branch feature/projectdocs at cms-community /
hippo-addon-channel-manager
Commits:
5bcdc92a by Michiel Rop at 2017-10-23T21:27:20+02:00
CHANNELMGR-1534 Make workflow call user context aware
- - - - -
1 changed file:
-
frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/social/SocialSharingPlugin.java
Changes:
=
frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/social/SocialSharingPlugin.java
=
---
a/frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/social/SocialSharingPlugin.java
+++
b/frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/social/SocialSharingPlugin.java
@@ -29,6 +29,7 @@ import org.hippoecm.addon.workflow.StdWorkflow;
import org.hippoecm.addon.workflow.WorkflowDescriptorModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
+import org.hippoecm.frontend.plugins.standardworkflow.ContextPayloadProvider;
import org.hippoecm.frontend.session.UserSession;
import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.api.Workflow;
@@ -88,7 +89,7 @@ public class SocialSharingPlugin extends
CompatibilityWorkflowPlugin {
if (node.isNodeType(HippoNodeType.NT_HANDLE)) {
WorkflowManager workflowManager =
UserSession.get().getWorkflowManager();
DocumentWorkflow workflow = (DocumentWorkflow)
workflowManager.getWorkflow(model.getObject());
-Serializable isLive = workflow.hints().get("isLive");
+Serializable isLive =
workflow.hints(ContextPayloadProvider.get()).get("isLive");
isPublished = (isLive instanceof Boolean) && ((Boolean)
isLive);
}
} catch (RepositoryException | RemoteException | WorkflowException
e) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5bcdc92a6156f3d59a0e3f923ef55c37e09c8417
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5bcdc92a6156f3d59a0e3f923ef55c37e09c8417
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4206: Switch to official OSGi versioning annotations
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: 6e002d4e by Julian Reschke at 2017-10-23T15:31:18+00:00 JCR-4206: Switch to official OSGi versioning annotations Part 1: just version annotations git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1813029 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 30 changed files: - jackrabbit-aws-ext/pom.xml - jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/package-info.java - jackrabbit-data/pom.xml - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/config/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/db/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/util/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/local/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/fs/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/core/util/db/package-info.java - jackrabbit-data/src/main/java/org/apache/jackrabbit/data/core/package-info.java - jackrabbit-jcr-commons/pom.xml - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/cnd/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/iterator/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/authorization/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/jackrabbit/user/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/json/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/observation/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/predicate/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/sql2/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/visitor/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java - jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/xml/package-info.java The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6e002d4e7cda3bad9daf21822d39a8df327db2ee --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6e002d4e7cda3bad9daf21822d39a8df327db2ee You're receiving this email because of your account on code.onehippo.org. ___ 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/5.0] CMS-10962 [back port CMS_10839 to 12.0] narrow down the styling of checkbox and…
Jeroen Hoffman pushed to branch release/5.0 at cms-community / hippo-cms
Commits:
54cfc1a3 by Jeroen Hoffman at 2017-10-23T16:31:43+02:00
CMS-10962 [back port CMS_10839 to 12.0] narrow down the styling of checkbox and
label to only this plugin
(cherry picked from commit 3427df93da6fe7a19b046c0a0b3bc0048f56408b)
- - - - -
2 changed files:
- api/src/main/styling/styles/_editor.scss
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
Changes:
=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -114,6 +114,10 @@
width: auto;
}
+ .hippo-editor-field-boolean > input[type="checkbox"] + label {
+margin-left: 8px;
+ }
+
input[type="submit"] {
width: auto;
}
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
@@ -1,5 +1,5 @@
http://wicket.apache.org/;>
-
+
- [
mixin ]
+
+ [
mixin ]
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/54cfc1a37cbd469724b4099ac4786cad8fb50b3b
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/54cfc1a37cbd469724b4099ac4786cad8fb50b3b
You're receiving this email because of your account on code.onehippo.org.
___
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/projectdocs] CMS-10959 Let infoEditAction determine its own visibility
Michiel Rop pushed to branch feature/projectdocs at cms-community / hippo-cms
Commits:
e1ed2f53 by Michiel Rop at 2017-10-23T10:25:37+02:00
CMS-10959 Let infoEditAction determine its own visibility
- - - - -
2 changed files:
-
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractPreviewWorkflowPlugin.java
-
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PreviewWorkflowPlugin.java
Changes:
=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractPreviewWorkflowPlugin.java
=
---
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractPreviewWorkflowPlugin.java
+++
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/AbstractPreviewWorkflowPlugin.java
@@ -46,15 +46,11 @@ import org.hippoecm.repository.api.DocumentWorkflowAction;
import org.hippoecm.repository.api.Workflow;
import org.hippoecm.repository.api.WorkflowTransition;
import org.hippoecm.repository.util.NodeIterable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractPreviewWorkflowPlugin extends
AbstractDocumentWorkflowPlugin {
private static final long serialVersionUID = 1L;
-private static final Logger log =
LoggerFactory.getLogger(AbstractPreviewWorkflowPlugin.class);
-
private final StdWorkflow infoAction;
private final StdWorkflow infoEditAction;
private final StdWorkflow editAction;
@@ -158,7 +154,6 @@ public abstract class AbstractPreviewWorkflowPlugin extends
AbstractDocumentWork
private void hideInvalidActions() {
hideIfNotAllowed(info, "obtainEditableInstance", editAction);
hideOrDisable(info, "status", infoAction);
-infoEditAction.setVisible(getInfoEditActionVisibility());
}
protected final String getHint(final String key){
@@ -169,9 +164,6 @@ public abstract class AbstractPreviewWorkflowPlugin extends
AbstractDocumentWork
return StringUtils.EMPTY;
}
-
-protected abstract boolean getInfoEditActionVisibility();
-
protected abstract StdWorkflow getInfoEditAction();
}
=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PreviewWorkflowPlugin.java
=
---
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PreviewWorkflowPlugin.java
+++
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/PreviewWorkflowPlugin.java
@@ -35,13 +35,23 @@ public class PreviewWorkflowPlugin extends
AbstractPreviewWorkflowPlugin {
inUseBy = getHint("inUseBy");
}
-protected boolean getInfoEditActionVisibility() {
-return StringUtils.isNotEmpty(inUseBy);
-}
-
protected StdWorkflow getInfoEditAction() {
return new StdWorkflow("infoEdit", "infoEdit") {
+/**
+ * Gets whether this component and any children are visible.
+ *
+ * WARNING: this method can be called multiple times during a
request. If you override this method, it is a good
+ * idea to keep it cheap in terms of processing. Alternatively,
you can call {@link #setVisible(boolean)}.
+ *
+ *
+ * @return True if component and any children are visible
+ */
+@Override
+public boolean isVisible() {
+return StringUtils.isNotEmpty(inUseBy);
+}
+
@Override
public String getSubMenu() {
return "info";
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e1ed2f53381e2b21b29904e03e7311f1b85c68a2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e1ed2f53381e2b21b29904e03e7311f1b85c68a2
You're receiving this email because of your account on code.onehippo.org.
___
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/projectdocs] CHANNELMGR-1534 Make workflow call user context aware
Michiel Rop pushed to branch feature/projectdocs at cms-community /
hippo-addon-channel-manager
Commits:
fc2f9d89 by Michiel Rop at 2017-10-23T15:39:24+02:00
CHANNELMGR-1534 Make workflow call user context aware
- - - - -
1 changed file:
-
frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin.java
Changes:
=
frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin.java
=
---
a/frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin.java
+++
b/frontend/src/main/java/org/onehippo/cms7/channelmanager/plugins/channelactions/ChannelActionsPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2011-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.
@@ -49,6 +49,7 @@ import org.hippoecm.addon.workflow.WorkflowDescriptorModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.frontend.plugins.standards.icon.HippoIcon;
+import org.hippoecm.frontend.plugins.standardworkflow.ContextPayloadProvider;
import org.hippoecm.frontend.service.IRestProxyService;
import org.hippoecm.frontend.session.UserSession;
import org.hippoecm.frontend.skin.Icon;
@@ -87,7 +88,7 @@ public class ChannelActionsPlugin extends
CompatibilityWorkflowPlugin
if (node.isNodeType(HippoNodeType.NT_HANDLE)) {
WorkflowManager workflowManager =
UserSession.get().getWorkflowManager();
DocumentWorkflow workflow = (DocumentWorkflow)
workflowManager.getWorkflow(model.getObject());
-if
(Boolean.TRUE.equals(workflow.hints().get("previewAvailable"))) {
+if
(Boolean.TRUE.equals(workflow.hints(ContextPayloadProvider.get()).get("previewAvailable")))
{
addMenuDescription(model);
}
}
@@ -153,12 +154,7 @@ public class ChannelActionsPlugin extends
CompatibilityWorkflowPlugin
for (final Map.Entry entry :
liveRestProxyServices.entrySet()) {
final DocumentService documentService =
entry.getValue().createSecureRestProxy(DocumentService.class);
-restProxyJobs.add(new Callable() {
-@Override
-public List call() throws Exception {
-return
documentService.getChannels(documentUuid).getChannelDocuments();
-}
-});
+restProxyJobs.add(() ->
documentService.getChannels(documentUuid).getChannelDocuments());
}
final List combinedChannelDocuments = new
ArrayList<>();
@@ -174,9 +170,9 @@ public class ChannelActionsPlugin extends
CompatibilityWorkflowPlugin
}
}
}
-Collections.sort(combinedChannelDocuments,
getChannelDocumentComparator());
+combinedChannelDocuments.sort(getChannelDocumentComparator());
-final Map idToChannelMap = new
LinkedHashMap();
+final Map idToChannelMap = new
LinkedHashMap<>();
for (final ChannelDocument channelDocument : combinedChannelDocuments)
{
idToChannelMap.put(channelDocument.getChannelId(),
channelDocument);
}
@@ -188,7 +184,7 @@ public class ChannelActionsPlugin extends
CompatibilityWorkflowPlugin
if (!idToChannelMap.isEmpty()) {
return new ArrayList<>(idToChannelMap.keySet());
} else {
-return Arrays.asList("");
+return Collections.singletonList("");
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fc2f9d89ce1285705d4664094180a045afddd3d7
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fc2f9d89ce1285705d4664094180a045afddd3d7
You're receiving this email because of your account on code.onehippo.org.
___
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 bugfix/CHANNELMGR-1459
Ran Shem Tov deleted branch bugfix/CHANNELMGR-1459 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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/CC-CHANNELMGR-1516
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1516 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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/CC-CHANNELMGR-1506
Ran Shem Tov deleted branch feature/CC-CHANNELMGR-1506 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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/CC-CHANNELMGR-1506] CHANNELMGR-1506 Extract close channel message to its own property to allow the change of it
Ran Shem Tov pushed to branch feature/CC-CHANNELMGR-1506 at cms-community /
hippo-addon-channel-manager
Commits:
b0e4057c by Ran ShemTov at 2017-10-23T13:14:23+02:00
CHANNELMGR-1506 Extract close channel message to its own property to allow the
change of it
- - - - -
1 changed file:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
@@ -63,7 +63,7 @@ class RightSidePanelCtrl {
this._onOpen();
},
// onClose
- () => this.beforeStateChange('SAVE_CHANGES_ON_CLOSE_CHANNEL').then(() =>
this._onClose()));
+ () => this.beforeStateChange(this.closeChannelMessage).then(() =>
this._onClose()));
}
$onInit() {
@@ -91,6 +91,7 @@ class RightSidePanelCtrl {
this.editing = true;
});
}
+this.closeChannelMessage = 'SAVE_CHANGES_ON_CLOSE_CHANNEL';
}
setCreateState() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b0e4057cfb5010937a9793299d3091a9f9727406
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b0e4057cfb5010937a9793299d3091a9f9727406
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4205: Upgrade JTA dependency to javax.transaction-api 1.2
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: ed7a00e7 by Julian Reschke at 2017-10-23T11:09:16+00:00 JCR-4205: Upgrade JTA dependency to javax.transaction-api 1.2 git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1812994 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - jackrabbit-core/pom.xml - jackrabbit-parent/pom.xml Changes: = jackrabbit-core/pom.xml = --- a/jackrabbit-core/pom.xml +++ b/jackrabbit-core/pom.xml @@ -334,8 +334,8 @@ org.apache.jackrabbit.test.api.query.qom.NodeLocalNameTest#testURILiteral test - org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + javax.transaction + javax.transaction-api test = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -430,9 +430,9 @@ 2.5 -org.apache.geronimo.specs -geronimo-jta_1.0.1B_spec -1.0.1 +javax.transaction +javax.transaction-api +1.2 org.slf4j View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/ed7a00e7bd047b859cbf03c46b68c857884b3e89 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/ed7a00e7bd047b859cbf03c46b68c857884b3e89 You're receiving this email because of your account on code.onehippo.org. ___ 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/CC-CHANNELMGR-1480] CHANNELMGR-1480 Simplify rightSidePanel logic for switching between edit
Arthur Bogaart pushed to branch feature/CC-CHANNELMGR-1480 at cms-community /
hippo-addon-channel-manager
Commits:
67bc6477 by Arthur Bogaart at 2017-10-23T10:49:06+02:00
CHANNELMGR-1480 Simplify rightSidePanel logic for switching between
editcreate
- - - - -
2 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
- frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.html
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.controller.js
@@ -44,16 +44,7 @@ class RightSidePanelCtrl {
SidePanelService.initialize('right', $element.find('.right-side-panel'),
// onOpen
- (type, options) => {
-if (type === 'edit') {
- this._openEditContent(options);
-} else if (type === 'create') {
- this._openCreateContent(options);
-} else {
- throw new Error(`Failed to open rightside panel component with type
${type}`);
-}
-this._onOpen();
- },
+ (type, options) => this._onOpen(type, options),
// onClose
() => this._onClose());
}
@@ -63,36 +54,24 @@ class RightSidePanelCtrl {
this.lastSavedWidth = this.localStorageService.get('rightSidePanelWidth')
|| '440px';
}
- _openEditContent(documentId) {
-if (this.documentId === documentId) {
- return;
-}
-
-this.beforeStateChange().then(() => {
- this._resetState();
- if (documentId) {
-this.documentId = documentId;
-this.editing = true;
- } else {
-this.createContent = true;
- }
-});
+ _openEditContent(options) {
+this.editing = true;
+this.options = options;
}
_openCreateContent(options) {
-this._resetState();
+this.creating = true;
this.options = options;
-this.create = true;
this.title = this.$translate.instant('NEW_CONTENT');
}
onBeforeStateChange(callback) {
this.beforeStateChange = callback;
}
+
_resetState() {
-delete this.documentId;
delete this.editing;
-delete this.create;
+delete this.creating;
delete this.options;
this._resetBeforeStateChange();
}
@@ -105,10 +84,21 @@ class RightSidePanelCtrl {
return this.SidePanelService.isOpen('right');
}
- _onOpen() {
-this.$element.addClass('sidepanel-open');
-this.$element.css('width', this.lastSavedWidth);
-this.$element.css('max-width', this.lastSavedWidth);
+ _onOpen(type, options) {
+this.beforeStateChange().then(() => {
+ this._resetState();
+ if (type === 'edit') {
+this._openEditContent(options);
+ } else if (type === 'create') {
+this._openCreateContent(options);
+ } else {
+throw new Error(`Failed to open rightside panel component with type
${type}`);
+ }
+
+ this.$element.addClass('sidepanel-open');
+ this.$element.css('width', this.lastSavedWidth);
+ this.$element.css('max-width', this.lastSavedWidth);
+});
}
_onClose() {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/rightSidePanel.html
@@ -25,12 +25,12 @@
ng-if="!RightSidePanelCtrl.isFullWidth">
-
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/67bc64775c50fae712b230623c5f3587ee06a924
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/67bc64775c50fae712b230623c5f3587ee06a924
You're receiving this email because of your account on code.onehippo.org.
___
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/CC-CHANNELMGR-1483
Mathijs den Burger deleted branch feature/CC-CHANNELMGR-1483 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ 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/CC-CHANNELMGR-1483] CHANNELMGR-1483 Simplify SlugFactory
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1483 at cms-community
/ hippo-addon-channel-manager
Commits:
bdd93e92 by Mathijs den Burger at 2017-10-23T09:48:25+02:00
CHANNELMGR-1483 Simplify SlugFactory
The locale argument to StringCodecService#getStringCodec can be null, so
we need only one method in SlugFactory. The calling code can then also
be reduced to a one-liner.
- - - - -
4 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/slug/SlugFactory.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/slug/SlugFactoryTest.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
@@ -113,13 +113,7 @@ public class ContentResource {
@Path("slugs")
public Response createSlug(String contentName, @QueryParam("locale")
String contentLocale, @Context HttpServletRequest servletRequest) {
return executeTask(servletRequest, Status.OK,
-(session, userLocale) -> {
-if (contentLocale == null) {
-return SlugFactory.createSlug(contentName);
-} else {
-return SlugFactory.createSlug(contentName,
contentLocale);
-}
-});
+(session, userLocale) -> SlugFactory.createSlug(contentName,
contentLocale));
}
private Response executeTask(final HttpServletRequest servletRequest,
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/slug/SlugFactory.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/slug/SlugFactory.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/slug/SlugFactory.java
@@ -22,18 +22,6 @@ import org.onehippo.cms7.services.HippoServiceRegistry;
public class SlugFactory {
/**
- * Creates a slug for a piece of content (a document, a folder, etc).
- *
- * @param name the name of the piece of content
- * @return the slug
- */
-public static String createSlug(final String name) {
-final StringCodecService service =
HippoServiceRegistry.getService(StringCodecService.class);
-final StringCodec codec =
service.getStringCodec(StringCodecService.Encoding.NODE_NAME);
-return codec.encode(name);
-}
-
-/**
* Creates a slug for a piece of content (a document, a folder, etc) in a
certain locale.
*
* @param name the name of the piece of content
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
@@ -289,7 +289,7 @@ public class ContentResourceTest extends CXFTest {
public void createSlugWithoutLocale() {
PowerMock.mockStaticPartial(SlugFactory.class, "createSlug");
-expect(SlugFactory.createSlug(eq("some content
name"))).andReturn("some-content-name");
+expect(SlugFactory.createSlug(eq("some content name"),
eq(null))).andReturn("some-content-name");
replayAll();
given()
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/slug/SlugFactoryTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/slug/SlugFactoryTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/slug/SlugFactoryTest.java
@@ -50,12 +50,12 @@ public class SlugFactoryTest {
final StringCodec codec = createMock(StringCodec.class);
expect(HippoServiceRegistry.getService(StringCodecService.class)).andReturn(codecService);
-
expect(codecService.getStringCodec(eq(StringCodecService.Encoding.NODE_NAME))).andReturn(codec);
+
expect(codecService.getStringCodec(eq(StringCodecService.Encoding.NODE_NAME),
eq(null))).andReturn(codec);
expect(codec.encode("a document name")).andReturn("a-document-name");
replayAll(codecService, codec);
-assertThat(SlugFactory.createSlug("a document name"),
equalTo("a-document-name"));
+assertThat(SlugFactory.createSlug("a document name",
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/create-content] REPO-1868 Improve javadoc of StringCodecService
Mathijs den Burger pushed to branch feature/create-content at cms-community /
hippo-repository
Commits:
b07903e3 by Mathijs den Burger at 2017-10-23T09:43:46+02:00
REPO-1868 Improve javadoc of StringCodecService
- - - - -
1 changed file:
- api/src/main/java/org/hippoecm/repository/api/StringCodecService.java
Changes:
=
api/src/main/java/org/hippoecm/repository/api/StringCodecService.java
=
--- a/api/src/main/java/org/hippoecm/repository/api/StringCodecService.java
+++ b/api/src/main/java/org/hippoecm/repository/api/StringCodecService.java
@@ -42,6 +42,7 @@ public interface StringCodecService {
/**
* Returns the default string codec for a certain encoding.
+ * Equivalent to calling {@link #getStringCodec(Encoding, String)} with a
null locale.
*
* @param encoding the type of encoding
*
@@ -53,7 +54,7 @@ public interface StringCodecService {
* Returns the string codec for a certain encoding that is best suited for
the given locale.
*
* @param encoding the type of encoding
- * @param locale the locale the string codec will be used for
+ * @param locale the locale the string codec will be used for. Can be null.
*
* @return the best matching string codec, or the default string codec if
no specific one could be found.
*/
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/b07903e332dae38c1283a09b17e4cad122cd2f37
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/b07903e332dae38c1283a09b17e4cad122cd2f37
You're receiving this email because of your account on code.onehippo.org.
___
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-10960 [back port CMS_10839 to 11.2] narrow down the styling of checkbox and…
Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-cms
Commits:
0a6ed6f1 by Jeroen Hoffman at 2017-10-23T09:37:10+02:00
CMS-10960 [back port CMS_10839 to 11.2] narrow down the styling of checkbox and
label to only this plugin
(cherry picked from commit 3427df93da6fe7a19b046c0a0b3bc0048f56408b)
- - - - -
2 changed files:
- api/src/main/styling/styles/_editor.scss
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
Changes:
=
api/src/main/styling/styles/_editor.scss
=
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -114,6 +114,10 @@
width: auto;
}
+ .hippo-editor-field-boolean > input[type="checkbox"] + label {
+margin-left: 8px;
+ }
+
input[type="submit"] {
width: auto;
}
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinPlugin.html
@@ -1,5 +1,5 @@
http://wicket.apache.org/;>
-
+
- [
mixin ]
+
+ [
mixin ]
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/0a6ed6f1801de6e3a7d3a12b6d7ea8b0eb4242d9
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/0a6ed6f1801de6e3a7d3a12b6d7ea8b0eb4242d9
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
