[HippoCMS-scm] [onehippo/urlrewritefilter] 629644: Minor doc change
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: 629644e99431c06e38b00ba70e1221c34612e033 https://github.com/onehippo/urlrewritefilter/commit/629644e99431c06e38b00ba70e1221c34612e033 Author: Jeroen Hoffman Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M README.md Log Message: --- Minor doc change ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] d9134a: Document the fork
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: d9134a417ca3871a688fd0b08c4a2f5e55fbf8a0 https://github.com/onehippo/urlrewritefilter/commit/d9134a417ca3871a688fd0b08c4a2f5e55fbf8a0 Author: Jeroen Hoffman Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: A FORK_INFO.md M README.md Log Message: --- Document the fork ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/wpm] 2 commits: REPO-1634: Remove externalId
Michiel Rop pushed to branch feature/wpm at cms-community / hippo-repository Commits: 24361aba by Michiel Rop at 2017-03-16T21:53:13+01:00 REPO-1634: Remove externalId - - - - - 59dd4fe5 by Michiel Rop at 2017-03-16T21:56:17+01:00 REPO-1634: Remove schedulepublishdepublish from request types - - - - - 2 changed files: - engine/src/main/resources/hippo.cnd - workflow/src/main/resources/hippostdpubwf.cnd Changes: = engine/src/main/resources/hippo.cnd = --- a/engine/src/main/resources/hippo.cnd +++ b/engine/src/main/resources/hippo.cnd @@ -47,7 +47,6 @@ - hippo:discriminator (string) multiple // deprecated + * (hippo:document) = hippo:document multiple version + hippo:request (hippo:request) multiple ignore -- hippo:externalid (string) [hippo:hardhandle] > mix:versionable mixin = workflow/src/main/resources/hippostdpubwf.cnd = --- a/workflow/src/main/resources/hippostdpubwf.cnd +++ b/workflow/src/main/resources/hippostdpubwf.cnd @@ -30,7 +30,7 @@ - hippostdpubwf:publicationDate (Date) [hippostdpubwf:request] > hippo:request -- hippostdpubwf:type (String) < 'rejected', 'publish', 'depublish', 'scheduledpublish', 'scheduleddepublish', 'delete', 'collection', 'scheduledpublishdepublish' +- hippostdpubwf:type (String) < 'rejected', 'publish', 'depublish', 'scheduledpublish', 'scheduleddepublish', 'delete', 'collection' - hippostdpubwf:reason (String) - hippostdpubwf:reqdate (Date) - hippostdpubwf:username (String) View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/237a371487cb9e7d4efd813b8cf7c6340a23b5c9...59dd4fe5e59b756b7321a5b07086f94d6192684d ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] c35fec: fix version test
Branch: refs/heads/urlrewritefilter-4.0.x Home: https://github.com/onehippo/urlrewritefilter Commit: c35fec22f5e88101becb5782bbbd6fc1d5b31247 https://github.com/onehippo/urlrewritefilter/commit/c35fec22f5e88101becb5782bbbd6fc1d5b31247 Author: Paul Tuckey Date: 2017-02-03 (Fri, 03 Feb 2017) Changed paths: M src/test/java/org/tuckey/web/filters/urlrewrite/UrlRewriteFilterTest.java Log Message: --- fix version test Commit: 2331693308dc052cf487a2e68081327448fc6759 https://github.com/onehippo/urlrewritefilter/commit/2331693308dc052cf487a2e68081327448fc6759 Author: Paul Tuckey Date: 2017-02-03 (Fri, 03 Feb 2017) Changed paths: M README.md M pom.xml M src/doc/manual/4.0/index.html M src/doc/maven-request.txt M src/site/site.xml Log Message: --- Remove refs to googlecode.com Commit: 0b176e2dbeb0dbb363d513fcbdc3d73731ed34c1 https://github.com/onehippo/urlrewritefilter/commit/0b176e2dbeb0dbb363d513fcbdc3d73731ed34c1 Author: Jeroen Hoffman Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M README.md M pom.xml M src/doc/manual/4.0/index.html M src/doc/maven-request.txt M src/site/site.xml Log Message: --- Merge branch 'master' into urlrewritefilter-4.0.x # Conflicts: # pom.xml # src/test/java/org/tuckey/web/filters/urlrewrite/UrlRewriteFilterTest.java Compare: https://github.com/onehippo/urlrewritefilter/compare/10291d8ac179...0b176e2dbeb0___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [onehippo/urlrewritefilter] c35fec: fix version test
Branch: refs/heads/master Home: https://github.com/onehippo/urlrewritefilter Commit: c35fec22f5e88101becb5782bbbd6fc1d5b31247 https://github.com/onehippo/urlrewritefilter/commit/c35fec22f5e88101becb5782bbbd6fc1d5b31247 Author: Paul Tuckey Date: 2017-02-03 (Fri, 03 Feb 2017) Changed paths: M src/test/java/org/tuckey/web/filters/urlrewrite/UrlRewriteFilterTest.java Log Message: --- fix version test Commit: 2331693308dc052cf487a2e68081327448fc6759 https://github.com/onehippo/urlrewritefilter/commit/2331693308dc052cf487a2e68081327448fc6759 Author: Paul Tuckey Date: 2017-02-03 (Fri, 03 Feb 2017) Changed paths: M README.md M pom.xml M src/doc/manual/4.0/index.html M src/doc/maven-request.txt M src/site/site.xml Log Message: --- Remove refs to googlecode.com Compare: https://github.com/onehippo/urlrewritefilter/compare/b805edf3efb8...2331693308dc___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][master] REPO-1 use same type as defined in cnd
Oscar Scholten pushed to branch master at cms-community / hippo-repository Commits: e2420be0 by Oscar Scholten at 2017-03-16T15:28:32+01:00 REPO-1 use same type as defined in cnd - - - - - 1 changed file: - config/src/main/resources/hippoecm-extension.xml Changes: = config/src/main/resources/hippoecm-extension.xml = --- a/config/src/main/resources/hippoecm-extension.xml +++ b/config/src/main/resources/hippoecm-extension.xml @@ -186,7 +186,7 @@ /hippo:configuration/hippo:groups/everybody/hipposys:system - + true View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/e2420be0978ad0671b20e8bf56a8213439992ff5 ___ 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-16 use same type as also defined in cnd
Oscar Scholten pushed to branch master at cms-community / hippo-cms Commits: 57f29388 by Oscar Scholten at 2017-03-16T15:18:29+01:00 CMS-16 use same type as also defined in cnd - - - - - 1 changed file: - config/src/main/resources/hippoecm-extension.xml Changes: = config/src/main/resources/hippoecm-extension.xml = --- a/config/src/main/resources/hippoecm-extension.xml +++ b/config/src/main/resources/hippoecm-extension.xml @@ -812,7 +812,7 @@ /hippo:configuration/hippo:modules/diagnostics/hipposys:cmsonly - + true View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/57f29388ead2118ce8e83b95e4d69acbe295119b ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/wpm] 3 commits: REPO-1634: remove methods for setting and getting processInstanceId
Michiel Rop pushed to branch feature/wpm at cms-community / hippo-repository
Commits:
c4bfaf59 by Michiel Rop at 2017-03-16T12:31:55+01:00
REPO-1634: remove methods for setting and getting processInstanceId
- - - - -
5a34e454 by Michiel Rop at 2017-03-16T12:32:04+01:00
REPO-1634: change access modifier to public to expose methods
- - - - -
237a3714 by Michiel Rop at 2017-03-16T12:32:08+01:00
REPO-1634: update copyright
- - - - -
1 changed file:
-
workflow/src/main/java/org/onehippo/repository/documentworkflow/DocumentHandle.java
Changes:
=
workflow/src/main/java/org/onehippo/repository/documentworkflow/DocumentHandle.java
=
---
a/workflow/src/main/java/org/onehippo/repository/documentworkflow/DocumentHandle.java
+++
b/workflow/src/main/java/org/onehippo/repository/documentworkflow/DocumentHandle.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2013-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,15 +49,15 @@ public class DocumentHandle implements SCXMLWorkflowData {
this.handle = handle;
}
-protected DocumentVariant createDocumentVariant(Node node) throws
RepositoryException {
+public DocumentVariant createDocumentVariant(Node node) throws
RepositoryException {
return new DocumentVariant(node);
}
-protected Request createRequest(Node node) throws RepositoryException {
+public Request createRequest(Node node) throws RepositoryException {
return Request.createRequest(node);
}
-protected boolean isInitialized() {
+public boolean isInitialized() {
return initialized;
}
@@ -134,12 +134,4 @@ public class DocumentHandle implements SCXMLWorkflowData {
}
return count > 1;
}
-
-public void setProcessInstanceId(final String processInstanceId) throws
RepositoryException {
-handle.setProperty("hippo:externalid", processInstanceId);
-}
-
-public String getProcessInstanceId() throws RepositoryException {
-return JcrUtils.getStringProperty(handle, "hippo:externalid", null);
-}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/compare/f0954e9626c069100e6eda8fb2267f914aa3fbcf...237a371487cb9e7d4efd813b8cf7c6340a23b5c9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/wpm] Revert "CMS-10644: replace request date by publication / depublication date"
Michiel Eggermont pushed to branch feature/wpm at cms-community / hippo-cms
Commits:
1eb893aa by Michiel Eggermont at 2017-03-15T14:15:45+01:00
Revert "CMS-10644: replace request date by publication / depublication
date"
This reverts commit f0b6a9eaa4bf8a62b48b67c2fbfaf913e8afc709.
UI needs to display the request date, i.e. the date on which the request was
made.
- - - - -
1 changed file:
-
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/model/RequestModel.java
Changes:
=
workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/model/RequestModel.java
=
---
a/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/model/RequestModel.java
+++
b/workflow/frontend/src/main/java/org/hippoecm/frontend/plugins/reviewedactions/model/RequestModel.java
@@ -53,8 +53,8 @@ public class RequestModel extends
LoadableDetachableModel {
Date schedule = null;
if
(node.isNodeType(HippoStdPubWfNodeType.NT_HIPPOSTDPUBWF_REQUEST)) {
state = "request-"+
node.getProperty(HippoStdPubWfNodeType.HIPPOSTDPUBWF_TYPE).getString();
-if
(node.hasProperty(HippoStdPubWfNodeType.HIPPOSTDPUBWF_PUBLICATION_DATE)) {
-schedule = new
Date(node.getProperty(HippoStdPubWfNodeType.HIPPOSTDPUBWF_PUBLICATION_DATE).getLong());
+if
(node.hasProperty(HippoStdPubWfNodeType.HIPPOSTDPUBWF_REQDATE)) {
+schedule = new
Date(node.getProperty(HippoStdPubWfNodeType.HIPPOSTDPUBWF_REQDATE).getLong());
}
}
else if (node.isNodeType("hipposched:workflowjob")) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/1eb893aae0112a869de1bf7f78242c35dd0d5395
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/wpm] REPO-1634 update cnd's for wpm use
Michiel Eggermont pushed to branch feature/wpm at cms-community / hippo-repository Commits: f0954e96 by Michiel Eggermont at 2017-03-16T09:45:51+01:00 REPO-1634 update cnd's for wpm use - Add externalid property to the document handle for keeping track of an external (BPM) process. - Add scheduledpublishdepublish as a request type to support request of combined scheduled publication/depublication. - - - - - 2 changed files: - engine/src/main/resources/hippo.cnd - workflow/src/main/resources/hippostdpubwf.cnd Changes: = engine/src/main/resources/hippo.cnd = --- a/engine/src/main/resources/hippo.cnd +++ b/engine/src/main/resources/hippo.cnd @@ -47,6 +47,7 @@ - hippo:discriminator (string) multiple // deprecated + * (hippo:document) = hippo:document multiple version + hippo:request (hippo:request) multiple ignore +- hippo:externalid (string) [hippo:hardhandle] > mix:versionable mixin = workflow/src/main/resources/hippostdpubwf.cnd = --- a/workflow/src/main/resources/hippostdpubwf.cnd +++ b/workflow/src/main/resources/hippostdpubwf.cnd @@ -30,7 +30,7 @@ - hippostdpubwf:publicationDate (Date) [hippostdpubwf:request] > hippo:request -- hippostdpubwf:type (String) < 'rejected', 'publish', 'depublish', 'scheduledpublish', 'scheduleddepublish', 'delete', 'collection' +- hippostdpubwf:type (String) < 'rejected', 'publish', 'depublish', 'scheduledpublish', 'scheduleddepublish', 'delete', 'collection', 'scheduledpublishdepublish' - hippostdpubwf:reason (String) - hippostdpubwf:reqdate (Date) - hippostdpubwf:username (String) View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/f0954e9626c069100e6eda8fb2267f914aa3fbcf ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-robotstxt][master] HIPPLUG-1145 explicitly set multiplicity as also defined in cnd
Ate Douma pushed to branch master at cms-community / hippo-plugin-robotstxt Commits: 73ef253d by Ate Douma at 2017-03-16T08:47:41+01:00 HIPPLUG-1145 explicitly set multiplicity as also defined in cnd - - - - - 1 changed file: - repository/src/main/resources/namespace.xml Changes: = repository/src/main/resources/namespace.xml = --- a/repository/src/main/resources/namespace.xml +++ b/repository/src/main/resources/namespace.xml @@ -97,7 +97,7 @@ * - + @@ -349,7 +349,7 @@ * - + View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-robotstxt/commit/73ef253d596bf72f9485a12b883e3f727ba72c73 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
