[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][master] 2 commits: HIPPLUG-1502 Move content categorization from demo to plugin
Tobias Jeger pushed to branch master at cms-community / hippo-plugin-taxonomy Commits: 2c7e90ab by Tobias Jeger at 2017-10-30T14:45:43+01:00 HIPPLUG-1502 Move content categorization from demo to plugin - - - - - 6fb6346d by Tobias Jeger at 2017-10-30T14:55:30+01:00 HIPPLUG-1502 Fix auto-export setup in demo project - - - - - 3 changed files: - addon/repository/src/main/resources/hcm-config/main.yaml - demo/plugin/src/main/resources/hcm-config/main.yaml - demo/repository-data/src/main/resources/hcm-config/main.yaml Changes: = addon/repository/src/main/resources/hcm-config/main.yaml = --- a/addon/repository/src/main/resources/hcm-config/main.yaml +++ b/addon/repository/src/main/resources/hcm-config/main.yaml @@ -3,3 +3,6 @@ definitions: hippotaxonomy: uri: http://www.hippoecm.org/hippotaxonomy/nt/1.2 cnd: hippotaxonomy.cnd + config: +/content/taxonomies: + .meta:category: content = demo/plugin/src/main/resources/hcm-config/main.yaml = --- a/demo/plugin/src/main/resources/hcm-config/main.yaml +++ b/demo/plugin/src/main/resources/hcm-config/main.yaml @@ -2,3 +2,8 @@ definitions: config: /hippo:namespaces/hippotaxonomy/taxonomy/editor:templates/_default_/root: plugin.class: org.onehippo.taxonomy.demo.plugin.AdditionalFieldCustomTaxonomyEditorPlugin +/hippo:configuration/hippo:modules/autoexport/hippo:moduleconfig: + autoexport:modules: +operation: add +type: string +value: ['plugin'] \ No newline at end of file = demo/repository-data/src/main/resources/hcm-config/main.yaml = --- a/demo/repository-data/src/main/resources/hcm-config/main.yaml +++ b/demo/repository-data/src/main/resources/hcm-config/main.yaml @@ -37,5 +37,3 @@ definitions: operation: add type: string value: [sitewriters] -/content/taxonomies: - .meta:category: content View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/b1773ef1d784a42f14a9d07ab3300dba5e5f27f1...6fb6346d2996a01329e896049a1dd882b7a2d44b --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/compare/b1773ef1d784a42f14a9d07ab3300dba5e5f27f1...6fb6346d2996a01329e896049a1dd882b7a2d44b You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/projectdocs] REPO-1876 Fix javadoc
Ard Schrijvers pushed to branch feature/projectdocs at cms-community /
hippo-repository
Commits:
086a162b by Ard Schrijvers at 2017-10-30T14:20:16+01:00
REPO-1876 Fix javadoc
- - - - -
1 changed file:
-
jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
Changes:
=
jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
=
---
a/jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
+++
b/jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
@@ -37,7 +37,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
/**
* Registers a JsonResource with as endpoint the value of the {@link
#ENDPOINT_ADDRESS} property.
*
- * Custom implementations should implement {@link
#getRestResource(ManagedUserSessionInvoker)} to provide their own
+ * Custom implementations should implement {@link
#getRestResource(SessionRequestContextProvider)} to provide their own
* Resource.
*/
public abstract class JsonResourceServiceModule extends
AbstractReconfigurableDaemonModule {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/086a162b4f51e057cb1d14c8b45ead89ac195020
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/086a162b4f51e057cb1d14c8b45ead89ac195020
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/projectdocs] CHANNELMGR-1556 Account for rename from SessionDataProvider to SessionRequestContextProvider
Ard Schrijvers pushed to branch feature/projectdocs at cms-community /
hippo-addon-channel-manager
Commits:
3e1379a0 by Ard Schrijvers at 2017-10-30T14:05:09+01:00
CHANNELMGR-1556 Account for rename from SessionDataProvider to
SessionRequestContextProvider
- - - - -
3 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ChannelContentServiceModule.java
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/ContentResourceTest.java
Changes:
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ChannelContentServiceModule.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ChannelContentServiceModule.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ChannelContentServiceModule.java
@@ -28,6 +28,7 @@ import
org.onehippo.cms.channelmanager.content.document.util.HintsInspector;
import
org.onehippo.cms.channelmanager.content.documenttype.DocumentTypesService;
import org.onehippo.repository.jaxrs.api.JsonResourceServiceModule;
import org.onehippo.repository.jaxrs.api.ManagedUserSessionInvoker;
+import org.onehippo.repository.jaxrs.api.SessionRequestContextProvider;
import org.onehippo.repository.jaxrs.event.JcrEventListener;
import static org.hippoecm.repository.util.JcrUtils.ALL_EVENTS;
@@ -69,8 +70,8 @@ public class ChannelContentServiceModule extends
JsonResourceServiceModule {
}
@Override
-protected Object getRestResource(final ManagedUserSessionInvoker
managedUserSessionInvoker) {
-return new ContentResource(managedUserSessionInvoker,
documentsService);
+protected Object getRestResource(final SessionRequestContextProvider
sessionRequestContextProvider) {
+return new ContentResource(sessionRequestContextProvider,
documentsService);
}
private abstract static class HippoNamespacesEventListener extends
JcrEventListener {
=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
=
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/ContentResource.java
@@ -44,7 +44,7 @@ import
org.onehippo.cms.channelmanager.content.document.util.FieldPath;
import
org.onehippo.cms.channelmanager.content.documenttype.DocumentTypesService;
import org.onehippo.cms.channelmanager.content.error.ErrorWithPayloadException;
import org.onehippo.cms7.services.cmscontext.CmsSessionContext;
-import org.onehippo.repository.jaxrs.api.SessionDataProvider;
+import org.onehippo.repository.jaxrs.api.SessionRequestContextProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,17 +60,17 @@ public class ContentResource {
NO_CACHE.setNoCache(true);
}
-private final SessionDataProvider sessionDataProvider;
+private final SessionRequestContextProvider sessionRequestContextProvider;
private final DocumentsService documentService;
private final ContextPayloadProvider contextPayloadProvider;
-public ContentResource(final SessionDataProvider userSessionProvider,
final DocumentsService documentsService) {
-this(userSessionProvider, documentsService, new
ContextPayloadProvider());
+public ContentResource(final SessionRequestContextProvider
sessionRequestContextProvider, final DocumentsService documentsService) {
+this(sessionRequestContextProvider, documentsService, new
ContextPayloadProvider());
}
-ContentResource(final SessionDataProvider userSessionProvider, final
DocumentsService documentsService,
+ContentResource(final SessionRequestContextProvider
sessionRequestContextProvider, final DocumentsService documentsService,
final ContextPayloadProvider contextPayloadProvider) {
-this.sessionDataProvider = userSessionProvider;
+this.sessionRequestContextProvider = sessionRequestContextProvider;
this.documentService = documentsService;
this.contextPayloadProvider = contextPayloadProvider;
}
@@ -147,8 +147,8 @@ public class ContentResource {
final Status successStatus,
final CacheControl cacheControl,
final EndPointTask task) {
-final Session session =
sessionDataProvider.getJcrSession(servletRequest);
-final Locale locale = sessionDataProvider.getLocale(servletRequest);
+final Session session =
sessionRequestContextProvider.getJcrSession(servletRequest);
+final Locale locale =
sessionRequestContextProvider.getLocale(servletRequest);
try {
final
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1555] CHANNELMGR-1555 Remove shrinkwrap
Ariel Weinberger pushed to branch feature/CHANNELMGR-1555 at cms-community / hippo-addon-channel-manager Commits: fd0cfd6b by Ariel Weinberger at 2017-10-30T13:53:00+01:00 CHANNELMGR-1555 Remove shrinkwrap - - - - - 1 changed file: - − frontend-ng/npm-shrinkwrap.json Changes: = frontend-ng/npm-shrinkwrap.json deleted = The diff for this file was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fd0cfd6b0a12f8d5ef9dcf0f981f2ce3c822839c --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fd0cfd6b0a12f8d5ef9dcf0f981f2ce3c822839c You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1555
Arthur Bogaart pushed new branch feature/CHANNELMGR-1555 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1555 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/create-content] CHANNELMGR-1554 Import *.d.ts explicitly
Arthur Bogaart pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
f0ba0eac by Arthur Bogaart at 2017-10-30T13:05:02+01:00
CHANNELMGR-1554 Import *.d.ts explicitly
- - - - -
5 changed files:
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
Changes:
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.spec.ts
@@ -21,7 +21,7 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import 'rxjs/add/observable/throw';
-import { TemplateQuery, DocumentTypeInfo } from './create-content';
+import { TemplateQuery, DocumentTypeInfo } from './create-content.d';
import { CreateContentComponent } from './create-content.component';
import { CreateContentService } from './create-content.service';
import FeedbackService from '../../../../services/feedback.service';
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.component.ts
@@ -19,7 +19,7 @@ import './create-content.scss';
import { NgForm } from '@angular/forms';
import { CreateContentService } from './create-content.service';
-import { CreateContentOptions, DocumentTypeInfo } from './create-content';
+import { CreateContentOptions, DocumentTypeInfo } from './create-content.d';
import FeedbackService from '../../../../services/feedback.service';
@Component({
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.d.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
- export interface TemplateQuery {
+export interface TemplateQuery {
documentTypes: Array;
}
@@ -24,8 +24,8 @@ export interface DocumentTypeInfo {
}
export interface CreateContentOptions {
- componentParameter?: string
- defaultPath?: string,
- rootPath?: string,
- templateQuery?: string
-}
\ No newline at end of file
+ componentParameter?: string;
+ defaultPath?: string;
+ rootPath?: string;
+ templateQuery?: string;
+}
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.spec.ts
@@ -17,7 +17,7 @@
import { TestBed, inject } from '@angular/core/testing';
import ContentService from '../../../../services/content.service';
import { CreateContentService } from './create-content.service';
-import { TemplateQuery, DocumentTypeInfo } from './create-content';
+import { TemplateQuery, DocumentTypeInfo } from './create-content.d';
class MockContentService {
_send(): Promise {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/create-content.service.ts
@@ -2,7 +2,7 @@ import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/fromPromise';
import { Injectable } from '@angular/core';
-import { TemplateQuery } from './create-content';
+import { TemplateQuery } from './create-content.d';
import ContentService from '../../../../services/content.service';
@Injectable()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/f0ba0eac5c1b7b361e6d45ad0e9ba4f88a71d3f3
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch feature/CC-HSTTWO-4152
Michael Metternich deleted branch feature/CC-HSTTWO-4152 at cms-community / hippo-site-toolkit --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
