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 2019/03/08 13:11:38 UTC
[syncope] branch master updated: [SYNCOPE-1421] Fix build
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
The following commit(s) were added to refs/heads/master by this push:
new 43a914c [SYNCOPE-1421] Fix build
43a914c is described below
commit 43a914c87a6455386564ca7daaa48cb579af4260
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Mar 8 14:11:29 2019 +0100
[SYNCOPE-1421] Fix build
---
.../console/wicket/markup/html/form/BinaryFieldPanel.java | 5 ++---
.../apache/syncope/client/enduser/commons/PreviewUtils.java | 12 ++++--------
.../client/enduser/markup/html/form/BinaryFieldPanel.java | 13 +++++++------
pom.xml | 13 -------------
4 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
index f57091e..373f50c 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.wicket.markup.html.form;
-import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
-
import static de.agilecoders.wicket.jquery.JQuery.$;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
@@ -36,9 +34,10 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeWebApplication;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.ui.commons.HttpResourceStream;
import org.apache.syncope.client.console.commons.PreviewUtils;
import org.apache.syncope.client.console.pages.BasePage;
+import org.apache.syncope.client.ui.commons.HttpResourceStream;
+import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
import org.apache.syncope.client.ui.commons.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.syncope.client.ui.commons.markup.html.form.BaseBinaryFieldPanel;
import org.apache.wicket.Component;
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/commons/PreviewUtils.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/commons/PreviewUtils.java
index f6bbab4..23c55a1 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/commons/PreviewUtils.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/commons/PreviewUtils.java
@@ -22,19 +22,15 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.enduser.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.ui.commons.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.syncope.client.ui.commons.markup.html.form.preview.DefaultPreviewer;
-import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils;
@Component
-public final class PreviewUtils {
+public class PreviewUtils {
- public static PreviewUtils getInstance() {
- return new PreviewUtils();
- }
-
- @SpringBean
- protected ClassPathScanImplementationLookup lookup;
+ @Autowired
+ private ClassPathScanImplementationLookup lookup;
public AbstractBinaryPreviewer getDefaultPreviewer(final String mimeType) {
return new DefaultPreviewer("previewer", mimeType);
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
index 3352bd1..f097d16 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/markup/html/form/BinaryFieldPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.enduser.markup.html.form;
-import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
-
import static de.agilecoders.wicket.jquery.JQuery.$;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.BootstrapFileInputField;
@@ -38,8 +36,9 @@ import org.apache.syncope.client.enduser.SyncopeWebApplication;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
import org.apache.syncope.client.enduser.commons.PreviewUtils;
import org.apache.syncope.client.ui.commons.Constants;
-import org.apache.syncope.client.ui.commons.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.syncope.client.ui.commons.markup.html.form.BaseBinaryFieldPanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel;
+import org.apache.syncope.client.ui.commons.markup.html.form.preview.AbstractBinaryPreviewer;
import org.apache.syncope.client.ui.commons.pages.BaseWebPage;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -58,13 +57,15 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
public class BinaryFieldPanel extends BaseBinaryFieldPanel {
private static final long serialVersionUID = 6264462604183088931L;
- private static final PreviewUtils PREVIEW_UTILS = PreviewUtils.getInstance();
+ @SpringBean
+ private PreviewUtils previewUtils;
private final String mimeType;
@@ -101,7 +102,7 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
this.fileKey = fileKey;
this.mimeType = mimeType;
- previewer = PREVIEW_UTILS.getPreviewer(mimeType);
+ previewer = previewUtils.getPreviewer(mimeType);
maxUploadSize = SyncopeWebApplication.get().getMaxUploadFileSizeMB() == null
? null
@@ -277,7 +278,7 @@ public class BinaryFieldPanel extends BaseBinaryFieldPanel {
if (StringUtils.isNotBlank(modelObj)) {
final Component panelPreview;
if (previewer == null) {
- panelPreview = PREVIEW_UTILS.getDefaultPreviewer(mimeType);
+ panelPreview = previewUtils.getDefaultPreviewer(mimeType);
} else {
panelPreview = previewer.preview(modelObj);
}
diff --git a/pom.xml b/pom.xml
index 5cd2d17..055a67c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,9 +514,6 @@ under the License.
<tomcat.version>9.0.16</tomcat.version>
- <nodejs.version>v8.11.4</nodejs.version>
- <protractor.version>5.4.0</protractor.version>
-
<docker.postgresql.version>11.1</docker.postgresql.version>
<docker.mariadb.version>10.4</docker.mariadb.version>
@@ -2123,16 +2120,6 @@ under the License.
</plugin>
<plugin>
- <groupId>com.github.klieber</groupId>
- <artifactId>phantomjs-maven-plugin</artifactId>
- <version>0.7</version>
- </plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.7.5</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>