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 2020/05/14 08:08:59 UTC
[syncope] branch 2_0_X updated (6b415e2 -> a6482ed)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 6b415e2 Upgrading Tomcat
new 1f0e959 [SYNCOPE-1560] Missing update for SAML metadata import
new a6482ed Upgrading FOP
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../syncope/client/console/panels/ImportMetadata.java | 15 ++++++++-------
pom.xml | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
[syncope] 02/02: Upgrading FOP
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit a6482ed5393447a49361bc5df035aae93331a584
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 10:08:39 2020 +0200
Upgrading FOP
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bbd1649..eb454e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1256,7 +1256,7 @@ under the License.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
[syncope] 01/02: [SYNCOPE-1560] Missing update for SAML metadata
import
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1f0e959c894ddf7c6119d6421cabd16acc8f2007
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 09:21:44 2020 +0200
[SYNCOPE-1560] Missing update for SAML metadata import
---
.../syncope/client/console/panels/ImportMetadata.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
index 61bd660..7c4c902 100644
--- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
+++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
@@ -23,6 +23,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.Fil
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Locale;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
@@ -45,20 +46,20 @@ public class ImportMetadata extends TogglePanel<Serializable> {
private final SAML2IdPsRestClient restClient = new SAML2IdPsRestClient();
- private final Form<?> form;
-
public ImportMetadata(final String id, final WebMarkupContainer container, final PageReference pageRef) {
super(id, pageRef);
- form = new Form<>("metadataForm");
+ Form<?> form = new Form<>("metadataForm");
addInnerObject(form);
final Model<byte[]> metadata = new Model<>();
- FileInputConfig config = new FileInputConfig();
- config.showUpload(false);
- config.showRemove(false);
- config.showPreview(false);
+ FileInputConfig config = new FileInputConfig().
+ showUpload(false).showRemove(false).showPreview(false);
+ String language = SyncopeConsoleSession.get().getLocale().getLanguage();
+ if (!Locale.ENGLISH.getLanguage().equals(language)) {
+ config.withLocale(language);
+ }
final BootstrapFileInputField fileUpload =
new BootstrapFileInputField("fileUpload", new ListModel<>(new ArrayList<FileUpload>()), config);
fileUpload.setOutputMarkupId(true);