You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2022/01/20 14:57:16 UTC
[syncope] 04/04: Fixing Enduser's SAML logout
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 143a88a256eba99a6e528bf3a91a0f402a2939b7
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jan 20 15:56:52 2022 +0100
Fixing Enduser's SAML logout
---
.../syncope/core/persistence/api/search/SearchCondVisitor.java | 6 +++---
.../{ => saml2sp4ui}/EnduserAssertionConsumerResource.java | 2 +-
.../enduser/resources/{ => saml2sp4ui}/EnduserLogoutResource.java | 2 +-
fit/wa-reference/src/main/resources/log4j2.xml | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index 1d31601..011627e 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -260,11 +260,11 @@ public class SearchCondVisitor extends AbstractSearchConditionVisitor<SearchBean
return leaf;
}
- protected SearchCond visitCompount(final SearchCondition<SearchBean> sc) {
+ protected SearchCond visitCompound(final SearchCondition<SearchBean> sc) {
List<SearchCond> searchConds = new ArrayList<>();
sc.getSearchConditions().forEach(searchCond -> {
searchConds.add(searchCond.getStatement() == null
- ? visitCompount(searchCond)
+ ? visitCompound(searchCond)
: visitPrimitive(searchCond));
});
@@ -288,7 +288,7 @@ public class SearchCondVisitor extends AbstractSearchConditionVisitor<SearchBean
@Override
public void visit(final SearchCondition<SearchBean> sc) {
- SEARCH_COND.set(sc.getStatement() == null ? visitCompount(sc) : visitPrimitive(sc));
+ SEARCH_COND.set(sc.getStatement() == null ? visitCompound(sc) : visitPrimitive(sc));
}
@Override
diff --git a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserAssertionConsumerResource.java b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserAssertionConsumerResource.java
similarity index 97%
rename from ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserAssertionConsumerResource.java
rename to ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserAssertionConsumerResource.java
index 2d74159..b848379 100644
--- a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserAssertionConsumerResource.java
+++ b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserAssertionConsumerResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.client.enduser.resources;
+package org.apache.syncope.client.enduser.resources.saml2sp4ui;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.commons.lang3.tuple.Pair;
diff --git a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserLogoutResource.java b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserLogoutResource.java
similarity index 95%
rename from ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserLogoutResource.java
rename to ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserLogoutResource.java
index e0b1ff4..30c8868 100644
--- a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/EnduserLogoutResource.java
+++ b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/resources/saml2sp4ui/EnduserLogoutResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.client.enduser.resources;
+package org.apache.syncope.client.enduser.resources.saml2sp4ui;
import org.apache.syncope.client.enduser.pages.SAML2SPBeforeLogout;
import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants;
diff --git a/fit/wa-reference/src/main/resources/log4j2.xml b/fit/wa-reference/src/main/resources/log4j2.xml
index c126ea3..2d3bb2e 100644
--- a/fit/wa-reference/src/main/resources/log4j2.xml
+++ b/fit/wa-reference/src/main/resources/log4j2.xml
@@ -56,14 +56,14 @@ under the License.
<appender-ref ref="main"/>
</asyncLogger>
- <asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
+ <asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
- <asyncLogger name="org.apache.syncope.wa" additivity="false" level="INFO">
+
+ <asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
<appender-ref ref="main"/>
</asyncLogger>
-
- <asyncLogger name="org.apache.cxf" additivity="false" level="DEBUG">
+ <asyncLogger name="org.apache.syncope.wa" additivity="false" level="INFO">
<appender-ref ref="main"/>
</asyncLogger>