Re: [PR] SLING-12264 only call save() if there's something to save [sling-org-apache-sling-jcr-repoinit]
sonarcloud[bot] commented on PR #52: URL: https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/52#issuecomment-2136195077 ## [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-jcr-repoinit=52) **Quality Gate passed** Issues  [0 New issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-jcr-repoinit=52=false=true)  [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-jcr-repoinit=52=WONTFIX) Measures  [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_sling-org-apache-sling-jcr-repoinit=52=false=true)  [55.6% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_sling-org-apache-sling-jcr-repoinit=52=new_coverage=list)  [0.0% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_sling-org-apache-sling-jcr-repoinit=52=new_duplicated_lines_density=list) [See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-jcr-repoinit=52) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] SLING-12262 use a metric to indicate repoinit failures [sling-org-apache-sling-jcr-repoinit]
sonarcloud[bot] commented on PR #51: URL: https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/51#issuecomment-2136192090 ## [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-jcr-repoinit=51) **Quality Gate passed** Issues  [0 New issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-jcr-repoinit=51=false=true)  [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-jcr-repoinit=51=WONTFIX) Measures  [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_sling-org-apache-sling-jcr-repoinit=51=false=true)  [100.0% Coverage on New Code](https://sonarcloud.io/component_measures?id=apache_sling-org-apache-sling-jcr-repoinit=51=new_coverage=list)  [0.0% Duplication on New Code](https://sonarcloud.io/component_measures?id=apache_sling-org-apache-sling-jcr-repoinit=51=new_duplicated_lines_density=list) [See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-jcr-repoinit=51) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [VOTE] Release Apache Sling Engine 2.15.16
+1 Am Di., 28. Mai 2024 um 16:59 Uhr schrieb Jörg Hoh : > Hi, > > We solved 5 issues in this > release:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310710=12354681=Text > Staging > repository:https://repository.apache.org/content/repositories/orgapachesling-2863/ > > You can use this UNIX script to download the release and verify the > signatures:https://raw.githubusercontent.com/apache/sling-tooling-release/master/check_staged_release.sh > Usage: > sh check_staged_release.sh 2863 /tmp/sling-staging > > Please vote to approve this release: > > [ ] +1 Approve the release > [ ] 0 Don't care > [ ] -1 Don't release, because ... > > This majority vote is open for at least 72 hours5 > > Jörg > > -- > https://cqdump.joerghoh.de > > -- https://cqdump.joerghoh.de
[VOTE] Release Apache Sling Engine 2.15.16
Hi, We solved 5 issues in this release:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310710=12354681=Text Staging repository:https://repository.apache.org/content/repositories/orgapachesling-2863/ You can use this UNIX script to download the release and verify the signatures:https://raw.githubusercontent.com/apache/sling-tooling-release/master/check_staged_release.sh Usage: sh check_staged_release.sh 2863 /tmp/sling-staging Please vote to approve this release: [ ] +1 Approve the release [ ] 0 Don't care [ ] -1 Don't release, because ... This majority vote is open for at least 72 hours5 Jörg -- https://cqdump.joerghoh.de
[jira] [Resolved] (SLING-12330) Fix formatting
[ https://issues.apache.org/jira/browse/SLING-12330?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joerg Hoh resolved SLING-12330. --- Resolution: Fixed > Fix formatting > -- > > Key: SLING-12330 > URL: https://issues.apache.org/jira/browse/SLING-12330 > Project: Sling > Issue Type: Task > Components: Engine >Affects Versions: Engine 2.15.14 >Reporter: Joerg Hoh >Assignee: Joerg Hoh >Priority: Major > Fix For: Engine 2.15.16 > > -- This message was sent by Atlassian Jira (v8.20.10#820010)
Re: [PR] SLING-12330 fix formatting [sling-org-apache-sling-engine]
joerghoh merged PR #48: URL: https://github.com/apache/sling-org-apache-sling-engine/pull/48 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] SLING-12330 fix formatting [sling-org-apache-sling-engine]
sonarcloud[bot] commented on PR #48: URL: https://github.com/apache/sling-org-apache-sling-engine/pull/48#issuecomment-2135211774 ## [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-engine=48) **Quality Gate passed** Issues  [0 New issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-engine=48=false=true)  [0 Accepted issues](https://sonarcloud.io/project/issues?id=apache_sling-org-apache-sling-engine=48=WONTFIX) Measures  [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_sling-org-apache-sling-engine=48=false=true)  No data about Coverage  No data about Duplication [See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-engine=48) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[jira] [Closed] (SLING-12307) INFO logging in case no servlet can be resolved
[ https://issues.apache.org/jira/browse/SLING-12307?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joerg Hoh closed SLING-12307. - > INFO logging in case no servlet can be resolved > --- > > Key: SLING-12307 > URL: https://issues.apache.org/jira/browse/SLING-12307 > Project: Sling > Issue Type: Task > Components: Servlets >Affects Versions: Servlets Resolver 2.11.2 >Reporter: Joerg Hoh >Assignee: Joerg Hoh >Priority: Major > > The Servlets Resolver should log INFO messages in case no servlet can be > resolved. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Resolved] (SLING-12307) INFO logging in case no servlet can be resolved
[ https://issues.apache.org/jira/browse/SLING-12307?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joerg Hoh resolved SLING-12307. --- Resolution: Duplicate Duplicate of SLING-12297 > INFO logging in case no servlet can be resolved > --- > > Key: SLING-12307 > URL: https://issues.apache.org/jira/browse/SLING-12307 > Project: Sling > Issue Type: Task > Components: Servlets >Affects Versions: Servlets Resolver 2.11.2 >Reporter: Joerg Hoh >Assignee: Joerg Hoh >Priority: Major > > The Servlets Resolver should log INFO messages in case no servlet can be > resolved. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[PR] SLING-12330 fix formatting [sling-org-apache-sling-engine]
joerghoh opened a new pull request, #48: URL: https://github.com/apache/sling-org-apache-sling-engine/pull/48 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[jira] [Created] (SLING-12330) Fix formatting
Joerg Hoh created SLING-12330: - Summary: Fix formatting Key: SLING-12330 URL: https://issues.apache.org/jira/browse/SLING-12330 Project: Sling Issue Type: Task Components: Engine Affects Versions: Engine 2.15.14 Reporter: Joerg Hoh Assignee: Joerg Hoh Fix For: Engine 2.15.16 -- This message was sent by Atlassian Jira (v8.20.10#820010)
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
jsedding merged PR #54: URL: https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
jsedding commented on code in PR #54:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54#discussion_r1616876096
##
src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java:
##
@@ -38,28 +44,70 @@
})
public class JcrRepoInitOpsProcessorImpl implements JcrRepoInitOpsProcessor {
+private static final Logger log =
LoggerFactory.getLogger(JcrRepoInitOpsProcessorImpl.class);
+
/**
* Apply the supplied operations: first the namespaces and nodetypes
* registrations, then the service users, paths and ACLs.
*/
@Override
public void apply(Session session, List ops) {
-Stream.of(
-// register namespaces first
-singleton(new NamespacesVisitor(session)),
-// then create node types and privileges, both use namespaces
-asList(
+AtomicReference lastAttemptedOperation = new
AtomicReference<>();
+try {
+Stream.of(
+// register namespaces first
+singleton(new NamespacesVisitor(session)),
+// then create node types and privileges, both use
namespaces
+asList(
+new NodetypesVisitor(session),
+new PrivilegeVisitor(session)),
+// finally apply everything else
+asList(
+new UserVisitor(session),
+new NodeVisitor(session),
+new AclVisitor(session),
+new GroupMembershipVisitor(session),
+new NodePropertiesVisitor(session))
+).forEach(visitorGroup -> {
+ops.forEach(op -> {
+lastAttemptedOperation.set(op);
+visitorGroup.forEach(op::accept);
+});
+});
+} catch (RepoInitException originalFailure) {
+// support legacy statement reordering for backwards compatibility
+try {
+session.refresh(false); // drop transient changes
+
+final OperationVisitor[] visitors = {
+new NamespacesVisitor(session),
new NodetypesVisitor(session),
-new PrivilegeVisitor(session)),
-// finally apply everything else
-asList(
+new PrivilegeVisitor(session),
new UserVisitor(session),
new NodeVisitor(session),
new AclVisitor(session),
new GroupMembershipVisitor(session),
-new NodePropertiesVisitor(session))
-).forEach(visitorGroup -> {
-ops.forEach(op -> visitorGroup.forEach(op::accept));
-});
+new NodePropertiesVisitor(session)
+};
+
+for (OperationVisitor v : visitors) {
+for (Operation op : ops) {
+op.accept(v);
+}
+}
+
+log.warn("DEPRECATION - The repoinit script being executed
relies on a bug causing repoinit " +
Review Comment:
Not sure if SLING-12107 helps. That is the ticket where the "new" ordering
was introduced.
We also don't have enough context to explain what the issue is. However, it
may be worthwhile including the `originalFailure` exception, or at least its
message, in the log message.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
jsedding commented on code in PR #54:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54#discussion_r1616872112
##
src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java:
##
@@ -567,7 +567,7 @@ private static String toString(JackrabbitAccessControlEntry
entry) throws Reposi
private static void checkState(boolean expression, String msgPattern,
Object... args) {
if (!expression) {
-if (args != null) {
+if (args == null) {
Review Comment:
Because it was wrong. I noticed the messages with the unsubstituted message
patterns while investigating issues caused by the re-ordering. I didn't think
this small fix was worth its own JIRA ticket.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
jsedding commented on code in PR #54:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54#discussion_r1616872388
##
src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java:
##
@@ -38,28 +44,70 @@
})
public class JcrRepoInitOpsProcessorImpl implements JcrRepoInitOpsProcessor {
+private static final Logger log =
LoggerFactory.getLogger(JcrRepoInitOpsProcessorImpl.class);
+
/**
* Apply the supplied operations: first the namespaces and nodetypes
* registrations, then the service users, paths and ACLs.
*/
@Override
public void apply(Session session, List ops) {
-Stream.of(
-// register namespaces first
-singleton(new NamespacesVisitor(session)),
-// then create node types and privileges, both use namespaces
-asList(
+AtomicReference lastAttemptedOperation = new
AtomicReference<>();
+try {
+Stream.of(
+// register namespaces first
+singleton(new NamespacesVisitor(session)),
+// then create node types and privileges, both use
namespaces
+asList(
+new NodetypesVisitor(session),
+new PrivilegeVisitor(session)),
+// finally apply everything else
+asList(
+new UserVisitor(session),
+new NodeVisitor(session),
+new AclVisitor(session),
+new GroupMembershipVisitor(session),
+new NodePropertiesVisitor(session))
+).forEach(visitorGroup -> {
+ops.forEach(op -> {
+lastAttemptedOperation.set(op);
+visitorGroup.forEach(op::accept);
+});
+});
+} catch (RepoInitException originalFailure) {
+// support legacy statement reordering for backwards compatibility
+try {
Review Comment:
Will do.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
joerghoh commented on code in PR #54:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54#discussion_r1616855141
##
src/main/java/org/apache/sling/jcr/repoinit/impl/AclUtil.java:
##
@@ -567,7 +567,7 @@ private static String toString(JackrabbitAccessControlEntry
entry) throws Reposi
private static void checkState(boolean expression, String msgPattern,
Object... args) {
if (!expression) {
-if (args != null) {
+if (args == null) {
Review Comment:
I don't get why this is changed. Can you please explain?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
joerghoh commented on code in PR #54:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54#discussion_r1616847657
##
src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java:
##
@@ -38,28 +44,70 @@
})
public class JcrRepoInitOpsProcessorImpl implements JcrRepoInitOpsProcessor {
+private static final Logger log =
LoggerFactory.getLogger(JcrRepoInitOpsProcessorImpl.class);
+
/**
* Apply the supplied operations: first the namespaces and nodetypes
* registrations, then the service users, paths and ACLs.
*/
@Override
public void apply(Session session, List ops) {
-Stream.of(
-// register namespaces first
-singleton(new NamespacesVisitor(session)),
-// then create node types and privileges, both use namespaces
-asList(
+AtomicReference lastAttemptedOperation = new
AtomicReference<>();
+try {
+Stream.of(
+// register namespaces first
+singleton(new NamespacesVisitor(session)),
+// then create node types and privileges, both use
namespaces
+asList(
+new NodetypesVisitor(session),
+new PrivilegeVisitor(session)),
+// finally apply everything else
+asList(
+new UserVisitor(session),
+new NodeVisitor(session),
+new AclVisitor(session),
+new GroupMembershipVisitor(session),
+new NodePropertiesVisitor(session))
+).forEach(visitorGroup -> {
+ops.forEach(op -> {
+lastAttemptedOperation.set(op);
+visitorGroup.forEach(op::accept);
+});
+});
+} catch (RepoInitException originalFailure) {
+// support legacy statement reordering for backwards compatibility
+try {
Review Comment:
can you please extract this complete section into a dedicated method?
##
src/main/java/org/apache/sling/jcr/repoinit/impl/JcrRepoInitOpsProcessorImpl.java:
##
@@ -38,28 +44,70 @@
})
public class JcrRepoInitOpsProcessorImpl implements JcrRepoInitOpsProcessor {
+private static final Logger log =
LoggerFactory.getLogger(JcrRepoInitOpsProcessorImpl.class);
+
/**
* Apply the supplied operations: first the namespaces and nodetypes
* registrations, then the service users, paths and ACLs.
*/
@Override
public void apply(Session session, List ops) {
-Stream.of(
-// register namespaces first
-singleton(new NamespacesVisitor(session)),
-// then create node types and privileges, both use namespaces
-asList(
+AtomicReference lastAttemptedOperation = new
AtomicReference<>();
+try {
+Stream.of(
+// register namespaces first
+singleton(new NamespacesVisitor(session)),
+// then create node types and privileges, both use
namespaces
+asList(
+new NodetypesVisitor(session),
+new PrivilegeVisitor(session)),
+// finally apply everything else
+asList(
+new UserVisitor(session),
+new NodeVisitor(session),
+new AclVisitor(session),
+new GroupMembershipVisitor(session),
+new NodePropertiesVisitor(session))
+).forEach(visitorGroup -> {
+ops.forEach(op -> {
+lastAttemptedOperation.set(op);
+visitorGroup.forEach(op::accept);
+});
+});
+} catch (RepoInitException originalFailure) {
+// support legacy statement reordering for backwards compatibility
+try {
+session.refresh(false); // drop transient changes
+
+final OperationVisitor[] visitors = {
+new NamespacesVisitor(session),
new NodetypesVisitor(session),
-new PrivilegeVisitor(session)),
-// finally apply everything else
-asList(
+new PrivilegeVisitor(session),
new UserVisitor(session),
new NodeVisitor(session),
new AclVisitor(session),
new GroupMembershipVisitor(session),
-new NodePropertiesVisitor(session))
-).forEach(visitorGroup -> {
-ops.forEach(op ->
[PR] SLING-12329 - Backwards compatibility for legacy repoinit statement reordering [sling-org-apache-sling-jcr-repoinit]
jsedding opened a new pull request, #54: URL: https://github.com/apache/sling-org-apache-sling-jcr-repoinit/pull/54 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@sling.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[jira] [Created] (SLING-12329) Backwards compatibility for legacy repoinit statement reordering
Julian Sedding created SLING-12329: -- Summary: Backwards compatibility for legacy repoinit statement reordering Key: SLING-12329 URL: https://issues.apache.org/jira/browse/SLING-12329 Project: Sling Issue Type: Improvement Components: Repoinit Affects Versions: Repoinit JCR 1.1.46 Reporter: Julian Sedding Assignee: Julian Sedding Fix For: Repoinit JCR 1.1.50 The fix for repoinit statement reordering can cause issues for users relying on the legacy ordering. We should support a fallback to the legacy ordering and log a deprecation message, warning users that their repoinit script relies on the legacy ordering, support for which may be removed in the future. -- This message was sent by Atlassian Jira (v8.20.10#820010)
