[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.8] JCR-4187: Release Jackrabbit 2.8.6
GitLab Mirror pushed to branch 2.8 at cms-community / hippo-jackrabbit Commits: 3a6d52c0 by Julian Reschke at 2017-09-22T05:24:00+00:00 JCR-4187: Release Jackrabbit 2.8.6 git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.8@1809254 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - RELEASE-NOTES.txt Changes: = RELEASE-NOTES.txt = --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,27 +1,34 @@ -Release Notes -- Apache Jackrabbit -- Version 2.8.5 +Release Notes -- Apache Jackrabbit -- Version 2.8.6 Introduction -This is Apache Jackrabbit(TM) 2.8.5, a fully compliant implementation of the +This is Apache Jackrabbit(TM) 2.8.6, a fully compliant implementation of the Content Repository for Java(TM) Technology API, version 2.0 (JCR 2.0) as specified in the Java Specification Request 283 (JSR 283). -Apache Jackrabbit 2.8.5 is a patch release that contains fixes and +Apache Jackrabbit 2.8.6 is a patch release that contains fixes and improvements over Jackrabbit 2.8. Jackrabbit 2.8.x releases are considered stable and targeted for production use. -Changes since Jackrabbit 2.8.4 +Changes since Jackrabbit 2.8.5 -- +Bug + +[JCR-4079] - incorrect PROPPATCH response error handling +[JCR-4118] - RepositoryChecker creates invalid node names +[JCR-4121] - ConcurrentModificationException in InternalVersionHistoryImpl.fixLegacy() +[JCR-4133] - fix javadoc problems that are errors with JDK8 + Improvement -[JCR-3801] - Improve ListenerTracker output -[JCR-3812] - Improvements to the GQL tools +[JCR-3924] - Allow release-deploy to skip tests Task -[JCR-4106] - fix JCR API docs link +[JCR-4122] - align parent pom references with Oak +[JCR-4129] - get rid of unused org.json dependency In addition to the above-mentioned changes, this release contains View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/3a6d52c07df3db8b8ea4705ca1f93ced50538166 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/3a6d52c07df3db8b8ea4705ca1f93ced50538166 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-site-toolkit][feature/HSTTWO-4133] HSTTWO-4133: Adding missing method
Woonsan Ko pushed to branch feature/HSTTWO-4133 at cms-community /
hippo-site-toolkit
Commits:
db3d5f79 by Woonsan Ko at 2017-09-21T15:22:05-04:00
HSTTWO-4133: Adding missing method
- - - - -
1 changed file:
-
components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultComponentConfigurationResolver.java
Changes:
=
components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultComponentConfigurationResolver.java
=
---
a/components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultComponentConfigurationResolver.java
+++
b/components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultComponentConfigurationResolver.java
@@ -152,5 +152,8 @@ public class DefaultComponentConfigurationResolver
implements ComponentConfigura
return null;
}
+public String getParametersInfoClassName() {
+return null;
+}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/db3d5f795d9a68263cbd598b3e930fcea8b5bb4c
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/db3d5f795d9a68263cbd598b3e930fcea8b5bb4c
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-testsuite] Pushed new branch feature/HSTTWO-4133
Woonsan Ko pushed new branch feature/HSTTWO-4133 at cms-community / hippo-testsuite --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/tree/feature/HSTTWO-4133 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-site-toolkit][feature/HSTTWO-4133] HSTTWO-4133: add exception handling
Woonsan Ko pushed to branch feature/HSTTWO-4133 at cms-community /
hippo-site-toolkit
Commits:
b1836457 by Woonsan Ko at 2017-09-21T12:08:12-04:00
HSTTWO-4133: add exception handling
- - - - -
3 changed files:
-
commons/src/main/java/org/hippoecm/hst/core/component/HstParameterInfoProxyFactoryImpl.java
-
components/core/src/test/java/org/hippoecm/hst/core/container/TestHstComponentInvokerImpl.java
-
components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultParametersInfoProviderContextProvider.java
Changes:
=
commons/src/main/java/org/hippoecm/hst/core/component/HstParameterInfoProxyFactoryImpl.java
=
---
a/commons/src/main/java/org/hippoecm/hst/core/component/HstParameterInfoProxyFactoryImpl.java
+++
b/commons/src/main/java/org/hippoecm/hst/core/component/HstParameterInfoProxyFactoryImpl.java
@@ -59,7 +59,7 @@ public class HstParameterInfoProxyFactoryImpl implements
HstParameterInfoProxyFa
@Override
public T createParameterInfoProxy(final ParametersInfo
parametersInfo,final ComponentConfiguration componentConfig,
final HstRequest request, final HstParameterValueConverter
converter) {
-return createParameterInfoProxy(parametersInfo, componentConfig,
request, converter);
+return createParameterInfoProxy(parametersInfo, componentConfig,
(HttpServletRequest) request, converter);
}
@Override
=
components/core/src/test/java/org/hippoecm/hst/core/container/TestHstComponentInvokerImpl.java
=
---
a/components/core/src/test/java/org/hippoecm/hst/core/container/TestHstComponentInvokerImpl.java
+++
b/components/core/src/test/java/org/hippoecm/hst/core/container/TestHstComponentInvokerImpl.java
@@ -173,7 +173,7 @@ public class TestHstComponentInvokerImpl {
@Override
public T createParameterInfoProxy(final ParametersInfo
parametersInfo,final ComponentConfiguration componentConfig,
final HstRequest request, final HstParameterValueConverter
converter) {
-return createParameterInfoProxy(parametersInfo, componentConfig,
request, converter);
+return createParameterInfoProxy(parametersInfo, componentConfig,
(HttpServletRequest) request, converter);
}
@Override
=
components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultParametersInfoProviderContextProvider.java
=
---
a/components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultParametersInfoProviderContextProvider.java
+++
b/components/jaxrs/src/main/java/org/hippoecm/hst/jaxrs/cxf/DefaultParametersInfoProviderContextProvider.java
@@ -49,6 +49,13 @@ public class DefaultParametersInfoProviderContextProvider
implements ContextProv
public ParametersInfoProvider createContext(Message message) {
final OperationResourceInfo operationResourceInfo =
message.getExchange().get(OperationResourceInfo.class);
final Class resourceCls =
operationResourceInfo.getClassResourceInfo().getResourceClass();
+
+if (!resourceCls.isAnnotationPresent(ParametersInfo.class)) {
+throw new RuntimeException(
+"Cannot find
org.hippoecm.hst.core.parameters.ParametersInfo annotation in the resource
class: "
++ resourceCls);
+}
+
return new ParametersInfoProviderImpl(message,
resourceCls.getAnnotation(ParametersInfo.class));
}
@@ -71,10 +78,6 @@ public class DefaultParametersInfoProviderContextProvider
implements ContextProv
@Override
public T getParametersInfo() {
-if (paramsInfoAnno == null) {
-return null;
-}
-
final HstRequestContext requestContext =
RequestContextProvider.get();
final HstParameterInfoProxyFactory parameterInfoProxyFacotory =
requestContext
.getParameterInfoProxyFactory();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b1836457ec18e9afc8d58864d1c319da5d1fe68a
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/b1836457ec18e9afc8d58864d1c319da5d1fe68a
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-plugin-taxonomy][feature/HIPPLUG-1480-B] HIPPLUG-1480 match the document locale against available translations
Bert Leunis pushed to branch feature/HIPPLUG-1480-B at cms-community /
hippo-plugin-taxonomy
Commits:
f2e367a3 by Bert Leunis at 2017-09-21T14:39:43+02:00
HIPPLUG-1480 match the document locale against available translations
- - - - -
4 changed files:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/api/TaxonomyHelper.java
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
- api/src/main/java/org/onehippo/taxonomy/api/Category.java
- hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/api/TaxonomyHelper.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/api/TaxonomyHelper.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/api/TaxonomyHelper.java
@@ -15,7 +15,9 @@
*/
package org.onehippo.taxonomy.plugin.api;
+import java.util.List;
import java.util.Locale;
+import java.util.Map;
import org.apache.commons.lang.LocaleUtils;
import org.onehippo.taxonomy.api.Category;
@@ -30,9 +32,13 @@ public final class TaxonomyHelper {
}
public static String getCategoryName(final Category category, final Locale
locale) {
-CategoryInfo info = category.getInfo(locale);
-if (info != null) {
-return info.getName();
+if (locale != null) {
+final List documentLocale =
Locale.LanguageRange.parse(locale.toLanguageTag());
+final Map availableTranslationsMap
= category.getInfosByLocale();
+final Locale matchingLocale = Locale.lookup(documentLocale,
availableTranslationsMap.keySet());
+if (matchingLocale != null) {
+return availableTranslationsMap.get(matchingLocale).getName();
+}
}
return category.getName();
}
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
@@ -312,6 +312,27 @@ public class JcrCategory extends TaxonomyObject implements
EditableCategory {
}
@Override
+public Map getInfosByLocale() {
+Map map = new HashMap<>();
+try {
+final Node node = getNode();
+if (node.hasNode(HIPPOTAXONOMY_CATEGORYINFOS)) {
+final Node infosNode =
node.getNode(HIPPOTAXONOMY_CATEGORYINFOS);
+final NodeIterator infoNodesIterator = infosNode.getNodes();
+while (infoNodesIterator.hasNext()) {
+final Node infoNode = infoNodesIterator.nextNode();
+final Locale locale =
LocaleUtils.toLocale(infoNode.getName());
+final JcrCategoryInfo jcrCategoryInfo = new
JcrCategoryInfo(new JcrNodeModel(infoNode), editable);
+map.put(locale, jcrCategoryInfo);
+}
+}
+} catch (RepositoryException ex) {
+log.error(ex.getMessage());
+}
+return map;
+}
+
+@Override
public boolean equals(Object obj) {
if (obj instanceof JcrCategory) {
return ((JcrCategory) obj).getNodeModel().equals(getNodeModel());
=
api/src/main/java/org/onehippo/taxonomy/api/Category.java
=
--- a/api/src/main/java/org/onehippo/taxonomy/api/Category.java
+++ b/api/src/main/java/org/onehippo/taxonomy/api/Category.java
@@ -77,9 +77,16 @@ public interface Category {
/**
* @return returns unmodifiable translations map keyed by language names.
+ * @deprecated use {@link #getInfosByLocale()} instead
*/
+@Deprecated
Map getInfos();
-
+
+/**
+ * @return returns unmodifiable translations map keyed by Locales.
+ */
+Map getInfosByLocale();
+
/**
*
* @return the {@link Taxonomy} that contains this item
=
hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
=
--- a/hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
+++ b/hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
@@ -162,7 +162,11 @@ public class CategoryImpl extends AbstractJCRService
implements Category {
return info;
}
+/**
+ * @deprecated use {@link #getInfosByLocale()} instead
+ */
@SuppressWarnings("unchecked")
+@Deprecated
public Map getInfos() {
final Map map = new HashMap();
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4186: Use current Derby version
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit Commits: 2e0466c7 by Julian Reschke at 2017-09-21T11:26:20+00:00 JCR-4186: Use current Derby version git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1809149 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-parent/pom.xml Changes: = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -517,7 +517,7 @@ org.apache.derby derby -10.5.3.0_1 +10.13.1.1 org.apache.geronimo.specs View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/2e0466c7a5eb08281feb4d34959d4f5c8133a1a8 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/2e0466c7a5eb08281feb4d34959d4f5c8133a1a8 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] Pushed new branch bugfix/CMS-10857
Mathijs den Burger pushed new branch bugfix/CMS-10857 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/bugfix/CMS-10857 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][master] CHANNELMGR-254 Fix typo in javadoc ('nithing' -> 'nothing')
Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
83d6352e by Mathijs den Burger at 2017-09-21T12:56:08+02:00
CHANNELMGR-254 Fix typo in javadoc (nithing - nothing)
- - - - -
1 changed file:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/EditingUtils.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/EditingUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/EditingUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/util/EditingUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2016-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.
@@ -125,7 +125,7 @@ public class EditingUtils {
*
* @param userId ID of some user
* @param session current user's JCR session
- * @returnname of the user or nithing, wrapped in an Optional
+ * @returnname of the user or nothing, wrapped in an Optional
*/
public static Optional getUserName(final String userId, final
Session session) {
try {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/83d6352e5e8c88cf24fb9dfd8a151b38298973e1
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/83d6352e5e8c88cf24fb9dfd8a151b38298973e1
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][release/10.2] CMS-16 Bump HST for HSTTWO-4136
Oscar Scholten pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: 22285ebd by Oscar Scholten at 2017-09-21T12:33:31+02:00 CMS-16 Bump HST for HSTTWO-4136 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 3.2.11 2.2.0 2.2.2 -3.2.8 +3.2.9-SNAPSHOT 3.2.0 3.2.8 2.2.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/22285ebdc001f8e1ec2b9155c361084a5e3bfaee --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/22285ebdc001f8e1ec2b9155c361084a5e3bfaee 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-testsuite][release/2.2] 2 commits: HSTTWO-4136 Add test mechanism for URI encoding
Oscar Scholten pushed to branch release/2.2 at cms-community / hippo-testsuite
Commits:
a0f6ccf9 by Oscar Scholten at 2017-09-21T11:32:54+02:00
HSTTWO-4136 Add test mechanism for URI encoding
(cherry picked from commit 0524e697799dd40bd8eeac80f96f8cdb56c0d436)
- - - - -
dbe4b33c by Oscar Scholten at 2017-09-21T12:19:03+02:00
HSTTWO-1003 Bump release version
- - - - -
4 changed files:
- components/src/main/java/org/hippoecm/hst/demo/components/Home.java
- content/src/main/resources/hstconfiguration/demosite/templates.xml
- pom.xml
- + site/src/main/webapp/WEB-INF/hst-config.properties
Changes:
=
components/src/main/java/org/hippoecm/hst/demo/components/Home.java
=
--- a/components/src/main/java/org/hippoecm/hst/demo/components/Home.java
+++ b/components/src/main/java/org/hippoecm/hst/demo/components/Home.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 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.
@@ -15,6 +15,8 @@
*/
package org.hippoecm.hst.demo.components;
+import java.util.Map;
+
import org.hippoecm.hst.component.support.bean.BaseHstComponent;
import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.content.beans.ObjectBeanManagerException;
@@ -25,6 +27,7 @@ import org.hippoecm.hst.core.component.HstResponse;
import org.hippoecm.hst.core.request.HstRequestContext;
import org.hippoecm.hst.demo.channel.DemoChannelInfo;
import org.hippoecm.hst.site.HstServices;
+import org.hippoecm.hst.util.HstRequestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,9 +65,11 @@ public class Home extends BaseHstComponent {
request.setAttribute("document", n);
-// test parametere from mount property
+// test parameter from mount property
request.setAttribute("testParamFromMount",
getComponentParameter("testParamFromMount"));
-}
-
-}
\ No newline at end of file
+// parameter to test query string parsing
+final Map parameters =
HstRequestUtils.parseQueryString(request.getRequestContext().getServletRequest());
+request.setAttribute("paramsMap", parameters);
+}
+}
=
content/src/main/resources/hstconfiguration/demosite/templates.xml
=
--- a/content/src/main/resources/hstconfiguration/demosite/templates.xml
+++ b/content/src/main/resources/hstconfiguration/demosite/templates.xml
@@ -109,7 +109,7 @@
RESOURCE URL: @hst.resourceURL@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.resourceURL
COMPONENT RENDERING URL: @hst.componentRenderingURL@hst.param
name="a" value="one"/@hst.param name="b"
value="two"//@hst.componentRenderingURL
ACTION URL: @hst.actionURL@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.actionURL
-LINK URL: @hst.link path="/news"@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+LINK URL: @hst.link path="/news"@hst.param name="a"
value="one"/@hst.param name="key-人" value="value-人"/@hst.param
name="b" value="two"//@hst.link/xmp/pre
hr/
pTest Example HST URLs (not escaped by
escapeXml="false")/p
@@ -117,7 +117,13 @@ LINK URL: @hst.link path="/news"@hst.param
name="a" value="one"/
RESOURCE URL: @hst.resourceURL escapeXml=false@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.resourceURL
COMPONENT RENDERING URL: @hst.componentRenderingURL
escapeXml=false@hst.param name="a" value="one"/@hst.param
name="b" value="two"//@hst.componentRenderingURL
ACTION URL: @hst.actionURL escapeXml=false@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.actionURL
-LINK URL: @hst.link path="/news" escapeXml=false@hst.param
name="a" value="one"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+LINK URL: @hst.link path="/news" escapeXml=false@hst.param
name="a" value="one"/@hst.param name="key-人"
value="value-人"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+
+hr/
+pParameters (key=[comma separated array of values]):/p
+#list paramsMap?keys as key
+p${key}=[${paramsMap[key]!?join(",")}]/p
+/#list
br/br/
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
org.onehippo.cms7
hippo-cms7-release
-10.2.6
+10.2.8-SNAPSHOT
=
site/src/main/webapp/WEB-INF/hst-config.properties
=
--- /dev/null
+++ b/site/src/main/webapp/WEB-INF/hst-config.properties
@@ -0,0 +1,7 @@
+# this file is used to be able to override defaults from
+#
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1096
Jasper Floor deleted branch feature/ESSENTIALS-1096 at cms-community / hippo-essentials --- 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-essentials][master] 5 commits: ESSENTIALS-1096 move banner icon and screenshots to plugin
Jasper Floor pushed to branch master at cms-community / hippo-essentials Commits: f114d5b2 by Bert Leunis at 2017-09-05T13:49:54+02:00 ESSENTIALS-1096 move banner icon and screenshots to plugin - - - - - 5f5dd34c by Bert Leunis at 2017-09-14T09:46:03+02:00 ESSENTIALS-1096 fix incorrect image name - - - - - a62f0e3d by Bert Leunis at 2017-09-14T11:32:52+02:00 ESSENTIALS-1096 move plugin images from dashboard to plugins themselves - - - - - d17b57cc by Jasper Floor at 2017-09-21T11:55:41+02:00 ESSENTIALS-1096 merge master changes in feature/ESSENTIALS-1096 merge is necessary, - - - - - 8046983d by Jasper Floor at 2017-09-21T11:57:14+02:00 ESSENTIALS-1096 Reintegrate ESSENTIALS-1096 - - - - - 30 changed files: - dashboard/src/main/webapp/images/icons/bundle.png → plugins/banner-and-carousel/src/main/resources/META-INF/resources/feature/images/banner-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/banner01.png → plugins/banner-and-carousel/src/main/resources/META-INF/resources/feature/images/screenshots/banner01.png - dashboard/src/main/webapp/images/screenshots/banner02.png → plugins/banner-and-carousel/src/main/resources/META-INF/resources/feature/images/screenshots/banner02.png - dashboard/src/main/webapp/images/screenshots/banner03.png → plugins/banner-and-carousel/src/main/resources/META-INF/resources/feature/images/screenshots/banner03.png - dashboard/src/main/webapp/images/screenshots/banner04.png → plugins/banner-and-carousel/src/main/resources/META-INF/resources/feature/images/screenshots/banner04.png - plugins/banner-and-carousel/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/bean-writer.png → plugins/bean-writer/src/main/resources/META-INF/resources/tool/images/bean-writer-icon.png - plugins/bean-writer/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/blog.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/blog-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/blog01.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog01.png - dashboard/src/main/webapp/images/screenshots/blog02.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog02.png - dashboard/src/main/webapp/images/screenshots/blog03.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog03.png - dashboard/src/main/webapp/images/screenshots/blog04.png → plugins/blog/src/main/resources/META-INF/resources/feature/images/screenshots/blog04.png - plugins/blog/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/content-blocks.png → plugins/content-blocks/src/main/resources/META-INF/resources/feature/images/content-blocks-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/contentblocks01.png → plugins/content-blocks/src/main/resources/META-INF/resources/feature/images/screenshots/contentblocks01.png - plugins/content-blocks/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/documents-wizard.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/documents-wizard-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/documentwizard01.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/screenshots/documentwizard01.png - dashboard/src/main/webapp/images/screenshots/documentwizard02.png → plugins/document-wizard/src/main/resources/META-INF/resources/feature/images/screenshots/documentwizard02.png - plugins/document-wizard/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/events.png → plugins/events/src/main/resources/META-INF/resources/feature/images/events-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/events01.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events01.png - dashboard/src/main/webapp/images/screenshots/events02.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events02.png - dashboard/src/main/webapp/images/screenshots/events03.png → plugins/events/src/main/resources/META-INF/resources/feature/images/screenshots/events03.png - plugins/events/src/main/resources/plugin-descriptor.json - dashboard/src/main/webapp/images/icons/faq.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/faq-plugin-icon.png - dashboard/src/main/webapp/images/screenshots/faq01.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq01.png - dashboard/src/main/webapp/images/screenshots/faq02.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq02.png - dashboard/src/main/webapp/images/screenshots/faq03.png → plugins/faq/src/main/resources/META-INF/resources/feature/images/screenshots/faq03.png The diff was not included because it is too large. View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1096] 3 commits: ESSENTIALS-1088 update node name of hippo author
Jasper Floor pushed to branch feature/ESSENTIALS-1096 at cms-community /
hippo-essentials
Commits:
d8077a2c by Bert Leunis at 2017-09-21T10:51:31+02:00
ESSENTIALS-1088 update node name of hippo author
- - - - -
36c1c35e by Jasper Floor at 2017-09-21T10:51:31+02:00
ESSENTIALS-1088 Reintegrate bugfix/ESSENTIALS-1088
- - - - -
d17b57cc by Jasper Floor at 2017-09-21T11:55:41+02:00
ESSENTIALS-1096 merge master changes in feature/ESSENTIALS-1096
merge is necessary,
- - - - -
1 changed file:
- plugins/blog/src/main/resources/xml/samples/author_1.xml
Changes:
=
plugins/blog/src/main/resources/xml/samples/author_1.xml
=
--- a/plugins/blog/src/main/resources/xml/samples/author_1.xml
+++ b/plugins/blog/src/main/resources/xml/samples/author_1.xml
@@ -1,6 +1,6 @@
-http://www.jcp.org/jcr/sv/1.0;>
+http://www.jcp.org/jcr/sv/1.0;>
hippo:handle
mix:referenceable
+hippo:named
5a6e1136-dea0-4927-9130-9ce0a47b0189
-
+
+Hippo Author
+
+
{{namespace}}:author
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/a62f0e3df4b4aedfa00a2cf76365a6390670bc0c...d17b57cc8e60421ea22b0775040b3805f5dbc058
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/a62f0e3df4b4aedfa00a2cf76365a6390670bc0c...d17b57cc8e60421ea22b0775040b3805f5dbc058
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-essentials][master] 2 commits: ESSENTIALS-1088 update node name of hippo author
Jasper Floor pushed to branch master at cms-community / hippo-essentials
Commits:
d8077a2c by Bert Leunis at 2017-09-21T10:51:31+02:00
ESSENTIALS-1088 update node name of hippo author
- - - - -
36c1c35e by Jasper Floor at 2017-09-21T10:51:31+02:00
ESSENTIALS-1088 Reintegrate bugfix/ESSENTIALS-1088
- - - - -
1 changed file:
- plugins/blog/src/main/resources/xml/samples/author_1.xml
Changes:
=
plugins/blog/src/main/resources/xml/samples/author_1.xml
=
--- a/plugins/blog/src/main/resources/xml/samples/author_1.xml
+++ b/plugins/blog/src/main/resources/xml/samples/author_1.xml
@@ -1,6 +1,6 @@
-http://www.jcp.org/jcr/sv/1.0;>
+http://www.jcp.org/jcr/sv/1.0;>
hippo:handle
mix:referenceable
+hippo:named
5a6e1136-dea0-4927-9130-9ce0a47b0189
-
+
+Hippo Author
+
+
{{namespace}}:author
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/70b625f09dc3c2fef1b62ec60c0f175feac0d5e7...36c1c35e2277b5477784f63786a60060d47b9817
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/70b625f09dc3c2fef1b62ec60c0f175feac0d5e7...36c1c35e2277b5477784f63786a60060d47b9817
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][release/11.2] CMS-16 Bump HST version for HSTTWO-4035
Oscar Scholten pushed to branch release/11.2 at cms-community / hippo-cms-release Commits: 443866d0 by Oscar Scholten at 2017-09-21T11:11:32+02:00 CMS-16 Bump HST version for HSTTWO-4035 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.2.5 3.2.0 3.2.0 -4.2.4 +4.2.5-SNAPSHOT 4.2.0 4.2.2 3.2.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/443866d0abedf905bfa70bca4627fd9b5ac43877 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/443866d0abedf905bfa70bca4627fd9b5ac43877 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-testsuite][release/3.2] HSTTWO-4035 Add test mechanism for URI encoding
Oscar Scholten pushed to branch release/3.2 at cms-community / hippo-testsuite
Commits:
0524e697 by Oscar Scholten at 2017-09-18T15:22:37+02:00
HSTTWO-4035 Add test mechanism for URI encoding
- - - - -
3 changed files:
- components/src/main/java/org/hippoecm/hst/demo/components/Home.java
- content/src/main/resources/hstconfiguration/demosite/templates.xml
- + site/src/main/webapp/WEB-INF/hst-config.properties
Changes:
=
components/src/main/java/org/hippoecm/hst/demo/components/Home.java
=
--- a/components/src/main/java/org/hippoecm/hst/demo/components/Home.java
+++ b/components/src/main/java/org/hippoecm/hst/demo/components/Home.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2013 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.
@@ -15,6 +15,8 @@
*/
package org.hippoecm.hst.demo.components;
+import java.util.Map;
+
import org.hippoecm.hst.component.support.bean.BaseHstComponent;
import org.hippoecm.hst.configuration.hosting.Mount;
import org.hippoecm.hst.content.beans.ObjectBeanManagerException;
@@ -25,6 +27,7 @@ import org.hippoecm.hst.core.component.HstResponse;
import org.hippoecm.hst.core.request.HstRequestContext;
import org.hippoecm.hst.demo.channel.DemoChannelInfo;
import org.hippoecm.hst.site.HstServices;
+import org.hippoecm.hst.util.HstRequestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,9 +65,11 @@ public class Home extends BaseHstComponent {
request.setAttribute("document", n);
-// test parametere from mount property
+// test parameter from mount property
request.setAttribute("testParamFromMount",
getComponentParameter("testParamFromMount"));
-}
-
-}
\ No newline at end of file
+// parameter to test query string parsing
+final Map parameters =
HstRequestUtils.parseQueryString(request.getRequestContext().getServletRequest());
+request.setAttribute("paramsMap", parameters);
+}
+}
=
content/src/main/resources/hstconfiguration/demosite/templates.xml
=
--- a/content/src/main/resources/hstconfiguration/demosite/templates.xml
+++ b/content/src/main/resources/hstconfiguration/demosite/templates.xml
@@ -114,7 +114,7 @@
RESOURCE URL: @hst.resourceURL@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.resourceURL
COMPONENT RENDERING URL: @hst.componentRenderingURL@hst.param
name="a" value="one"/@hst.param name="b"
value="two"//@hst.componentRenderingURL
ACTION URL: @hst.actionURL@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.actionURL
-LINK URL: @hst.link path="/news"@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+LINK URL: @hst.link path="/news"@hst.param name="a"
value="one"/@hst.param name="key-人" value="value-人"/@hst.param
name="b" value="two"//@hst.link/xmp/pre
hr/
pTest Example HST URLs (not escaped by
escapeXml="false")/p
@@ -122,7 +122,13 @@ LINK URL: @hst.link path="/news"@hst.param
name="a" value="one"/
RESOURCE URL: @hst.resourceURL escapeXml=false@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.resourceURL
COMPONENT RENDERING URL: @hst.componentRenderingURL
escapeXml=false@hst.param name="a" value="one"/@hst.param
name="b" value="two"//@hst.componentRenderingURL
ACTION URL: @hst.actionURL escapeXml=false@hst.param name="a"
value="one"/@hst.param name="b"
value="two"//@hst.actionURL
-LINK URL: @hst.link path="/news" escapeXml=false@hst.param
name="a" value="one"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+LINK URL: @hst.link path="/news" escapeXml=false@hst.param
name="a" value="one"/@hst.param name="key-人"
value="value-人"/@hst.param name="b"
value="two"//@hst.link/xmp/pre
+
+hr/
+pParameters (key=[comma separated array of values]):/p
+#list paramsMap?keys as key
+p${key}=[${paramsMap[key]!?join(",")}]/p
+/#list
br/br/
=
site/src/main/webapp/WEB-INF/hst-config.properties
=
--- /dev/null
+++ b/site/src/main/webapp/WEB-INF/hst-config.properties
@@ -0,0 +1,7 @@
+# this file is used to be able to override defaults from
+# org/hippoecm/hst/site/container/SpringComponentManager.properties
+
+# comment these out to use the same settings as v12
+# uriencoding.use.container = false
+# uriencoding.use.body.charset = false
+# uriencoding.default.charset = UTF-8
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-testsuite/commit/0524e697799dd40bd8eeac80f96f8cdb56c0d436
---
View it on GitLab:
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][feature/HIPPLUG-1480-B] HIPPLUG-1480 make unit tests run again
Bert Leunis pushed to branch feature/HIPPLUG-1480-B at cms-community /
hippo-plugin-taxonomy
Commits:
c3c32828 by Bert Leunis at 2017-09-21T10:38:38+02:00
HIPPLUG-1480 make unit tests run again
- - - - -
2 changed files:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
- hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrCategory.java
@@ -301,8 +301,12 @@ public class JcrCategory extends TaxonomyObject implements
EditableCategory {
return LazyMap.decorate(map,
new Transformer() {
@Override
-public Object transform(Object language) {
-return getInfo((Locale) language); // TODO: check
this, must it be Locale?
+public Object transform(Object locale) {
+if (locale instanceof Locale) {
+return getInfo((Locale) locale);
+} else {
+return getInfo((String) locale);
+}
}
});
}
=
hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
=
--- a/hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
+++ b/hst/src/main/java/org/onehippo/taxonomy/impl/CategoryImpl.java
@@ -168,8 +168,12 @@ public class CategoryImpl extends AbstractJCRService
implements Category {
return LazyMap.decorate(map, new Transformer() {
@Override
-public Object transform(Object input) {
-return getInfo((Locale) input); // TODO: check this, must be
Locale?
+public Object transform(Object locale) {
+if (locale instanceof Locale) {
+return getInfo((Locale) locale);
+} else {
+return getInfo((String) locale);
+}
}
});
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/c3c328288aa19c247af3068fba3b4091f476c5ef
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/c3c328288aa19c247af3068fba3b4091f476c5ef
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-repository] Deleted branch feature/REPO-1822
Jasper Floor deleted branch feature/REPO-1822 at cms-community / hippo-repository --- 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-repository][master] 5 commits: REPO-1822 in URI encoding, add support for special hyphens and quotes in the…
Jasper Floor pushed to branch master at cms-community / hippo-repository
Commits:
c8bb6f75 by Jeroen Hoffman at 2017-09-19T10:34:51+02:00
REPO-1822 in URI encoding, add support for special hyphens and quotes in the
0x201x subrange of Unicode General Punctuation
- - - - -
79a1958b by Jasper Floor at 2017-09-20T13:26:39+02:00
REPO-1822 Merge master changes in feature/REPO-1822
- - - - -
cfbff022 by Jeroen Hoffman at 2017-09-21T09:48:19+02:00
REPO-1822 in URI encoding, treat quote-like characters as quote, so remove
them, because quotes cannot be used in JCR node names
- - - - -
f4d0a989 by Jasper Floor at 2017-09-21T10:26:46+02:00
REPO-1822 Merge master changes in feature/REPO-1822
- - - - -
352aa381 by Jasper Floor at 2017-09-21T10:28:37+02:00
REPO-1822 Reintegrate feature/REPO-1822
- - - - -
2 changed files:
- api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
- api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
Changes:
=
api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
=
--- a/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
+++ b/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
@@ -114,11 +114,14 @@ public class StringCodecFactory {
}
/**
- * Direct usage of this class discouraged. If should only be used by
frameworks to initialize the StringCodecFactory instance.
- *
- * Performs a one-way encoding (no decoding possible) for translating any
string to a suitable set of characters
- * that can be used in URIs.
- *
+ * The UriEncoding class is responsible for creating human-readable URI
from a String, by either removing characters
+ * or by mapping them to characters that need not be percent-encoded.
+ *
+ * Note that the name 'UriEncoding' is not fully accurate as it does not
conform to URI specs but rather creates a
+ * slug, a human-readable String.
+ *
+ * Direct usage of this class discouraged. It should only be used by
frameworks to initialize the StringCodecFactory instance.
+ *
* @see Encoding of node names
*/
public static class UriEncoding implements StringCodec {
@@ -513,6 +516,24 @@ public class StringCodecFactory {
case 0x017e: sb.append("z");break; // ž
case 0x017f: sb.append("s");break; // ſ
+// 0x201x subrange of Unicode General Punctuation, see
https://en.wikipedia.org/wiki/General_Punctuation
+case 0x2010: sb.append("-");break; // ‐
(hyphen-minus)
+case 0x2011: sb.append("-");break; // ‑
(non-breaking hyphen)
+case 0x2012: sb.append("-");break; // ‒
+case 0x2013: sb.append("-");break; // –
+case 0x2014: sb.append("-");break; // —
+case 0x2015: sb.append("-");break; // ―
+case 0x2016: sb.append("-");break; // ‖
+case 0x2017: sb.append("-");break; // ‗
+case 0x2018: break; // ‘ (left single quotation) treat
quote-like characters as quote: remove
+case 0x2019: break; // ’ (right single quotation)
+case 0x201a: break; // ‚
+case 0x201b: break; // ‛
+case 0x201c: break; // “
+case 0x201d: break; // ”
+case 0x201e: break; // „
+case 0x201f: break; // ‟
+
// 0xac00 - 0xd7a3 : Hangul Syllables (only some of
them are encoded)
case 0xc2a0:
appendSpace = true;
=
api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
=
--- a/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
+++ b/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
@@ -77,6 +77,9 @@ public class UriEncodingTest {
assertEquals("aaeeiiijijjjkkkllnoooeoerrttwwyyyzzs",
uri.encode("ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ"));
+// 0x201x subrange of Unicode General Punctuation
+assertEquals("with-ending",
uri.encode("‐‑‒–—―‖‗‘’‚‛“”„‟with-ending"));
+
// trailing dots
assertEquals("abc", uri.encode("abc."));
assertEquals("a", uri.encode("a..."));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/b4393869670da0837ae7973e144e91a5836f6c9c...352aa381ddf906caca051b48c1654bbdbf594038
---
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/REPO-1822] 2 commits: REPO-1823 Restoring previous value of /content/documents/jcr:uuid for…
Jasper Floor pushed to branch feature/REPO-1822 at cms-community / hippo-repository Commits: b4393869 by Peter Centgraf at 2017-09-20T16:25:48+02:00 REPO-1823 Restoring previous value of /content/documents/jcr:uuid for backwards-compatibility with older archetype-generated projects (cherry picked from commit f5380b346c09a4e2e4ab3b9462c6b5263af5e1fb) - - - - - f4d0a989 by Jasper Floor at 2017-09-21T10:26:46+02:00 REPO-1822 Merge master changes in feature/REPO-1822 - - - - - 1 changed file: - workflow/src/main/resources/hcm-config/content-root.yaml Changes: = workflow/src/main/resources/hcm-config/content-root.yaml = --- a/workflow/src/main/resources/hcm-config/content-root.yaml +++ b/workflow/src/main/resources/hcm-config/content-root.yaml @@ -10,7 +10,9 @@ definitions: .meta:residual-child-node-category: content jcr:primaryType: hippostd:folder jcr:mixinTypes: ['mix:referenceable'] -jcr:uuid: 302beda6-84a3-4636-bbab-63972219bca8 +# note: the following value is referenced by /hippo:reports/facet-types/hippo:docbase and elsewhere +# until HCM supports node-path-to-UUID conversions for String properties, preserve this value +jcr:uuid: 2c21a29c-a5d1-4e84-aec4-594e5bf93b25 hippostd:foldertype: [new-folder, new-translated-folder] /gallery: .meta:residual-child-node-category: content View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/cfbff0229ca953c3462508aaa99b22b078aae4f5...f4d0a989a894ad3a3358003b27653f3156ac389b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/cfbff0229ca953c3462508aaa99b22b078aae4f5...f4d0a989a894ad3a3358003b27653f3156ac389b 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-site-toolkit][bugfix/HSTTWO-4035] HSTTWO-4035 Use private fields for constants not available in v12
Oscar Scholten pushed to branch bugfix/HSTTWO-4035 at cms-community /
hippo-site-toolkit
Commits:
47fee4ee by Oscar Scholten at 2017-09-21T09:58:30+02:00
HSTTWO-4035 Use private fields for constants not available in v12
- - - - -
1 changed file:
- commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
Changes:
=
commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
=
--- a/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
+++ b/commons/src/main/java/org/hippoecm/hst/util/HstRequestUtils.java
@@ -56,8 +56,8 @@ public class HstRequestUtils {
public static String URI_ENCODING_DEFAULT_CHARSET_VALUE = "ISO-8859-1";
public static String URI_ENCODING_USE_BODY_CHARSET_KEY =
"uriencoding.use.body.charset";
public static boolean URI_ENCODING_USE_BODY_CHARSET_VALUE = true;
-public static String URI_ENCODING_USE_CONTAINER_KEY =
"uriencoding.use.container";
-public static boolean URI_ENCODING_USE_CONTAINER_VALUE = true;
+private static String URI_ENCODING_USE_CONTAINER_KEY =
"uriencoding.use.container";
+private static boolean URI_ENCODING_USE_CONTAINER_VALUE = true;
// Small wrapper class to read configuration settings also when running
within a unit test
private static class URIEncodingConfiguration {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/47fee4eeb74f3a18f305079e377659a0a3cff987
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/47fee4eeb74f3a18f305079e377659a0a3cff987
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-repository][feature/REPO-1822] REPO-1822 in URI encoding, treat quote-like characters as quote, so remove them,…
Jeroen Hoffman pushed to branch feature/REPO-1822 at cms-community /
hippo-repository
Commits:
cfbff022 by Jeroen Hoffman at 2017-09-21T09:48:19+02:00
REPO-1822 in URI encoding, treat quote-like characters as quote, so remove
them, because quotes cannot be used in JCR node names
- - - - -
2 changed files:
- api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
- api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
Changes:
=
api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
=
--- a/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
+++ b/api/src/main/java/org/hippoecm/repository/api/StringCodecFactory.java
@@ -525,14 +525,14 @@ public class StringCodecFactory {
case 0x2015: sb.append("-");break; // ―
case 0x2016: sb.append("-");break; // ‖
case 0x2017: sb.append("-");break; // ‗
-case 0x2018: sb.append("'");break; // ‘ (left
single quotation)
-case 0x2019: sb.append("'");break; // ’ (right
single quotation)
-case 0x201a: sb.append("'");break; // ‚
-case 0x201b: sb.append("'");break; // ‛
-case 0x201c: sb.append("'");break; // “
-case 0x201d: sb.append("'");break; // ”
-case 0x201e: sb.append("'");break; // „
-case 0x201f: sb.append("'");break; // ‟
+case 0x2018: break; // ‘ (left single quotation) treat
quote-like characters as quote: remove
+case 0x2019: break; // ’ (right single quotation)
+case 0x201a: break; // ‚
+case 0x201b: break; // ‛
+case 0x201c: break; // “
+case 0x201d: break; // ”
+case 0x201e: break; // „
+case 0x201f: break; // ‟
// 0xac00 - 0xd7a3 : Hangul Syllables (only some of
them are encoded)
case 0xc2a0:
=
api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
=
--- a/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
+++ b/api/src/test/java/org/hippoecm/repository/api/UriEncodingTest.java
@@ -78,7 +78,7 @@ public class UriEncodingTest {
uri.encode("ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ"));
// 0x201x subrange of Unicode General Punctuation
-assertEquals("", uri.encode("‐‑‒–—―‖‗‘’‚‛“”„‟"));
+assertEquals("with-ending",
uri.encode("‐‑‒–—―‖‗‘’‚‛“”„‟with-ending"));
// trailing dots
assertEquals("abc", uri.encode("abc."));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/cfbff0229ca953c3462508aaa99b22b078aae4f5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/cfbff0229ca953c3462508aaa99b22b078aae4f5
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
