[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4272: Upgrade surefire and failsafe plugins to 2.21.0
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
4a484b81 by Julian Reschke at 2018-03-08T06:16:24+00:00
JCR-4272: Upgrade surefire and failsafe plugins to 2.21.0
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1826178
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
@@ -44,8 +44,7 @@
-Xmx256m
-
--XX:+IgnoreUnrecognizedVMOptions
--add-modules=java.xml.bind
+
${test.opts.modules} ${test.opts.coverage} ${test.opts.memory}
-enableassertions
8.2.0.v20160908
1.17
@@ -289,11 +288,11 @@
maven-surefire-plugin
- 2.20.1
+ 2.21.0
maven-failsafe-plugin
- 2.20.1
+ 2.21.0
maven-war-plugin
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/4a484b8153f13b6244820056143dedd323bcf938
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/4a484b8153f13b6244820056143dedd323bcf938
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-4271: Remove redundant JavaDoc link to Java 7 API (ported to 2.16)
GitLab Mirror pushed to branch 2.16 at cms-community / hippo-jackrabbit
Commits:
24fdfaea by Julian Reschke at 2018-03-07T20:10:12+00:00
JCR-4271: Remove redundant JavaDoc link to Java 7 API (ported to 2.16)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.16@1826156
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
@@ -187,7 +187,6 @@
${java.version}
true
-http://docs.oracle.com/javase/7/docs/api/
https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0/
https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/
https://hc.apache.org/httpcomponents-client-ga/httpmime/apidocs/
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/24fdfaeaaf064889074495226cf397231baf8a1e
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/24fdfaeaaf064889074495226cf397231baf8a1e
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4271: Remove redundant JavaDoc link to Java 7 API
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
f21addeb by Julian Reschke at 2018-03-07T20:02:45+00:00
JCR-4271: Remove redundant JavaDoc link to Java 7 API
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1826154
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
@@ -181,7 +181,6 @@
${java.version}
true
-http://docs.oracle.com/javase/7/docs/api/
https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0/
https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/
https://hc.apache.org/httpcomponents-client-ga/httpmime/apidocs/
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f21addebd65551d48dc7312148f3f5eda06a9b26
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/f21addebd65551d48dc7312148f3f5eda06a9b26
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-components][feature/spaplus] 2 commits: ESSCOM-28 update master for 12.3 development
Woonsan Ko pushed to branch feature/spaplus at cms-community / hippo-essentials-components Commits: 8e9e2b95 by Ate Douma at 2018-02-28T15:38:20+01:00 ESSCOM-28 update master for 12.3 development - - - - - 3734198d by Woonsan Ko at 2018-03-07T13:34:38-05:00 ESSCOM-31: Merge branch master into feature/spaplus - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/spaplus] 3 commits: HSTTWO-4175 update master for 12.3 development
Woonsan Ko pushed to branch feature/spaplus at cms-community /
hippo-site-toolkit
Commits:
e2f5ca66 by Ate Douma at 2018-02-28T15:42:38+01:00
HSTTWO-4175 update master for 12.3 development
- - - - -
7b71fb82 by Woonsan Ko at 2018-03-07T11:48:33-05:00
HSTTWO-4227: Merge branch master into feature/spaplus
- - - - -
c085dbc6 by Woonsan Ko at 2018-03-07T13:16:52-05:00
HSTTWO-4227: generate component rendering url link for site url, not api url.
- - - - -
2 changed files:
-
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
- pom.xml
Changes:
=
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
@@ -40,6 +40,8 @@ import org.hippoecm.hst.core.container.ContainerConstants;
import org.hippoecm.hst.core.container.ContainerException;
import org.hippoecm.hst.core.container.HstComponentWindow;
import org.hippoecm.hst.core.container.HstContainerConfig;
+import org.hippoecm.hst.core.container.HstContainerURL;
+import org.hippoecm.hst.core.container.HstContainerURLProvider;
import org.hippoecm.hst.core.linking.HstLink;
import org.hippoecm.hst.core.linking.HstLinkCreator;
import org.hippoecm.hst.core.pagemodel.model.AggregatedPageModel;
@@ -208,6 +210,12 @@ public class PageModelAggregationValve extends
AggregationValve {
protected AggregatedPageModel createAggregatedPageModel(final
HstComponentWindow[] sortedComponentWindows,
final Map requestMap,
final Map responseMap) throws
ContainerException {
+final HstRequestContext requestContext = RequestContextProvider.get();
+final HstContainerURLProvider containerURLProvider =
getUrlFactory().getContainerURLProvider();
+final HstContainerURL apiBaseURL = requestContext.getBaseURL();
+final Mount siteMount =
requestContext.getMount(ContainerConstants.MOUNT_ALIAS_SITE);
+final HstContainerURL siteBaseURL =
containerURLProvider.createURL(siteMount, apiBaseURL, apiBaseURL.getPathInfo());
+
// root component (page component) is the first item in the
sortedComponentWindows.
final HstComponentWindow rootWindow = sortedComponentWindows[0];
final String id = rootWindow.getReferenceNamespace();
@@ -233,7 +241,7 @@ public class PageModelAggregationValve extends
AggregationValve {
curContainerWindowModel = new
ComponentContainerWindowModel(window.getReferenceNamespace(),
window.getName());
addParameterMapMetadata(window, curContainerWindowModel);
-addComponentRenderingURLLink(hstResponse,
curContainerWindowModel);
+addComponentRenderingURLLink(requestContext, siteBaseURL,
window, curContainerWindowModel);
decorateComponentWindowMetadata(hstRequest, hstResponse,
curContainerWindowModel);
pageModel.addContainerWindow(curContainerWindowModel);
} else if (window.isContainerItemWindow()) {
@@ -247,7 +255,7 @@ public class PageModelAggregationValve extends
AggregationValve {
window.getReferenceNamespace(), window.getName(),
window.getComponentName());
componentWindowModel.setLabel(window.getComponentInfo().getLabel());
addParameterMapMetadata(window, componentWindowModel);
-addComponentRenderingURLLink(hstResponse,
componentWindowModel);
+addComponentRenderingURLLink(requestContext, siteBaseURL,
window, componentWindowModel);
decorateComponentWindowMetadata(hstRequest, hstResponse,
componentWindowModel);
curContainerWindowModel.addComponentWindowSet(componentWindowModel);
} else {
@@ -282,10 +290,18 @@ public class PageModelAggregationValve extends
AggregationValve {
return pageModel;
}
-private void addComponentRenderingURLLink(HstResponse hstResponse,
-IdentifiableLinkableMetadataBaseModel linkableModel) {
-HstURL compRenderURL = hstResponse.createComponentRenderingURL();
-
linkableModel.putLink(ContainerConstants.LINK_NAME_COMPONENT_RENDERING,
compRenderURL.toString());
+/**
+ * Generate a component rendering URL which should return renderable
markups.
+ * @param requestContext request context
+ * @param siteBaseURL site base page rendering URL which is not from this
API pipeline but normal site pipeline.
+ * @param compWindow HST component window
+ * @param linkableModel linable model object
+ */
+private void
[HippoCMS-scm] [Git][cms-community/hippo-testsuite][feature/spaplus] HSTTWO-4227 add 'resourceapi menu item
Ard Schrijvers pushed to branch feature/spaplus at cms-community / hippo-testsuite Commits: fce0f199 by Ard Schrijvers at 2018-03-07T17:14:01+01:00 HSTTWO-4227 add resourceapi menu item - - - - - 1 changed file: - resources/src/main/webapp/WEB-INF/jsp/components/main/leftmenu.jsp Changes: = resources/src/main/webapp/WEB-INF/jsp/components/main/leftmenu.jsp = --- a/resources/src/main/webapp/WEB-INF/jsp/components/main/leftmenu.jsp +++ b/resources/src/main/webapp/WEB-INF/jsp/components/main/leftmenu.jsp @@ -106,8 +106,13 @@ -RESTful Representation + + +Resource API Representation + View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/fce0f199c9610001beb8d68abbcbf75d2a49f400 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-testsuite/commit/fce0f199c9610001beb8d68abbcbf75d2a49f400 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/spaplus] HSTTWO-4228 correct typo
Ard Schrijvers pushed to branch feature/spaplus at cms-community /
hippo-site-toolkit
Commits:
62ec5d81 by Ard Schrijvers at 2018-03-07T16:58:16+01:00
HSTTWO-4228 correct typo
- - - - -
1 changed file:
- api/src/main/java/org/hippoecm/hst/core/ModelContributable.java
Changes:
=
api/src/main/java/org/hippoecm/hst/core/ModelContributable.java
=
--- a/api/src/main/java/org/hippoecm/hst/core/ModelContributable.java
+++ b/api/src/main/java/org/hippoecm/hst/core/ModelContributable.java
@@ -55,7 +55,7 @@ public interface ModelContributable {
* combined view for both models and other
attributes through #getAttribute(String),
* #getAttributeNames() or #getAttributeMap.
*
- * @return an unmodifiable map of model objectscontributed by {@link
#setModel(String, Object)}
+ * @return an unmodifiable map of model objects contributed by {@link
#setModel(String, Object)}
*/
Map getModelsMap();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/62ec5d81fdfcb9be133eef299984c9a5ba2e6390
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/62ec5d81fdfcb9be133eef299984c9a5ba2e6390
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] REPO-1962 Annotate module with @ProvidesService
Michiel Eggermont pushed to branch master at cms-community / hippo-repository
Commits:
c8aa43ef by Michiel Eggermont at 2018-03-07T16:51:46+01:00
REPO-1962 Annotate module with @ProvidesService
This way other modules can safely get the LocalizationService by
annotating their module with @RequiresService.
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/repository/l10n/LocalizationModule.java
Changes:
=
engine/src/main/java/org/onehippo/repository/l10n/LocalizationModule.java
=
--- a/engine/src/main/java/org/onehippo/repository/l10n/LocalizationModule.java
+++ b/engine/src/main/java/org/onehippo/repository/l10n/LocalizationModule.java
@@ -26,11 +26,13 @@ import javax.jcr.observation.EventListener;
import org.onehippo.cms7.services.HippoServiceRegistry;
import org.onehippo.repository.modules.DaemonModule;
+import org.onehippo.repository.modules.ProvidesService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static
org.onehippo.repository.l10n.LocalizationService.TRANSLATIONS_PATH;
+@ProvidesService(types = LocalizationService.class)
public class LocalizationModule implements DaemonModule {
private static final Logger log =
LoggerFactory.getLogger(LocalizationModule.class);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/c8aa43ef2c7f7ac88b8e2f8375f697366e2890f2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/c8aa43ef2c7f7ac88b8e2f8375f697366e2890f2
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 to 4.2.7-SNAPSHOT on behalf of HSTTWO-4248
Jeroen Hoffman pushed to branch release/11.2 at cms-community / hippo-cms-release Commits: 59714312 by Jeroen Hoffman at 2018-03-07T10:31:36+01:00 CMS-16 bump HST version to 4.2.7-SNAPSHOT on behalf of HSTTWO-4248 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 4.2.11 3.2.0 3.2.0 -4.2.6 +4.2.7-SNAPSHOT 4.2.0 4.2.8-SNAPSHOT 3.2.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/597143125fbfc1809ed3eeddaa97d9121a454312 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/597143125fbfc1809ed3eeddaa97d9121a454312 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 repository version to 4.2.8-SNAPSHOT on behalf of REPO-1960
Jeroen Hoffman pushed to branch release/11.2 at cms-community / hippo-cms-release Commits: b5ffa739 by Jeroen Hoffman at 2018-03-07T10:26:56+01:00 CMS-16 bump repository version to 4.2.8-SNAPSHOT on behalf of REPO-1960 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 3.2.0 4.2.6 4.2.0 -4.2.7 +4.2.8-SNAPSHOT 3.2.1 3.2.0 3.2.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/b5ffa7397260f3893f7cc26dc0b9ebdd387397c3 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/b5ffa7397260f3893f7cc26dc0b9ebdd387397c3 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] 4 commits: REPO-1869 prevent document variants from being counted as duplicates
Jeroen Hoffman pushed to branch master at cms-community / hippo-repository
Commits:
558e52a7 by Jasper Floor at 2018-02-27T14:59:40+01:00
REPO-1869 prevent document variants from being counted as duplicates
- - - - -
0c15259e by Jeroen Hoffman at 2018-03-07T09:45:05+01:00
REPO-1869 remove parent-check logic: lot of code for a situation that is very
very unlikely (2 or 3 found variants with different parent)
- - - - -
f69fe4e6 by Jeroen Hoffman at 2018-03-07T09:46:48+01:00
REPO-1869 simplify code
- - - - -
ff5cb5d3 by Jeroen Hoffman at 2018-03-07T10:03:13+01:00
REPO-1869 Reintegrate branch bugfix/REPO-1869 into master
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
Changes:
=
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
=
---
a/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
+++
b/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2018 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.
@@ -64,20 +64,24 @@ public final class HippoTranslatedNode {
}
public Node getTranslation(String language) throws RepositoryException {
-String id = node.getProperty(HippoTranslationNodeType.ID).getString();
-Query query =
node.getSession().getWorkspace().getQueryManager().createQuery(
+final String id =
node.getProperty(HippoTranslationNodeType.ID).getString();
+final Query query =
node.getSession().getWorkspace().getQueryManager().createQuery(
"SELECT * FROM " + HippoTranslationNodeType.NT_TRANSLATED
+ " WHERE " + HippoTranslationNodeType.ID + "='" + id
+ "'"
+ " AND " + HippoTranslationNodeType.LOCALE + "='" +
language + "'",
Query.SQL);
final QueryResult result = query.execute();
-NodeIterator nodes = result.getNodes();
+final NodeIterator nodes = result.getNodes();
if (!nodes.hasNext()) {
-throw new ItemNotFoundException("Folder was not translated to " +
language);
+throw new ItemNotFoundException("Node " + node.getPath() + " was
not translated to " + language);
}
-if (nodes.getSize() > 1) {
-log.warn("More than one translated variant found for node " + id +
" in language " + language);
+
+if (nodes.getSize() > 3) {
+// check 3 for the stable draft/unpublished/published versions
+log.warn("Not a maximum of 3 but {} translated variants found for
node {} with translation id {} and language {}.",
+nodes.getSize(), node.getPath(), id, language);
}
+
return nodes.nextNode();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/4b64f92ed4d59d9317c30766a4a704d9cf391337...ff5cb5d301089dddf5ee3cf394a778ea8a53ea9a
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/4b64f92ed4d59d9317c30766a4a704d9cf391337...ff5cb5d301089dddf5ee3cf394a778ea8a53ea9a
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/msdts] REPO-1957 Refactoring due to API cleanup
Sergey Shepelevich pushed to branch feature/msdts at cms-community /
hippo-repository
Commits:
1f62ed43 by Sergey Shepelevich at 2018-03-07T09:54:31+01:00
REPO-1957 Refactoring due to API cleanup
- - - - -
1 changed file:
- engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
Changes:
=
engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
=
---
a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
+++
b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationConfigService.java
@@ -145,7 +145,7 @@ public class ConfigurationConfigService {
final String fsBundleDigest =
DigestBundleResolver.calculateFsBundleDigest(bundleZipFile, webFilesService);
boolean reload = shouldReloadBundle(fsBundleDigest,
bundleName, webFilesService.getReloadMode(), baselineService, session);
if (reload) {
-webFilesService.importJcrWebFileBundle(session,
bundleZipFile);
+webFilesService.importJcrWebFileBundle(session,
bundleZipFile, false);
final Map bundlesDigests =
baselineService.getBundlesDigests(session);
final String baselineBundleDigest =
bundlesDigests.get(bundleName);
if ((baselineBundleDigest != null &&
!baselineBundleDigest.equals(fsBundleDigest)) || baselineBundleDigest == null) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/1f62ed4362e8c57d427162411489fdd1950edb9d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/1f62ed4362e8c57d427162411489fdd1950edb9d
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][bugfix/REPO-1869] 2 commits: REPO-1869 remove parent-check logic: lot of code for a situation that is very…
Jeroen Hoffman pushed to branch bugfix/REPO-1869 at cms-community /
hippo-repository
Commits:
0c15259e by Jeroen Hoffman at 2018-03-07T09:45:05+01:00
REPO-1869 remove parent-check logic: lot of code for a situation that is very
very unlikely (2 or 3 found variants with different parent)
- - - - -
f69fe4e6 by Jeroen Hoffman at 2018-03-07T09:46:48+01:00
REPO-1869 simplify code
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
Changes:
=
builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
=
---
a/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
+++
b/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java
@@ -64,33 +64,25 @@ public final class HippoTranslatedNode {
}
public Node getTranslation(String language) throws RepositoryException {
-String id = node.getProperty(HippoTranslationNodeType.ID).getString();
-Query query =
node.getSession().getWorkspace().getQueryManager().createQuery(
+final String id =
node.getProperty(HippoTranslationNodeType.ID).getString();
+final Query query =
node.getSession().getWorkspace().getQueryManager().createQuery(
"SELECT * FROM " + HippoTranslationNodeType.NT_TRANSLATED
+ " WHERE " + HippoTranslationNodeType.ID + "='" + id
+ "'"
+ " AND " + HippoTranslationNodeType.LOCALE + "='" +
language + "'",
Query.SQL);
final QueryResult result = query.execute();
-NodeIterator nodes = result.getNodes();
+final NodeIterator nodes = result.getNodes();
if (!nodes.hasNext()) {
-throw new ItemNotFoundException("Folder was not translated to " +
language);
+throw new ItemNotFoundException("Node " + node.getPath() + " was
not translated to " + language);
}
-Node node = nodes.nextNode();
if (nodes.getSize() > 3) {
-log.warn("More than one translated variant found for node " + id +
" in language " + language);
-} else if (nodes.getSize() > 1) {
-String handleId = null;
-Node parent = node.getParent();
-do {
-Node next = nodes.nextNode();
-if
(!next.getParent().getIdentifier().equals(parent.getIdentifier())) {
-log.warn("More than one translated variant found for node
" + id + " in language " + language);
-break;
-}
-} while (nodes.hasNext());
+// check 3 for the stable draft/unpublished/published versions
+log.warn("Not a maximum of 3 but {} translated variants found for
node {} with translation id {} and language {}.",
+nodes.getSize(), node.getPath(), id, language);
}
-return node;
+
+return nodes.nextNode();
}
public boolean hasTranslation(String language) throws RepositoryException {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/558e52a7072e201a2b04e84ade6ac87aaee551f6...f69fe4e6284dd30fe003c307b5c5344cb00e1de1
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/558e52a7072e201a2b04e84ade6ac87aaee551f6...f69fe4e6284dd30fe003c307b5c5344cb00e1de1
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
