[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1403] 3 commits: HIPPLUG-1405 prepare release hippo-plugin-relateddocs-parent-4.1.0
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1403 at cms-community / hippo-plugin-relateddocs Commits: 5c8299e4 by Arent-Jan Banck at 2016-10-26T11:47:40+02:00 HIPPLUG-1405 prepare release hippo-plugin-relateddocs-parent-4.1.0 - - - - - b3684463 by Arent-Jan Banck at 2016-10-26T11:47:41+02:00 HIPPLUG-1405 prepare for next development iteration - - - - - 23aab94c by Jeroen Hoffman at 2016-10-28T10:27:45+02:00 HIPPLUG-1403 Merge branch 'release/4.1' into bugfix/HIPPLUG-1403 - - - - - 3 changed files: - addon-cms/pom.xml - hst/pom.xml - pom.xml Changes: = addon-cms/pom.xml = --- a/addon-cms/pom.xml +++ b/addon-cms/pom.xml @@ -18,7 +18,7 @@ hippo-plugin-relateddocs-parent org.onehippo.cms7 -4.1.0-SNAPSHOT +4.1.1-SNAPSHOT 4.0.0 = hst/pom.xml = --- a/hst/pom.xml +++ b/hst/pom.xml @@ -18,7 +18,7 @@ hippo-plugin-relateddocs-parent org.onehippo.cms7 -4.1.0-SNAPSHOT +4.1.1-SNAPSHOT 4.0.0 = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/11.0] CMS-16 after 11.0.3 released, bump relateddocs version to 3.2.2-SNAPSHOT on behalf of HIPPLUG 1396
Jeroen Hoffman pushed to branch release/11.0 at cms-community / hippo-cms-release Commits: f57aab9c by Jeroen Hoffman at 2016-10-28T10:20:18+02:00 CMS-16 after 11.0.3 released, bump relateddocs version to 3.2.2-SNAPSHOT on behalf of HIPPLUG 1396 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 3.0.1 3.0.1 3.0.1 -4.0.1 + 4.0.2-SNAPSHOT 3.0.1 3.0.1 4.0.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/f57aab9cb67c623200905c95865e5431110f73f2 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][feature/CMS-10098] CMS-10098 non-functional: whereClauseBuilder --> containsBuilder; logging improvement
Jeroen Hoffman pushed to branch feature/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
05e62c06 by Jeroen Hoffman at 2016-10-27T22:29:08+02:00
CMS-10098 non-functional: whereClauseBuilder --> containsBuilder; logging
improvement
- - - - -
1 changed file:
- jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
Changes:
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
=
--- a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
+++ b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
@@ -50,7 +50,7 @@ public class Filter {
* This allows us to change those filters even after those are added to
filter
* @see #getJcrExpression()
*/
-private List childFilters = new
ArrayList();
+private List childFilters = new ArrayList<>();
private ChildFilterType firstAddedType;
@@ -76,11 +76,11 @@ public class Filter {
public void addContains(String scope, String fullTextSearch) throws
JcrQueryException {
scope = JcrQueryUtils.toXPathProperty(scope, true, "addContains", new
String[]{"."});
-if(fullTextSearch == null) {
+if (fullTextSearch == null) {
throw new JcrQueryException("Not allowed to search on 'null'.");
}
-StringBuilder whereClauseBuilder = new StringBuilder();
+final StringBuilder containsBuilder = new StringBuilder();
// we rewrite a search for * into a more efficient search
if("*".equals(fullTextSearch)) {
if(".".equals(scope)) {
@@ -98,24 +98,26 @@ public class Filter {
final String parsedTextWildcarded =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, true,
fulltextWildcardPostfixMinLength);
if (parsedTextWildcarded.length() > 0) {
if (parsedText.length() > 0) {
-whereClauseBuilder.append("(");
-addContainsToBuilder(whereClauseBuilder, scope,
parsedText);
-whereClauseBuilder.append(" or ");
-addContainsToBuilder(whereClauseBuilder, scope,
parsedTextWildcarded);
-whereClauseBuilder.append(")");
+containsBuilder.append("(");
+addContainsToBuilder(containsBuilder, scope,
parsedText);
+containsBuilder.append(" or ");
+addContainsToBuilder(containsBuilder, scope,
parsedTextWildcarded);
+containsBuilder.append(")");
} else {
-addContainsToBuilder(whereClauseBuilder, scope,
parsedTextWildcarded);
+addContainsToBuilder(containsBuilder, scope,
parsedTextWildcarded);
}
} else if (parsedText.length() > 0) {
-addContainsToBuilder(whereClauseBuilder, scope,
parsedText);
+addContainsToBuilder(containsBuilder, scope, parsedText);
}
} else if (parsedText.length() > 0) {
-addContainsToBuilder(whereClauseBuilder, scope, parsedText);
+addContainsToBuilder(containsBuilder, scope, parsedText);
}
-log.info("Translated fullTextSearch '{}' to where clause '{}'.",
fullTextSearch, whereClauseBuilder.toString());
+log.info("Translated fullTextSearch '{}' to function '{}' with
wildcarding={} and minimum length={}.",
+fullTextSearch, containsBuilder.toString(),
fulltextWildcardPostfixEnabled, fulltextWildcardPostfixMinLength);
}
-if (whereClauseBuilder.length() > 0) {
-addExpression(whereClauseBuilder.toString());
+
+if (containsBuilder.length() > 0) {
+addExpression(containsBuilder.toString());
}
}
@@ -319,7 +321,7 @@ public class Filter {
return;
}
if(builder.length() == 0) {
-builder.append("(").append(filter.getJcrExpression()).append(")");;
+builder.append("(").append(filter.getJcrExpression()).append(")");
} else {
builder.append(" and
").append("(").append(filter.getJcrExpression()).append(")");
}
@@ -378,7 +380,6 @@ public class Filter {
/**
* Process AND or OR filters
- * @return jcr query expression or null
*/
private void processChildFilters(StringBuilder childFiltersExpression) {
for (FilterTypeWrapper filter : childFilters) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/05e62c06e8e2e8997cfc4c61ddee2bf4821ea80a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][feature/CMS-10098] CMS-10098 Add unit tests for various parameterizations and inputs of QueryUtils.text().contains
Jeroen Hoffman pushed to branch feature/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
584a5a4b by Jeroen Hoffman at 2016-10-27T22:23:03+02:00
CMS-10098 Add unit tests for various parameterizations and inputs of
QueryUtils.text().contains
- - - - -
2 changed files:
- jcr/src/test/java/org/onehippo/cms7/services/search/jcr/TestUtils.java
-
jcr/src/test/java/org/onehippo/cms7/services/search/jcr/query/TestJcrQueryBuilder.java
Changes:
=
jcr/src/test/java/org/onehippo/cms7/services/search/jcr/TestUtils.java
=
--- a/jcr/src/test/java/org/onehippo/cms7/services/search/jcr/TestUtils.java
+++ b/jcr/src/test/java/org/onehippo/cms7/services/search/jcr/TestUtils.java
@@ -23,9 +23,15 @@ import
org.onehippo.cms7.services.search.jcr.query.JcrQueryVisitor;
import org.onehippo.cms7.services.search.jcr.service.HippoJcrSearchService;
public class TestUtils {
+
public static String getQueryAsString(final QueryImpl query, final Session
session) {
+return getQueryAsString(query, session,
HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_ENABLED,
HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_MINLENGTH);
+}
+
+public static String getQueryAsString(final QueryImpl query, final Session
session,
+ final boolean
wildcardPostfixEnabled, final int wildcardPostfixMinlenth) {
final JcrQueryBuilder builder = new JcrQueryBuilder(session,
-HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_ENABLED,
HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_MINLENGTH);
+wildcardPostfixEnabled, wildcardPostfixMinlenth);
JcrQueryVisitor visitor = new JcrQueryVisitor(builder, session);
query.accept(visitor);
return builder.getQueryString();
=
jcr/src/test/java/org/onehippo/cms7/services/search/jcr/query/TestJcrQueryBuilder.java
=
---
a/jcr/src/test/java/org/onehippo/cms7/services/search/jcr/query/TestJcrQueryBuilder.java
+++
b/jcr/src/test/java/org/onehippo/cms7/services/search/jcr/query/TestJcrQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -199,4 +199,70 @@ public class TestJcrQueryBuilder extends
RepositoryTestCase {
assertEquals("//*[" + COMMON_SCOPE + " and (((jcr:contains(.,'this')
or jcr:contains(.,'this*']" + COMMON_ORDERBY, queryAsString);
}
-}
+@Test
+public void test_contains_with_small_term_with_wildcarding() {
+InitialQueryImpl initialQuery = new InitialQueryImpl();
+QueryImpl query =
initialQuery.from("/").where(QueryUtils.text().contains("ab"));
+
+// small terms are not wildcarded
+String queryAsString = TestUtils.getQueryAsString(query, session,
true, 3);
+assertEquals("//*[" + COMMON_SCOPE + " and (jcr:contains(.,'ab'))]" +
COMMON_ORDERBY, queryAsString);
+}
+
+@Test
+public void test_contains_with_small_term_without_wildcarding() {
+InitialQueryImpl initialQuery = new InitialQueryImpl();
+QueryImpl query =
initialQuery.from("/").where(QueryUtils.text().contains("ab"));
+
+String queryAsString = TestUtils.getQueryAsString(query, session,
false, 3);
+assertEquals("//*[" + COMMON_SCOPE + " and (jcr:contains(.,'ab'))]" +
COMMON_ORDERBY, queryAsString);
+}
+
+@Test
+public void test_contains_with_big_term_with_wildcarding_at_min_length() {
+InitialQueryImpl initialQuery = new InitialQueryImpl();
+QueryImpl query =
initialQuery.from("/").where(QueryUtils.text().contains("abcdefghij"));
+
+String queryAsString = TestUtils.getQueryAsString(query, session,
true, "abcdefghij".length());
+assertEquals("//*[" + COMMON_SCOPE + " and
((jcr:contains(.,'abcdefghij') or jcr:contains(.,'abcdefghij*')))]" +
COMMON_ORDERBY, queryAsString);
+}
+
+@Test
+public void
test_contains_with_big_term_with_wildcarding_at_min_length_plus_one() {
+InitialQueryImpl initialQuery = new InitialQueryImpl();
+QueryImpl query =
initialQuery.from("/").where(QueryUtils.text().contains("abcdefghij"));
+
+String queryAsString = TestUtils.getQueryAsString(query, session,
true, "abcdefghij".length() + 1);
+assertEquals("//*[" + COMMON_SCOPE + " and
(jcr:contains(.,'abcdefghij'))]" + COMMON_ORDERBY, queryAsString);
+
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][feature/CMS-10098] CMS-10098 Add @Deprecated to FullTextSearchParser#getMinimalLength
Jeroen Hoffman pushed to branch feature/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
41859560 by Jeroen Hoffman at 2016-10-27T10:31:34+02:00
CMS-10098 Add @Deprecated to FullTextSearchParser#getMinimalLength
- - - - -
1 changed file:
-
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
Changes:
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
=
---
a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
+++
b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
@@ -160,6 +160,7 @@ public final class FullTextSearchParser {
*
* @deprecated please use
HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_MINLENGTH
*/
+@Deprecated
public static int getMinimalLength() {
return HippoJcrSearchService.DEFAULT_WILDCARD_POSTFIX_MINLENGTH;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/418595609b2329e982983377a0b64899e83c5818
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][feature/CMS-10098] CMS-10098 Correct license header for SearchServiceModule.java
Jeroen Hoffman pushed to branch feature/CMS-10098 at cms-community / hippo-addon-search-service Commits: a1a5eee8 by Jeroen Hoffman at 2016-10-27T10:27:44+02:00 CMS-10098 Correct license header for SearchServiceModule.java - - - - - 1 changed file: - jcr/src/main/java/org/onehippo/cms7/services/search/jcr/service/SearchServiceModule.java Changes: = jcr/src/main/java/org/onehippo/cms7/services/search/jcr/service/SearchServiceModule.java = --- a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/service/SearchServiceModule.java +++ b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/service/SearchServiceModule.java @@ -1,5 +1,17 @@ /* * Copyright 2016 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.onehippo.cms7.services.search.jcr.service; View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/a1a5eee8a4ae3170d77078c05e12338c819f92b5 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype][master] ARCHE-516 remove cargo property catalina.servlet.uriencoding from main project pom.xml
Jeroen Hoffman pushed to branch master at cms-community /
hippo-project-archetype
Commits:
6d65d180 by Bert Leunis at 2016-10-25T12:32:11+02:00
ARCHE-516 remove cargo property catalina.servlet.uriencoding from main project
pom.xml
- - - - -
1 changed file:
- src/main/resources/archetype-resources/pom.xml
Changes:
=
src/main/resources/archetype-resources/pom.xml
=
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -248,9 +248,6 @@
cargo-maven2-plugin
-
-
UTF-8
-
${project.basedir}/conf/context.xml
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-project-archetype/commit/6d65d1807c552f31c92fe26725a9588378c5beb0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Deleted branch bugfix/ARCHE-516
Jeroen Hoffman deleted branch bugfix/ARCHE-516 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][master] 5 commits: HIPPLUG-1404 Regression: Related Documents - Adding suggested document doesn't r…
Jeroen Hoffman pushed to branch master at cms-community /
hippo-plugin-relateddocs
Commits:
8ef9f21c by Marijan Milicevic at 2016-10-25T14:42:30+02:00
HIPPLUG-1404 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
(cherry picked from commit df3757461ccffd96ab3c1ce57552d1ba38380178)
- - - - -
34f60727 by Jeroen Hoffman at 2016-10-25T14:42:39+02:00
HIPPLUG-1404 remove 'else' branch that will not be reached; rename some
variables for readability (e.g. itsParent -->
canonicalDocument)
(cherry picked from commit a1c183ca6a8a2c785003a1eccc1d4774e727c7e7)
- - - - -
2c58f457 by Jeroen Hoffman at 2016-10-25T14:42:44+02:00
HIPPLUG-1404 Logging improvements
(cherry picked from commit 3dc243ee4a5945254633b7bfb3390a034cfa3e13)
- - - - -
e02a3eb6 by Jeroen Hoffman at 2016-10-25T14:42:53+02:00
HIPPLUG-1404 Indents only
(cherry picked from commit 60b23aea9a10ac4623f437c0aabc5c56f0e030d3)
- - - - -
5f290af8 by Jeroen Hoffman at 2016-10-25T14:46:51+02:00
HIPPLUG-1404 Reintegrate branch 'bugfix/HIPPLUG-1404' into master
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -28,7 +28,7 @@ import javax.jcr.query.RowIterator;
import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
-import org.hippoecm.repository.api.HippoQuery;
+import org.hippoecm.repository.api.HippoNode;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -66,22 +66,22 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
try {
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
-//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one." + e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one. Message={}.", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet();
+Set currentUuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
-uuidSet.add(r.getUuid());
+currentUuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
+Node docHandleNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
-log.debug("Executing query{}: ", xpathQuery);
+log.debug("Executing query: {}", xpathQuery);
}
@SuppressWarnings(value = "deprecation")
Query query =
nodeModel.getNode().getSession().getWorkspace().getQueryManager().createQuery(
@@ -99,9 +99,27 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
// retrieve the found document from the repository
try {
Node document = nodeModel.getNode().getSession().getNode(path);
+Node canonicalDocument = ((HippoNode)
document).getCanonicalNode();
+if (docHandleNode.isSame(canonicalDocument)) {
+if (log.isDebugEnabled()) {
+log.debug("Skipping same handle node as 'self' at {}",
canonicalDocument.getPath());
+}
+continue;
+}
+
+if (currentUuidSet.contains(documen
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs] Pushed new branch bugfix/HIPPLUG-1403
Jeroen Hoffman pushed new branch bugfix/HIPPLUG-1403 at cms-community / hippo-plugin-relateddocs ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/10.2] CMS-16 bump relateddocs version to 3.2.2-SNAPSHOT on behalf of HIPPLUG 1402
Jeroen Hoffman pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: 69b691ae by Jeroen Hoffman at 2016-10-25T12:58:12+02:00 CMS-16 bump relateddocs version to 3.2.2-SNAPSHOT on behalf of HIPPLUG 1402 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 2.2.0 2.2.0 2.2.1 -3.2.1 + 3.2.2-SNAPSHOT 2.2.0 2.2.0 3.2.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/69b691aee14acf8cc0e520afce46f08bdbbb8f55 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][release/3.2] 5 commits: HIPPLUG-1402 Regression: Related Documents - Adding suggested document doesn't r…
Jeroen Hoffman pushed to branch release/3.2 at cms-community /
hippo-plugin-relateddocs
Commits:
069d1023 by Marijan Milicevic at 2016-10-25T12:30:23+02:00
HIPPLUG-1402 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
(cherry picked from commit df3757461ccffd96ab3c1ce57552d1ba38380178)
- - - - -
31b8ceea by Jeroen Hoffman at 2016-10-25T12:30:52+02:00
HIPPLUG-1402 remove 'else' branch that will not be reached; rename some
variables for readability (e.g. itsParent -->
canonicalDocument)
(cherry picked from commit a1c183ca6a8a2c785003a1eccc1d4774e727c7e7)
- - - - -
d6271bf4 by Jeroen Hoffman at 2016-10-25T12:31:07+02:00
HIPPLUG-1402 Logging improvements
(cherry picked from commit 3dc243ee4a5945254633b7bfb3390a034cfa3e13)
- - - - -
9a08a1d5 by Jeroen Hoffman at 2016-10-25T12:31:40+02:00
HIPPLUG-1402 Indents only
(cherry picked from commit 60b23aea9a10ac4623f437c0aabc5c56f0e030d3)
- - - - -
64cf78b9 by Jeroen Hoffman at 2016-10-25T12:56:37+02:00
HIPPLUG-1402 Reintegrate local branch 'bugfix/HIPPLUG-1402' into
release/3.2
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -28,7 +28,7 @@ import javax.jcr.query.RowIterator;
import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
-import org.hippoecm.repository.api.HippoQuery;
+import org.hippoecm.repository.api.HippoNode;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -66,22 +66,22 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
try {
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
-//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one." + e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one. Message={}.", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet();
+Set currentUuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
-uuidSet.add(r.getUuid());
+currentUuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
+Node docHandleNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
-log.debug("Executing query{}: ", xpathQuery);
+log.debug("Executing query: {}", xpathQuery);
}
@SuppressWarnings(value = "deprecation")
Query query =
nodeModel.getNode().getSession().getWorkspace().getQueryManager().createQuery(
@@ -99,9 +99,27 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
// retrieve the found document from the repository
try {
Node document = nodeModel.getNode().getSession().getNode(path);
+Node canonicalDocument = ((HippoNode)
document).getCanonicalNode();
+if (docHandleNode.isSame(canonicalDocument)) {
+if (log.isDebugEnabled()) {
+log.debug("Skipping same handle node as 'self' at {}",
canonicalDocument.getPath());
+}
+continue;
+}
+
+if (currentUuidSet
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs] Deleted branch bugfix/HIPPLUG-1396
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1396 at cms-community / hippo-plugin-relateddocs ___ 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.0] CMS-16 bump relateddocs version to 4.0.2-SNAPSHOT on behalf of HIPPLUG 1396
Jeroen Hoffman pushed to branch release/11.0 at cms-community / hippo-cms-release Commits: cacdf3b8 by Jeroen Hoffman at 2016-10-25T12:51:16+02:00 CMS-16 bump relateddocs version to 4.0.2-SNAPSHOT on behalf of HIPPLUG 1396 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 3.0.1 3.0.1 3.0.1 -4.0.1 + 4.0.2-SNAPSHOT 3.0.1 3.0.1 4.0.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/cacdf3b8b1a371df1569ae530c6dedb69b8d1b55 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][release/4.0] 9 commits: HIPPLUG-1396 Regression: Related Documents - Adding suggested document doesn't r…
Jeroen Hoffman pushed to branch release/4.0 at cms-community /
hippo-plugin-relateddocs
Commits:
871bf85d by Marijan Milicevic at 2016-10-19T15:25:12+02:00
HIPPLUG-1396 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
- - - - -
21903f8a by Marijan Milicevic at 2016-10-20T12:38:43+02:00
HIPPLUG-1396 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
- - - - -
3e1c8726 by Marijan Milicevic at 2016-10-20T12:40:29+02:00
Revert "HIPPLUG-1396 Regression: Related Documents - Adding suggested
document doesn't remove it from the list of suggestions."
This reverts commit 21903f8ad785340793d7f0d086e7707c1943.
- - - - -
b7d83a81 by Marijan Milicevic at 2016-10-20T12:40:44+02:00
Revert "HIPPLUG-1396 Regression: Related Documents - Adding suggested
document doesn't remove it from the list of suggestions."
This reverts commit 871bf85d6835bdb676418cc8c2128062eb64b948.
- - - - -
df375746 by Marijan Milicevic at 2016-10-20T12:42:15+02:00
HIPPLUG-1396 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
- - - - -
a1c183ca by Jeroen Hoffman at 2016-10-24T14:59:22+02:00
HIPPLUG-1396 remove 'else' branch that will not be reached; rename some
variables for readability (e.g. itsParent --> canonicalDocument)
- - - - -
3dc243ee by Jeroen Hoffman at 2016-10-25T11:29:03+02:00
HIPPLUG-1396 Llogging improvements
- - - - -
60b23aea by Jeroen Hoffman at 2016-10-25T11:31:15+02:00
HIPPLUG-1396 Indents only
- - - - -
72317a80 by Jeroen Hoffman at 2016-10-25T11:53:11+02:00
HIPPLUG-1396 Reintegrate branch 'bugfix/HIPPLUG-1396' into release/4.0
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -28,7 +28,7 @@ import javax.jcr.query.RowIterator;
import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
-import org.hippoecm.repository.api.HippoQuery;
+import org.hippoecm.repository.api.HippoNode;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -66,22 +66,22 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
try {
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
-//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one." + e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one. Message={}.", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet();
+Set currentUuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
-uuidSet.add(r.getUuid());
+currentUuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
+Node docHandleNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
-log.debug("Executing query{}: ", xpathQuery);
+log.debug("Executing query: {}", xpathQuery);
}
@SuppressWarnings(val
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1396] HIPPLUG-1396 Indents only
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1396 at cms-community /
hippo-plugin-relateddocs
Commits:
60b23aea by Jeroen Hoffman at 2016-10-25T11:31:15+02:00
HIPPLUG-1396 Indents only
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -21,7 +21,7 @@ import java.util.Set;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
-import javax.jcr.query .Query;
+import javax.jcr.query.Query;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
@@ -102,20 +102,20 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
Node canonicalDocument = ((HippoNode)
document).getCanonicalNode();
if (docHandleNode.isSame(canonicalDocument)) {
if (log.isDebugEnabled()) {
-log.debug("Skipping same handle node as 'self' at {}",
canonicalDocument.getPath());
+log.debug("Skipping same handle node as 'self' at {}",
canonicalDocument.getPath());
}
continue;
}
if (currentUuidSet.contains(document.getIdentifier())) {
if (log.isDebugEnabled()) {
-log.debug("Not adding already selected document {}",
document.getPath());
+log.debug("Not adding already selected document {}",
document.getPath());
}
continue;
}
if (log.isDebugEnabled()) {
-log.debug("Adding related document {}", document.getPath());
+log.debug("Adding related document {}",
document.getPath());
}
collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
} catch (RepositoryException e) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-relateddocs/commit/60b23aea9a10ac4623f437c0aabc5c56f0e030d3
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1396] 2 commits: HIPPLUG-1396 remove 'else' branch that will not be reached; rename some variable…
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1396 at cms-community /
hippo-plugin-relateddocs
Commits:
a1c183ca by Jeroen Hoffman at 2016-10-24T14:59:22+02:00
HIPPLUG-1396 remove 'else' branch that will not be reached; rename some
variables for readability (e.g. itsParent --> canonicalDocument)
- - - - -
3dc243ee by Jeroen Hoffman at 2016-10-25T11:29:03+02:00
HIPPLUG-1396 Llogging improvements
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -21,7 +21,7 @@ import java.util.Set;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
-import javax.jcr.query.Query;
+import javax.jcr.query .Query;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
@@ -29,7 +29,6 @@ import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.repository.api.HippoNode;
-import org.hippoecm.repository.api.HippoNodeType;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -67,23 +66,22 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
try {
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
-//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one.{}", e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one. Message={}.", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet<>();
+Set currentUuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
-uuidSet.add(r.getUuid());
+currentUuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
-Node parentNode = docNode.getParent();
+Node docHandleNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
-log.debug("Executing query{}: ", xpathQuery);
+log.debug("Executing query: {}", xpathQuery);
}
@SuppressWarnings(value = "deprecation")
Query query =
nodeModel.getNode().getSession().getWorkspace().getQueryManager().createQuery(
@@ -101,34 +99,27 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
// retrieve the found document from the repository
try {
Node document = nodeModel.getNode().getSession().getNode(path);
-Node itsParent = ((HippoNode) document).getCanonicalNode();
-if (parentNode.isSame(itsParent)) {
+Node canonicalDocument = ((HippoNode)
document).getCanonicalNode();
+if (docHandleNode.isSame(canonicalDocument)) {
if (log.isDebugEnabled()) {
-log.debug("Found parent {}", itsParent.getPath());
+log.debug("Skipping same handle node as 'self' at {}",
canonicalDocument.getPath());
}
continue;
}
-if (document.isNodeType(HippoNodeType.NT_HANDLE)) {
-if (uuidSet.contains(document.getIdentifier())) {
-continue;
-}
+
+if (currentUuidSet.contains(document.getIdentifier())) {
if (log.isDebugEnabled()) {
-log.debug("Found related document {}",
document.getPath());
-}
-collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
-} else if (itsParent.isNodeType(Hip
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][master] CMS-16 in search-service master, remove one more 'public' modifiers from interface method
Jeroen Hoffman pushed to branch master at cms-community /
hippo-addon-search-service
Commits:
1219a912 by Jeroen Hoffman at 2016-10-24T13:08:59+02:00
CMS-16 in search-service master, remove one more 'public' modifiers
from interface method
- - - - -
1 changed file:
- api/src/main/java/org/onehippo/cms7/services/search/content/ContentId.java
Changes:
=
api/src/main/java/org/onehippo/cms7/services/search/content/ContentId.java
=
--- a/api/src/main/java/org/onehippo/cms7/services/search/content/ContentId.java
+++ b/api/src/main/java/org/onehippo/cms7/services/search/content/ContentId.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -36,6 +36,6 @@ public interface ContentId extends Serializable {
* Returns a stringified ID string
* @return
*/
-public String toIdentifier();
+String toIdentifier();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/1219a912af4aed5a29d78ee80d5fcf6431ab3659
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service] Deleted branch bugfix/CMS-10098
Jeroen Hoffman deleted branch bugfix/CMS-10098 at cms-community / hippo-addon-search-service ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][master] CMS-10508 set default locales in methods testing DateConstraint#toString
Jeroen Hoffman pushed to branch master at cms-community /
hippo-addon-search-service
Commits:
bbc3baee by Jeroen Hoffman at 2016-10-24T12:41:53+02:00
CMS-10508 set default locales in methods testing DateConstraint#toString
- - - - -
1 changed file:
- commons/src/test/java/org/onehippo/cms7/services/search/query/QueryTest.java
Changes:
=
commons/src/test/java/org/onehippo/cms7/services/search/query/QueryTest.java
=
---
a/commons/src/test/java/org/onehippo/cms7/services/search/query/QueryTest.java
+++
b/commons/src/test/java/org/onehippo/cms7/services/search/query/QueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -17,6 +17,7 @@ package org.onehippo.cms7.services.search.query;
import java.util.Calendar;
import java.util.Date;
+import java.util.Locale;
import org.junit.Test;
import org.onehippo.cms7.services.search.commons.query.InitialQueryImpl;
@@ -121,6 +122,9 @@ public class QueryTest {
@Test
public void testStringVisitor() throws Exception {
+
+Locale.setDefault(Locale.Category.FORMAT, Locale.ENGLISH);
+
long fixedTime = 1348827767244L;
QueryImpl query = new InitialQueryImpl()
.ofType("hippo:document")
@@ -140,6 +144,9 @@ public class QueryTest {
@Test
public void testStringVisitorRangeQuery() throws Exception {
+
+Locale.setDefault(Locale.Category.FORMAT, Locale.ENGLISH);
+
long fixedTime = 1348827767244L;
Date after = new Date(fixedTime);
Calendar beforeCal = Calendar.getInstance();
@@ -164,6 +171,9 @@ public class QueryTest {
@Test
public void testStringVisitorRangeQueryNonDefaultResolution() throws
Exception {
+
+Locale.setDefault(Locale.Category.FORMAT, Locale.ENGLISH);
+
long fixedTime = 1348827767244L;
Date after = new Date(fixedTime);
Calendar beforeCal = Calendar.getInstance();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/bbc3baee62056788f8abec784d8d6abc5818431d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][feature/CMS-10098] 3 commits: CMS-10176 prepare for next development iteration
Jeroen Hoffman pushed to branch feature/CMS-10098 at cms-community / hippo-addon-search-service Commits: 4f053ce3 by Arent-Jan Banck at 2016-10-21T12:12:13+02:00 CMS-10176 prepare for next development iteration - - - - - b9614c2c by Jeroen Hoffman at 2016-10-24T10:08:30+02:00 CMS-10098 Merge branch 'master' into feature/CMS-10098 - - - - - 57370832 by Jeroen Hoffman at 2016-10-24T10:10:08+02:00 CMS-10098 Re-add org.onehippo.cms7:hippo-services in dependencyManagement - - - - - 5 changed files: - api/pom.xml - commons/pom.xml - jcr/pom.xml - pom.xml - sandbox/pom.xml Changes: = api/pom.xml = --- a/api/pom.xml +++ b/api/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-search-service -3.1.0-SNAPSHOT +3.2.0-SNAPSHOT Hippo Search Service API = commons/pom.xml = --- a/commons/pom.xml +++ b/commons/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-search-service -3.1.0-SNAPSHOT +3.2.0-SNAPSHOT Hippo Search Service Commons = jcr/pom.xml = --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-search-service -3.1.0-SNAPSHOT +3.2.0-SNAPSHOT Hippo Search Service JCR = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ http://www.onehippo.com/ hippo-search-service - 3.1.0-SNAPSHOT + 3.2.0-SNAPSHOT pom 2012 @@ -54,9 +54,9 @@ 1.8.4 2.2.2 -4.1.0-SNAPSHOT -3.1.0-SNAPSHOT -3.1.0-SNAPSHOT +4.2.0-SNAPSHOT +3.2.0-SNAPSHOT +3.2.0-SNAPSHOT 3.0-beta-3 2.2 = sandbox/pom.xml = --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-search-service -3.1.0-SNAPSHOT +3.2.0-SNAPSHOT Hippo Search Service Sandbox View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-search-service/compare/fccb5c7fade4ef7c14579522c19f666e697a5949...573708328210a06bc4273e176baad26b17b5e3fe ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service] Pushed new branch feature/CMS-10098
Jeroen Hoffman pushed new branch feature/CMS-10098 at cms-community / hippo-addon-search-service ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-10477 Resource field: revision history shows wrong file names
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
6b6c8ffe by Marijan Milicevic at 2016-10-14T13:08:06+02:00
CMS-10477 Resource field: revision history shows wrong file names
- use own model and not current one when creating diff
(cherry picked from commit 5ba2405344f701b0c2ae94d3531b1422aaeb7667)
- - - - -
9d79c8db by Mathijs den Burger at 2016-10-14T13:08:19+02:00
CMS-10477 Bump copyright year
(cherry picked from commit e624549e8de76211a008160178e28b6b8893b98c)
- - - - -
ee7c07fc by Jeroen Hoffman at 2016-10-14T13:10:03+02:00
CMS-10477 Reintegrate local branch 'bugfix/CMS-10477' into master
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -108,7 +108,7 @@ public class ImageDisplayPlugin extends RenderPlugin {
fragment = new Fragment(id, "embed", this);
fragment.add(new Label("filesize",
Model.of(formatter.format(stream.length().bytes();
fragment.add(new Label("mimetype",
Model.of(stream.getContentType(;
-fragment.add(createFileLink(stream, getModelObject()));
+fragment.add(createFileLink(stream,
stream.getChainedModel().getObject()));
if (stream.getContentType().equals(MIME_TYPE_HIPPO_BLANK)) {
fragment.setVisible(false);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/b45af2dab439174ea6bf62b8d45bc391098c9ed4...ee7c07fc1087129a94efc488320bf2fa76988c55
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.0] 3 commits: CMS-10476 Resource field: revision history shows wrong file names
Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
c6322d79 by Marijan Milicevic at 2016-10-14T11:20:50+02:00
CMS-10476 Resource field: revision history shows wrong file names
- use own model and not current one when creating diff
(cherry picked from commit 5ba2405344f701b0c2ae94d3531b1422aaeb7667)
- - - - -
ba32ce60 by Mathijs den Burger at 2016-10-14T11:21:21+02:00
CMS-10476 Bump copyright year
(cherry picked from commit e624549e8de76211a008160178e28b6b8893b98c)
- - - - -
f4c510ed by Jeroen Hoffman at 2016-10-14T11:23:52+02:00
CMS-10476 Reintegrate branch 'bugfix/CMS-10476' into release/4.0
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/resource/ImageDisplayPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -108,7 +108,7 @@ public class ImageDisplayPlugin extends RenderPlugin {
fragment = new Fragment(id, "embed", this);
fragment.add(new Label("filesize",
Model.of(formatter.format(stream.length().bytes();
fragment.add(new Label("mimetype",
Model.of(stream.getContentType(;
-fragment.add(createFileLink(stream, getModelObject()));
+fragment.add(createFileLink(stream,
stream.getChainedModel().getObject()));
if (stream.getContentType().equals(MIME_TYPE_HIPPO_BLANK)) {
fragment.setVisible(false);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/f8ca719f51c6f2b624f0369f8cd79c0713e567be...f4c510eda637793f4884181ce7fea83435220f81
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-hst-configuration-editor] Deleted branch bugfix/HSTCONFIGEDIT-203
Jeroen Hoffman deleted branch bugfix/HSTCONFIGEDIT-203 at cms-community / hippo-addon-hst-configuration-editor ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10433
Jeroen Hoffman deleted branch bugfix/CMS-10433 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10432
Jeroen Hoffman deleted branch bugfix/CMS-10432 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Deleted branch bugfix/HIPPLUG-1319
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][master] 2 commits: HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple'…
Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-taxonomy Commits: 7e406a03 by Jeroen Hoffman at 2016-10-13T16:40:54+02:00 HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple' for extrataxonomy field and delete polluting second prototype - - - - - a3fbe776 by Jeroen Hoffman at 2016-10-13T16:44:44+02:00 HIPPLUG-1319 Reintegrate branch 'bugfix/HIPPLUG-1319' into master - - - - - 1 changed file: - demo/content/src/main/resources/taxonomy-demo-namespace.xml Changes: = demo/content/src/main/resources/taxonomy-demo-namespace.xml = --- a/demo/content/src/main/resources/taxonomy-demo-namespace.xml +++ b/demo/content/src/main/resources/taxonomy-demo-namespace.xml @@ -732,6 +732,9 @@ hipposysedit:field + +true + taxonomydemo:alternatekeys @@ -785,50 +788,6 @@ document-type-locale - - - nt:unstructured - - - hippostd:relaxed - hippostdpubwf:document - hippotranslation:translated - mix:referenceable - hippostd:publishableSummary - hippotaxonomy:classifiable - - - 3b467921-0690-4834-91aa-f455f1c22355 - - - - holder - - - draft - - - new - - - - - - 2014-06-12T17:19:37.772+02:00 - - - 2014-06-12T17:19:37.772+02:00 - - - - - - document-type-locale-id - - - document-type-locale - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/5465c1c40e4678f057824ef1a5e0b80e8e47bd1c...a3fbe7763ed3d0c82f42d745aa3f0c3633c787e3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1319] HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple'…
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy Commits: 7e406a03 by Jeroen Hoffman at 2016-10-13T16:40:54+02:00 HIPPLUG-1319 in demo's 'doubletaxonomy' namespace, add '"hipposysedit:multiple' for extrataxonomy field and delete polluting second prototype - - - - - 1 changed file: - demo/content/src/main/resources/taxonomy-demo-namespace.xml Changes: = demo/content/src/main/resources/taxonomy-demo-namespace.xml = --- a/demo/content/src/main/resources/taxonomy-demo-namespace.xml +++ b/demo/content/src/main/resources/taxonomy-demo-namespace.xml @@ -732,6 +732,9 @@ hipposysedit:field + +true + taxonomydemo:alternatekeys @@ -785,50 +788,6 @@ document-type-locale - - - nt:unstructured - - - hippostd:relaxed - hippostdpubwf:document - hippotranslation:translated - mix:referenceable - hippostd:publishableSummary - hippotaxonomy:classifiable - - - 3b467921-0690-4834-91aa-f455f1c22355 - - - - holder - - - draft - - - new - - - - - - 2014-06-12T17:19:37.772+02:00 - - - 2014-06-12T17:19:37.772+02:00 - - - - - - document-type-locale-id - - - document-type-locale - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/7e406a03e6ed4662d5f60aa605cfefec82acc62c ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-hst-configuration-editor][master] HSTCONFIGEDIT-204 for new sitemap items set the selected page design to the firs…
Jeroen Hoffman pushed to branch master at cms-community /
hippo-addon-hst-configuration-editor
Commits:
992ad2a7 by Jasper Floor at 2016-10-13T15:31:22+02:00
HSTCONFIGEDIT-204 for new sitemap items set the selected page design to the
first item in the list - forward port of 203
(cherry picked from commit f070af49c8fa3c1a2eaa7693603d23d665c56e96)
- - - - -
1 changed file:
-
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
Changes:
=
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
=
---
a/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
+++
b/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
@@ -272,14 +272,18 @@ public class DescriptionPicker extends Panel {
current = 0;
String selected = getDefaultModelObjectAsString();
if (selected != null) {
-int cnt = 0;
-for (Descriptive descriptive : descriptives) {
-final String name = getName(descriptive);
-if (selected.equals(name)) {
-current = cnt;
-break;
+if (StringUtils.isEmpty(selected)) {
+setDefaultModelObjectByCurrentSelection();
+} else {
+int cnt = 0;
+for (Descriptive descriptive : descriptives) {
+final String name = getName(descriptive);
+if (selected.equals(name)) {
+current = cnt;
+break;
+}
+cnt++;
}
-cnt++;
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-hst-configuration-editor/commit/992ad2a70989cf5c08532fd2c981a60c9b0785cf
___
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.0] CMS-16 bump HST configuration editor version to 3.0.2-SNAPSHOT on behalf of HSTCONFIGEDIT-203
Jeroen Hoffman pushed to branch release/11.0 at cms-community / hippo-cms-release Commits: ff9faafe by Jeroen Hoffman at 2016-10-13T14:33:04+02:00 CMS-16 bump HST configuration editor version to 3.0.2-SNAPSHOT on behalf of HSTCONFIGEDIT-203 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 11.0.3-SNAPSHOT - 3.0.1 + 3.0.2-SNAPSHOT 4.0.3-SNAPSHOT 3.0.0 3.0.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/ff9faafe3a9c706b290a701474c7b8d779646898 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-hst-configuration-editor][release/3.0] 2 commits: HSTCONFIGEDIT-203 for new sitemap items set the selected page design to the firs…
Jeroen Hoffman pushed to branch release/3.0 at cms-community /
hippo-addon-hst-configuration-editor
Commits:
f070af49 by Jasper Floor at 2016-10-07T15:35:48+02:00
HSTCONFIGEDIT-203 for new sitemap items set the selected page design to the
first item in the list - forward port of 202
- - - - -
511e78ae by Jeroen Hoffman at 2016-10-13T14:28:52+02:00
HSTCONFIGEDIT-203 Reintegrate branch 'bugfix/HSTCONFIGEDIT-203' into
release/3.0
- - - - -
1 changed file:
-
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
Changes:
=
frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
=
---
a/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
+++
b/frontend/src/main/java/org/hippoecm/hst/plugins/frontend/editor/description/DescriptionPicker.java
@@ -272,14 +272,18 @@ public class DescriptionPicker extends Panel {
current = 0;
String selected = getDefaultModelObjectAsString();
if (selected != null) {
-int cnt = 0;
-for (Descriptive descriptive : descriptives) {
-final String name = getName(descriptive);
-if (selected.equals(name)) {
-current = cnt;
-break;
+if (StringUtils.isEmpty(selected)) {
+setDefaultModelObjectByCurrentSelection();
+} else {
+int cnt = 0;
+for (Descriptive descriptive : descriptives) {
+final String name = getName(descriptive);
+if (selected.equals(name)) {
+current = cnt;
+break;
+}
+cnt++;
}
-cnt++;
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-hst-configuration-editor/compare/7fe364060fd25fd68bb96263bad0bd6094b46970...511e78ae8fb7c9c9da32c817e6f074d5585f059e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-10433 hide timezone selection always on the console login page
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
26ab86bf by Bert Leunis at 2016-09-13T11:41:24+02:00
CMS-10433 hide timezone selection always on the console login page
- - - - -
2375b84d by Jeroen Hoffman at 2016-10-13T13:33:40+02:00
CMS-10433 Merge master changes into bugfix branch
- - - - -
b45af2da by Jeroen Hoffman at 2016-10-13T13:40:13+02:00
CMS-10433 Reintegrate bugfix branch into master
- - - - -
1 changed file:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -34,9 +34,11 @@ import
org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.template.PackageTextTemplate;
import org.apache.wicket.util.template.TextTemplate;
+import org.hippoecm.frontend.Main;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
import org.hippoecm.frontend.session.UserSession;
+import org.hippoecm.frontend.util.WebApplicationHelper;
public class DefaultLoginPlugin extends SimpleLoginPlugin {
@@ -80,7 +82,8 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
super(id, autoComplete, locales, handler);
final IPluginConfig config = getPluginConfig();
-final boolean isTimeZoneVisible =
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
+final boolean consoleLogin =
WebApplicationHelper.getApplicationName().equals(Main.PLUGIN_APPLICATION_VALUE_CONSOLE);
+final boolean isTimeZoneVisible = !consoleLogin &&
config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM);
if (isTimeZoneVisible) {
availableTimeZones =
getSelectableTimezones(config.getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/711a72881dd9d862324b2a408bea041049f1fd2e...b45af2dab439174ea6bf62b8d45bc391098c9ed4
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-10432 use the formatter with the user's locale
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
286db122 by Bert Leunis at 2016-09-12T16:11:27+02:00
CMS-10432 use the formatter with the user's locale
- - - - -
a55155c9 by Jeroen Hoffman at 2016-10-13T12:29:24+02:00
CMS-10432 Merge master changes into bugfix branch
- - - - -
711a7288 by Jeroen Hoffman at 2016-10-13T12:33:45+02:00
CMS-10432 Reintegrate bugfix branch into master
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java
@@ -20,7 +20,6 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Locale;
-import java.util.Optional;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Session;
@@ -57,10 +56,10 @@ public class ZonedDateLabel extends Label {
@Override
public String getObject() {
final DateTimeFormatter formatter =
DateTimeFormatter.ofLocalizedDate(dateStyle);
-formatter.withLocale(getLocale());
+final DateTimeFormatter withLocale =
formatter.withLocale(getLocale());
final ZonedDateTime zonedDateTime = model.getObject();
-return zonedDateTime == null ? StringUtils.EMPTY :
zonedDateTime.format(formatter);
+return zonedDateTime == null ? StringUtils.EMPTY :
zonedDateTime.format(withLocale);
}
private static Locale getLocale() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/6f9560f4a849c263d741a5f2567b4b765f6f07d5...711a72881dd9d862324b2a408bea041049f1fd2e
___
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][master] HSTTWO-3617 set time zone explicitly to UTC in unit test, should fix Jenkins tests
Jeroen Hoffman pushed to branch master at cms-community / hippo-site-toolkit
Commits:
5e0b3ff3 by Jeroen Hoffman at 2016-10-04T14:48:21+02:00
HSTTWO-3617 set time zone explicitly to UTC in unit test, should fix Jenkins
tests
- - - - -
1 changed file:
-
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
Changes:
=
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
=
---
a/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
+++
b/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
@@ -27,6 +27,7 @@ import java.math.BigInteger;
import java.util.Calendar;
import java.util.Collections;
import java.util.Locale;
+import java.util.TimeZone;
import org.junit.Test;
@@ -90,8 +91,11 @@ public class TestHstFilters extends AbstractBeanTestCase {
// Calendar/Date
Calendar cal = Calendar.getInstance(Locale.ENGLISH);
cal.setTimeInMillis(147515500L);
-assertEquals("xs:dateTime('2016-09-29T15:16:40.000+02:00')",
filter.getStringValue(cal));
-assertEquals("xs:dateTime('2016-09-29T15:16:40.000+02:00')",
filter.getStringValue(cal.getTime()));
+cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+assertEquals("xs:dateTime('2016-09-29T13:16:40.000Z')",
filter.getStringValue(cal));
+
+// this should work but doesn't yet, see HSTTWO-3826
+// assertEquals("xs:dateTime('2016-09-29T13:16:40.000Z')",
filter.getStringValue(cal.getTime()));
}
@Test(expected = FilterException.class)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/5e0b3ff3254e08ae658450050e8289d426ee70ac
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10465 Replace hardcoded "\n" by system property "line.separator"
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
a4310ef5 by Jeroen Hoffman at 2016-10-03T15:53:39+02:00
CMS-10465 Replace hardcoded "\n" by system property
"line.separator"
- - - - -
1 changed file:
- api/src/test/java/org/hippoecm/frontend/skin/IconUtilTest.java
Changes:
=
api/src/test/java/org/hippoecm/frontend/skin/IconUtilTest.java
=
--- a/api/src/test/java/org/hippoecm/frontend/skin/IconUtilTest.java
+++ b/api/src/test/java/org/hippoecm/frontend/skin/IconUtilTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 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.
@@ -33,6 +33,8 @@ import static org.junit.Assert.assertThat;
public class IconUtilTest extends WicketTester {
+private static final String LINE_SEPARATOR =
System.getProperty("line.separator");
+
@Before
public void setUp() {
final IResourceSettings resourceSettings =
Application.get().getResourceSettings();
@@ -57,15 +59,15 @@ public class IconUtilTest extends WicketTester {
public void svg_as_string_from_resource_reference() throws Exception {
String svgAsString = IconUtil.svgAsString(new
PackageResourceReference("/test-SVG.svg"));
assertThat(svgAsString, startsWith("\n"));
+assertThat(svgAsString, endsWith("" + LINE_SEPARATOR));
svgAsString = IconUtil.svgAsString(new
PackageResourceReference("/test-SVG-with-simple-root-element.svg"));
assertThat(svgAsString, startsWith("\n"));
+assertThat(svgAsString, endsWith("" + LINE_SEPARATOR));
svgAsString = IconUtil.svgAsString(new
PackageResourceReference("/test-SVG-with-newline-after-root-element.svg"));
assertThat(svgAsString, startsWith("\n"));
+assertThat(svgAsString, endsWith("" + LINE_SEPARATOR));
}
@Test
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/a4310ef5fe930af5eb05926ca007c7230e5221c4
___
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] Deleted branch bugfix/HSTTWO-3617
Jeroen Hoffman deleted branch bugfix/HSTTWO-3617 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][bugfix/HSTTWO-3617] HSTTWO-3617 added unit tests for HstFilterImpl.getStringValue() method
Jeroen Hoffman pushed to branch bugfix/HSTTWO-3617 at cms-community /
hippo-site-toolkit
Commits:
348d4126 by Jeroen Hoffman at 2016-09-29T15:41:27+02:00
HSTTWO-3617 added unit tests for HstFilterImpl.getStringValue() method
- - - - -
1 changed file:
-
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
Changes:
=
content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
=
---
a/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
+++
b/content-beans/src/test/java/org/hippoecm/hst/content/beans/query/TestHstFilters.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2010-2016 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.
@@ -17,9 +17,17 @@ package org.hippoecm.hst.content.beans.query;
import org.hippoecm.hst.AbstractBeanTestCase;
+import org.hippoecm.hst.content.beans.query.exceptions.FilterException;
import org.hippoecm.hst.content.beans.query.filter.Filter;
import org.hippoecm.hst.content.beans.query.filter.FilterImpl;
import org.hippoecm.repository.util.DateTools;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Locale;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -62,6 +70,37 @@ public class TestHstFilters extends AbstractBeanTestCase {
assertEquals("@A = fn:lower-case('aaab') and @B =
fn:lower-case('bb')",mainFilter.getJcrExpression());
}
+@Test
+public void test_getStringValue_conversions() throws Exception {
+
+final FilterImpl filter = new FilterImpl(session, null);
+
+// String, Boolean
+assertEquals("'stringvalue'", filter.getStringValue("stringvalue"));
+assertEquals("'true'", filter.getStringValue(Boolean.TRUE));
+
+// various Numbers
+assertEquals("1", filter.getStringValue(1));
+assertEquals("2", filter.getStringValue(2L));
+assertEquals("3", filter.getStringValue(new BigInteger("3")));
+assertEquals("4.0", filter.getStringValue(4.0D));
+assertEquals("5.0", filter.getStringValue(5.0F));
+assertEquals("6.00", filter.getStringValue(new
BigDecimal(6.0D).setScale(2, BigDecimal.ROUND_UNNECESSARY)));
+
+// Calendar/Date
+Calendar cal = Calendar.getInstance(Locale.ENGLISH);
+cal.setTimeInMillis(147515500L);
+assertEquals("xs:dateTime('2016-09-29T15:16:40.000+02:00')",
filter.getStringValue(cal));
+assertEquals("xs:dateTime('2016-09-29T15:16:40.000+02:00')",
filter.getStringValue(cal.getTime()));
+}
+
+@Test(expected = FilterException.class)
+public void test_getStringValue_unsupported() throws Exception {
+
+final FilterImpl filter = new FilterImpl(session, null);
+assertEquals("exception",
filter.getStringValue(Collections.EMPTY_LIST));
+}
+
/**
* Combine some AND-ed filters
* @throws Exception
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/348d4126554e00609a139d8968a2060087654290
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch bugfix/REPO-1421
Jeroen Hoffman deleted branch bugfix/REPO-1421 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] 4 commits: REPO-1421 added constant for jcr workspace root node id
Jeroen Hoffman pushed to branch master at cms-community / hippo-repository
Commits:
e7a44385 by Bert Leunis at 2016-09-16T10:06:39+02:00
REPO-1421 added constant for jcr workspace root node id
- - - - -
9db57aeb by Jeroen Hoffman at 2016-09-29T13:40:59+02:00
REPO-1421 remove JCR_ prefix from the new constant because is stands for the
jcr: prefix in the other constants
- - - - -
842eefee by Jeroen Hoffman at 2016-09-29T13:47:43+02:00
REPO-1421 Merge master changes into bugfix branch
- - - - -
69ec73a1 by Jeroen Hoffman at 2016-09-29T13:57:48+02:00
REPO-1421 Reintegrate 'bugfix/REPO-1421' into master
- - - - -
1 changed file:
- api/src/main/java/org/onehippo/repository/util/JcrConstants.java
Changes:
=
api/src/main/java/org/onehippo/repository/util/JcrConstants.java
=
--- a/api/src/main/java/org/onehippo/repository/util/JcrConstants.java
+++ b/api/src/main/java/org/onehippo/repository/util/JcrConstants.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2013-2016 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.
@@ -77,4 +77,8 @@ public final class JcrConstants {
public static final String JCR_READ = "jcr:read";
public static final String JCR_WRITE = "jcr:write";
+// -- general
+
+public static final String ROOT_NODE_ID =
"cafebabe-cafe-babe-cafe-babecafebabe";
+
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/d8e3021e174b29c1e369109432278a3bc595436e...69ec73a1729b8e1b7de497b4fb377fbdd0c9ee9c
___
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-1421] REPO-1421 remove JCR_ prefix from the new constant because is stands for the jcr…
Jeroen Hoffman pushed to branch bugfix/REPO-1421 at cms-community /
hippo-repository
Commits:
9db57aeb by Jeroen Hoffman at 2016-09-29T13:40:59+02:00
REPO-1421 remove JCR_ prefix from the new constant because is stands for the
jcr: prefix in the other constants
- - - - -
1 changed file:
- api/src/main/java/org/onehippo/repository/util/JcrConstants.java
Changes:
=
api/src/main/java/org/onehippo/repository/util/JcrConstants.java
=
--- a/api/src/main/java/org/onehippo/repository/util/JcrConstants.java
+++ b/api/src/main/java/org/onehippo/repository/util/JcrConstants.java
@@ -79,6 +79,6 @@ public final class JcrConstants {
// -- general
-public static final String JCR_ROOT_NODE_ID =
"cafebabe-cafe-babe-cafe-babecafebabe";
+public static final String ROOT_NODE_ID =
"cafebabe-cafe-babe-cafe-babecafebabe";
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/9db57aeb9505aa683e8c09adb711139a8cd8fcdb
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-10240 TIFF files cannot be uploaded as assets
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
05d59fd2 by Marijan Milicevic at 2016-09-29T11:28:03+02:00
CMS-10240 TIFF files cannot be uploaded as assets
- add mimetypes.allowed multistring property
(cherry picked from commit 0bc63a8128d6022ceb2f2ca5a70d45dc26bdb71b)
(cherry picked from commit 18b47b52c869cc2edb6ada5c069c57a91dfaef16)
- - - - -
1dedebfe by Jeroen Hoffman at 2016-09-29T11:28:25+02:00
CMS-10240 copyright to 2016
(cherry picked from commit c24899e5633920da367b4fb2d59a52bd3e6b632e)
(cherry picked from commit 2a2025c5ee98e8d2c1391f8ad875103bf0c34c78)
- - - - -
015dc06a by Jeroen Hoffman at 2016-09-29T11:32:32+02:00
Merge branch 'bugfix/CMS-10240'
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -21,6 +21,8 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
+import com.google.common.base.Strings;
+
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -51,10 +53,12 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public static final String MAX_FILE_SIZE = "max.file.size";
public static final String EXTENSIONS_ALLOWED = "extensions.allowed";
+public static final String MIME_TYPES_ALLOWED = "mimetypes.allowed";
private ValidationResult result;
private List validators;
private List allowedExtensions;
+private List allowedMimeTypes;
private IValueMap values;
public DefaultUploadValidationService() {
@@ -64,12 +68,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public DefaultUploadValidationService(IValueMap params) {
validators = new LinkedList<>();
allowedExtensions = new LinkedList<>();
+allowedMimeTypes = new LinkedList<>();
if (params.containsKey(EXTENSIONS_ALLOWED)) {
setAllowedExtensions(params.getStringArray(EXTENSIONS_ALLOWED));
} else {
setAllowedExtensions(getDefaultExtensionsAllowed());
}
+if (params.containsKey(MIME_TYPES_ALLOWED)) {
+setAllowedMimeTypes(params.getStringArray(MIME_TYPES_ALLOWED));
+}
values = params;
@@ -151,6 +159,9 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
private void validateMimeType(final FileUpload upload) {
String mimeType = upload.getContentType();
+if (allowedMimeTypes.contains(mimeType)) {
+return;
+}
try (InputStream is = upload.getInputStream()){
MimeTypeHelper.validateMimeType(is, mimeType);
} catch (InvalidMimeTypeException e) {
@@ -163,6 +174,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
}
}
+
+public void setAllowedMimeTypes(final String[] mimeTypes) {
+allowedMimeTypes.clear();
+for (String type : mimeTypes) {
+if (!Strings.isNullOrEmpty(type)) {
+allowedMimeTypes.add(type);
+}
+}
+}
+
@Override
public String[] getAllowedExtensions() {
return allowedExtensions.toArray(new String[allowedExtensions.size()]);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/0d70ffaea234d9e5b6d8913aa484866a1be46455...015dc06a91ce1cc61c1add6a42d856de3da6d573
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10239
Jeroen Hoffman deleted branch bugfix/CMS-10239 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1005
Jeroen Hoffman deleted branch bugfix/ESSENTIALS-1005 at cms-community / hippo-essentials ___ 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] 3 commits: ESSENTIALS-1005
Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials Commits: f0ffdf80 by Michiel Rop at 2016-09-15T13:25:13+02:00 ESSENTIALS-1005 Delete non-functional #ftl tag - deleted non-funtional #ftl tag - - - - - 1f3d7936 by Jeroen Hoffman at 2016-09-27T14:00:11+02:00 ESSENTIALS-1005 Merge master to bugfix branch - - - - - e08a794f by Jeroen Hoffman at 2016-09-27T14:03:54+02:00 ESSENTIALS-1005 Reintegrate bugfix branch into master - - - - - 1 changed file: - plugins/skeleton-package/src/main/resources/instructions/freemarker/imports.ftl Changes: = plugins/skeleton-package/src/main/resources/instructions/freemarker/imports.ftl = --- a/plugins/skeleton-package/src/main/resources/instructions/freemarker/imports.ftl +++ b/plugins/skeleton-package/src/main/resources/instructions/freemarker/imports.ftl @@ -1,5 +1,3 @@ -<#ftl encoding="UTF-8"> - <#assign hst=JspTaglibs["http://www.hippoecm.org/jsp/hst/core";] > <#assign fmt=JspTaglibs ["http://java.sun.com/jsp/jstl/fmt";] > View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/a61b56a4857ccbe4da0727ffb464a4197c1c1603...e08a794f879473cba1da4bcf57b910782630f0df ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10319
Jeroen Hoffman deleted branch bugfix/CMS-10319 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 2 commits: CMS-10319 no longer return false in the default validateDelete, on behalf of the DynamicMultiSelect
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
60e07165 by Jeroen Hoffman at 2016-09-22T16:31:48+02:00
CMS-10319 no longer return false in the default validateDelete, on behalf of
the DynamicMultiSelect
If the refactor from CMS-6892 is reverted, deleting DynamicMultiSelect from the
doc type editor works again.
The overriding (and now exact same) methods in MixinLoaderPluginEditorPlugin
and FieldPluginEditorPlugin no longer needed; also no need to explicitly
override to false in ListViewPluginEditorPlugin or LayoutPluginEditorPlugin
since they don't show delete button.
- - - - -
ea731fe7 by Jeroen Hoffman at 2016-09-23T11:58:19+02:00
CMS-10319 Reintegrate 'bugfix/CMS-10319' into master
- - - - -
3 changed files:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinLoaderPluginEditorPlugin.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -350,7 +350,7 @@ public class RenderPluginEditorPlugin extends RenderPlugin
implements ILayoutAwa
}
protected boolean validateDelete() {
-return false;
+return checkWhetherSubtypesHaveEditorTemplates();
}
protected void registerChildTrackers() {
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/FieldPluginEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2016 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.
@@ -194,11 +194,6 @@ public class FieldPluginEditorPlugin extends
RenderPluginEditorPlugin {
}
}
-@Override
-protected boolean validateDelete() {
-return checkWhetherSubtypesHaveEditorTemplates();
-}
-
private ITemplateEngine getTemplateEngine() {
return
getPluginContext().getService(getEffectivePluginConfig().getString("engine"),
ITemplateEngine.class);
}
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinLoaderPluginEditorPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinLoaderPluginEditorPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/mixin/MixinLoaderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -155,11 +155,6 @@ public class MixinLoaderPluginEditorPlugin extends
RenderPluginEditorPlugin {
}
}
-@Override
-protected boolean validateDelete() {
-return checkWhetherSubtypesHaveEditorTemplates();
-}
-
private ITemplateEngine getTemplateEngine() {
return
getPluginContext().getService(getEffectivePluginConfig().getString("engine"),
ITemplateEngine.class);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/ea4a9f38ba5184547db12cbe9e5f526ce9b6...ea731fe7773b4f8027e4d282b9216555ecf09814
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10319
Jeroen Hoffman pushed new branch bugfix/CMS-10319 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10453
Jeroen Hoffman deleted branch bugfix/CMS-10453 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] 2 commits: CMS-10453: Backport: ReferringDocumentsProvider should use path instead of node…
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
3a471e38 by Marijan Milicevic at 2016-09-21T13:35:16+02:00
CMS-10453: Backport: ReferringDocumentsProvider should use path instead of
node name in sorting method
cherry-picked from 65fc832481988b534a1c6baef71628faf65569d6
(cherry picked from commit b01e640)
- - - - -
089e97c2 by Jeroen Hoffman at 2016-09-22T11:40:15+02:00
CMS-10453 Reintegrate 'bugfix/CMS-10453' into release/3.2
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
=
---
a/api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
+++
b/api/src/main/java/org/hippoecm/frontend/editor/workflow/model/ReferringDocumentsProvider.java
@@ -193,7 +193,7 @@ public class ReferringDocumentsProvider extends
NodeModelWrapper implements ISor
private static SortedSet getSortedReferrers(final Collection
nodes) throws RepositoryException {
final TreeSet sorted = new TreeSet<>((o1, o2) -> {
try {
-return o1.getName().compareTo(o2.getName());
+return o1.getPath().compareTo(o2.getPath());
} catch (RepositoryException e) {
throw new RepositoryRuntimeException(e);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/25e601fd945071aaffc8799eaa20be53eed3c4a7...089e97c209c78ba26f7109d4304b2522648b0e6b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][bugfix/HIPPLUG-1334] HIPPLUG-1334 Delete essentials overlays
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1334 at cms-community / hippo-plugin-poll Commits: 5658d95d by Jeroen Hoffman at 2016-09-16T11:49:35+02:00 HIPPLUG-1334 Delete essentials overlays - - - - - 30 changed files: - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102.info - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/applicationContext.xml - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/errors/404.jsp - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/errors/500.jsp - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/index.jsp - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/jackson.xml - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/filters/NoCacheFilter.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/InstallState.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/InstallStateMachine.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/Plugin.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/PluginException.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/PluginParameterServiceFactory.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/PluginStore$1.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/plugin/PluginStore.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/project/ProjectUtils.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/DocumentResource.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/JcrResource.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/NodeResource.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/PluginResource.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/ProjectResource.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/client/RestClient.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/config/RestServletListener.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/PropertyRestful$1.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/PropertyRestful$PropertyType.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/PropertyRestful.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/RestList.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/StatusRestful.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7/essentials/rest/model/SystemInfo.class - − demo/essentials/overlays/org.onehippo.cms7.hippo-essentials-dashboard-3.1.0-20160818.143213-102/WEB-INF/classes/org/onehippo/cms7
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][bugfix/HIPPLUG-1334] 2 commits: HIPPLUG-1334 Fix tyop in README
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1334 at cms-community / hippo-plugin-poll Commits: d24518fb by Jeroen Hoffman at 2016-09-16T11:40:54+02:00 HIPPLUG-1334 Fix tyop in README - - - - - 46382cfb by Jeroen Hoffman at 2016-09-16T11:43:39+02:00 HIPPLUG-1334 Exclude demo from rat plugin - - - - - 2 changed files: - demo/_demo_creation/README.txt - pom.xml Changes: = demo/_demo_creation/README.txt = --- a/demo/_demo_creation/README.txt +++ b/demo/_demo_creation/README.txt @@ -16,7 +16,7 @@ How to create the demo project Rebuild and run. -Creating a custom poll document the contains the poll compound. +Creating a custom poll document that contains the poll compound --- For the next steps, we rely on the auto-export function to export changes into the project. = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ README.md addon-repository/src/main/resources/**/*.xml -demo/content/src/main/resources/**/*.xml +demo/**/*.* View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/7b60047ae981a45eb0730448daa98af4169dc08b...46382cfba23b476e58266a75f19a95e49f27 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][bugfix/HIPPLUG-1334] 2 commits: HIPPLUG-1381 moving component parameter translations to repository resource bundle
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1334 at cms-community /
hippo-plugin-poll
Commits:
4228767a by Oscar Scholten at 2016-09-05T15:33:48+02:00
HIPPLUG-1381 moving component parameter translations to repository resource
bundle
- - - - -
7b60047a by Jeroen Hoffman at 2016-09-16T11:29:51+02:00
HIPPLUG-1334 Merge branch 'master' into bugfix/HIPPLUG-1334
- - - - -
4 changed files:
- + addon-repository/src/main/resources/component-param-translations.json
- addon-repository/src/main/resources/hippoecm-extension.xml
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
Changes:
=
addon-repository/src/main/resources/component-param-translations.json
=
--- /dev/null
+++ b/addon-repository/src/main/resources/component-param-translations.json
@@ -0,0 +1,29 @@
+{
+ "hippo:hst": {
+"componentparameters": {
+ "org": {
+"onehippo": {
+ "forge": {
+"poll": {
+ "component": {
+"PollComponentInfo": {
+ "en": {
+"poll-dataPath": "Path to store poll data",
+"poll-docsClass": "Poll documents class",
+"poll-pollCompoundName": "Name of poll compound",
+"poll-docsPath": "Path to poll documents relative to site
content root"
+ }
+},
+"PollDocumentComponentInfo": {
+ "en": {
+"poll-docsPath": "Poll document"
+ }
+}
+ }
+}
+ }
+}
+ }
+}
+ }
+}
\ No newline at end of file
=
addon-repository/src/main/resources/hippoecm-extension.xml
=
--- a/addon-repository/src/main/resources/hippoecm-extension.xml
+++ b/addon-repository/src/main/resources/hippoecm-extension.xml
@@ -213,6 +213,18 @@
+
+
+ hippo:initializeitem
+
+
+ 20402
+
+
+ component-param-translations.json
+
+
+
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
@@ -20,16 +20,16 @@ import org.hippoecm.hst.core.parameters.Parameter;
public interface PollComponentInfo {
-@Parameter(name = "poll-dataPath", displayName = "Path to store poll data")
+@Parameter(name = "poll-dataPath")
String getPollDataPath();
-@Parameter(name = "poll-docsClass", displayName = "Poll documents class")
+@Parameter(name = "poll-docsClass")
String getPollDocsClass();
-@Parameter(name = "poll-pollCompoundName", displayName = "Name of poll
compound")
+@Parameter(name = "poll-pollCompoundName")
String getPollCompoundName();
-@Parameter(name = "poll-docsPath", required = true, displayName = "Path to
poll documents relative to site content root")
+@Parameter(name = "poll-docsPath", required = true)
@JcrPath(pickerSelectableNodeTypes = "hippostd:folder")
String getPollDocsPath();
}
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
@@ -21,19 +21,19 @@ import org.hippoecm.hst.core.parameters.Parameter;
public interface PollDocumentComponentInfo extends PollComponentInfo {
@Override
-@Parameter(name = "poll-dataPath", displayName = "Path to store poll
data", hideInChannelManager = true)
+@Parameter(name = "poll-dataPath", hideInChannelManager = true)
String getPollDataPath();
@Override
-@Parameter(name = "poll-docsClass", displayName = "Poll documents class",
hideInChannelManager = true)
+@Parameter(name = "poll-docsClass", hideInChannelManager = true)
String getPollDocsClass();
@Override
-@Parameter(name = "poll-pollCompoundName", displayName = "Name of poll
compound", hideInChannelManager =
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch feature/ARCHE-355
Jeroen Hoffman pushed new branch feature/ARCHE-355 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Deleted branch feature/ARCHE-355
Jeroen Hoffman deleted branch feature/ARCHE-355 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10310] CMS-10310 replace check for "/console/" servlet path by configured application name "console"
Jeroen Hoffman pushed to branch bugfix/CMS-10310 at cms-community / hippo-cms
Commits:
67ee3586 by Jeroen Hoffman at 2016-08-22T12:13:23+02:00
CMS-10310 replace check for "/console/" servlet path by configured
application name "console"
- also using wicket:enclosure to hide complete section
- - - - -
3 changed files:
- engine/src/main/java/org/hippoecm/frontend/Main.java
- engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.html
- engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/Main.java
=
--- a/engine/src/main/java/org/hippoecm/frontend/Main.java
+++ b/engine/src/main/java/org/hippoecm/frontend/Main.java
@@ -123,7 +123,10 @@ public class Main extends PluginApplication {
public final static String MAXUPLOAD_PARAM = "upload-limit";
public final static String ENCRYPT_URLS = "encrypt-urls";
public final static String OUTPUT_WICKETPATHS = "output-wicketpaths";
+
public final static String PLUGIN_APPLICATION_NAME_PARAMETER = "config";
+public final static String PLUGIN_APPLICATION_VALUE_CMS = "cms";
+public final static String PLUGIN_APPLICATION_VALUE_CONSOLE = "console";
// comma separated init parameter
public final static String ACCEPTED_ORIGIN_WHITELIST =
"accepted-origin-whitelist";
@@ -507,7 +510,7 @@ public class Main extends PluginApplication {
@Override
public String getPluginApplicationName() {
-return getConfigurationParameter(PLUGIN_APPLICATION_NAME_PARAMETER,
"cms");
+return getConfigurationParameter(PLUGIN_APPLICATION_NAME_PARAMETER,
PLUGIN_APPLICATION_VALUE_CMS);
}
@Override
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.html
=
--- a/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.html
+++ b/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.html
@@ -1,5 +1,5 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.java
=
--- a/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.java
+++ b/engine/src/main/java/org/hippoecm/frontend/plugins/login/LoginPanel.java
@@ -212,12 +212,11 @@ public class LoginPanel extends Panel {
submitButton = new Button("submit", new
ResourceModel("submit-label"));
addLabelledComponent(submitButton);
-// hide languages selection for console app
-final String servletPath = ((HttpServletRequest)
getRequest().getContainerRequest()).getServletPath();
-final boolean consoleLogin = !Strings.isNullOrEmpty(servletPath)
&& servletPath.equals("/console/");
+
+// hide language selection for console app
+final boolean consoleLogin =
WebApplicationHelper.getApplicationName().equals(Main.PLUGIN_APPLICATION_VALUE_CONSOLE);
if (consoleLogin) {
locale.setVisible(false);
-localeLabel.setVisible(false);
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/67ee3586e12076db2df4fa49e81bcfb3cbf1b718
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Deleted branch bugfix/HIPPLUG-1334-old
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1334-old at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Pushed new branch bugfix/HIPPLUG-1334
Jeroen Hoffman pushed new branch bugfix/HIPPLUG-1334 at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Deleted branch bugfix/HIPPLUG-1334
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1334 at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Pushed new branch bugfix/HIPPLUG-1334-old
Jeroen Hoffman pushed new branch bugfix/HIPPLUG-1334-old at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][bugfix/HIPPLUG-1334] 2 commits: HIPPLUG-1334 add demo/storage to gitignore
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1334 at cms-community / hippo-plugin-poll Commits: 7e77c68c by Jeroen Hoffman at 2016-07-21T16:35:38+02:00 HIPPLUG-1334 add demo/storage to gitignore - - - - - 5d866145 by Jeroen Hoffman at 2016-07-21T16:49:37+02:00 HIPPLUG-1334 regenerated demo project from the 4.1.0-SNAPSHOT archetype - - - - - 30 changed files: - .gitignore - − demo/LICENSE - − demo/NOTICE - + demo/README-DEMO.txt - demo/README.txt - + demo/bootstrap/configuration/pom.xml - demo/content/src/main/resources/configuration/modules/autoexport-module.xml → demo/bootstrap/configuration/src/main/resources/configuration/modules/autoexport-module.xml - + demo/bootstrap/configuration/src/main/resources/configuration/queries/templates/new-poll-document.xml - + demo/bootstrap/configuration/src/main/resources/configuration/queries/templates/new-poll-folder.xml - + demo/bootstrap/configuration/src/main/resources/configuration/queries/templates/new-resource-bundle.xml - + demo/bootstrap/configuration/src/main/resources/configuration/queries/templates/new-untranslated-folder.xml - demo/content/src/main/resources/hippoecm-extension.xml → demo/bootstrap/configuration/src/main/resources/hippoecm-extension.xml - demo/content/src/main/resources/hst/channels.xml → demo/bootstrap/configuration/src/main/resources/hst/channels.xml - demo/content/src/main/resources/hst/configurations/poll-demo/sitemenus.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/default/catalog.xml - demo/content/src/main/resources/hst/configurations/poll-demo/pages.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/abstractpages.xml - demo/content/src/main/resources/hst/configurations/poll-demo/pages/standard.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/abstractpages/base.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/catalog.xml - demo/content/src/main/resources/hst/configurations/poll-demo/components.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/components.xml - demo/content/src/main/resources/hst/configurations.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/pages.xml - demo/content/src/main/resources/hst/configurations/poll-demo/pages/overview.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/pages/homepage.xml - demo/content/src/main/resources/hst/configurations/poll-demo/pages/textpage.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/pages/pagenotfound.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/prototypepages.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/sitemap.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/sitemenus.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/templates.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/workspace.xml - demo/content/src/main/resources/hst/configurations/poll-demo/workspace.xml → demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/workspace/containers.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/workspace/pages.xml - + demo/bootstrap/configuration/src/main/resources/hst/configurations/polldemo/workspace/sitemap.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/78e1186d72d8c8b01b1f52a3cd156122080a21d1...5d866145d622b9b3de8f899f9864039032769af8 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/10.2] CMS-16 update 10.2 release pom to pull in public interfaces of the poll (HIPPLUG_1342)
Jeroen Hoffman pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: 6b3bdc75 by Jeroen Hoffman at 2016-07-21T12:43:56+02:00 CMS-16 update 10.2 release pom to pull in public interfaces of the poll (HIPPLUG_1342) - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 5.2.0 2.2.0 2.2.0 -2.2.0 +2.2.1-SNAPSHOT 3.2.1-SNAPSHOT 2.2.0 2.2.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/6b3bdc7556e62eb4120e487c721c417ebdf41c62 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][release/2.2] HIPPLUG-1342 [back port to 10.2] make interfaces PollComponentInfo and PollDocum…
Jeroen Hoffman pushed to branch release/2.2 at cms-community / hippo-plugin-poll
Commits:
47f9c34f by Jeroen Hoffman at 2016-07-21T12:40:35+02:00
HIPPLUG-1342 [back port to 10.2] make interfaces PollComponentInfo and
PollDocumentComponentInfo public again
(cherry picked from commit 132b29e)
(cherry picked from commit d6418cc)
- - - - -
2 changed files:
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
Changes:
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollComponentInfo {
+public interface PollComponentInfo {
@Parameter(name = "poll-dataPath", displayName = "Path to store poll data")
String getPollDataPath();
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollDocumentComponentInfo extends PollComponentInfo {
+public interface PollDocumentComponentInfo extends PollComponentInfo {
@Override
@Parameter(name = "poll-dataPath", displayName = "Path to store poll
data", hideInChannelManager = true)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/47f9c34f1fe244a7100cadcf4ed90b5328617150
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][release/3.0] HIPPLUG-1341 [back port to 11.0] make interfaces PollComponentInfo and PollDocum…
Jeroen Hoffman pushed to branch release/3.0 at cms-community / hippo-plugin-poll
Commits:
d6418cc4 by Jeroen Hoffman at 2016-07-21T12:34:28+02:00
HIPPLUG-1341 [back port to 11.0] make interfaces PollComponentInfo and
PollDocumentComponentInfo public again
(cherry picked from commit 132b29e)
- - - - -
2 changed files:
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
Changes:
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollComponentInfo {
+public interface PollComponentInfo {
@Parameter(name = "poll-dataPath", displayName = "Path to store poll data")
String getPollDataPath();
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollDocumentComponentInfo extends PollComponentInfo {
+public interface PollDocumentComponentInfo extends PollComponentInfo {
@Override
@Parameter(name = "poll-dataPath", displayName = "Path to store poll
data", hideInChannelManager = true)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/d6418cc452bfb9300f30f49afa6b10070293a870
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][master] HIPPLUG-1340 make interfaces PollComponentInfo and PollDocumentComponentInfo public again
Jeroen Hoffman pushed to branch master at cms-community / hippo-plugin-poll
Commits:
132b29e3 by Jeroen Hoffman at 2016-07-21T12:23:28+02:00
HIPPLUG-1340 make interfaces PollComponentInfo and PollDocumentComponentInfo
public again
- - - - -
2 changed files:
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
Changes:
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollComponentInfo {
+public interface PollComponentInfo {
@Parameter(name = "poll-dataPath", displayName = "Path to store poll data")
String getPollDataPath();
=
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
=
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 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.
@@ -18,7 +18,7 @@ package org.onehippo.forge.poll.component;
import org.hippoecm.hst.core.parameters.JcrPath;
import org.hippoecm.hst.core.parameters.Parameter;
-interface PollDocumentComponentInfo extends PollComponentInfo {
+public interface PollDocumentComponentInfo extends PollComponentInfo {
@Override
@Parameter(name = "poll-dataPath", displayName = "Path to store poll
data", hideInChannelManager = true)
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/132b29e3275c7531e5550041ea2d83370fc3b12b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] CMS-10256 [Back port to 10.2] Image upload select doesn't pick up the right imageset
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
5101c041 by Jeroen Hoffman at 2016-07-20T14:05:11+02:00
CMS-10256 [Back port to 10.2] Image upload select doesn't pick up the right
imageset
(cherry picked from commit e044f428ceda82d4f09d0c276762f23687e486a3)
- - - - -
1 changed file:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -25,6 +25,8 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -242,6 +244,12 @@ public class GalleryWorkflowPlugin extends
CompatibilityWorkflowPlugin("type", new
PropertyModel<>(this, "type"), galleryTypes,
new
TypeChoiceRenderer(this)).setNullValid(false).setRequired(true);
+// needed to keep dropdown selection:
+typeComponent.add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+@Override
+protected void onUpdate(AjaxRequestTarget art) {
+}
+});
} else if (galleryTypes != null && galleryTypes.size() == 1) {
type = galleryTypes.get(0);
typeComponent = new Label("type", type).setVisible(false);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/5101c04191c45ab23606154b40c4d6a4a52e9b88
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.0] CMS-10225 [Back port to 11.0] Image upload select doesn't pick up the right imageset
Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
e044f428 by Jeroen Hoffman at 2016-07-20T12:49:24+02:00
CMS-10225 [Back port to 11.0] Image upload select doesn't pick up the right
imageset
(cherry picked from commit caa7ff3750bffa9bfceb1cf5958640998da86e8c)
(cherry picked from commit 5e49e1ee0351a147bdfdf261c50ffbabe8c89cf3)
- - - - -
1 changed file:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/GalleryWorkflowPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -25,6 +25,8 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -242,6 +244,12 @@ public class GalleryWorkflowPlugin extends
CompatibilityWorkflowPlugin("type", new
PropertyModel<>(this, "type"), galleryTypes,
new
TypeChoiceRenderer(this)).setNullValid(false).setRequired(true);
+// needed to keep dropdown selection:
+typeComponent.add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+@Override
+protected void onUpdate(AjaxRequestTarget art) {
+}
+});
} else if (galleryTypes != null && galleryTypes.size() == 1) {
type = galleryTypes.get(0);
typeComponent = new Label("type", type).setVisible(false);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e044f428ceda82d4f09d0c276762f23687e486a3
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10277
Jeroen Hoffman deleted branch bugfix/CMS-10277 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10277
Jeroen Hoffman pushed new branch bugfix/CMS-10277 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9467
Jeroen Hoffman deleted branch bugfix/CMS-9467 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/2.26] 4 commits: CMS-10218 Regression (again): New-translated-folder under non-translated folder …
Jeroen Hoffman pushed to branch release/2.26 at cms-community / hippo-cms
Commits:
8a43d25b by Marijan Milicevic at 2016-07-19T12:58:20+02:00
CMS-10218 Regression (again): New-translated-folder under non-translated folder
won't store selected locale
- add language as argument if set
(cherry picked from commit b625f77be015b69d5c30d8f3cd6bde4f8b6b8d11)
- - - - -
f906f0be by Jeroen Hoffman at 2016-07-19T12:58:36+02:00
CMS-10218 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
(cherry picked from commit e6496a45c80ce7fff4a22f739f22554f1de5f520)
- - - - -
2ae1aa7c by Jeroen Hoffman at 2016-07-19T13:33:51+02:00
CMS-10218 Import HippoTranslationNodeType after cherry picking didn't build
- - - - -
7f3fac84 by Jeroen Hoffman at 2016-07-19T13:45:50+02:00
CMS-10218 Reintegrate bugfix branch into release/2.26
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -75,6 +75,7 @@ import org.hippoecm.repository.api.WorkflowManager;
import org.hippoecm.repository.standardworkflow.DefaultWorkflow;
import org.hippoecm.repository.standardworkflow.EditableWorkflow;
import org.hippoecm.repository.standardworkflow.FolderWorkflow;
+import org.hippoecm.repository.translation.HippoTranslationNodeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -307,7 +308,9 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-
+if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
+
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
+}
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
onWorkflowAdded(path);
UserSession.get().getJcrSession().refresh(true);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/153abb8a0b21e5aec633a8d5fe31c131f5aad8cc...7f3fac84352900a8f17ba4f7de575540b0d4ac12
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10219 Reintegrated/cherry picked 11.0 bugfix/CMS-10217 into 11.1 master
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
9403e673 by Jeroen Hoffman at 2016-07-19T12:53:49+02:00
CMS-10219 Reintegrated/cherry picked 11.0 bugfix/CMS-10217 into 11.1 master
(cherry picked from commit e6496a45c80ce7fff4a22f739f22554f1de5f520)
(cherry picked from commit e0632d823777fa8ab6ecaa8b06d29f206dc55e1f)
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -342,7 +342,9 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-
+if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
+
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
+}
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
onWorkflowAdded(path);
JcrNodeModel nodeModel = new
JcrNodeModel(path);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/9403e67392a14ac298f33528f01aa0b07b023c75
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.0] 3 commits: CMS-10217 Regression (again): New-translated-folder under non-translated folder …
Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
a7ee908e by Marijan Milicevic at 2016-07-19T11:09:51+02:00
CMS-10217 Regression (again): New-translated-folder under non-translated folder
won't store selected locale
- add language as argument if set
(cherry picked from commit b625f77be015b69d5c30d8f3cd6bde4f8b6b8d11)
- - - - -
e0632d82 by Jeroen Hoffman at 2016-07-19T11:10:07+02:00
CMS-10217 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
(cherry picked from commit e6496a45c80ce7fff4a22f739f22554f1de5f520)
- - - - -
8eabde39 by Jeroen Hoffman at 2016-07-19T11:18:57+02:00
CMS-10217 Reintegrate bugfix branch into release/4.0
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -342,7 +342,9 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-
+if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
+
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
+}
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
onWorkflowAdded(path);
JcrNodeModel nodeModel = new
JcrNodeModel(path);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/3152b028a51c85f048b69ca43aea0fdd5c20c8b3...8eabde398adc78c799bdfd0fbbabacb43aad25c5
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] 4 commits: CMS-10173 Regression (again): New-translated-folder under non-translated folder …
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
b625f77b by Marijan Milicevic at 2016-06-16T18:26:30+02:00
CMS-10173 Regression (again): New-translated-folder under non-translated folder
won't store selected locale
- add language as argument if set
- - - - -
e6496a45 by Jeroen Hoffman at 2016-07-19T09:55:55+02:00
CMS-10173 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
- - - - -
b9d734cf by Jeroen Hoffman at 2016-07-19T10:06:05+02:00
CMS-10173 Merge latest release/3.2 into bugfix branch
- - - - -
70c7ce28 by Jeroen Hoffman at 2016-07-19T10:10:00+02:00
CMS-10173 Reintegrate bugfix branch into release/3.2
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -349,7 +349,9 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-
+if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
+
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
+}
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
onWorkflowAdded(path);
JcrNodeModel nodeModel = new
JcrNodeModel(path);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/c146b56599c1815a64e7abfcbc6806bf17659b13...70c7ce281dc2e77fd7f726319085e3956abfa1cb
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10173] 58 commits: CMS-9765 add styles for bold-italics and italics-bold combination for rich text editor
Jeroen Hoffman pushed to branch bugfix/CMS-10173 at cms-community / hippo-cms Commits: 5de1bc47 by Bert Leunis at 2016-06-03T12:57:21+02:00 CMS-9765 add styles for bold-italics and italics-bold combination for rich text editor - - - - - b263e5cb by Marijan Milicevic at 2016-06-14T18:37:33+02:00 CMS-9985 When toggling between “fit image into view” mode and normal mode, the selection rectangle does not rescale - resize rectangle when in firt view and keep aspect ratio from resetting to default - - - - - d1abd31d by Marijan Milicevic at 2016-06-15T20:10:22+02:00 CMS-9467 action is overlooked when updating an asset. - fire an event in case binary (image or asset) is uploaded or when image is cropped. - - - - - 08261312 by Arent-Jan Banck at 2016-06-16T17:23:55+02:00 CMS-16 Bump ckeditor to use the release version - - - - - 55f4760f by Mathijs den Burger at 2016-06-17T09:39:12+02:00 CMS-9765 Reintegrate bugfix/CMS-9765 - - - - - af818717 by Arthur Bogaart at 2016-06-24T12:08:53+02:00 CMS-10224 Render custom document icons with primary color - Added the appropriate CSS classes to custom icons if they are resolved in the listing - Added a third css class to set the primary color so we don't have to abuse .hi-file-text or .hi-folder - Make sure extraCssClasses of a ResourceIcon are copied by the copy constructor - Changed extraCssClasses into a set since it's values should be unique (cherry picked from commit c4068fad2d422909fa58ae1d6138dde9cdc22a62) - - - - - 1f4c83aa by Saimir Muco at 2016-06-27T11:16:59+02:00 CMS-10148 - add a check on the node type to prevent hippo:compound node from being instantiated - refactor some logs - replace deprecated method - - - - - 0bc63a81 by Marijan Milicevic at 2016-06-27T21:36:51+02:00 CMS-9943 TIFF files cannot be uploaded as assets - add mimetypes.allowed multistring property - - - - - 50bf24c4 by Marijan Milicevic at 2016-06-28T16:11:14+02:00 CMS-10233 Copying document (trees) in the console breaks translations - keep translation id per hippo:handle node and use it as value for child nodes - - - - - 94012db9 by Pankaj Gupta at 2016-06-28T17:48:15+02:00 CMS-10230 prepare release hippo-cms-3.2.2 - - - - - 3e302fed by Pankaj Gupta at 2016-06-28T17:48:31+02:00 CMS-10230 prepare for next development iteration - - - - - e8a41282 by Marijan Milicevic at 2016-06-28T18:02:10+02:00 Revert "CMS-9467 action is overlooked when updating an asset." This reverts commit d1abd31de21849e0e830baeadf690436c115dbcb. - - - - - 33da56d1 by Saimir Muco at 2016-06-29T17:26:52+02:00 CMS-10233 reuse a constant - - - - - da071978 by Marijan Milicevic at 2016-06-29T20:51:27+02:00 CMS-10023 Clicking twice on internal link toolbar button throws exception and requires to logout to recover - disable button for 300ms to prevent double clicks. - - - - - bdb02ba2 by Joeri de Gooijer at 2016-06-30T14:25:19+02:00 CMS-10247 Switch from bower to npm for dependency management (cherry picked from commit 464c0f2b29df961201a189356b33f6f3bed98b5e, 69c4d9d0af1e965a4a034f51a1ce32d987cae91d) - - - - - 430e7fd2 by Saimir Muco at 2016-07-01T13:46:39+02:00 CMS-10023 set the variable declaration in one statement - - - - - 99c15e05 by Joeri de Gooijer at 2016-07-04T16:27:18+02:00 CMS-10245 switch from bower to npm for frontend dependency management (cherry picked from commit ba7669d0cd61ba7a022dea4fcf4f56245824b090) CMS-10245 rework after review - Updated date in license headers - Renamed grunt tasks from 'bower' to 'npm' (cherry picked from commit 2778d56499e636ae629054d6392c52abd3360841) CMS-10245 Used latest hippo theme version supporting npm - - - - - da859d72 by Arthur Bogaart at 2016-07-04T16:45:23+02:00 CMS-10247 Reintegrate bugfix/CMS-10247 - - - - - 0a862f43 by Saimir Muco at 2016-07-08T11:12:38+02:00 CMS-10148 query the NodeTypeManager to find out whether the type is an abstract node - - - - - 50bc1b7d by Arthur Bogaart at 2016-07-08T13:00:52+02:00 CMS-10233 Refactor GenerateNewTranslationIdsVisitor - simplified the code a bit by extending the Default TraversingitemVisitor - added a few tests - - - - - fa2aba4d by Arthur Bogaart at 2016-07-08T13:31:37+02:00 CMS-10023 Format code - - - - - f1b1b9ae by Arthur Bogaart at 2016-07-11T10:42:40+02:00 CMS-10023 Rename variable name - - - - - 75fd57f7 by Arthur Bogaart at 2016-07-11T10:54:08+02:00 CMS-10023 Reintegrate bugfix/CMS-10023 - - - - - 7300d425 by Arthur Bogaart at 2016-07-11T12:17:29+02:00 CMS-9985 Merge release/3.2 changes in bugfix/CMS-9985 - - - - - 5ccdac1b by Arthur Bogaart at 2016-07-11T15:09:15+02:00 CMS-9985 Add white background-color to crop-widget - background color for dialogs if actually #f7f7f7, almost white - use that same color as the background for editing in full-screen - format code - - - - - aa8d8c81 by Arthur Bogaart at 2016-07-11T15:24:20+02:00 CMS-9985 Fix visibility of drop-widget border - - - - - 1000163f by Arthur Bogaart at 2016-07-11T15:49:55+02:0
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10173] CMS-10173 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
Jeroen Hoffman pushed to branch bugfix/CMS-10173 at cms-community / hippo-cms
Commits:
e6496a45 by Jeroen Hoffman at 2016-07-19T09:55:55+02:00
CMS-10173 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -31,8 +31,6 @@ import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeDefinition;
-import com.google.common.base.Strings;
-
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
@@ -351,7 +349,7 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-if
(!Strings.isNullOrEmpty(addDocumentModel.getLanguage())) {
+if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
}
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e6496a45c80ce7fff4a22f739f22554f1de5f520
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Deleted branch bugfix/HIPPLUG-1325
Jeroen Hoffman deleted branch bugfix/HIPPLUG-1325 at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10261
Jeroen Hoffman deleted branch bugfix/CMS-10261 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10261
Jeroen Hoffman pushed new branch bugfix/CMS-10261 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10148
Jeroen Hoffman deleted branch bugfix/CMS-10148 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10148] 21 commits: CMS-10224 Render custom document icons with primary color
Jeroen Hoffman pushed to branch bugfix/CMS-10148 at cms-community / hippo-cms Commits: af818717 by Arthur Bogaart at 2016-06-24T12:08:53+02:00 CMS-10224 Render custom document icons with primary color - Added the appropriate CSS classes to custom icons if they are resolved in the listing - Added a third css class to set the primary color so we don't have to abuse .hi-file-text or .hi-folder - Make sure extraCssClasses of a ResourceIcon are copied by the copy constructor - Changed extraCssClasses into a set since it's values should be unique (cherry picked from commit c4068fad2d422909fa58ae1d6138dde9cdc22a62) - - - - - 0bc63a81 by Marijan Milicevic at 2016-06-27T21:36:51+02:00 CMS-9943 TIFF files cannot be uploaded as assets - add mimetypes.allowed multistring property - - - - - 50bf24c4 by Marijan Milicevic at 2016-06-28T16:11:14+02:00 CMS-10233 Copying document (trees) in the console breaks translations - keep translation id per hippo:handle node and use it as value for child nodes - - - - - 94012db9 by Pankaj Gupta at 2016-06-28T17:48:15+02:00 CMS-10230 prepare release hippo-cms-3.2.2 - - - - - 3e302fed by Pankaj Gupta at 2016-06-28T17:48:31+02:00 CMS-10230 prepare for next development iteration - - - - - 33da56d1 by Saimir Muco at 2016-06-29T17:26:52+02:00 CMS-10233 reuse a constant - - - - - da071978 by Marijan Milicevic at 2016-06-29T20:51:27+02:00 CMS-10023 Clicking twice on internal link toolbar button throws exception and requires to logout to recover - disable button for 300ms to prevent double clicks. - - - - - bdb02ba2 by Joeri de Gooijer at 2016-06-30T14:25:19+02:00 CMS-10247 Switch from bower to npm for dependency management (cherry picked from commit 464c0f2b29df961201a189356b33f6f3bed98b5e, 69c4d9d0af1e965a4a034f51a1ce32d987cae91d) - - - - - 430e7fd2 by Saimir Muco at 2016-07-01T13:46:39+02:00 CMS-10023 set the variable declaration in one statement - - - - - 99c15e05 by Joeri de Gooijer at 2016-07-04T16:27:18+02:00 CMS-10245 switch from bower to npm for frontend dependency management (cherry picked from commit ba7669d0cd61ba7a022dea4fcf4f56245824b090) CMS-10245 rework after review - Updated date in license headers - Renamed grunt tasks from 'bower' to 'npm' (cherry picked from commit 2778d56499e636ae629054d6392c52abd3360841) CMS-10245 Used latest hippo theme version supporting npm - - - - - da859d72 by Arthur Bogaart at 2016-07-04T16:45:23+02:00 CMS-10247 Reintegrate bugfix/CMS-10247 - - - - - 50bc1b7d by Arthur Bogaart at 2016-07-08T13:00:52+02:00 CMS-10233 Refactor GenerateNewTranslationIdsVisitor - simplified the code a bit by extending the Default TraversingitemVisitor - added a few tests - - - - - fa2aba4d by Arthur Bogaart at 2016-07-08T13:31:37+02:00 CMS-10023 Format code - - - - - f1b1b9ae by Arthur Bogaart at 2016-07-11T10:42:40+02:00 CMS-10023 Rename variable name - - - - - 75fd57f7 by Arthur Bogaart at 2016-07-11T10:54:08+02:00 CMS-10023 Reintegrate bugfix/CMS-10023 - - - - - 1fb572e8 by Jeroen Hoffman at 2016-07-12T12:25:00+02:00 CMS-9943 Merge release/3.2 changes into bugfix/CMS-9943 branch - - - - - 24c83c94 by Jeroen Hoffman at 2016-07-12T12:35:24+02:00 CMS-9943 Reintegrate bugfix/CMS-9943 branch into release/3.2 - - - - - c24899e5 by Jeroen Hoffman at 2016-07-12T12:40:32+02:00 CMS-9943 copyright to 2016 - - - - - 12b46eb0 by Mathijs den Burger at 2016-07-12T14:39:28+02:00 CMS-10233 Skip virtual nodes by using FilteringItemVisitor Separated the isVirtual logic into a predicate. To prevent visiting all properties (which is slow) we skip all properties and just check the t9id property when visiting a translated node. Bumped the repository version to be able to use MockNode#isVirtual and MockItem#accept. - - - - - d0374568 by Mathijs den Burger at 2016-07-12T14:42:24+02:00 CMS-10233 Reintegrate bugfix/CMS-10233 - - - - - 772ba844 by Jeroen Hoffman at 2016-07-12T16:57:01+02:00 CMS-10148 Merge release/3.2 changes into bugfix branch - - - - - 30 changed files: - − api/.bowerrc - api/.csslintrc - api/Gruntfile.js - api/README - − api/bower.json - api/build.config.js - api/npm-shrinkwrap.json - api/package.json - api/pom.xml - api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/icon/HippoIcon.java - api/src/main/java/org/hippoecm/frontend/plugins/standards/list/resolvers/IconRenderUtil.java - api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java - api/src/main/resources/org/hippoecm/frontend/extjs/hippotheme/ExtHippoTheme.scss - api/src/main/styling/styles/_ajax_loader.scss - api/src/main/styling/styles/_hippo_logo.scss - api/src/main/styling/styles/_icons.scss - api/src/main/styling/styles/main.scss - automatic-export/frontend/pom.xml - automatic-export/pom.xml - automatic-export/repository/pom.xml - brokenlinks/common/pom.xml - brokenlinks/frontend
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.0] 3 commits: CMS-10239 TIFF files cannot be uploaded as assets
Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
18b47b52 by Marijan Milicevic at 2016-07-12T14:52:49+02:00
CMS-10239 TIFF files cannot be uploaded as assets
- add mimetypes.allowed multistring property
(cherry picked from commit 0bc63a8128d6022ceb2f2ca5a70d45dc26bdb71b)
- - - - -
2a2025c5 by Jeroen Hoffman at 2016-07-12T15:16:06+02:00
CMS-10239 copyright to 2016
(cherry picked from commit c24899e5633920da367b4fb2d59a52bd3e6b632e)
- - - - -
032a3dae by Jeroen Hoffman at 2016-07-12T15:38:18+02:00
CMS-10239 Merge branch 'bugfix/CMS-10239' into release/4.0
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -21,6 +21,8 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
+import com.google.common.base.Strings;
+
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -51,10 +53,12 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public static final String MAX_FILE_SIZE = "max.file.size";
public static final String EXTENSIONS_ALLOWED = "extensions.allowed";
+public static final String MIME_TYPES_ALLOWED = "mimetypes.allowed";
private ValidationResult result;
private List validators;
private List allowedExtensions;
+private List allowedMimeTypes;
private IValueMap values;
public DefaultUploadValidationService() {
@@ -64,12 +68,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public DefaultUploadValidationService(IValueMap params) {
validators = new LinkedList<>();
allowedExtensions = new LinkedList<>();
+allowedMimeTypes = new LinkedList<>();
if (params.containsKey(EXTENSIONS_ALLOWED)) {
setAllowedExtensions(params.getStringArray(EXTENSIONS_ALLOWED));
} else {
setAllowedExtensions(getDefaultExtensionsAllowed());
}
+if (params.containsKey(MIME_TYPES_ALLOWED)) {
+setAllowedMimeTypes(params.getStringArray(MIME_TYPES_ALLOWED));
+}
values = params;
@@ -151,6 +159,9 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
private void validateMimeType(final FileUpload upload) {
String mimeType = upload.getContentType();
+if (allowedMimeTypes.contains(mimeType)) {
+return;
+}
try (InputStream is = upload.getInputStream()){
MimeTypeHelper.validateMimeType(is, mimeType);
} catch (InvalidMimeTypeException e) {
@@ -163,6 +174,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
}
}
+
+public void setAllowedMimeTypes(final String[] mimeTypes) {
+allowedMimeTypes.clear();
+for (String type : mimeTypes) {
+if (!Strings.isNullOrEmpty(type)) {
+allowedMimeTypes.add(type);
+}
+}
+}
+
@Override
public String[] getAllowedExtensions() {
return allowedExtensions.toArray(new String[allowedExtensions.size()]);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/fcb1080387a44f2d14e604338447886d21cc63b7...032a3daebe238a7fda3cf463d69969995c95ca2d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10239
Jeroen Hoffman pushed new branch bugfix/CMS-10239 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] 4 commits: CMS-9943 TIFF files cannot be uploaded as assets
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
0bc63a81 by Marijan Milicevic at 2016-06-27T21:36:51+02:00
CMS-9943 TIFF files cannot be uploaded as assets
- add mimetypes.allowed multistring property
- - - - -
1fb572e8 by Jeroen Hoffman at 2016-07-12T12:25:00+02:00
CMS-9943 Merge release/3.2 changes into bugfix/CMS-9943 branch
- - - - -
24c83c94 by Jeroen Hoffman at 2016-07-12T12:35:24+02:00
CMS-9943 Reintegrate bugfix/CMS-9943 branch into release/3.2
- - - - -
c24899e5 by Jeroen Hoffman at 2016-07-12T12:40:32+02:00
CMS-9943 copyright to 2016
- - - - -
1 changed file:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -21,6 +21,8 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
+import com.google.common.base.Strings;
+
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -51,10 +53,12 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public static final String MAX_FILE_SIZE = "max.file.size";
public static final String EXTENSIONS_ALLOWED = "extensions.allowed";
+public static final String MIME_TYPES_ALLOWED = "mimetypes.allowed";
private ValidationResult result;
private List validators;
private List allowedExtensions;
+private List allowedMimeTypes;
private IValueMap values;
public DefaultUploadValidationService() {
@@ -64,12 +68,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
public DefaultUploadValidationService(IValueMap params) {
validators = new LinkedList<>();
allowedExtensions = new LinkedList<>();
+allowedMimeTypes = new LinkedList<>();
if (params.containsKey(EXTENSIONS_ALLOWED)) {
setAllowedExtensions(params.getStringArray(EXTENSIONS_ALLOWED));
} else {
setAllowedExtensions(getDefaultExtensionsAllowed());
}
+if (params.containsKey(MIME_TYPES_ALLOWED)) {
+setAllowedMimeTypes(params.getStringArray(MIME_TYPES_ALLOWED));
+}
values = params;
@@ -151,6 +159,9 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
private void validateMimeType(final FileUpload upload) {
String mimeType = upload.getContentType();
+if (allowedMimeTypes.contains(mimeType)) {
+return;
+}
try (InputStream is = upload.getInputStream()){
MimeTypeHelper.validateMimeType(is, mimeType);
} catch (InvalidMimeTypeException e) {
@@ -163,6 +174,16 @@ public class DefaultUploadValidationService implements
FileUploadValidationServi
}
}
+
+public void setAllowedMimeTypes(final String[] mimeTypes) {
+allowedMimeTypes.clear();
+for (String type : mimeTypes) {
+if (!Strings.isNullOrEmpty(type)) {
+allowedMimeTypes.add(type);
+}
+}
+}
+
@Override
public String[] getAllowedExtensions() {
return allowedExtensions.toArray(new String[allowedExtensions.size()]);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/75fd57f75392c29f20d00d115a2cbe231a36faa6...c24899e5633920da367b4fb2d59a52bd3e6b632e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9943] 11 commits: CMS-10230 prepare release hippo-cms-3.2.2
Jeroen Hoffman pushed to branch bugfix/CMS-9943 at cms-community / hippo-cms Commits: 94012db9 by Pankaj Gupta at 2016-06-28T17:48:15+02:00 CMS-10230 prepare release hippo-cms-3.2.2 - - - - - 3e302fed by Pankaj Gupta at 2016-06-28T17:48:31+02:00 CMS-10230 prepare for next development iteration - - - - - da071978 by Marijan Milicevic at 2016-06-29T20:51:27+02:00 CMS-10023 Clicking twice on internal link toolbar button throws exception and requires to logout to recover - disable button for 300ms to prevent double clicks. - - - - - bdb02ba2 by Joeri de Gooijer at 2016-06-30T14:25:19+02:00 CMS-10247 Switch from bower to npm for dependency management (cherry picked from commit 464c0f2b29df961201a189356b33f6f3bed98b5e, 69c4d9d0af1e965a4a034f51a1ce32d987cae91d) - - - - - 430e7fd2 by Saimir Muco at 2016-07-01T13:46:39+02:00 CMS-10023 set the variable declaration in one statement - - - - - 99c15e05 by Joeri de Gooijer at 2016-07-04T16:27:18+02:00 CMS-10245 switch from bower to npm for frontend dependency management (cherry picked from commit ba7669d0cd61ba7a022dea4fcf4f56245824b090) CMS-10245 rework after review - Updated date in license headers - Renamed grunt tasks from 'bower' to 'npm' (cherry picked from commit 2778d56499e636ae629054d6392c52abd3360841) CMS-10245 Used latest hippo theme version supporting npm - - - - - da859d72 by Arthur Bogaart at 2016-07-04T16:45:23+02:00 CMS-10247 Reintegrate bugfix/CMS-10247 - - - - - fa2aba4d by Arthur Bogaart at 2016-07-08T13:31:37+02:00 CMS-10023 Format code - - - - - f1b1b9ae by Arthur Bogaart at 2016-07-11T10:42:40+02:00 CMS-10023 Rename variable name - - - - - 75fd57f7 by Arthur Bogaart at 2016-07-11T10:54:08+02:00 CMS-10023 Reintegrate bugfix/CMS-10023 - - - - - 1fb572e8 by Jeroen Hoffman at 2016-07-12T12:25:00+02:00 CMS-9943 Merge release/3.2 changes into bugfix/CMS-9943 branch - - - - - 30 changed files: - − api/.bowerrc - api/.csslintrc - api/Gruntfile.js - api/README - − api/bower.json - api/build.config.js - api/npm-shrinkwrap.json - api/package.json - api/pom.xml - api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior.java - api/src/main/resources/org/hippoecm/frontend/extjs/hippotheme/ExtHippoTheme.scss - api/src/main/styling/styles/_ajax_loader.scss - api/src/main/styling/styles/_hippo_logo.scss - api/src/main/styling/styles/main.scss - automatic-export/frontend/pom.xml - automatic-export/pom.xml - automatic-export/repository/pom.xml - brokenlinks/common/pom.xml - brokenlinks/frontend/pom.xml - brokenlinks/pom.xml - brokenlinks/repository/pom.xml - brokenlinks/test/pom.xml - builtin/pom.xml - config/pom.xml - − console/frontend/.bowerrc - console/frontend/Gruntfile.js - console/frontend/README - − console/frontend/bower.json - console/frontend/build.config.js - console/frontend/npm-shrinkwrap.json The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/0bc63a8128d6022ceb2f2ca5a70d45dc26bdb71b...1fb572e8f8e5d4c610c80fbfb363cf471f49fb05 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10148] 2 commits: CMS-10148 pulled catching RepositoryException inside the new method
Jeroen Hoffman pushed to branch bugfix/CMS-10148 at cms-community / hippo-cms
Commits:
4fb62d11 by Jeroen Hoffman at 2016-07-12T10:35:40+02:00
CMS-10148 pulled catching RepositoryException inside the new method
- - - - -
ec40e131 by Jeroen Hoffman at 2016-07-12T11:51:34+02:00
CMS-10148 using nodeTypeManager.hasNodeType to avoid unnecessary exceptions
- - - - -
1 changed file:
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
Changes:
=
editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
=
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/plugins/field/AbstractFieldPlugin.java
@@ -340,15 +340,11 @@ public abstract class AbstractFieldPlugin exte
ITypeDescriptor subType = field.getTypeDescriptor();
AbstractProvider provider = newProvider(field, subType,
model);
-try {
-if (IEditor.Mode.EDIT == mode && provider.size() == 0
-&& (!field.isMultiple() ||
field.getValidators().contains("required"))
-&& !field.getValidators().contains("optional")
-&& isNotAbstractNodeType(subType.getType())) {
-provider.addNew();
-}
-} catch (RepositoryException e) {
-log.warn("error determining whether type
"+subType.getType()+ " is abstract", e);
+if (IEditor.Mode.EDIT == mode && provider.size() == 0
+&& (!field.isMultiple() ||
field.getValidators().contains("required"))
+&& !field.getValidators().contains("optional")
+&& isNotAbstractNodeType(subType.getType())) {
+provider.addNew();
}
return provider;
@@ -618,8 +614,15 @@ public abstract class AbstractFieldPlugin exte
return key;
}
-private boolean isNotAbstractNodeType(final String type) throws
RepositoryException {
-NodeTypeManager nodeTypeManager =
getSession().getJcrSession().getWorkspace().getNodeTypeManager();
-return !nodeTypeManager.getNodeType(type).isAbstract();
+private boolean isNotAbstractNodeType(final String type) {
+try {
+final NodeTypeManager nodeTypeManager =
getSession().getJcrSession().getWorkspace().getNodeTypeManager();
+if (nodeTypeManager.hasNodeType(type)) {
+return !nodeTypeManager.getNodeType(type).isAbstract();
+}
+} catch (RepositoryException e) {
+log.error("Exception determining whether type " + type + " is
abstract", e);
+}
+return true;
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/0a862f437dca346806f99c3b2651f0673b9e49a6...ec40e131d7f312670ba37b5847954cb6a2e585ab
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch feature/ARCHE-355
Jeroen Hoffman pushed new branch feature/ARCHE-355 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1504
Jeroen Hoffman pushed new branch bugfix/REPO-1504 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][release/3.2] 3 commits: REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-repository
Commits:
eddb985a by Marijan Milicevic at 2016-06-01T14:16:42+02:00
REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input
- - - - -
255851ee by Bert Leunis at 2016-06-03T15:07:11+02:00
REPO-1485 keep the input div inside the html body
- - - - -
a3106c2e by Jeroen Hoffman at 2016-06-21T16:29:55+02:00
REPO-1485 Reintegrate branch bugfix/REPO-1485 into release/3.2
- - - - -
1 changed file:
- servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
Changes:
=
servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
=
---
a/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
+++
b/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
@@ -44,7 +44,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
.logout { float: right; padding: 4px 10px 0 0;}
.logout a { color: white; font-size: small;}
-.query-input {width: 100%; height: 75px;}
+.query-input {width: 100%;box-sizing: border-box;}
.search-params {padding: 20px 0 10px 0;}
.search-params input { margin-bottom: 4px}
@@ -121,14 +121,14 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#--XPATH-->
XPath:
- ${request.getParameter('xpath')!}
+
Limit (XPath query):
<#--SQL-->
SQL:
- ${request.getParameter('sql')!}
+
Limit (SQL query):
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/0275bf48026c990523b8cb0963d6777092281ec7...a3106c2e2d9932806268605c177ae43fca51f19b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][bugfix/CMS-10098] CMS-10098: used SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH on two more occasi…
Jeroen Hoffman pushed to branch bugfix/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
dff6be5f by Jeroen Hoffman at 2016-06-06T14:50:23+02:00
CMS-10098: used SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH on two more
occasions and removed the now useless FullTextSearchParser#getMinimalLength
- - - - -
2 changed files:
- jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
-
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
Changes:
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
=
--- a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
+++ b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/Filter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -25,15 +25,17 @@ import javax.jcr.Session;
import org.hippoecm.repository.util.DateTools;
import org.onehippo.cms7.services.search.query.constraint.DateConstraint;
+import org.onehippo.cms7.services.search.service.SearchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Filter {
static final Logger log = LoggerFactory.getLogger(Filter.class);
+
private static final String[] DEFAULT_SKIPS = new String[]{"."};
-private int wildcardPostfixMinLength = 5;
+private int wildcardPostfixMinLength =
SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH;
private StringBuilder jcrExpressionBuilder;
@@ -93,7 +95,7 @@ public class Filter {
return;
}
} else {
-String parsedText =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, false,
wildcardPostfixMinLength);
+String parsedText =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, false);
if (fulltextWildcardPostfixed && fullTextSearch.length() >
wildcardPostfixMinLength) {
String parsedTextWildCardPostFixed =
FullTextSearchParser.fullTextParseCmsSimpleSearchMode(fullTextSearch, true,
wildcardPostfixMinLength);
=
jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
=
---
a/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
+++
b/jcr/src/main/java/org/onehippo/cms7/services/search/jcr/query/FullTextSearchParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2012-2016 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.
@@ -18,6 +18,7 @@ package org.onehippo.cms7.services.search.jcr.query;
import java.util.StringTokenizer;
import org.apache.commons.lang.StringUtils;
+import org.onehippo.cms7.services.search.service.SearchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,8 +36,6 @@ public final class FullTextSearchParser {
private final static String ignoredChars = DEFAULT_IGNORED_CHARS;
-private final static int minimalLength = 3;
-
private static final String WHITESPACE_PATTERN = "\\s+";
private FullTextSearchParser() {
@@ -64,8 +63,9 @@ public final class FullTextSearchParser {
public static String fullTextParseCmsSimpleSearchMode(String value, final
boolean wildcardPostfix) {
-return fullTextParseCmsSimpleSearchMode(value, wildcardPostfix,
getMinimalLength());
+return fullTextParseCmsSimpleSearchMode(value, wildcardPostfix,
SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH);
}
+
public static String fullTextParseCmsSimpleSearchMode(String value, final
boolean wildcardPostfix, final int minimalLength) {
value = foldToASCIIReplacer(value.trim());
@@ -115,7 +115,7 @@ public final class FullTextSearchParser {
if (wildcardPostfix && tb.length() < minimalLength &&
!isOperatorToken) {
-// for wildcard postfixing we demand the term to be at least
as long as #getMinimalLength()
+// for wildcard postfixing we demand the term to be at least
as long as minimal length
continue;
}
@@ -157,11 +157,6 @@ public final class FullTextSearchParser {
return whereClauseBuilder.toString();
}
-public static int getMinimalLength() {
-return minimalLength;
-}
-
-
/**
*
* Removes invalid chars, escapes some chars. If
allowSingleNonLeadingWildCard is true, there
View it
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections][demo/3.2] HIPPLUG-1291 bump 3.2 demo to 3.2.1-SNAPSHOT and use plugin 3.2.1-SNAPSHOT
Jeroen Hoffman pushed to branch demo/3.2 at cms-community / hippo-plugin-selections Commits: 994d0e76 by Jeroen Hoffman at 2016-05-20T11:14:31+02:00 HIPPLUG-1291 bump 3.2 demo to 3.2.1-SNAPSHOT and use plugin 3.2.1-SNAPSHOT - - - - - 4 changed files: - cms/pom.xml - content/pom.xml - pom.xml - site/pom.xml Changes: = cms/pom.xml = --- a/cms/pom.xml +++ b/cms/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] CMS-16: pulling in htmldiff 1.01.04 on behalf of NPE fix HTMLDIFF_6
Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms Commits: a1491667 by Jeroen Hoffman at 2016-05-20T10:14:21+02:00 CMS-16: pulling in htmldiff 1.01.04 on behalf of NPE fix HTMLDIFF_6 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.2 1.01.12 -1.01.03 +1.01.04 1.01.05 4.5.5-h2-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/a149166752b2c230c17079d4ecd60f5cccfeb799 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][release/10.2] CMS-16: update 10.2 release pom to pull in selection bugfixes HIPPLUG_1287 and HIPPLUG_1291
Jeroen Hoffman pushed to branch release/10.2 at cms-community / hippo-cms-release Commits: c97009bf by Jeroen Hoffman at 2016-05-19T16:54:27+02:00 CMS-16: update 10.2 release pom to pull in selection bugfixes HIPPLUG_1287 and HIPPLUG_1291 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 3.2.0 2.2.0 2.2.0 -3.2.0 + 3.2.1-SNAPSHOT 2.2.0 2.2.0 2.2.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/c97009bfa4ddfa6c78bbac0a2b8cb6223f94ab3d ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1478
Jeroen Hoffman pushed new branch bugfix/REPO-1478 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10088
Jeroen Hoffman pushed new branch bugfix/CMS-10088 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-9891
Jeroen Hoffman pushed new branch feature/CMS-9891 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1263] HIPPLUG-1263: reverted the re-addition of serialVersionUID fields
Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1263 at cms-community /
hippo-plugin-taxonomy
Commits:
eb476886 by Jeroen Hoffman at 2016-04-22T21:37:12+02:00
HIPPLUG-1263: reverted the re-addition of serialVersionUID fields
- - - - -
2 changed files:
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
-
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
Changes:
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/TaxonomyEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 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.
@@ -99,8 +99,6 @@ import org.slf4j.LoggerFactory;
/**
* TaxonomyEditorPlugin used when editing taxonomy documents.
- *
- * @version $Id$
*/
public class TaxonomyEditorPlugin extends RenderPlugin {
@@ -142,8 +140,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
synonymModel = new IModel() {
-private static final long serialVersionUID = 1L;
-
public String[] getObject() {
EditableCategoryInfo info =
taxonomy.getCategoryByKey(key).getInfo(currentLanguageSelection.getLanguageCode());
return info.getSynonyms();
@@ -224,8 +220,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
DropDownChoice languageSelectionChoice =
new DropDownChoice<>("language", new PropertyModel<>(this,
"currentLanguageSelection"), availableLanguageSelections, choiceRenderer);
languageSelectionChoice.add(new OnChangeAjaxBehavior() {
-private static final long serialVersionUID = 1L;
-
@Override
protected void onUpdate(AjaxRequestTarget target) {
redraw();
@@ -467,8 +461,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
final int j = i;
list.add(new IModel() {
-private static final long serialVersionUID = 1L;
-
public String getObject() {
String[] synonyms = synonymModel.getObject();
return synonyms[j];
@@ -607,7 +599,6 @@ public class TaxonomyEditorPlugin extends
RenderPlugin {
protected final class LanguageSelection implements Serializable {
-private static final long serialVersionUID = 1L;
private String languageCode;
private String displayName;
=
addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
=
---
a/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
+++
b/addon/frontend/src/main/java/org/onehippo/taxonomy/plugin/model/JcrTaxonomy.java
@@ -41,8 +41,7 @@ import org.slf4j.LoggerFactory;
public class JcrTaxonomy extends TaxonomyObject implements EditableTaxonomy {
-private static final Logger log =
LoggerFactory.getLogger(JcrTaxonomy.class);
-private static final long serialVersionUID = 1L;
+static final Logger log = LoggerFactory.getLogger(JcrTaxonomy.class);
private transient Map categories;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/eb4768865573504d255f0b9b3dfabc0ae71f5b3a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-9894
Jeroen Hoffman deleted branch bugfix/CMS-9894 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9894] CMS-9894: processed reviewed feedback: use "embedded" workflow, better exception…
Jeroen Hoffman pushed to branch bugfix/CMS-9894 at cms-community / hippo-cms
Commits:
bb7410c1 by Jeroen Hoffman at 2016-04-22T09:42:11+02:00
CMS-9894: processed reviewed feedback: use "embedded" workflow,
better exception handling and forbid workflow action if something's wrong
- - - - -
1 changed file:
-
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DocumentWorkflowPlugin.java
Changes:
=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DocumentWorkflowPlugin.java
=
---
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DocumentWorkflowPlugin.java
+++
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/DocumentWorkflowPlugin.java
@@ -64,7 +64,7 @@ import org.onehippo.repository.util.JcrConstants;
public class DocumentWorkflowPlugin extends AbstractDocumentWorkflowPlugin {
-private static final String DEFAULT_FOLDERWORKFLOW_CATEGORY = "threepane";
+private static final String DEFAULT_FOLDERWORKFLOW_CATEGORY = "embedded";
private StdWorkflow deleteAction;
private StdWorkflow requestDeleteAction;
@@ -496,12 +496,13 @@ public class DocumentWorkflowPlugin extends
AbstractDocumentWorkflowPlugin {
else {
log.error("(Supposed) document handle {} does not have
same-name subnode", handle.getPath());
}
-} catch (RepositoryException | RemoteException ignore) {
+} catch (RepositoryException | RemoteException e) {
+log.error(e.getClass().getName() + " during check for workflow
allowed in folder: " + e.getMessage());
} catch (WorkflowException we) {
-log.info("Exception during workflow execution", we);
+log.error(we.getClass().getName() + " during workflow execution",
we);
}
-// don't want to forbid action if something goes wrong
-return true;
+// forbid workflow action if something's wrong
+return false;
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/bb7410c1311856b93eb1467f0d81b0d5f78ace33
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
