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 2018/03/19 08:35:21 UTC
[1/2] syncope git commit: Upgrading Log4J and Wicket-jQueryUI
Repository: syncope
Updated Branches:
refs/heads/2_0_X 3a438184f -> ef29709a0
refs/heads/master 73f7e0f24 -> 7a3dd4bc3
Upgrading Log4J and Wicket-jQueryUI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7a3dd4bc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7a3dd4bc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7a3dd4bc
Branch: refs/heads/master
Commit: 7a3dd4bc34ab4492c833e8f06e4bf31d23f4afff
Parents: 73f7e0f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 19 09:32:34 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 19 09:32:34 2018 +0100
----------------------------------------------------------------------
.../syncope/core/logic/init/LoggerLoader.java | 16 ++++++++++++----
pom.xml | 4 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a3dd4bc/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
index 7c4145f..0a09641 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
@@ -30,8 +30,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.db.ColumnMapping;
+import org.apache.logging.log4j.core.appender.db.jdbc.AbstractConnectionSource;
import org.apache.logging.log4j.core.appender.db.jdbc.ColumnConfig;
-import org.apache.logging.log4j.core.appender.db.jdbc.ConnectionSource;
import org.apache.logging.log4j.core.appender.db.jdbc.JdbcAppender;
import org.apache.logging.log4j.core.appender.rewrite.RewriteAppender;
import org.apache.logging.log4j.core.config.LoggerConfig;
@@ -99,7 +99,7 @@ public class LoggerLoader implements SyncopeLoader {
appender = JdbcAppender.newBuilder().
withName("audit_for_" + entry.getKey()).
withIgnoreExceptions(false).
- setConnectionSource(new DataSourceConnectionSource(entry.getValue())).
+ setConnectionSource(new DataSourceConnectionSource(entry.getKey(), entry.getValue())).
setBufferSize(0).
setTableName("SYNCOPEAUDIT").
setColumnConfigs(columnConfigs).
@@ -190,11 +190,14 @@ public class LoggerLoader implements SyncopeLoader {
}
}
- private static class DataSourceConnectionSource implements ConnectionSource {
+ private static class DataSourceConnectionSource extends AbstractConnectionSource {
+
+ private final String description;
private final DataSource dataSource;
- DataSourceConnectionSource(final DataSource dataSource) {
+ DataSourceConnectionSource(final String domain, final DataSource dataSource) {
+ this.description = "dataSource{ domain=" + domain + ", value=" + dataSource + " }";
this.dataSource = dataSource;
}
@@ -203,5 +206,10 @@ public class LoggerLoader implements SyncopeLoader {
return DataSourceUtils.getConnection(dataSource);
}
+ @Override
+ public String toString() {
+ return this.description;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a3dd4bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d2a711d..0064596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ under the License.
<elasticsearch.version>6.2.2</elasticsearch.version>
- <log4j.version>2.10.0</log4j.version>
+ <log4j.version>2.11.0</log4j.version>
<disruptor.version>3.4.1</disruptor.version>
<commons-io.version>2.6</commons-io.version>
@@ -438,7 +438,7 @@ under the License.
<jsplumb.version>2.0.7</jsplumb.version>
<wicket.version>7.10.0</wicket.version>
- <wicket-jqueryui.version>7.10.1</wicket-jqueryui.version>
+ <wicket-jqueryui.version>7.10.2</wicket-jqueryui.version>
<wicket-bootstrap.version>0.10.17</wicket-bootstrap.version>
<wicket-chartjs.version>7.0.1</wicket-chartjs.version>
[2/2] syncope git commit: Upgrading Log4J and Wicket-jQueryUI
Posted by il...@apache.org.
Upgrading Log4J and Wicket-jQueryUI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ef29709a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ef29709a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ef29709a
Branch: refs/heads/2_0_X
Commit: ef29709a0382905cd70d1ef60267e9c52ed209ab
Parents: 3a43818
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 19 09:32:34 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Mar 19 09:32:42 2018 +0100
----------------------------------------------------------------------
.../syncope/core/logic/init/LoggerLoader.java | 16 ++++++++++++----
pom.xml | 4 ++--
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ef29709a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
index e4a4bc5..9743f50 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
@@ -30,8 +30,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.db.ColumnMapping;
+import org.apache.logging.log4j.core.appender.db.jdbc.AbstractConnectionSource;
import org.apache.logging.log4j.core.appender.db.jdbc.ColumnConfig;
-import org.apache.logging.log4j.core.appender.db.jdbc.ConnectionSource;
import org.apache.logging.log4j.core.appender.db.jdbc.JdbcAppender;
import org.apache.logging.log4j.core.appender.rewrite.RewriteAppender;
import org.apache.logging.log4j.core.config.LoggerConfig;
@@ -99,7 +99,7 @@ public class LoggerLoader implements SyncopeLoader {
appender = JdbcAppender.newBuilder().
withName("audit_for_" + entry.getKey()).
withIgnoreExceptions(false).
- setConnectionSource(new DataSourceConnectionSource(entry.getValue())).
+ setConnectionSource(new DataSourceConnectionSource(entry.getKey(), entry.getValue())).
setBufferSize(0).
setTableName("SYNCOPEAUDIT").
setColumnConfigs(columnConfigs).
@@ -193,11 +193,14 @@ public class LoggerLoader implements SyncopeLoader {
}
}
- private static class DataSourceConnectionSource implements ConnectionSource {
+ private static class DataSourceConnectionSource extends AbstractConnectionSource {
+
+ private final String description;
private final DataSource dataSource;
- DataSourceConnectionSource(final DataSource dataSource) {
+ DataSourceConnectionSource(final String domain, final DataSource dataSource) {
+ this.description = "dataSource{ domain=" + domain + ", value=" + dataSource + " }";
this.dataSource = dataSource;
}
@@ -206,5 +209,10 @@ public class LoggerLoader implements SyncopeLoader {
return DataSourceUtils.getConnection(dataSource);
}
+ @Override
+ public String toString() {
+ return this.description;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ef29709a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 07d3018..66a83a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,7 +394,7 @@ under the License.
<elasticsearch.version>5.6.8</elasticsearch.version>
- <log4j.version>2.10.0</log4j.version>
+ <log4j.version>2.11.0</log4j.version>
<disruptor.version>3.4.1</disruptor.version>
<commons-io.version>2.6</commons-io.version>
@@ -442,7 +442,7 @@ under the License.
<jsplumb.version>2.0.7</jsplumb.version>
<wicket.version>7.10.0</wicket.version>
- <wicket-jqueryui.version>7.10.1</wicket-jqueryui.version>
+ <wicket-jqueryui.version>7.10.2</wicket-jqueryui.version>
<wicket-bootstrap.version>0.10.17</wicket-bootstrap.version>
<wicket-chartjs.version>7.0.1</wicket-chartjs.version>