[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.14] JCR-3929: ConsistencyChecker now deals with empty repositories (ported to 2.14)
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits:
99f877d4 by Julian Reschke at 2017-10-25T18:38:16+00:00
JCR-3929: ConsistencyChecker now deals with empty repositories (ported to 2.14)
(thanks to pacuk.an...@gmail.com for investigating)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1813337
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
2 changed files:
-
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
-
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ConsistencyCheckerImplTest.java
Changes:
=
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
=
---
a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
+++
b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/ConsistencyCheckerImpl.java
@@ -243,7 +243,9 @@ public class ConsistencyCheckerImpl {
allInfos.putAll(batch);
}
-if (pm.exists(lastId)) {
+if (lastId == null) {
+log.info("No nodes exists, skipping");
+} else if (pm.exists(lastId)) {
for (Map.Entry entry :
allInfos.entrySet()) {
checkBundleConsistency(entry.getKey(),
entry.getValue(), allInfos);
}
=
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ConsistencyCheckerImplTest.java
=
---
a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ConsistencyCheckerImplTest.java
+++
b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ConsistencyCheckerImplTest.java
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.core.data;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -221,6 +222,13 @@ public class ConsistencyCheckerImplTest extends TestCase {
assertTrue("Expected orphan to be modified",
listener.changes.isModified(orphanedId));
}
+public void testEmptyRepo() throws RepositoryException {
+List t = Collections.emptyList();
+MockPersistenceManager pm = new MockPersistenceManager(t);
+ConsistencyCheckerImpl checker = new ConsistencyCheckerImpl(pm, null,
null, null);
+checker.check(null, false);
+}
+
public void testDoubleCheckOrphanedNode() throws RepositoryException {
NodePropBundle orphaned = new NodePropBundle(new NodeId(0, 1));
orphaned.setParentId(new NodeId(1, 0));
@@ -453,6 +461,11 @@ public class ConsistencyCheckerImplTest extends TestCase {
}
@Override
+public boolean exists(final NodeId id) {
+return bundles.containsKey(id);
+}
+
+@Override
protected void evictBundle(final NodeId id) {
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/99f877d484667d0f44358a4cc846d7e72e346403
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/99f877d484667d0f44358a4cc846d7e72e346403
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.14] JCR-4200: javax.transaction.UserTransaction hidden by surefire plugin in with…
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits:
c4a6cfb8 by Julian Reschke at 2017-10-25T17:21:25+00:00
JCR-4200: javax.transaction.UserTransaction hidden by surefire plugin in with
Java 9 (ported to 2.14)
Override surefires default --add-module directive for Java 9
(to be revisited in future versions of Java and/or the surefire plugin)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1813323
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-parent/pom.xml
Changes:
=
jackrabbit-parent/pom.xml
=
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -44,7 +44,9 @@
-Xmx256m
-${test.opts.coverage} ${test.opts.memory}
-enableassertions
+
+-XX:+IgnoreUnrecognizedVMOptions
--add-modules=java.xml.bind
+${test.opts.modules} ${test.opts.coverage} ${test.opts.memory}
-enableassertions
8.2.0.v20160908
1.7
${project.build.sourceEncoding}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/c4a6cfb884cb5ec2862f3a866f1d3f132d4e16d3
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/c4a6cfb884cb5ec2862f3a866f1d3f132d4e16d3
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.14] JCR-4196: update surefire and failsafe plugins for use with java 9 (ported to 2.14)
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit Commits: 9cb89da4 by Julian Reschke at 2017-10-25T14:58:18+00:00 JCR-4196: update surefire and failsafe plugins for use with java 9 (ported to 2.14) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1813310 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 1 changed file: - jackrabbit-parent/pom.xml Changes: = jackrabbit-parent/pom.xml = --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -290,11 +290,11 @@ maven-surefire-plugin - 2.20 + 2.20.1 maven-failsafe-plugin - 2.20 + 2.20.1 maven-war-plugin View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9cb89da46dd22c82a28495354654ef5455c31db4 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9cb89da46dd22c82a28495354654ef5455c31db4 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/CC-HSTTWO-4152] HSTTWO-4152 Allow componentParameter without document or templateQuery
Mathijs den Burger pushed to branch feature/CC-HSTTWO-4152 at cms-community /
hippo-site-toolkit
Commits:
303884f8 by Mathijs den Burger at 2017-10-25T16:45:55+02:00
HSTTWO-4152 Allow componentParameter without document or templateQuery
Use case: a user is only allowed to pick existing documents for a
component parameter.
- - - - -
2 changed files:
- client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
- client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
Changes:
=
client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
=
--- a/client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
+++ b/client/src/main/java/org/hippoecm/hst/tag/HstManageContentTag.java
@@ -80,13 +80,8 @@ public class HstManageContentTag extends TagSupport {
return EVAL_PAGE;
}
-if (templateQuery == null && document == null) {
-if (componentParameter == null) {
-log.debug("Skipping manage content tag because neither
'templateQuery', 'document' or 'componentParameter' attribute specified.");
-} else {
-log.warn("Ignoring 'manageContent' tag with
'componentParameter' attribute set to '"
-+ componentParameter + "': 'document' and/or
'templateQuery' attribute required");
-}
+if (templateQuery == null && document == null &&
componentParameter == null) {
+log.debug("Skipping manage content tag because neither
'templateQuery', 'document' or 'componentParameter' attribute specified.");
return EVAL_PAGE;
}
=
client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
=
--- a/client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
+++ b/client/src/test/java/org/hippoecm/hst/tag/HstManageContentTagTest.java
@@ -278,14 +278,16 @@ public class HstManageContentTagTest {
@Test
public void componentParameterWithoutDocumentOrTemplateQuery() throws
Exception {
-try (Log4jInterceptor listener =
Log4jInterceptor.onWarn().trap(HstManageContentTag.class).build()) {
-tag.setComponentParameter("test");
+tag.setComponentParameter("test");
-tag.doEndTag();
+tag.doEndTag();
-assertLogged(listener, "Ignoring 'manageContent' tag with
'componentParameter' attribute set to 'test': 'document' and/or 'templateQuery'
attribute required");
-assertEquals("", response.getContentAsString());
-}
+assertEquals("",
+response.getContentAsString());
}
@Test
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/303884f85c71be3617946c5aaa7eecfc557f23a2
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/303884f85c71be3617946c5aaa7eecfc557f23a2
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.14] JCR-4185: spi2dav URIResolverImpl should check status code before attempting to…
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits:
39ad7e38 by Julian Reschke at 2017-10-25T14:04:01+00:00
JCR-4185: spi2dav URIResolverImpl should check status code before attempting to
parse multistatus (ported to 2.14)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1813294
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
-
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Changes:
=
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
=
---
a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
+++
b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
@@ -283,12 +283,15 @@ class URIResolverImpl implements URIResolver {
request = new HttpPropfind(uri, nameSet, DavConstants.DEPTH_0);
HttpResponse response = service.executeRequest(sessionInfo,
request);
+if (response.getStatusLine().getStatusCode() !=
DavServletResponse.SC_MULTI_STATUS) {
+throw new ItemNotFoundException("Unable to retrieve the node
with id " + uri + ", response status was: "
++ response.getStatusLine().getStatusCode());
+}
MultiStatusResponse[] responses =
request.getResponseBodyAsMultiStatus(response).getResponses();
if (responses.length != 1) {
throw new ItemNotFoundException("Unable to retrieve the node
with id " + uri);
}
return buildNodeId(parentId, uri, responses[0],
sessionInfo.getWorkspaceName(), service.getNamePathResolver(sessionInfo));
-
} catch (IOException e) {
throw new RepositoryException(e);
} catch (DavException e) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/39ad7e38fa1f830d9510aa190ad07cf3732adc0a
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/39ad7e38fa1f830d9510aa190ad07cf3732adc0a
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/CC-CHANNELMGR-1510
Ran Shem Tov pushed new branch feature/CC-CHANNELMGR-1510 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1510 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][master] 2 commits: CHANNELMGR-1484 MaterialModule is imported in SharedModule
Ariel Weinberger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
35f3eb9e by Ariel Weinberger at 2017-10-25T16:02:31+02:00
CHANNELMGR-1484 MaterialModule is imported in SharedModule
- - - - -
a621a31e by Ariel Weinberger at 2017-10-25T16:05:40+02:00
CHANNELMGR-1545 Cherry pick of Material module merge into SharedModule
- - - - -
3 changed files:
- frontend-ng/src/app/material/material.module.ts →
frontend-ng/src/app/shared/material/material.module.ts
- frontend-ng/src/app/material/material.scss →
frontend-ng/src/app/shared/material/material.scss
- frontend-ng/src/app/shared/shared.module.ts
Changes:
=
frontend-ng/src/app/material/material.module.ts →
frontend-ng/src/app/shared/material/material.module.ts
=
--- a/frontend-ng/src/app/material/material.module.ts
+++ b/frontend-ng/src/app/shared/material/material.module.ts
@@ -16,10 +16,13 @@
import { NgModule } from '@angular/core';
import {
+ MATERIAL_SANITY_CHECKS,
NoConflictStyleCompatibilityMode,
MdListModule,
MdButtonModule,
- MATERIAL_SANITY_CHECKS,
+ MdInputModule,
+ MdSelectModule,
+ MdIconModule
} from '@angular/material';
import './material.scss';
@@ -28,6 +31,10 @@ import './material.scss';
NoConflictStyleCompatibilityMode,
MdListModule,
MdButtonModule,
+MdInputModule,
+MdButtonModule,
+MdSelectModule,
+MdIconModule
],
providers: [
{provide: MATERIAL_SANITY_CHECKS, useValue: false},
=
frontend-ng/src/app/material/material.scss →
frontend-ng/src/app/shared/material/material.scss
=
--- a/frontend-ng/src/app/material/material.scss
+++ b/frontend-ng/src/app/shared/material/material.scss
@@ -13,7 +13,7 @@
// limitations under the License.
@import 'variables';
-@import '~@angular/material/theming';
+@import '../../../../node_modules/@angular/material/theming';
@include mat-core;
$hippo-blue: (
=
frontend-ng/src/app/shared/shared.module.ts
=
--- a/frontend-ng/src/app/shared/shared.module.ts
+++ b/frontend-ng/src/app/shared/shared.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MaterialModule } from '../material/material.module';
+import { MaterialModule } from './material/material.module';
import { FeedbackServiceProvider } from './services/feedback.service.provider';
import { ContentServiceProvider } from './services/content.service.provider';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6df5c3f59241c681262aadd19ca6d77b75aa01ab...a621a31e5e28fe3ffabf425a4175dc2ac3b79e06
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6df5c3f59241c681262aadd19ca6d77b75aa01ab...a621a31e5e28fe3ffabf425a4175dc2ac3b79e06
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CC-CHANNELMGR-1484] 2 commits: CHANNELMGR-1484 Move Material module into "shared" folder
Ariel Weinberger pushed to branch feature/CC-CHANNELMGR-1484 at cms-community /
hippo-addon-channel-manager
Commits:
680673f7 by Ariel Weinberger at 2017-10-25T15:49:40+02:00
CHANNELMGR-1484 Move Material module into shared folder
- - - - -
4ff8c034 by Ariel Weinberger at 2017-10-25T15:51:53+02:00
CHANNELMGR-1484 MaterialModule is imported in SharedModule
- - - - -
3 changed files:
- frontend-ng/src/app/material/material.module.ts →
frontend-ng/src/app/shared/material/material.module.ts
- frontend-ng/src/app/material/material.scss →
frontend-ng/src/app/shared/material/material.scss
- frontend-ng/src/app/shared/shared.module.ts
Changes:
=
frontend-ng/src/app/material/material.module.ts →
frontend-ng/src/app/shared/material/material.module.ts
=
--- a/frontend-ng/src/app/material/material.module.ts
+++ b/frontend-ng/src/app/shared/material/material.module.ts
@@ -21,7 +21,7 @@ import {
MdListModule,
MdButtonModule,
MdInputModule,
- MdSelectModule,
+ MdSelectModule, MdIconModule,
} from '@angular/material';
import './material.scss';
@@ -33,6 +33,7 @@ import './material.scss';
MdInputModule,
MdButtonModule,
MdSelectModule,
+MdIconModule
],
providers: [
{provide: MATERIAL_SANITY_CHECKS, useValue: false},
=
frontend-ng/src/app/material/material.scss →
frontend-ng/src/app/shared/material/material.scss
=
--- a/frontend-ng/src/app/material/material.scss
+++ b/frontend-ng/src/app/shared/material/material.scss
@@ -13,7 +13,7 @@
// limitations under the License.
@import 'variables';
-@import '~@angular/material/theming';
+@import '../../../../node_modules/@angular/material/theming';
@include mat-core;
$hippo-blue: (
=
frontend-ng/src/app/shared/shared.module.ts
=
--- a/frontend-ng/src/app/shared/shared.module.ts
+++ b/frontend-ng/src/app/shared/shared.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MaterialModule } from '../material/material.module';
+import { MaterialModule } from './material/material.module';
import { FeedbackServiceProvider } from './services/feedback.service.provider';
import { ContentServiceProvider } from './services/content.service.provider';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/32b43e7808c8f6e4fa908008105bf808bb8ec8ae...4ff8c0349d1a9c235fe3d26071666cdd7b871534
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/32b43e7808c8f6e4fa908008105bf808bb8ec8ae...4ff8c0349d1a9c235fe3d26071666cdd7b871534
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/CC-CHANNELMGR-1484
Ariel Weinberger pushed new branch feature/CC-CHANNELMGR-1484 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1484 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] Deleted branch feature/CC-CHANNELMGR-1484
Ariel Weinberger deleted branch feature/CC-CHANNELMGR-1484 at cms-community / hippo-addon-channel-manager --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.14] JCR-4188: avoid use of sun.security.acl.GroupImpl in PrincipalManagerTest (ported to 2.14)
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits:
739e0e57 by Julian Reschke at 2017-10-25T12:31:33+00:00
JCR-4188: avoid use of sun.security.acl.GroupImpl in PrincipalManagerTest
(ported to 2.14)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1813270
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
-
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java
Changes:
=
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java
=
---
a/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java
+++
b/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.core.security.principal;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import java.security.Principal;
import java.security.acl.Group;
import java.util.Properties;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal;
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.jackrabbit.test.NotExecutableException;
-import sun.security.acl.GroupImpl;
+import org.mockito.Mockito;
/**
@@ -35,7 +36,7 @@ import sun.security.acl.GroupImpl;
public class PrincipalManagerTest extends AbstractJCRTest {
private static final String TESTGROUP_NAME =
"org.apache.jackrabbit.core.security.principal.PrincipalManagerTest.testgroup";
-private static final Group TESTGROUP = new GroupImpl(TESTGROUP_NAME);
+private static final Group TESTGROUP = Mockito.mock(Group.class);
private static class CustomPrincipalProvider extends
AbstractPrincipalProvider {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/739e0e57669993a853fc6b7a190c80586000dfe5
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/739e0e57669993a853fc6b7a190c80586000dfe5
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] Deleted branch feature/CC-CHANNELMGR-1541
Ariel Weinberger deleted branch feature/CC-CHANNELMGR-1541 at cms-community / hippo-addon-channel-manager --- 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][master] CHANNELMGR-1541 Apply shared folder changes to master branch
Ariel Weinberger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
6df5c3f5 by Ariel Weinberger at 2017-10-25T11:48:05+02:00
CHANNELMGR-1541 Apply shared folder changes to master branch
- - - - -
5 changed files:
- frontend-ng/src/app/app.module.ts
- +
frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
- + frontend-ng/src/app/shared/services/content.service.provider.ts
- + frontend-ng/src/app/shared/services/feedback.service.provider.ts
- + frontend-ng/src/app/shared/shared.module.ts
Changes:
=
frontend-ng/src/app/app.module.ts
=
--- a/frontend-ng/src/app/app.module.ts
+++ b/frontend-ng/src/app/app.module.ts
@@ -15,20 +15,16 @@
*/
import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { SharedModule } from './shared/shared.module';
import { UpgradeModule } from '@angular/upgrade/static';
-import { MaterialModule } from './material/material.module';
import ng1Module from './hippo-cm.ng1.module.js';
@NgModule({
imports: [
-BrowserModule,
-BrowserAnimationsModule,
+SharedModule,
UpgradeModule,
-MaterialModule,
- ],
+ ]
})
export class AppModule {
constructor(private upgrade: UpgradeModule) {}
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
=
--- /dev/null
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
=
frontend-ng/src/app/shared/services/content.service.provider.ts
=
--- /dev/null
+++ b/frontend-ng/src/app/shared/services/content.service.provider.ts
@@ -0,0 +1,10 @@
+import ContentService from '../../services/content.service.js';
+
+export function contentServiceFactory(i: any) {
+ return i.get('ContentService');
+}
+export const ContentServiceProvider = {
+ provide: ContentService,
+ useFactory: contentServiceFactory,
+ deps: ['$injector']
+};
=
frontend-ng/src/app/shared/services/feedback.service.provider.ts
=
--- /dev/null
+++ b/frontend-ng/src/app/shared/services/feedback.service.provider.ts
@@ -0,0 +1,10 @@
+import FeedbackService from '../../services/feedback.service.js';
+
+export function feedbackServiceFactory(i: any) {
+ return i.get('FeedbackService');
+}
+export const FeedbackServiceProvider = {
+ provide: FeedbackService,
+ useFactory: feedbackServiceFactory,
+ deps: ['$injector']
+};
=
frontend-ng/src/app/shared/shared.module.ts
=
--- /dev/null
+++ b/frontend-ng/src/app/shared/shared.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { MaterialModule } from '../material/material.module';
+
+import { FeedbackServiceProvider } from './services/feedback.service.provider';
+import { ContentServiceProvider } from './services/content.service.provider';
+
+@NgModule({
+ imports: [
+BrowserModule,
+BrowserAnimationsModule,
+MaterialModule
+ ],
+ exports: [
+BrowserModule,
+BrowserAnimationsModule,
+MaterialModule,
+ ],
+ providers: [
+ContentServiceProvider,
+FeedbackServiceProvider
+ ]
+})
+export class SharedModule {}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6df5c3f59241c681262aadd19ca6d77b75aa01ab
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6df5c3f59241c681262aadd19ca6d77b75aa01ab
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-1541 Move shared services to SharedModule, move CreateContent service…
Ariel Weinberger pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
b100ec17 by Ariel Weinberger at 2017-10-25T11:37:53+02:00
CHANNELMGR-1541 Move shared services to SharedModule, move CreateContent
service to RightSidePanel module
- - - - -
5 changed files:
- frontend-ng/src/app/app.module.ts
-
frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
- frontend-ng/src/app/services/content.service.provider.ts →
frontend-ng/src/app/shared/services/content.service.provider.ts
- frontend-ng/src/app/services/feedback.service.provider.ts →
frontend-ng/src/app/shared/services/feedback.service.provider.ts
- frontend-ng/src/app/shared/shared.module.ts
Changes:
=
frontend-ng/src/app/app.module.ts
=
--- a/frontend-ng/src/app/app.module.ts
+++ b/frontend-ng/src/app/app.module.ts
@@ -16,28 +16,15 @@
import ng1Module from './hippo-cm.ng1.module.js';
import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { SharedModule } from './shared/shared.module';
import { UpgradeModule } from '@angular/upgrade/static';
-
-import { MaterialModule } from './material/material.module';
import { RightSidePanelModule } from
'./channel/sidePanels/rightSidePanel/right-side-panel.module';
-import { ContentServiceProvider } from './services/content.service.provider';
-import { CreateContentService } from
'./channel/sidePanels/rightSidePanel/createContent/create-content.service';
-import { FeedbackServiceProvider } from './services/feedback.service.provider';
@NgModule({
imports: [
-BrowserModule,
-BrowserAnimationsModule,
+SharedModule,
UpgradeModule,
-MaterialModule,
RightSidePanelModule,
- ],
- providers: [
-ContentServiceProvider,
-CreateContentService,
-FeedbackServiceProvider,
]
})
export class AppModule {
=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
=
---
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
+++
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/right-side-panel.module.ts
@@ -15,6 +15,7 @@
*/
import { NgModule } from '@angular/core';
+import { CreateContentService } from './createContent/create-content.service';
import { CreateContentComponent } from
'./createContent/create-content.component';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../shared/shared.module';
@@ -31,6 +32,9 @@ import { HintsComponent } from
'../../../shared/components/hints/hints.component
],
entryComponents: [
CreateContentComponent
+ ],
+ providers: [
+CreateContentService
]
})
export class RightSidePanelModule {}
=
frontend-ng/src/app/services/content.service.provider.ts →
frontend-ng/src/app/shared/services/content.service.provider.ts
=
--- a/frontend-ng/src/app/services/content.service.provider.ts
+++ b/frontend-ng/src/app/shared/services/content.service.provider.ts
@@ -1,4 +1,4 @@
-import ContentService from './content.service.js';
+import ContentService from '../../services/content.service.js';
export function contentServiceFactory(i: any) {
return i.get('ContentService');
=
frontend-ng/src/app/services/feedback.service.provider.ts →
frontend-ng/src/app/shared/services/feedback.service.provider.ts
=
--- a/frontend-ng/src/app/services/feedback.service.provider.ts
+++ b/frontend-ng/src/app/shared/services/feedback.service.provider.ts
@@ -1,4 +1,4 @@
-import FeedbackService from './feedback.service.js';
+import FeedbackService from '../../services/feedback.service.js';
export function feedbackServiceFactory(i: any) {
return i.get('FeedbackService');
=
frontend-ng/src/app/shared/shared.module.ts
=
--- a/frontend-ng/src/app/shared/shared.module.ts
+++ b/frontend-ng/src/app/shared/shared.module.ts
@@ -1,15 +1,25 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MaterialModule } from '../material/material.module';
+import { FeedbackServiceProvider } from './services/feedback.service.provider';
+import { ContentServiceProvider } from './services/content.service.provider';
+
@NgModule({
imports: [
BrowserModule,
+BrowserAnimationsModule,
MaterialModule
],
exports: [
BrowserModule,
-MaterialModule
+BrowserAnimationsModule,
+MaterialModule,
+ ],
+ providers: [
+
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CC-CHANNELMGR-1541
Ariel Weinberger pushed new branch feature/CC-CHANNELMGR-1541 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CC-CHANNELMGR-1541 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch bugfix/ESSENTIALS-1104
Jeroen Hoffman deleted branch bugfix/ESSENTIALS-1104 at cms-community / hippo-essentials --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1104 improve beans structure
Jeroen Hoffman pushed to branch master at cms-community / hippo-essentials Commits: 43320694 by Bert Leunis at 2017-10-17T13:07:54+02:00 ESSENTIALS-1104 improve beans structure - - - - - 4502fe16 by Jeroen Hoffman at 2017-10-25T10:14:47+02:00 ESSENTIALS-1104 Reintegrate branch bugfix/ESSENTIALS-1104 into master - - - - - 1 changed file: - plugins/rest-services/src/main/resources/spring-plain-rest-api.xml Changes: = plugins/rest-services/src/main/resources/spring-plain-rest-api.xml = --- a/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml +++ b/plugins/rest-services/src/main/resources/spring-plain-rest-api.xml @@ -4,7 +4,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd;> - @@ -44,16 +43,27 @@ - + - + + + + + + + + + + + + View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f420535b269283403c5d3dbcbeed2ca2ec31da48...4502fe16ce099d76084a107b953fb7163c060de0 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
