[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.16] JCR-4250: remove guava dependency (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
930ee607 by Julian Reschke at 2018-02-03T06:36:04+00:00
JCR-4250: remove guava dependency (ported to 2.16)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1823019
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
3 changed files:
- jackrabbit-jcr-commons/pom.xml
-
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
- jackrabbit-parent/pom.xml
Changes:
=
jackrabbit-jcr-commons/pom.xml
=
--- a/jackrabbit-jcr-commons/pom.xml
+++ b/jackrabbit-jcr-commons/pom.xml
@@ -73,10 +73,6 @@
true
- com.google.guava
- guava
-
-
org.osgi
org.osgi.annotation
provided
=
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
=
---
a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
+++
b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
@@ -29,7 +29,6 @@ import static javax.jcr.PropertyType.STRING;
import static javax.jcr.PropertyType.UNDEFINED;
import static javax.jcr.PropertyType.WEAKREFERENCE;
-import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.util.Base64;
import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.util.TransientFileFactory;
@@ -53,7 +52,9 @@ import java.io.OutputStream;
import java.io.BufferedOutputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -71,18 +72,26 @@ public class ValueHelper {
private static final Map SUPPORTED_CONVERSIONS =
new HashMap();
static {
-SUPPORTED_CONVERSIONS.put(DATE, ImmutableSet.of(STRING, BINARY,
DOUBLE, DECIMAL, LONG));
-SUPPORTED_CONVERSIONS.put(DOUBLE, ImmutableSet.of(STRING, BINARY,
DECIMAL, DATE, LONG));
-SUPPORTED_CONVERSIONS.put(DECIMAL, ImmutableSet.of(STRING, BINARY,
DOUBLE, DATE, LONG));
-SUPPORTED_CONVERSIONS.put(LONG, ImmutableSet.of(STRING, BINARY,
DECIMAL, DATE, DOUBLE));
-SUPPORTED_CONVERSIONS.put(BOOLEAN, ImmutableSet.of(STRING, BINARY));
-SUPPORTED_CONVERSIONS.put(NAME, ImmutableSet.of(STRING, BINARY, PATH,
PropertyType.URI));
-SUPPORTED_CONVERSIONS.put(PATH, ImmutableSet.of(STRING, BINARY, NAME,
PropertyType.URI));
-SUPPORTED_CONVERSIONS.put(PropertyType.URI, ImmutableSet.of(STRING,
BINARY, NAME, PATH));
-SUPPORTED_CONVERSIONS.put(REFERENCE, ImmutableSet.of(STRING, BINARY,
WEAKREFERENCE));
-SUPPORTED_CONVERSIONS.put(WEAKREFERENCE, ImmutableSet.of(STRING,
BINARY, REFERENCE));
+SUPPORTED_CONVERSIONS.put(DATE, immutableSetOf(STRING, BINARY, DOUBLE,
DECIMAL, LONG));
+SUPPORTED_CONVERSIONS.put(DOUBLE, immutableSetOf(STRING, BINARY,
DECIMAL, DATE, LONG));
+SUPPORTED_CONVERSIONS.put(DECIMAL, immutableSetOf(STRING, BINARY,
DOUBLE, DATE, LONG));
+SUPPORTED_CONVERSIONS.put(LONG, immutableSetOf(STRING, BINARY,
DECIMAL, DATE, DOUBLE));
+SUPPORTED_CONVERSIONS.put(BOOLEAN, immutableSetOf(STRING, BINARY));
+SUPPORTED_CONVERSIONS.put(NAME, immutableSetOf(STRING, BINARY, PATH,
PropertyType.URI));
+SUPPORTED_CONVERSIONS.put(PATH, immutableSetOf(STRING, BINARY, NAME,
PropertyType.URI));
+SUPPORTED_CONVERSIONS.put(PropertyType.URI, immutableSetOf(STRING,
BINARY, NAME, PATH));
+SUPPORTED_CONVERSIONS.put(REFERENCE, immutableSetOf(STRING, BINARY,
WEAKREFERENCE));
+SUPPORTED_CONVERSIONS.put(WEAKREFERENCE, immutableSetOf(STRING,
BINARY, REFERENCE));
}
+private static Set immutableSetOf(int... types) {
+Set t = new HashSet();
+for (int type : types) {
+t.add(type);
+}
+return Collections.unmodifiableSet(t);
+}
+
public static boolean isSupportedConversion(int fromType, int toType) {
if (fromType == toType) {
return true;
=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -586,11 +586,6 @@
3.4
-com.google.guava
-guava
-15.0
-
-
junit
junit
4.12
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/930ee607ccf8d6c94b9a9cc840c53ff3ed659baf
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/930ee607ccf8d6c94b9a9cc840c53ff3ed659baf
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.16] JCR-4248: Upgrade httpcore dependency to 4.4.9 (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit Commits: 9e3238bf by Julian Reschke at 2018-02-03T05:57:00+00:00 JCR-4248: Upgrade httpcore dependency to 4.4.9 (ported to 2.16) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1823018 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-webapp/pom.xml Changes: = jackrabbit-webapp/pom.xml = --- a/jackrabbit-webapp/pom.xml +++ b/jackrabbit-webapp/pom.xml @@ -160,7 +160,7 @@ org.apache.httpcomponents httpcore - 4.4.8 + 4.4.9 test View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9e3238bfcd1c5a0def0c891897921e1209a12418 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9e3238bfcd1c5a0def0c891897921e1209a12418 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] Pushed new branch feature/ESSENTIALS-1164
Arent-Jan Banck pushed new branch feature/ESSENTIALS-1164 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1164 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] ESSENTIALS-1137 Remove unused import and redundant cast
Arent-Jan Banck pushed to branch master at cms-community / hippo-essentials
Commits:
fbdd16f5 by Arent-Jan Banck at 2018-02-02T22:21:26+01:00
ESSENTIALS-1137 Remove unused import and redundant cast
- - - - -
1 changed file:
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
Changes:
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
@@ -34,7 +34,6 @@ import
org.onehippo.cms7.essentials.plugin.sdk.config.ProjectSettingsBean;
import org.onehippo.cms7.essentials.plugin.sdk.utils.EssentialConst;
import org.onehippo.cms7.essentials.sdk.api.service.PlaceholderService;
import org.onehippo.cms7.essentials.sdk.api.model.Module;
-import org.onehippo.cms7.essentials.sdk.api.service.SettingsService;
import org.onehippo.testutils.log4j.Log4jInterceptor;
import static org.junit.Assert.assertEquals;
@@ -130,7 +129,7 @@ public class ProjectServiceImplTest extends
ResourceModifyingTest {
final ProjectSettingsBean settings = new ProjectSettingsBean();
settings.setBeansFolder("beans/src/main/java");
-((TestSettings.Service)settingsService).setSettings(settings);
+settingsService.setSettings(settings);
assertEquals(projectRoot.resolve("beans/src/main/java"),
projectService.getBeansRootPath());
}
@@ -143,7 +142,7 @@ public class ProjectServiceImplTest extends
ResourceModifyingTest {
final ProjectSettingsBean settings = new ProjectSettingsBean();
settings.setBeansFolder("beans/src/main/java");
settings.setSelectedBeansPackage("com.test.bean");
-((TestSettings.Service)settingsService).setSettings(settings);
+settingsService.setSettings(settings);
assertEquals(projectRoot.resolve("beans/src/main/java").resolve("com").resolve("test").resolve("bean"),
projectService.getBeansPackagePath());
@@ -219,7 +218,7 @@ public class ProjectServiceImplTest extends
ResourceModifyingTest {
}
@Test
-public void copy_absent_resource() throws Exception {
+public void copy_absent_resource() {
final String resourcePath = "/services/project/absent.txt";
final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT +
"}}" + File.separator + "test" + File.separator + "copy.txt";
final Map placeholderData =
placeholderService.makePlaceholders();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/fbdd16f54997a79b96b57738acae45318cf07ba5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/fbdd16f54997a79b96b57738acae45318cf07ba5
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] ESSENTIALS-1137 Call createModifiableDirectory before placeholderService is used…
Arent-Jan Banck pushed to branch master at cms-community / hippo-essentials
Commits:
900af2fd by Arent-Jan Banck at 2018-02-02T22:05:42+01:00
ESSENTIALS-1137 Call createModifiableDirectory before placeholderService is
used as createModifiableDirectory sets a system property with the directory
path used by the placeholderService. Test will fail dependening on the test
execution order, failed on Windows
- - - - -
1 changed file:
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
Changes:
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
@@ -232,10 +232,10 @@ public class ProjectServiceImplTest extends
ResourceModifyingTest {
@Test
public void copy_onto_directory() throws Exception {
+createModifiableDirectory("test");
final String resourcePath = "/services/project/to-be-copied.txt";
final String targetLocation = "{{" + PlaceholderService.PROJECT_ROOT +
"}}" + File.separator + "test";
final Map placeholderData =
placeholderService.makePlaceholders();
-createModifiableDirectory("test");
try (Log4jInterceptor interceptor =
Log4jInterceptor.onError().trap(ProjectServiceImpl.class).build()) {
assertFalse(projectService.copyResource(resourcePath,
targetLocation, placeholderData, true, false));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/900af2fdc75fd21977e15ae1d8ed9596d51c3f19
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/900af2fdc75fd21977e15ae1d8ed9596d51c3f19
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] ESSENTIALS-1137 Clean system properties after test to avoid test failers in other tests
Arent-Jan Banck pushed to branch master at cms-community / hippo-essentials
Commits:
ccb390fa by Arent-Jan Banck at 2018-02-02T21:49:31+01:00
ESSENTIALS-1137 Clean system properties after test to avoid test failers in
other tests
- - - - -
1 changed file:
-
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
Changes:
=
plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
=
---
a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
+++
b/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/plugin/sdk/services/ProjectServiceImplTest.java
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onehippo.cms7.essentials.ResourceModifyingTest;
@@ -68,6 +69,12 @@ public class ProjectServiceImplTest extends
ResourceModifyingTest {
settingsService.setSettings(projectSettings);
}
+@After
+public void tearDown() {
+System.clearProperty(EssentialConst.PROJECT_BASEDIR_PROPERTY);
+System.clearProperty(EssentialConst.ESSENTIALS_BASEDIR_PROPERTY);
+}
+
@Test
public void get_base_path() {
assertEquals(projectRoot,
projectService.getBasePathForModule(Module.PROJECT));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/ccb390fadc89d799fb724a4397ae5bafa68af846
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/ccb390fadc89d799fb724a4397ae5bafa68af846
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][2.16] JCR-4237 - cleanup throws clauses of private methods (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
a9d00afa by Julian Reschke at 2018-02-02T20:07:16+00:00
JCR-4237 - cleanup throws clauses of private methods (ported to 2.16)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1823002
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
9 changed files:
- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
-
jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
-
jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
-
jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Changes:
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
=
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
@@ -408,10 +408,9 @@ public class ItemManager implements ItemStateListener {
* in which case the itemId present with the specified data
is used.
* @return true if the item with the given data can be read;
* false otherwise.
- * @throws AccessDeniedException
* @throws RepositoryException
*/
-private boolean canRead(ItemData data, Path path) throws
AccessDeniedException, RepositoryException {
+private boolean canRead(ItemData data, Path path) throws
RepositoryException {
// JCR-1601: cached item may just have been invalidated
ItemState state = data.getState();
if (state == null) {
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
@@ -644,11 +644,10 @@ public class NodeTypeManagerImpl extends
AbstractNodeTypeManager
*
* @param definition the definition
* @return a NodeTypeDef
- * @throws InvalidNodeTypeDefinitionException if the definition is invalid
* @throws RepositoryException if a repository error occurs
*/
private QNodeTypeDefinition toNodeTypeDef(NodeTypeDefinition definition)
-throws InvalidNodeTypeDefinitionException, RepositoryException {
+throws RepositoryException {
return new QNodeTypeDefinitionImpl(definition, context,
QValueFactoryImpl.getInstance());
}
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
@@ -155,8 +155,7 @@ class RowIteratorImpl implements RowIterator {
NamePathResolver resolver,
ValueFactory valueFactory,
ExcerptProvider exProvider,
-SpellSuggestion spellSuggestion)
-throws NamespaceException {
+SpellSuggestion spellSuggestion) {
this.scoreNodes = scoreNodes;
this.columns = columns;
this.selectorNames.addAll(Arrays.asList(selectorNames));
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
@@ -282,10 +282,9 @@ public class ACLEditor extends ProtectedItemModifier
implements AccessControlEdi
*
* @param path the path
* @return the node
- * @throws PathNotFoundException if not found
* @throws RepositoryException if an error occurs
*/
-private NodeImpl getNode(String path) throws PathNotFoundException,
RepositoryException {
+private NodeImpl getNode(String path) throws RepositoryException {
return (NodeImpl) session.getNode(path);
}
=
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1137 Remove empty ProjectServiceImpleTest
Arent-Jan Banck pushed to branch master at cms-community / hippo-essentials Commits: 03d0536d by Arent-Jan Banck at 2018-02-02T21:00:46+01:00 ESSENTIALS-1137 Remove empty ProjectServiceImpleTest - - - - - 1 changed file: - − plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java Changes: = plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java deleted = --- a/plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/services/ProjectServiceImplTest.java +++ /dev/null View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/03d0536dca8960e9bd166a9b4c9378876f10a93d --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/03d0536dca8960e9bd166a9b4c9378876f10a93d 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/spaplus
Woonsan Ko pushed new branch feature/spaplus at cms-community / hippo-testsuite --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/tree/feature/spaplus 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][2.16] JCR-4247: Update commons-io dependency (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit Commits: a4e6de28 by Julian Reschke at 2018-02-02T18:38:49+00:00 JCR-4247: Update commons-io dependency (ported to 2.16) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822997 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 @@ -431,7 +431,7 @@ commons-io commons-io -2.5 +2.6 javax.transaction View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/a4e6de28390572c1cf1e81fbd0599d033de6f671 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/a4e6de28390572c1cf1e81fbd0599d033de6f671 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][2.16] JCR-4239: Suppress Tika startup warnings (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit Commits: 252ba067 by Julian Reschke at 2018-02-02T16:56:37+00:00 JCR-4239: Suppress Tika startup warnings (ported to 2.16) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822988 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml Changes: = jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml = --- a/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml +++ b/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml @@ -52,4 +52,6 @@ + + View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/252ba06712bd883e338a88394a6b811467cf3bac --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/252ba06712bd883e338a88394a6b811467cf3bac 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][2.16] JCR-4215: Use Tika version 1.17 (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
5c43b54d by Julian Reschke at 2018-02-02T16:26:08+00:00
JCR-4215: Use Tika version 1.17 (ported to 2.16)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822984
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
2 changed files:
- jackrabbit-parent/pom.xml
- jackrabbit-webapp/pom.xml
Changes:
=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -48,7 +48,7 @@
-XX:+IgnoreUnrecognizedVMOptions
--add-modules=java.xml.bind
${test.opts.modules} ${test.opts.coverage} ${test.opts.memory}
-enableassertions
8.2.0.v20160908
-1.16
+1.17
${project.build.sourceEncoding}
=
jackrabbit-webapp/pom.xml
=
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -145,6 +145,24 @@
${slf4j.version}
test
+
+ org.slf4j
+ jul-to-slf4j
+ ${slf4j.version}
+ test
+
+
+ org.apache.james
+ apache-mime4j
+ 0.6
+ test
+
+
+ org.apache.httpcomponents
+ httpcore
+ 4.4.8
+ test
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5c43b54de3d6d81590030ef09bab4c5a3e3c8409
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5c43b54de3d6d81590030ef09bab4c5a3e3c8409
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][2.16] JCR-4244: Upgrade tomcat dependency to 8.5.24 (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit Commits: 1ded129b by Julian Reschke at 2018-02-02T15:38:41+00:00 JCR-4244: Upgrade tomcat dependency to 8.5.24 (ported to 2.16) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822975 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-webapp/pom.xml Changes: = jackrabbit-webapp/pom.xml = --- a/jackrabbit-webapp/pom.xml +++ b/jackrabbit-webapp/pom.xml @@ -36,7 +36,7 @@ 1.0.39 -7.0.82 +8.5.24 View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/1ded129b69804b63d030378e40c026558113685a --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/1ded129b69804b63d030378e40c026558113685a 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][2.16] CR-4240: IndexingQueueTest relies on Tika behavior that is changed in Tika 1.17 (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
9796c276 by Julian Reschke at 2018-02-02T15:02:07+00:00
CR-4240: IndexingQueueTest relies on Tika behavior that is changed in Tika 1.17
(ported to 2.16)
Changed test to use an actual payload (and parse that), adding tika config to
detect the custom type. (Thanks to talli...@apache.org for the proposed fix!)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822970
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
3 changed files:
-
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
-
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
- + jackrabbit-core/src/test/resources/org/apache/tika/mime/custom-mimetypes.xml
Changes:
=
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
=
---
a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
+++
b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/BlockingParser.java
@@ -16,16 +16,22 @@
*/
package org.apache.jackrabbit.core.query.lucene;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.Set;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.EmptyParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.sax.XHTMLContentHandler;
+import org.w3c.dom.Document;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class BlockingParser extends EmptyParser {
@@ -76,10 +82,19 @@ public class BlockingParser extends EmptyParser {
Metadata metadata, ParseContext context)
throws SAXException {
waitIfBlocked();
-XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
-xhtml.startDocument();
-xhtml.element("p", "The quick brown fox jumped over the lazy dog.");
-xhtml.endDocument();
+try {
+DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+Document doc = dbf.newDocumentBuilder().parse(new
InputSource(stream));
+String contents = doc.getDocumentElement().getTextContent();
+XHTMLContentHandler xhtml = new XHTMLContentHandler(handler,
metadata);
+xhtml.startDocument();
+xhtml.element("p", contents);
+xhtml.endDocument();
+} catch (ParserConfigurationException ex) {
+throw new SAXException(ex);
+} catch (IOException ex) {
+throw new SAXException(ex);
+}
}
}
=
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
=
---
a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
+++
b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
@@ -42,6 +42,8 @@ public class IndexingQueueTest extends AbstractIndexingTest {
private static final File TEMP_DIR =
new File(System.getProperty("java.io.tmpdir"));
+private static final String TESTCONTENT = "\nThe quick brown fox jumps over the lazy
dog.";
+
public void testQueue() throws Exception {
SearchIndex index = getSearchIndex();
IndexingQueue queue = index.getIndex().getIndexingQueue();
@@ -50,7 +52,7 @@ public class IndexingQueueTest extends AbstractIndexingTest {
assertEquals(0, queue.getNumPendingDocuments());
Node resource = testRootNode.addNode(nodeName1, "nt:resource");
-resource.setProperty("jcr:data", "", PropertyType.BINARY);
+resource.setProperty("jcr:data", TESTCONTENT, PropertyType.BINARY);
resource.setProperty("jcr:lastModified", Calendar.getInstance());
resource.setProperty("jcr:mimeType", BlockingParser.TYPE.toString());
session.save();
@@ -169,7 +171,7 @@ public class IndexingQueueTest extends AbstractIndexingTest
{
// create files
Node file = folder.addNode("file" + i, "nt:file");
Node resource = file.addNode("jcr:content", "nt:resource");
-resource.setProperty("jcr:data", "", PropertyType.BINARY);
+resource.setProperty("jcr:data", TESTCONTENT, PropertyType.BINARY);
resource.setProperty("jcr:lastModified", Calendar.getInstance());
resource.setProperty("jcr:mimeType",
BlockingParser.TYPE.toString());
count++;
=
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.16] JCR-4001: When using Node.getProperties(String namePattern) also child nodes are…
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
b6258c4c by Julian Reschke at 2018-02-02T14:27:50+00:00
JCR-4001: When using Node.getProperties(String namePattern) also child nodes
are processed (ported to 2.16)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1822968
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
-
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/ChildrenCollectorFilter.java
Changes:
=
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/ChildrenCollectorFilter.java
=
---
a/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/ChildrenCollectorFilter.java
+++
b/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/ChildrenCollectorFilter.java
@@ -30,6 +30,7 @@ import
org.apache.jackrabbit.commons.iterator.PropertyIteratorAdapter;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
/**
* ChildrenCollectorFilter is a utility class
@@ -64,7 +65,7 @@ public class ChildrenCollectorFilter extends
TraversingItemVisitor.Default {
boolean collectNodes, boolean collectProperties, int maxLevel) {
super(false, maxLevel);
this.namePattern = namePattern;
-nameGlobs = null;
+this.nameGlobs = null;
this.children = children;
this.collectNodes = collectNodes;
this.collectProperties = collectProperties;
@@ -86,7 +87,7 @@ public class ChildrenCollectorFilter extends
TraversingItemVisitor.Default {
boolean collectNodes, boolean collectProperties, int maxLevel) {
super(false, maxLevel);
this.nameGlobs = nameGlobs;
-namePattern = null;
+this.namePattern = null;
this.children = children;
this.collectNodes = collectNodes;
this.collectProperties = collectProperties;
@@ -110,17 +111,26 @@ public class ChildrenCollectorFilter extends
TraversingItemVisitor.Default {
public static PropertyIterator collectProperties(
Node node, String namePattern) throws RepositoryException {
-Collection properties = new ArrayList();
-node.accept(new ChildrenCollectorFilter(
-namePattern, properties, false, true, 1));
+Collection properties = Collections.emptySet();
+PropertyIterator pit = node.getProperties();
+while (pit.hasNext()) {
+Property p = pit.nextProperty();
+if (matches(p.getName(), namePattern)) {
+properties = addToCollection(properties, p);
+}
+}
return new PropertyIteratorAdapter(properties);
}
-public static PropertyIterator collectProperties(
-Node node, String[] nameGlobs) throws RepositoryException {
-Collection properties = new ArrayList();
-node.accept(new ChildrenCollectorFilter(
-nameGlobs, properties, false, true, 1));
+public static PropertyIterator collectProperties(Node node, String[]
nameGlobs) throws RepositoryException {
+Collection properties = Collections.emptySet();
+PropertyIterator pit = node.getProperties();
+while (pit.hasNext()) {
+Property p = pit.nextProperty();
+if (matches(p.getName(), nameGlobs)) {
+properties = addToCollection(properties, p);
+}
+}
return new PropertyIteratorAdapter(properties);
}
@@ -179,4 +189,18 @@ public class ChildrenCollectorFilter extends
TraversingItemVisitor.Default {
public static boolean matches(String name, String[] nameGlobs) {
return ItemNameMatcher.matches(name, nameGlobs);
}
+
+private static Collection addToCollection(Collection c, Item
p) {
+Collection nc = c;
+if (c.isEmpty()) {
+nc = Collections.singleton(p);
+} else if (c.size() == 1) {
+nc = new ArrayList(c);
+nc.add(p);
+} else {
+nc.add(p);
+}
+
+return nc;
+}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/b6258c4ca4174ad100bd35ac909faa0424841fab
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/b6258c4ca4174ad100bd35ac909faa0424841fab
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] Pushed new branch feature/ESSENTIALS-1163
Bert Leunis pushed new branch feature/ESSENTIALS-1163 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1163 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-4208] HSTTWO-4208 keep hippobean attribute in the tag lowercase, like as in other tags
Bert Leunis pushed to branch feature/HSTTWO-4208 at cms-community /
hippo-site-toolkit
Commits:
a617a567 by Bert Leunis at 2018-02-02T13:48:16+01:00
HSTTWO-4208 keep hippobean attribute in the tag lowercase, like as in other tags
- - - - -
3 changed files:
- client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
- client/src/main/resources/META-INF/hst-core.tld
- client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
Changes:
=
client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
=
--- a/client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
+++ b/client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
@@ -299,7 +299,7 @@ public class HstManageContentTag extends TagSupport {
this.defaultPath = defaultPath;
}
-public void setHippoBean(final HippoBean hippoBean) {
+public void setHippobean(final HippoBean hippoBean) {
this.hippoBean = hippoBean;
}
=
client/src/main/resources/META-INF/hst-core.tld
=
--- a/client/src/main/resources/META-INF/hst-core.tld
+++ b/client/src/main/resources/META-INF/hst-core.tld
@@ -718,7 +718,7 @@
JSP
Bean for existing document.
- hippoBean
+ hippobean
false
true
org.hippoecm.hst.content.beans.standard.HippoBean
=
client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
=
--- a/client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
+++ b/client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
@@ -145,7 +145,7 @@ public class HstManageContentTagTest {
@Test
public void documentFromHandle() throws Exception {
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
final MockNode handle = root.addNode("document",
HippoNodeType.NT_HANDLE);
@@ -163,7 +163,7 @@ public class HstManageContentTagTest {
@Test
public void documentFromVariantBelowHandle() throws Exception {
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
final MockNode handle = root.addNode("document",
HippoNodeType.NT_HANDLE);
@@ -182,7 +182,7 @@ public class HstManageContentTagTest {
@Test
public void documentWithoutCanonicalNodeOutputsNothing() throws Exception {
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final HippoNode handle = createMock(HippoNode.class);
expect(document.getNode()).andReturn(handle);
@@ -198,7 +198,7 @@ public class HstManageContentTagTest {
@Test
public void documentWithoutHandleNodeOutputsNothing() throws Exception {
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
expect(document.getNode()).andReturn(root);
@@ -212,7 +212,7 @@ public class HstManageContentTagTest {
@Test
public void exceptionWhileReadingUuidOutputsNothing() throws Exception {
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final HippoNode brokenNode = createMock(HippoNode.class);
expect(document.getNode()).andReturn(brokenNode).anyTimes();
@@ -311,7 +311,7 @@ public class HstManageContentTagTest {
tag.setParameterName("absPath");
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
final MockNode handle = root.addNode("document",
HippoNodeType.NT_HANDLE);
@@ -343,7 +343,7 @@ public class HstManageContentTagTest {
tag.setParameterName("relPath");
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
final MockNode handle = root.addNode("document",
HippoNodeType.NT_HANDLE);
@@ -372,7 +372,7 @@ public class HstManageContentTagTest {
tag.setParameterName("absPath");
final HippoBean document = createMock(HippoBean.class);
-tag.setHippoBean(document);
+tag.setHippobean(document);
final MockNode root = MockNode.root();
final MockNode handle = root.addNode("document",
HippoNodeType.NT_HANDLE);
@@ -399,7 +399,7 @@ public class HstManageContentTagTest {
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4256: create announcement mail template for releases (fix line ends, add a…
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
6c85f800 by Julian Reschke at 2018-02-02T12:18:30+00:00
JCR-4256: create announcement mail template for releases (fix line ends, add a
note that the template was generated)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1822950
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,21 @@ least three +1 Jackrabbit PMC votes are cast.
[ ] +1 Release this package as Apache Jackrabbit ${project.version}
[ ] -1 Do not release this package because...${line.separator}
+
+From: ${username}@apache.org
+To: annou...@apache.org, annou...@jackrabbit.apache.org,
us...@jackrabbit.apache.org, d...@jackrabbit.apache.org,
oak-...@jackrabbit.apache.org
+Subject: [ANNOUNCE] Apache Jackrabbit ${project.version} released
+
+The Apache Jackrabbit community is pleased to announce the release of
+Apache Jackrabbit ${project.version}. The release is available for download at:
+
+ http://jackrabbit.apache.org/downloads.html
+
+See the full release notes below for details about this release:
+
+
+
+
The release candidate has been prepared in:
@@ -212,24 +227,12 @@ Please deploy it to
https://dist.apache.org/repos/dist/dev/jackrabbit/:
A release vote template has been generated for you:
file://${basedir}/target/vote.txt
-
-
-
-From: ${username}@apache.org
-To: annou...@apache.org, annou...@jackrabbit.apache.org,
us...@jackrabbit.apache.org, d...@jackrabbit.apache.org,
oak-...@jackrabbit.apache.org
-Subject: [ANNOUNCE] Apache Jackrabbit ${project.version} released
-
-The Apache Jackrabbit community is pleased to announce the release of
-Apache Jackrabbit ${project.version}. The release is available for download at:
-
- http://jackrabbit.apache.org/downloads.html
-See the full release notes below for details about this release:
+An announcement mail template can be found at:
+file://${basedir}/target/announcement.txt
-
-
-
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6c85f8005a9a02328816c32d59c4fc1f31e82e51
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/6c85f8005a9a02328816c32d59c4fc1f31e82e51
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-1520] 2 commits: CHANNELMGR-1520 Recognize compound fields explicitly
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community
/ hippo-addon-channel-manager
Commits:
8635de59 by Mathijs den Burger at 2018-02-02T13:06:34+01:00
CHANNELMGR-1520 Recognize compound fields explicitly
Instead of assuming that everything thats not a choice field is
a compound, we now explicit recognize compounds fields: one of their
required supertypes is always hippo:compound. That prevents the
code from recognizing compound-like types like hippogallerypicker:imagelink
as a compound. These will now be parsed an UNKNOWN types instead,
which makes it possible to later recognize them as unknown required
types.
- - - - -
6461285b by Mathijs den Burger at 2018-02-02T13:10:21+01:00
CHANNELMGR-1520 Fix reporting of unsupported field types
They were not included anymore because FieldTypeUtils#determineFieldType
returned Unknown instead of an empty string for unsupported fields.
Dont include the unsupportedFieldTypes property in the JSON
output
unless its not empty, otherwise the frontend will erroneously report
a usage statistic about it with an empty array of type names (an empty
array is truthy in JavaScript).
- - - - -
2 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/model/DocumentType.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/FieldTypeUtils.java
@@ -32,6 +32,7 @@ import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import org.hippoecm.repository.HippoStdNodeType;
+import org.hippoecm.repository.api.HippoNodeType;
import org.hippoecm.repository.util.JcrUtils;
import org.onehippo.cms.channelmanager.content.document.model.FieldValue;
import org.onehippo.cms.channelmanager.content.document.util.FieldPath;
@@ -58,6 +59,8 @@ import
org.onehippo.cms.channelmanager.content.error.ErrorInfo.Reason;
import org.onehippo.cms.channelmanager.content.error.ErrorWithPayloadException;
import
org.onehippo.cms.channelmanager.content.error.InternalServerErrorException;
import org.onehippo.cms7.services.contenttype.ContentTypeItem;
+import org.onehippo.cms7.services.contenttype.EffectiveNodeTypeChild;
+import org.onehippo.cms7.services.contenttype.EffectiveNodeTypeItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -231,11 +234,29 @@ public class FieldTypeUtils {
}
if (item.isProperty()) {
-// Unsupported type
+// All known property fields are part of the FIELD_TYPE_MAP, so
this one is unknown
return FIELD_TYPE_UNKNOWN;
}
-return ChoiceFieldUtils.isChoiceField(context) ? FIELD_TYPE_CHOICE :
FIELD_TYPE_COMPOUND;
+if (ChoiceFieldUtils.isChoiceField(context)) {
+return FIELD_TYPE_CHOICE;
+}
+
+if (isCompound(item)) {
+return FIELD_TYPE_COMPOUND;
+}
+
+return FIELD_TYPE_UNKNOWN;
+}
+
+private static boolean isCompound(final ContentTypeItem item) {
+final EffectiveNodeTypeItem effectiveItem =
item.getEffectiveNodeTypeItem();
+
+if (effectiveItem instanceof EffectiveNodeTypeChild) {
+EffectiveNodeTypeChild effectiveChild = (EffectiveNodeTypeChild)
effectiveItem;
+return
effectiveChild.getRequiredPrimaryTypes().contains(HippoNodeType.NT_COMPOUND);
+}
+return false;
}
private static boolean usesDefaultFieldPlugin(final FieldTypeContext
context, final TypeDescriptor descriptor) {
@@ -253,7 +274,7 @@ public class FieldTypeUtils {
public static Set getUnsupportedFieldTypes(final
ContentTypeContext context) {
return NamespaceUtils.retrieveFieldSorter(context.getContentTypeRoot())
.map(fieldSorter -> fieldSorter.sortFields(context).stream()
-.filter(fieldTypeContext ->
determineFieldType(fieldTypeContext).isEmpty())
+.filter(fieldTypeContext ->
determineFieldType(fieldTypeContext).equals(FIELD_TYPE_UNKNOWN))
.map(FieldTypeUtils::mapFieldTypeName)
.collect(Collectors.toCollection(TreeSet::new))
)
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/model/DocumentType.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/model/DocumentType.java
+++
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4256: create announcement mail template for releases
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
5b8758e8 by Julian Reschke at 2018-02-02T11:10:48+00:00
JCR-4256: create announcement mail template for releases
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1822947
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@ A staged Maven repository is available for review at:
The command for running automated checks against this release candidate is:
+# run in SVN checkout of https://dist.apache.org/repos/dist/dev/jackrabbit/
$ sh check-release.sh ${project.version} ${checksum}
Please vote on releasing this package as Apache Jackrabbit ${project.version}.
@@ -213,6 +214,22 @@ A release vote template has been generated for you:
file://${basedir}/target/vote.txt
+
+From: ${username}@apache.org
+To: annou...@apache.org, annou...@jackrabbit.apache.org,
us...@jackrabbit.apache.org, d...@jackrabbit.apache.org,
oak-...@jackrabbit.apache.org
+Subject: [ANNOUNCE] Apache Jackrabbit ${project.version} released
+
+The Apache Jackrabbit community is pleased to announce the release of
+Apache Jackrabbit ${project.version}. The release is available for download at:
+
+ http://jackrabbit.apache.org/downloads.html
+
+See the full release notes below for details about this release:
+
+
+
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5b8758e8c790a1c956224fc86ca693d63301d2cc
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/5b8758e8c790a1c956224fc86ca693d63301d2cc
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][feature/ESSENTIALS-1137] 32 commits: ESSENTIALS-1110 Make essentials part of create content setup
Tobias Jeger pushed to branch feature/ESSENTIALS-1137 at cms-community / hippo-essentials Commits: 5feb954d by Michael Metternich at 2017-11-13T13:39:51+01:00 ESSENTIALS-1110 Make essentials part of create content setup - - - - - b01f9ed5 by Michael Metternich at 2017-11-13T13:53:55+01:00 ESSENTIALS-1110 Remove create-content tag - - - - - 0a3e9917 by Michael Metternich at 2017-11-13T13:56:57+01:00 ESSENTIALS-1110 Set create-content tag - - - - - ba2ceee4 by Michael Metternich at 2017-12-01T11:13:25+01:00 ESSENTIALS-1129 Merge master into feature/create-content - - - - - 462b5aa1 by Michael Metternich at 2017-12-01T11:23:30+01:00 ESSENTIALS-1129 Add create-content version to new plugins - - - - - a11e1bb3 by Michael Metternich at 2017-12-22T15:02:58+01:00 ESSENTIALS-1108 Change cmseditlink to manage content tag - - - - - ed98496f by Bert Leunis at 2018-01-05T15:09:06+01:00 ESSENTIALS-1108 faq list template with separate buttons for create and edit - - - - - 83150332 by Michael Metternich at 2018-01-09T09:39:58+01:00 ESSENTIALS-1108 Change cmseditlink to manage content tag for news plugin - - - - - f7bb51e1 by Michael Metternich at 2018-01-09T10:37:37+01:00 ESSENTIALS-1108 Change manage content tag for content plugin - - - - - 9585e352 by Michael Metternich at 2018-01-09T16:02:25+01:00 ESSENTIALS-1108 News manage content tag should not create content - - - - - cc9a29c2 by Michael Metternich at 2018-01-09T16:30:16+01:00 ESSENTIALS-1108 Change manage content tag for events plugin - - - - - 63d3c86b by Michael Metternich at 2018-01-11T16:15:27+01:00 ESSENTIALS-1108 Change manage content tag for search plugin - - - - - abc096e4 by Michael Metternich at 2018-01-11T16:21:11+01:00 ESSENTIALS-1108 Change manage content tag for list plugin - - - - - ff029c7d by Michael Metternich at 2018-01-12T11:11:17+01:00 ESSENTIALS-1108 Tags in blog should not add new documents Date field type is not supported in right side panel, so new documents cannot be created from the right side panel. - - - - - 69bc6995 by Michael Metternich at 2018-01-12T11:11:57+01:00 ESSENTIALS-1108 Consistently use rootPath instead of defaultPath - - - - - c4af5b73 by Michael Metternich at 2018-01-12T11:12:23+01:00 ESSENTIALS-1108 Also update jsp files - - - - - 2af0ed80 by Bert Leunis at 2018-01-15T14:27:55+01:00 ESSENTIALS-1108 layout fixes. add defaultPath for new faq items. - - - - - d144bc36 by Bert Leunis at 2018-01-15T15:49:01+01:00 ESSENTIALS-1129 Merge master changes in feature/create-content - - - - - 96333dfa by Bert Leunis at 2018-01-15T15:56:47+01:00 ESSENTIALS-1108 Merge feature/create-content changes in feature/CC-ESSENTIALS-1108 - - - - - 75ddefce by Bert Leunis at 2018-01-18T12:55:40+01:00 ESSENTIALS-1108 use new request attributes for year/month strings - - - - - 1ec61956 by Bert Leunis at 2018-01-18T13:01:12+01:00 ESSENTIALS-1108 Reintegrate feature/CC-ESSENTIALS-1108 - - - - - bf63e192 by Bert Leunis at 2018-01-19T15:27:05+01:00 ESSENTIALS-1110 add manageContent buttons for carousel documents - - - - - 78b8fa07 by Bert Leunis at 2018-01-29T13:55:45+01:00 ESSENTIALS-1155 if a banner component has a banner document configured, you can now use the orange button to pick another one - - - - - b58549b7 by Bert Leunis at 2018-01-29T15:50:30+01:00 ESSENTIALS-1158 add the option to create a new document from the generic content list templates - - - - - ea2908db by Bert Leunis at 2018-01-29T17:00:10+01:00 ESSENTIALS-1156 to option to add new faq item documents has been removed - - - - - d717ea44 by Michael Metternich at 2018-01-30T10:14:40+01:00 ESSENTIALS-1156 Merge feature/create-content - - - - - 681e1c5f by Michael Metternich at 2018-01-30T10:16:30+01:00 ESSENTIALS-1156 Also removed rootPath - - - - - 135909ae by Michael Metternich at 2018-01-30T10:17:21+01:00 ESSENTIALS-1156 Reintegrate bugfix/CC-ESSENTIALS-1156 - - - - - 964a0ac8 by Michael Metternich at 2018-01-30T10:37:33+01:00 ESSENTIALS-1158 Merge feature/create-content - - - - - 2a4e93a8 by Bert Leunis at 2018-02-01T16:00:02+01:00 ESSENTIALS-1129 Merge master changes in feature/create-content - - - - - 3c7d181c by Bert Leunis at 2018-02-01T16:05:05+01:00 ESSENTIALS-1129 Reintegrate feature/create-content - - - - - d437b848 by Tobias Jeger at 2018-02-02T11:15:02+01:00 ESSENTIALS-1137 Merge branch master into feature/ESSENTIALS-1137 - - - - - 30 changed files: - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner-without-description.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-banner.ftl - plugins/banner-and-carousel/src/main/resources/freemarker/essentials-carousel.ftl - plugins/banner-and-carousel/src/main/resources/jsp/essentials-banner.jsp - plugins/banner-and-carousel/src/main/resources/jsp/essentials-carousel.jsp - plugins/blog/src/main/resources/freemarker/blog-detail-variant.ftl - plugins/blog/src/main/resources/freemarker/blog-detail.ftl -
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1137
Tobias Jeger deleted branch feature/ESSENTIALS-1137 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] Pushed new branch feature/ESSENTIALS-1151
Tobias Jeger pushed new branch feature/ESSENTIALS-1151 at cms-community / hippo-essentials --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/tree/feature/ESSENTIALS-1151 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] 48 commits: ESSENTIALS-1137 Simplify aggregation of RebuildEvents
Tobias Jeger pushed to branch master at cms-community / hippo-essentials Commits: 49385f10 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Simplify aggregation of RebuildEvents Essentials plugins can indicate that they require a project rebuild and restart. They used to do so by constructing an event class, and posting it on the eventBus. A listener would collect them into a list, from which the dashboard collects them during each Ping. The same functionality has been simplified inside the RebuildService, which avoid the need for the event bus, collects the relevant information (plugin IDs only) and provides them to the dashboard. With this change, the last use of the APIs PluginEvent is gone, and so the PluginEvent interface is removed from the API. - - - - - 7e9607b3 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unused classes - - - - - 91e2b1f0 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove superfluous ProjectResource#coordinates endpoint - - - - - a19da663 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Make the selections tool depend on the SDK API only - - - - - 1e258b4c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Refactor PluginContext and ProjectUtils PluginContext used to be a misnamed collection of project specific settings and logic, extensively using ProjectUtils and, upon construction reading the ProjectSettings from a project resource, over and over again. This extensive refactoring moves most of the combined logic from PluginContext and ProjectUtils into a new, Spring-injectable ProjectService, who, in turn, uses a new SettingsService for managing the project settings/parameters. This refactoring cleans up quite some duplicate (and sometimes buggy) logic and reduces the weight of and need to instantiate and pass along PluginContexts all through Essentials. - - - - - da6bfe03 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 More refactoring of PluginContext With the PluginContext having lost much of its weight and importance, it was now unused in many method signature and interface. This commit focuses on removing this superfluous passing-around of PluginContext instances. This commit also cleans up the ProjectSettings API to only contain getters, and only for fields potentially relevant to plugins. Dashboard- internal data can be accessed through the ProjectSettingsBean, as can the settings be adjusted. - - - - - c60b793e by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unnecessary complexity in PluginConfigService PluginConfigService used to be an SDK API interface for (de-)serializing Documents to/from XML files. This mechanism is intended for the Dashboard only, and used in the plugin InstallStateMachine and the SettingsServiceImpl (for managing the project-global settings). This refactoring removes these concepts from the SDK API (not relevant there) and removes unnecessary abstraction layers. - - - - - 53838ddb by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Improve Javadoc of SDK API services - - - - - c4fd0d5c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove unused JAX-RS parameters - - - - - ab2a0d02 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove lots of unused and some duplicate code - Moved the PluginModuleRestful from the SDK to the dashboard, because its only used in the dashboard and not intended to be exposed to plugins. - - - - - da76b33c by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove usage of instructions from REST and Gallery tools Instead of manually executing an instruction set, I refactored the FileInstruction to use the ProjectService for copying files to the project or deleting files from the project. The REST resource if the REST plugin can now use the ProjectService (and JcrService) directly, rather than taking the elaborate detour through the instruction mechanism, which should really be dashboard-internal. - - - - - fd12bf29 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Remove installation instruction-related APIs All but the Instruction API are really only used internally by the Dashboard, so they should not be part of the API. Plugins who used to use these InstructionXYZ APIs have been refactored to use the services directly, which is considerably simpler to comprehend/ maintain. - - - - - 39a431f7 by Tobias Jeger at 2018-01-16T23:26:38+01:00 ESSENTIALS-1137 Move MessageGroup and InstructionStatus into Instruction These two enumerations were only used in the context of an Instruction. Also, their naming has been improved to Type and Status. - - - - - 50e2dad2 by Tobias Jeger at 2018-01-16T23:26:39+01:00 ESSENTIALS-1137 Move EssentialsGenerated annotation to SDK impl module - - - - - 22bb2c5e by Tobias Jeger at 2018-01-16T23:26:39+01:00 ESSENTIALS-1137 Improve plugin SDK package naming changed o.o.c.essentials.dashboard.* to
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-11064
Marijan Milicevic pushed new branch bugfix/CMS-11064 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/bugfix/CMS-11064 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] Pushed new branch feature/HSTTWO-4208
Michael Metternich pushed new branch feature/HSTTWO-4208 at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-4208 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-1520] 49 commits: CHANNELMGR-254 Update copyright year of NOTICE file to 2018
Mathijs den Burger pushed to branch feature/CC-CHANNELMGR-1520 at cms-community / hippo-addon-channel-manager Commits: cd072e29 by Arent-Jan Banck at 2018-01-23T21:16:00+01:00 CHANNELMGR-254 Update copyright year of NOTICE file to 2018 - - - - - 07fc13fa by Ariel Weinberger at 2018-01-24T15:27:01+01:00 CHANNELMGR-1686 Add disabled class styling for disabled fab-options dial button - - - - - 47c18299 by Ariel Weinberger at 2018-01-24T15:58:57+01:00 CHANNELMGR-1686 Merge branch feature/create-content into feature/CC-CHANNELMGR-1686 - - - - - 3cc6cc07 by Arthur Bogaart at 2018-01-25T12:00:09+01:00 CHANNELMGR-1657 Disable document-location widget for non-existing path the REST endpoint for folders returns a new field exists which describes whether a folder exists or not. This is used by the frontend to render a disabled or enabled document-location widget. This means the picker can not be opened for non-existing folders. - - - - - 55a7e41f by Arent-Jan Banck at 2018-01-25T12:22:55+01:00 CHANNELMGR-1660 Remove version override - - - - - c293cb87 by Ariel Weinberger at 2018-01-25T17:56:12+01:00 CHANNELMGR-1686 Disable main and speed-dial buttons in necessary scenarios. Implement disabled style mixin to be re-used in both cases. Click events were disabled as well. - - - - - 1448e650 by Ariel Weinberger at 2018-01-25T17:56:51+01:00 CHANNELMGR-1686 FIx sasslint errors - - - - - bbd02789 by Ariel Weinberger at 2018-01-25T18:06:42+01:00 CHANNELMGR-1686 Fix unit tests and remove a scenario which is unused anymore (hiding main buttons) - - - - - 514b9c81 by Arthur Bogaart at 2018-01-26T10:51:47+01:00 CHANNELMGR-1692 Delete draft of open document when channel is closed - - - - - df2c6045 by Arthur Bogaart at 2018-01-26T10:51:56+01:00 CHANNELMGR-1692 Fixed lint errors - - - - - e3860e3c by Arthur Bogaart at 2018-01-26T13:50:50+01:00 CHANNELMGR-1657 Merge feature/create-content changes - - - - - ac4ed2de by Michael Metternich at 2018-01-26T14:44:07+01:00 CHANNELMGR-1535 Add usage statistics - - - - - 5f874258 by Mathijs den Burger at 2018-01-26T14:58:43+01:00 CHANNELMGR-1694 Remove unused variable from OverlayService test - - - - - 888f108b by Arthur Bogaart at 2018-01-26T16:02:10+01:00 CHANNELMGR-1657 Add text-disabled color - - - - - 631151b3 by Arthur Bogaart at 2018-01-26T16:03:56+01:00 CHANNELMGR-1657 Add style difference between existing and non-existing folders To simplify the layout, I overlayed the current widget with a div that contains the styled path. - - - - - a23bee55 by Mathijs den Burger at 2018-01-26T16:14:47+01:00 CHANNELMGR-1694 Dont delete document of other editor when exiting step2 Opening the other editor for a document kills the content editor in the right side-panel for that document. This used to be controller only by the edit-content state. However, create-content-step-2 now also shows a content editor, so it has to monitor the kill editor event separately. The step2 controller used to always delete the document when step2 state was left without clicking save. That also deleted the document when the other editor opened it, which crashed the CMS once it was reloaded. The logic to delete a document now moved into the content editor. When the content editor is killed, the document is not deleted (similar to the deleteDraft() behavior). The create content service kills the editor of step 2 when the other editor opens it. Together, the content editor is killed (but the document is not deleted) when the other editor opens it. - - - - - d93c0c39 by Bert Leunis at 2018-01-26T16:28:36+01:00 CHANNELMGR-1488 Merge master changes in feature/create-content - - - - - 36d5c0c9 by Mathijs den Burger at 2018-01-26T16:59:31+01:00 CHANNELMGR-1515 Update component path parameter of the rendered variant - - - - - d0c4171a by Arthur Bogaart at 2018-01-26T23:19:04+01:00 CHANNELMGR-1647 Show full truncated path + search icon Refactored the controller while removing the constraints of a) MAX folders shown and b) show at most 1 folder of the rootPath. Updated the specs. The overlay element is truncated at a calculated width to leave space for the search icon. - - - - - fe391cc4 by Michael Metternich at 2018-01-27T23:02:04+01:00 CHANNELMGR-1657 Merge feature/create-content changes - - - - - c3c1c17f by Michael Metternich at 2018-01-27T23:04:50+01:00 CHANNELMGR-1657 Reintegrate feature/CC-CHANNELMGR-1657 - - - - - a6604789 by Ariel Weinberger at 2018-01-29T10:38:04+01:00 CHANNELMGR-1686 Rename config.isDisabled to config.isLockedByOtherUser and simplify disabled button logic. Instead of removing the on-click callback in a function (_disableButton), the callback wont be set from the beginning if the button is disabled. Class name is also added explicitly for each buttons case, so the _disabledButton function is removed. - - - - - 20e78399 by Ariel Weinberger at 2018-01-29T10:40:32+01:00 CHANNELMGR-1686 Extract .disabled selector from the disable-fab-button mixin and use it
[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/REPO-1860
Bert Leunis deleted branch feature/REPO-1860 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] 3 commits: REPO-1860 prepare restore original commit message
Bert Leunis pushed to branch master at cms-community / hippo-repository
Commits:
5d129a53 by Bert Leunis at 2018-02-02T09:28:21+01:00
REPO-1860 prepare restore original commit message
- - - - -
acc94e2a by Mathijs den Burger at 2018-02-02T09:37:14+01:00
REPO-1860 Add StringCodecService and a module that provides it
The service populates a StringCodecFactory with dynamically loaded
StringCodec classes. Customers can register a more locale-specific
StringCodec class by adding more properties to
/hippo:configuration/hippo:modules/stringcodec/hippo:moduleconfig
(e.g. encoding.display.de for a German-specific encoder of display
names).
The StringCodecModuleConfig always registers a default identity codec
under the null key, so the StringCodecServiceImpl can use the
null
key to retrieve the codec for identity encoding.
Note: the original commit date of these changes was 20-10-2017. The
original commit message got lost during a reintegration, so these
changes merely restore the original commit messages.
- - - - -
62f06ec0 by Bert Leunis at 2018-02-02T09:45:16+01:00
REPO-1860 Reintegrate feature/REPO-1860
- - - - -
3 changed files:
- api/src/main/java/org/hippoecm/repository/api/StringCodecService.java
-
modules/src/main/java/org/hippoecm/repository/stringcodec/StringCodecModule.java
-
modules/src/test/java/org/hippoecm/repository/stringcodec/StringCodecModuleConfigTest.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
@@ -54,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. Can be null.
+ * @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.
*/
=
modules/src/main/java/org/hippoecm/repository/stringcodec/StringCodecModule.java
=
---
a/modules/src/main/java/org/hippoecm/repository/stringcodec/StringCodecModule.java
+++
b/modules/src/main/java/org/hippoecm/repository/stringcodec/StringCodecModule.java
@@ -33,12 +33,12 @@ public class StringCodecModule extends
AbstractReconfigurableDaemonModule {
}
@Override
-protected void doConfigure(final Node node) throws RepositoryException {
+protected void doConfigure(final Node node) {
config.reconfigure(node);
}
@Override
-protected void doInitialize(final Session session) throws
RepositoryException {
+protected void doInitialize(final Session session) {
service = new StringCodecServiceImpl(config);
HippoServiceRegistry.registerService(service,
StringCodecService.class);
}
=
modules/src/test/java/org/hippoecm/repository/stringcodec/StringCodecModuleConfigTest.java
=
---
a/modules/src/test/java/org/hippoecm/repository/stringcodec/StringCodecModuleConfigTest.java
+++
b/modules/src/test/java/org/hippoecm/repository/stringcodec/StringCodecModuleConfigTest.java
@@ -48,7 +48,7 @@ public class StringCodecModuleConfigTest {
}
@Test
-public void emptyConfigHasDefaultCodec() throws RepositoryException {
+public void emptyConfigHasDefaultCodec() {
final StringCodecModuleConfig config = new StringCodecModuleConfig();
final MockNode emptyNode = MockNode.root();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/3472e690a21f374c414eab8eeef375b8f92e79d9...62f06ec0af7935bfbf96c78190ebb9800c7db2fd
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/3472e690a21f374c414eab8eeef375b8f92e79d9...62f06ec0af7935bfbf96c78190ebb9800c7db2fd
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] Pushed new branch feature/REPO-1860
Bert Leunis pushed new branch feature/REPO-1860 at cms-community / hippo-repository --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/tree/feature/REPO-1860 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
