[2/4] syncope git commit: [SYNCOPE-1025] Log level for the domain logger was not set to DEBUG, as instead expected
[SYNCOPE-1025] Log level for the domain logger was not set to DEBUG, as instead expected Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/898ce487 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/898ce487 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/898ce487 Branch: refs/heads/2_0_X Commit: 898ce487934a67ff8bfc7c542f9148d2c7ae220c Parents: 691a30b Author: Francesco ChicchiriccòAuthored: Thu Feb 23 17:06:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 17:06:04 2017 +0100 -- .../syncope/core/logic/init/LoggerLoader.java | 9 +++--- .../core/provisioning/java/AuditEntry.java | 30 +--- 2 files changed, 31 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/898ce487/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 9ab3b7b..60d02eb 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 @@ -71,13 +71,13 @@ public class LoggerLoader implements SyncopeLoader { ColumnConfig[] columnConfigs = { ColumnConfig.newBuilder(). setConfiguration(ctx.getConfiguration()).setName("EVENT_DATE").setEventTimestamp(true).build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER_LEVEL").setPattern("%level").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER").setPattern("%logger").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("MESSAGE").setPattern("%message").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("THROWABLE").setPattern("%ex{full}").build() }; ColumnMapping[] columnMappings = new ColumnMapping[0]; @@ -100,6 +100,7 @@ public class LoggerLoader implements SyncopeLoader { LoggerConfig logConf = new LoggerConfig( AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), null, false); logConf.addAppender(appender, Level.DEBUG, null); +logConf.setLevel(Level.DEBUG); ctx.getConfiguration().addLogger(AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), logConf); AuthContextUtils.execWithAuthContext(entry.getKey(), new AuthContextUtils.Executable() { http://git-wip-us.apache.org/repos/asf/syncope/blob/898ce487/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java -- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java index 4b8279f..8d56f53 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java @@ -20,7 +20,10 @@ package org.apache.syncope.core.provisioning.java; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.syncope.common.lib.AbstractBaseBean; +import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AuditLoggerName; public class AuditEntry extends AbstractBaseBean { @@ -46,12 +49,31 @@ public class AuditEntry extends AbstractBaseBean { @JsonProperty("input") final Object[] input) { super(); - + this.who = who; this.logger = logger; -this.before = before; -this.output = output; -this.input = input; +this.before = filterUserPassword(before); +this.output = filterUserPassword(output); +this.input = ArrayUtils.clone(input); +if (this.input != null) { +for (int i = 0; i < this.input.length; i++) { +
[3/4] syncope git commit: Fix typo for MariaDB
Fix typo for MariaDB Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/32824d48 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/32824d48 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/32824d48 Branch: refs/heads/master Commit: 32824d48c56affa6cd8863ad578ed907f6c55572 Parents: 2a9d9b1 Author: Francesco ChicchiriccòAuthored: Thu Feb 23 16:51:45 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 17:06:16 2017 +0100 -- .../workingwithapachesyncope/systemadministration/dbms.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/32824d48/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc index 4199b44..2734785 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc @@ -87,7 +87,7 @@ In `provisioning.properties`: quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -quartz.sql=tables_mariadb_innodb.sql +quartz.sql=tables_mariadb.sql [WARNING]
[1/4] syncope git commit: Fix typo for MariaDB
Repository: syncope Updated Branches: refs/heads/2_0_X 249793b07 -> 898ce4879 refs/heads/master 2a9d9b105 -> 2fb13a27f Fix typo for MariaDB Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/691a30b0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/691a30b0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/691a30b0 Branch: refs/heads/2_0_X Commit: 691a30b0d0686b652b3d9b1612bcf1f81e8f2d20 Parents: 249793b Author: Francesco ChicchiriccòAuthored: Thu Feb 23 16:51:45 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 16:51:45 2017 +0100 -- .../workingwithapachesyncope/systemadministration/dbms.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/691a30b0/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc index 4199b44..2734785 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc @@ -87,7 +87,7 @@ In `provisioning.properties`: quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -quartz.sql=tables_mariadb_innodb.sql +quartz.sql=tables_mariadb.sql [WARNING]
[4/4] syncope git commit: [SYNCOPE-1025] Log level for the domain logger was not set to DEBUG, as instead expected
[SYNCOPE-1025] Log level for the domain logger was not set to DEBUG, as instead expected Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2fb13a27 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2fb13a27 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2fb13a27 Branch: refs/heads/master Commit: 2fb13a27fbd2c716c583458ca19168820022bdb8 Parents: 32824d4 Author: Francesco ChicchiriccòAuthored: Thu Feb 23 17:06:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 17:06:20 2017 +0100 -- .../syncope/core/logic/init/LoggerLoader.java | 9 +++--- .../core/provisioning/java/AuditEntry.java | 30 +--- 2 files changed, 31 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2fb13a27/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 9ab3b7b..60d02eb 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 @@ -71,13 +71,13 @@ public class LoggerLoader implements SyncopeLoader { ColumnConfig[] columnConfigs = { ColumnConfig.newBuilder(). setConfiguration(ctx.getConfiguration()).setName("EVENT_DATE").setEventTimestamp(true).build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER_LEVEL").setPattern("%level").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER").setPattern("%logger").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("MESSAGE").setPattern("%message").build(), -ColumnConfig.newBuilder(). +ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("THROWABLE").setPattern("%ex{full}").build() }; ColumnMapping[] columnMappings = new ColumnMapping[0]; @@ -100,6 +100,7 @@ public class LoggerLoader implements SyncopeLoader { LoggerConfig logConf = new LoggerConfig( AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), null, false); logConf.addAppender(appender, Level.DEBUG, null); +logConf.setLevel(Level.DEBUG); ctx.getConfiguration().addLogger(AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), logConf); AuthContextUtils.execWithAuthContext(entry.getKey(), new AuthContextUtils.Executable() { http://git-wip-us.apache.org/repos/asf/syncope/blob/2fb13a27/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java -- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java index 4b8279f..8d56f53 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java @@ -20,7 +20,10 @@ package org.apache.syncope.core.provisioning.java; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.syncope.common.lib.AbstractBaseBean; +import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AuditLoggerName; public class AuditEntry extends AbstractBaseBean { @@ -46,12 +49,31 @@ public class AuditEntry extends AbstractBaseBean { @JsonProperty("input") final Object[] input) { super(); - + this.who = who; this.logger = logger; -this.before = before; -this.output = output; -this.input = input; +this.before = filterUserPassword(before); +this.output = filterUserPassword(output); +this.input = ArrayUtils.clone(input); +if (this.input != null) { +for (int i = 0; i < this.input.length; i++) { +
svn commit: r1784161 - /syncope/site/docs/reference-guide.html
Author: ilgrosso Date: Thu Feb 23 15:52:35 2017 New Revision: 1784161 URL: http://svn.apache.org/viewvc?rev=1784161=rev Log: Fix typo Modified: syncope/site/docs/reference-guide.html Modified: syncope/site/docs/reference-guide.html URL: http://svn.apache.org/viewvc/syncope/site/docs/reference-guide.html?rev=1784161=1784160=1784161=diff == --- syncope/site/docs/reference-guide.html (original) +++ syncope/site/docs/reference-guide.html Thu Feb 23 15:52:35 2017 @@ -6967,7 +6967,7 @@ This assumes that you have a MySQL insta quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate -quartz.sql=tables_mariadb_innodb.sql +quartz.sql=tables_mariadb.sql
[31/31] syncope git commit: Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cf18763b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cf18763b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cf18763b Branch: refs/heads/SYNCOPE-808 Commit: cf18763b90480ca7e6c02dbe8b0f9c5011af2dfd Parents: 9cd3b92 Author: Francesco ChicchiriccòAuthored: Mon Jan 9 18:32:44 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 14:12:55 2017 +0100 -- ide/netbeans/LICENSE| 677 ++ ide/netbeans/NOTICE | 50 ++ ide/netbeans/legal/META-INF/LICENSE | 896 --- ide/netbeans/legal/META-INF/NOTICE | 80 -- ide/netbeans/nb-configuration.xml | 20 +- ide/netbeans/pom.xml| 330 --- .../syncope/ide/netbeans/PluginConstants.java | 43 + .../syncope/ide/netbeans/ResourceConnector.java | 77 ++ .../syncope/ide/netbeans/UserProperties.java| 79 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 546 +++ .../ide/netbeans/view/ServerDetailsView.form| 161 .../ide/netbeans/view/ServerDetailsView.java| 183 .../plugin/connector/ResourceConnector.java | 76 -- .../plugin/constants/PluginConstants.java | 33 - .../netbeans/plugin/entity/UserProperties.java | 78 -- .../service/MailTemplateManagerService.java | 68 -- .../service/ReportTemplateManagerService.java | 68 -- .../view/ResourceExplorerTopComponent.form | 68 -- .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 - .../resources/org/apache/syncope/checkstyle.xml | 223 - .../syncope/ide/netbeans/view/Bundle.properties | 28 + .../org/apache/syncope/java-formatter.xml | 309 --- .../netbeans/plugin/view/Bundle.properties | 28 - pom.xml | 211 ++--- .../resources/org/apache/syncope/checkstyle.xml | 5 +- 30 files changed, 2354 insertions(+), 3119 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/LICENSE -- diff --git a/ide/netbeans/LICENSE b/ide/netbeans/LICENSE new file mode 100644 index 000..876156c --- /dev/null +++ b/ide/netbeans/LICENSE @@ -0,0 +1,677 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which
[13/31] syncope git commit: Upgrading SLF4J
Upgrading SLF4J Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d4c7d74d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d4c7d74d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d4c7d74d Branch: refs/heads/SYNCOPE-808 Commit: d4c7d74dafc99ca2193dceb3e6e470e3301ee32f Parents: b1e52bf Author: Francesco ChicchiriccòAuthored: Wed Feb 15 15:24:21 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 15 15:24:21 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d4c7d74d/pom.xml -- diff --git a/pom.xml b/pom.xml index 064910f..68b2ba3 100644 --- a/pom.xml +++ b/pom.xml @@ -380,7 +380,7 @@ under the License. 5.22.0 -1.7.22 +1.7.23 2.8 3.3.6
[06/31] syncope git commit: [SYNCOPE-1013] Esclamation mark missing
[SYNCOPE-1013] Esclamation mark missing Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9448637b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9448637b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9448637b Branch: refs/heads/SYNCOPE-808 Commit: 9448637bc61bb102676cde5d09836e3ac7227007 Parents: 4c4d3ba Author: Francesco ChicchiriccòAuthored: Sun Feb 12 14:02:14 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 14:02:14 2017 +0100 -- .../src/main/resources/domains/MasterContent.xml | 4 ++-- .../src/test/resources/domains/MasterContent.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/9448637b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml index 05f3921..5b6cab9 100644 --- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml @@ -158,7 +158,7 @@ a password reset was request for ${user.getUsername()}. In order to complete this request, you need to visit this link: -http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')} +http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')} If you did not request this reset, just ignore the present e-mail. @@ -169,7 +169,7 @@ Best regards." a password reset was request for ${user.getUsername()}./p pIn order to complete this request, you need to visit this -a href=http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')}link/a/p. +a href=http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')}link/a/p. pIf you did not request this reset, just ignore the present e-mail./p http://git-wip-us.apache.org/repos/asf/syncope/blob/9448637b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 50b8e47..28c6715 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -1210,7 +1210,7 @@ a password reset was request for ${user.getUsername()}. In order to complete this request, you need to visit this link: -http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')} +http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')} If you did not request this reset, just ignore the present e-mail. @@ -1221,7 +1221,7 @@ Best regards." a password reset was request for ${user.getUsername()}./p pIn order to complete this request, you need to visit this -a href=http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')}link/a/p. +a href=http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=${input.get(0).replaceAll(' ', '%20')}link/a/p. pIf you did not request this reset, just ignore the present e-mail./p @@ -2434,4 +2434,4 @@ $$ } - \ No newline at end of file +
[27/31] syncope git commit: Antrun plugin to add LICENSE and PlUGIN to nbm archive
Antrun plugin to add LICENSE and PlUGIN to nbm archive Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9cd3b923 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9cd3b923 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9cd3b923 Branch: refs/heads/SYNCOPE-808 Commit: 9cd3b923d424bafccd6c4523836f39d2923f3a1c Parents: b9f59a6 Author: TusharAuthored: Mon Jan 9 18:07:06 2017 +0530 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 14:12:55 2017 +0100 -- ide/netbeans/legal/META-INF/LICENSE | 896 +++ ide/netbeans/legal/META-INF/NOTICE | 80 ++ ide/netbeans/pom.xml| 28 + .../src/main/resources/META-INF/LICENSE | 896 --- ide/netbeans/src/main/resources/META-INF/NOTICE | 80 -- pom.xml | 7 + 6 files changed, 1011 insertions(+), 976 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/9cd3b923/ide/netbeans/legal/META-INF/LICENSE -- diff --git a/ide/netbeans/legal/META-INF/LICENSE b/ide/netbeans/legal/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/legal/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity +
[10/31] syncope git commit: Remove some unneeded variable declarations (= null etc)
Remove some unneeded variable declarations (= null etc) Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2540facc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2540facc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2540facc Branch: refs/heads/SYNCOPE-808 Commit: 2540facc1b08a78574fe2a625c1384cf7f1b2713 Parents: dd8cda6 Author: Colm O hEigeartaighAuthored: Tue Feb 14 09:55:57 2017 + Committer: Francesco Chicchiriccò Committed: Tue Feb 14 12:22:00 2017 +0100 -- .../java/org/apache/syncope/client/cli/util/JasyptUtils.java | 2 +- .../apache/syncope/client/console/commons/status/StatusBean.java | 2 +- .../syncope/client/console/panels/ConnObjectListViewPanel.java | 2 +- .../apache/syncope/client/console/panels/StartAtTogglePanel.java | 2 +- .../syncope/client/console/tasks/SchedTaskWizardBuilder.java | 2 +- .../client/console/wicket/markup/html/form/FieldPanel.java | 4 ++-- .../syncope/client/console/widgets/reconciliation/Anys.java | 2 +- .../client/console/wizards/AbstractModalPanelBuilder.java| 2 +- .../org/apache/syncope/client/console/wizards/AjaxWizard.java| 4 ++-- .../main/java/org/apache/syncope/core/logic/ResourceLogic.java | 2 +- .../syncope/core/persistence/jpa/content/MultiParentNode.java| 2 +- .../apache/syncope/core/persistence/jpa/entity/user/JPAUser.java | 2 +- .../provisioning/java/pushpull/AbstractPullResultHandler.java| 2 +- .../provisioning/java/pushpull/RealmPullResultHandlerImpl.java | 2 +- .../syncope/core/provisioning/camel/SyncopeCamelContext.java | 2 +- .../org/apache/syncope/fit/core/reference/TestPullActions.java | 2 +- .../src/test/java/org/apache/syncope/fit/console/LogsITCase.java | 2 +- .../java/org/apache/syncope/installer/utilities/InstallLog.java | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java -- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java index 0ddd9bf..0f31de0 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/JasyptUtils.java @@ -26,7 +26,7 @@ public final class JasyptUtils { private final BasicTextEncryptor textEncryptor; -private static JasyptUtils JASYPT_UTILS = null; +private static JasyptUtils JASYPT_UTILS; public static JasyptUtils get() { if (JASYPT_UTILS == null) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java index 3f1afd1..a34425a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/StatusBean.java @@ -37,7 +37,7 @@ public class StatusBean implements Serializable { private final String resourceName; -private String connObjectLink = null; +private String connObjectLink; private Status status = Status.OBJECT_NOT_FOUND; http://git-wip-us.apache.org/repos/asf/syncope/blob/2540facc/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java index 45ddb35..327c007 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java @@ -49,7 +49,7 @@ public abstract class ConnObjectListViewPanel extends Panel { private static final int SIZE = 10; -private String nextPageCookie = null; +private String nextPageCookie; protected ConnObjectListViewPanel( final String id,
[05/31] syncope git commit: [SYNCOPE-1012] Just a case problem
[SYNCOPE-1012] Just a case problem Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4c4d3bae Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4c4d3bae Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4c4d3bae Branch: refs/heads/SYNCOPE-808 Commit: 4c4d3baefbb10da1e28391f38de0793e090a12ee Parents: b8aa792 Author: Francesco ChicchiriccòAuthored: Sun Feb 12 09:06:05 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 09:06:05 2017 +0100 -- .../client/enduser/resources/InfoResource.java | 4 --- .../enduser/resources/LogoutResource.java | 8 ++ .../resources/SecurityQuestionResource.java | 5 .../resources/UserSelfChangePassword.java | 5 .../resources/UserSelfConfirmPasswordReset.java | 5 .../resources/UserSelfCreateResource.java | 16 --- .../resources/UserSelfPasswordReset.java| 30 +--- .../enduser/resources/UserSelfReadResource.java | 1 - 8 files changed, 21 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/4c4d3bae/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java index 1af9593..d6eab9a 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java @@ -28,13 +28,9 @@ import org.apache.syncope.client.enduser.util.SaltGenerator; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.util.cookies.CookieUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class InfoResource extends AbstractBaseResource { -private static final Logger LOG = LoggerFactory.getLogger(InfoResource.class); - private static final long serialVersionUID = 6453101466981543020L; @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/4c4d3bae/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LogoutResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LogoutResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LogoutResource.java index 3101332..4f20d60 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LogoutResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LogoutResource.java @@ -19,22 +19,18 @@ package org.apache.syncope.client.enduser.resources; import org.apache.syncope.client.enduser.SyncopeEnduserSession; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class LogoutResource extends AbstractBaseResource { private static final long serialVersionUID = -648841355644985051L; -private static final Logger LOG = LoggerFactory.getLogger(LogoutResource.class); - @Override protected ResourceResponse newResourceResponse(final Attributes attributes) { LOG.debug("Logout from enduser application"); - + SyncopeEnduserSession.get().invalidate(); - + ResourceResponse response = new ResourceResponse(); response.setStatusCode(204); return response; http://git-wip-us.apache.org/repos/asf/syncope/blob/4c4d3bae/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java index 160c30e..d812f72 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java @@ -31,13 +31,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.AbstractResource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.util.string.StringValue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SecurityQuestionResource extends
[19/31] syncope git commit: Do not show the Configuration > Workflow menu item is Activiti was not enabled
Do not show the Configuration > Workflow menu item is Activiti was not enabled Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d58f4490 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d58f4490 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d58f4490 Branch: refs/heads/SYNCOPE-808 Commit: d58f4490af294c6f652766ffec980d16c4048909 Parents: dd9489d Author: Francesco ChicchiriccòAuthored: Wed Feb 22 18:58:38 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 22 18:58:38 2017 +0100 -- .../apache/syncope/client/console/pages/BasePage.java| 3 +++ .../apache/syncope/client/console/pages/Workflow.java| 11 +-- 2 files changed, 8 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d58f4490/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java index dee1ee1..787990c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java @@ -189,6 +189,9 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware { confLIContainer.add(confULContainer); liContainer = new WebMarkupContainer(getLIContainerId("workflow")); +liContainer.setOutputMarkupPlaceholderTag(true); +liContainer.setVisible( + SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti")); confULContainer.add(liContainer); link = BookmarkablePageLinkBuilder.build("workflow", Workflow.class); MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.WORKFLOW_DEF_READ); http://git-wip-us.apache.org/repos/asf/syncope/blob/d58f4490/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java index 3746c0d..a9e0b14 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Workflow.java @@ -39,6 +39,9 @@ public class Workflow extends BasePage { public Workflow(final PageParameters parameters) { super(parameters); +final boolean isActivitiEnabledForUsers = + SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti"); + WebMarkupContainer noActivitiEnabledForUsers = new WebMarkupContainer("noActivitiEnabledForUsers"); noActivitiEnabledForUsers.setOutputMarkupPlaceholderTag(true); body.add(noActivitiEnabledForUsers); @@ -58,7 +61,7 @@ public class Workflow extends BasePage { @Override protected byte[] getImageData(final IResource.Attributes attributes) { -return isActivitiEnabledForUsers() +return isActivitiEnabledForUsers ? wfRestClient.getDiagram() : new byte[0]; } @@ -73,7 +76,7 @@ public class Workflow extends BasePage { togglePanel.setOutputMarkupId(true); workflowDef.add(togglePanel); -if (isActivitiEnabledForUsers()) { +if (isActivitiEnabledForUsers) { noActivitiEnabledForUsers.setVisible(false); } else { workflowDef.setVisible(false); @@ -82,8 +85,4 @@ public class Workflow extends BasePage { MetaDataRoleAuthorizationStrategy.authorize(workflowDef, ENABLE, StandardEntitlement.WORKFLOW_DEF_READ); body.add(workflowDef); } - -private boolean isActivitiEnabledForUsers() { -return SyncopeConsoleSession.get().getPlatformInfo().getUserWorkflowAdapter().contains("Activiti"); -} }
[02/31] syncope git commit: Remove some unnecessary types
Remove some unnecessary types Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e49ee074 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e49ee074 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e49ee074 Branch: refs/heads/SYNCOPE-808 Commit: e49ee0747313c2e221e279548b3f1cd9dedecf13 Parents: e214daf Author: Colm O hEigeartaighAuthored: Fri Feb 10 16:45:27 2017 + Committer: Francesco Chicchiriccò Committed: Fri Feb 10 17:52:05 2017 +0100 -- .../syncope/client/console/panels/search/MapOfListModel.java | 2 +- .../core/provisioning/api/serialization/AttributeDeserializer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e49ee074/client/console/src/main/java/org/apache/syncope/client/console/panels/search/MapOfListModel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/MapOfListModel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/MapOfListModel.java index 403c498..372a494 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/MapOfListModel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/MapOfListModel.java @@ -52,7 +52,7 @@ public class MapOfListModel extends PropertyModel { if (map.containsKey(key)) { res = map.get(key); } else { -res = new ArrayList(); +res = new ArrayList<>(); map.put(key, res); } return res; http://git-wip-us.apache.org/repos/asf/syncope/blob/e49ee074/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializer.java -- diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializer.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializer.java index 5c563c9..91a5980 100644 --- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializer.java +++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/serialization/AttributeDeserializer.java @@ -45,7 +45,7 @@ class AttributeDeserializer extends JsonDeserializer { String name = tree.get("name").asText(); -List values = new ArrayList(); +List values = new ArrayList<>(); for (Iterator itor = tree.get("value").iterator(); itor.hasNext();) { JsonNode node = itor.next(); if (node.isNull()) {
[30/31] syncope git commit: Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml index c594e04..74f296c 100644 --- a/ide/netbeans/pom.xml +++ b/ide/netbeans/pom.xml @@ -16,157 +16,191 @@ specific language governing permissions and limitations under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> -4.0.0 - - org.apache.syncope - syncope-ide - 2.0.2-SNAPSHOT - + 4.0.0 + +org.apache.syncope +syncope-ide +2.0.3-SNAPSHOT + -Apache Syncope IDE Netbeans -Apache Syncope IDE Netbeans -org.apache.syncope.ide -syncope-ide-netbeans + Apache Syncope IDE Netbeans + Apache Syncope IDE Netbeans + org.apache.syncope.ide + syncope-ide-netbeans -nbm + nbm - - ${basedir}/../.. - + +${basedir}/../.. + - - - -src/main/resources/META-INF/ - - + + + org.netbeans.api + org-netbeans-api-annotations-common + + + org.netbeans.api + org-openide-windows + + + org.netbeans.api + org-openide-util + + + org.netbeans.api + org-openide-util-ui + + + org.netbeans.api + org-openide-util-lookup + + + org.netbeans.api + org-openide-awt + + + org.netbeans.api + org-netbeans-modules-settings + + + org.apache.syncope.common + syncope-common-lib + + + org.apache.syncope.client + syncope-client-lib + + + org.netbeans.api + org-openide-io + + + org.netbeans.api + org-openide-nodes + + + org.netbeans.api + org-openide-text + + + org.netbeans.api + org-openide-filesystems + + + org.netbeans.api + org-openide-loaders + + + commons-io + commons-io + + + org.netbeans.api + org-netbeans-core-multiview + jar + + + org.netbeans.api + org-netbeans-modules-editor-lib2 + jar + + + org.netbeans.api + org-netbeans-api-progress + + + org.netbeans.api + org-netbeans-api-progress-nb + + + org.netbeans.external + asm-all-5.0.1 + + + + + + +org.codehaus.mojo +nbm-maven-plugin +true + + false + + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + +org.apache.maven.plugins +maven-antrun-plugin + + +package + + + + + + + + + run + + + + + + +org.apache.maven.plugins +maven-checkstyle-plugin + + + + + +${basedir} +META-INF + + LICENSE + NOTICE + + + + + + + + apache-release + + - -org.codehaus.mojo -nbm-maven-plugin -true - -false - - -src/main/resources/META-INF -../META-INF - - - - - -org.apache.maven.plugins -maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - -maven-antrun-plugin -1.7 - - -package - - - - - - - - - run - - - - + +org.apache.maven.plugins +maven-deploy-plugin + + true + + + +org.apache.maven.plugins +maven-source-plugin +false + + true + + - - - - -org.netbeans.api -org-netbeans-api-annotations-common - - -
[22/31] syncope git commit: Upgrading Payara
Upgrading Payara Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/249793b0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/249793b0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/249793b0 Branch: refs/heads/SYNCOPE-808 Commit: 249793b079abb4ee0c7a29ad2fa3e8d13945b927 Parents: 2944f95 Author: Francesco ChicchiriccòAuthored: Thu Feb 23 11:39:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 11:39:04 2017 +0100 -- fit/core-reference/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/249793b0/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 05a560e..19867f8 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -628,7 +628,7 @@ under the License. glassfish4x - https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.164/payara-4.1.1.164.zip + https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.171.0.1/payara-4.1.1.171.0.1.zip ${settings.localRepository}/org/codehaus/cargo/cargo-container-archives ${project.build.directory}/cargo/extract
[26/31] syncope git commit: Antrun plugin to add LICENSE and PlUGIN to nbm archive
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cd3b923/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f34bfd3..000 --- a/ide/netbeans/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,896 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s)
[29/31] syncope git commit: Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java deleted file mode 100644 index e56b24b..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/service/ReportTemplateManagerService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.netbeans.plugin.service; - -import java.io.InputStream; -import java.util.List; -import javax.ws.rs.core.Response; -import org.apache.syncope.client.lib.SyncopeClient; -import org.apache.syncope.client.lib.SyncopeClientFactoryBean; -import org.apache.syncope.common.lib.to.ReportTemplateTO; -import org.apache.syncope.common.lib.types.ReportTemplateFormat; -import org.apache.syncope.common.rest.api.service.ReportTemplateService; - -public class ReportTemplateManagerService { - -private ReportTemplateService service; - -public ReportTemplateManagerService(final String url, final String userName, final String password) { -SyncopeClient syncopeClient = new SyncopeClientFactoryBean().setAddress(url).create(userName, password); -service = syncopeClient.getService(ReportTemplateService.class); -} - -public List list() { -return service.list(); -} - -public boolean create(final ReportTemplateTO reportTemplateTO) { -return Response.Status.CREATED.getStatusCode() == service.create(reportTemplateTO).getStatus(); -} - -public ReportTemplateTO read(final String key) { -return service.read(key); -} - -public boolean delete(final String key) { -service.delete(key); -return true; -} - -public Object getFormat(final String key, final ReportTemplateFormat format) { -return service.getFormat(key, format).getEntity(); -} - -public void setFormat(final String key, final ReportTemplateFormat format, final InputStream templateIn) { -service.setFormat(key, format, templateIn); -} - -public boolean removeFormat(final String key, final ReportTemplateFormat format) { -return false; -} - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form deleted file mode 100644 index 79458db..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.form +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java -- diff --git a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java b/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java deleted file mode 100644 index 4c91ec5..000 --- a/ide/netbeans/src/main/java/org/apache/syncope/netbeans/plugin/view/ResourceExplorerTopComponent.java +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more
[25/31] syncope git commit: Added netbeans to syncope/ide
Added netbeans to syncope/ide Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b9f59a6d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b9f59a6d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b9f59a6d Branch: refs/heads/SYNCOPE-808 Commit: b9f59a6d908b696c8218718196fd5db9a3a3a0a7 Parents: 249793b Author: TusharAuthored: Tue Jan 3 15:36:07 2017 +0530 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 14:12:55 2017 +0100 -- ide/netbeans/nb-configuration.xml | 36 + ide/netbeans/pom.xml| 144 +++ .../plugin/connector/ResourceConnector.java | 76 ++ .../plugin/constants/PluginConstants.java | 33 + .../netbeans/plugin/entity/UserProperties.java | 78 ++ .../service/MailTemplateManagerService.java | 68 ++ .../service/ReportTemplateManagerService.java | 68 ++ .../view/ResourceExplorerTopComponent.form | 68 ++ .../view/ResourceExplorerTopComponent.java | 553 .../netbeans/plugin/view/ServerDetailsView.form | 161 .../netbeans/plugin/view/ServerDetailsView.java | 218 + ide/netbeans/src/main/nbm/MANIFEST.MF | 3 + .../src/main/resources/META-INF/LICENSE | 896 +++ ide/netbeans/src/main/resources/META-INF/NOTICE | 80 ++ .../resources/org/apache/syncope/checkstyle.xml | 223 + .../org/apache/syncope/java-formatter.xml | 309 +++ .../netbeans/plugin/view/Bundle.properties | 28 + ide/pom.xml | 5 +- pom.xml | 104 ++- 19 files changed, 3147 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/ide/netbeans/nb-configuration.xml -- diff --git a/ide/netbeans/nb-configuration.xml b/ide/netbeans/nb-configuration.xml new file mode 100644 index 000..ec22826 --- /dev/null +++ b/ide/netbeans/nb-configuration.xml @@ -0,0 +1,36 @@ + + + + +http://www.netbeans.org/ns/maven-properties-data/1;> + + true + + http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/ide/netbeans/pom.xml -- diff --git a/ide/netbeans/pom.xml b/ide/netbeans/pom.xml new file mode 100644 index 000..1afbb88 --- /dev/null +++ b/ide/netbeans/pom.xml @@ -0,0 +1,144 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + + org.apache.syncope + syncope-ide + 2.0.2-SNAPSHOT + + +Apache Syncope IDE Netbeans +Apache Syncope IDE Netbeans +org.apache.syncope.ide +syncope-ide-netbeans + +nbm + + + ${basedir}/../.. + + + + + +src/main/resources/META-INF/ + + + + +org.codehaus.mojo +nbm-maven-plugin +true + +false + + + +org.apache.maven.plugins +maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + +org.netbeans.api +org-netbeans-api-annotations-common + + +org.netbeans.api +org-openide-windows + + +org.netbeans.api +org-openide-util + + +org.netbeans.api +org-openide-util-ui + + +org.netbeans.api +org-openide-util-lookup + + +org.netbeans.api +org-openide-awt + + +org.netbeans.api +org-netbeans-modules-settings + + +org.apache.syncope.common +syncope-common-lib + + +org.apache.syncope.client +syncope-client-lib + + +org.netbeans.api +org-openide-io + + +org.netbeans.api +org-openide-nodes + + +org.netbeans.api +org-openide-text + + +org.netbeans.api +org-openide-filesystems + + +org.netbeans.api +org-openide-loaders + + +commons-io +commons-io + +
[17/31] syncope git commit: [SYNCOPE-1016] Fixing test exec
[SYNCOPE-1016] Fixing test exec Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b170c261 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b170c261 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b170c261 Branch: refs/heads/SYNCOPE-808 Commit: b170c261a64a12eea7bbacde628261d60ad61511 Parents: e5963f4 Author: Francesco ChicchiriccòAuthored: Thu Feb 16 09:30:23 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 16 09:30:23 2017 +0100 -- .../syncope/core/persistence/jpa/entity/PlainAttrListener.java | 6 -- .../apache/syncope/core/persistence/jpa/outer/UserTest.java| 4 ++-- .../src/test/java/org/apache/syncope/fit/core/GroupITCase.java | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java index 6471ecd..a3aa93a 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/PlainAttrListener.java @@ -27,7 +27,9 @@ public class PlainAttrListener extends AbstractSysInfoListener { @PrePersist @PreUpdate public void setSysInfoOnOwner(final PlainAttr plainAttr) { -LOG.debug("Set system properties for owner of '{}'", plainAttr); -setSysInfoOnAnnotatedEntity(plainAttr.getOwner()); +if (plainAttr.getOwner() != null) { +LOG.debug("Set system properties for owner of '{}'", plainAttr); +setSysInfoOnAnnotatedEntity(plainAttr.getOwner()); +} } } http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java -- diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java index f9f02ba..0f915ea 100644 --- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java +++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/UserTest.java @@ -271,7 +271,7 @@ public class UserTest extends AbstractTest { @Test public void issueSYNCOPE1016() { -User user = userDAO.findByUsername("vivaldi"); +User user = userDAO.findByUsername("rossini"); Date initial = user.getLastChangeDate(); assertNotNull(initial); @@ -285,7 +285,7 @@ public class UserTest extends AbstractTest { userDAO.flush(); -user = userDAO.findByUsername("vivaldi"); +user = userDAO.findByUsername("rossini"); Date afterwards = user.getLastChangeDate(); assertNotNull(afterwards); http://git-wip-us.apache.org/repos/asf/syncope/blob/b170c261/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java -- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java index 0e94b58..2295fc8 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java @@ -1036,6 +1036,7 @@ public class GroupITCase extends AbstractITCase { assertEquals("11.23", groupTO.getPlainAttrMap().get(doubleSchemaName).getValues().get(0)); // 3. update schema, set conversion pattern +schema = schemaService.read(SchemaType.PLAIN, schema.getKey()); schema.setConversionPattern("0.000"); schemaService.update(SchemaType.PLAIN, schema);
[28/31] syncope git commit: Several pom fixes, proper LICENSE and NOTICE, package reorganization, checkstyle setup
http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml b/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml deleted file mode 100644 index 07961a6..000 --- a/ide/netbeans/src/main/resources/org/apache/syncope/java-formatter.xml +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties deleted file mode 100644 index 17de78d..000 --- a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties +++ /dev/null @@ -1,28 +0,0 @@ -#Licensed to the Apache Software Foundation (ASF) under one -#or more contributor license agreements. See the NOTICE file -#distributed with this work for additional information -#regarding copyright ownership. The ASF licenses this file -#to you under the Apache License, Version 2.0 (the -#"License"); you may not use this file except in compliance -#with the License. You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -#Unless required by applicable law or agreed to in writing, -#software distributed under the License is distributed on an -#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -#KIND, either express or implied. See the License for the -#specific language governing permissions and limitations -#under the License. - -TemplateViewTopComponent.jPanel1.TabConstraints.tabTitle=TEXT -TemplateViewTopComponent.jPanel2.TabConstraints.tabTitle=XML - -ServerDetailsView.jLabel1.text=URL -ServerDetailsView.jLabel4.text=Apache Syncope -ServerDetailsView.okButton.text=OK -ServerDetailsView.passwordTxt.text= -ServerDetailsView.userNameTxt.text= -ServerDetailsView.urlTxt.text= -ServerDetailsView.jLabel3.text=Password -ServerDetailsView.jLabel2.text=User Name http://git-wip-us.apache.org/repos/asf/syncope/blob/cf18763b/pom.xml -- diff --git a/pom.xml b/pom.xml index b8757ed..672e5d8 100644 --- a/pom.xml +++ b/pom.xml @@ -441,13 +441,12 @@ under the License. 5.0.10 4.3.6 3.0.0 -0.23.1 - -RELEASE802 -RELEASE82 1.0-alpha-1 3.0.0 +0.23.1 +RELEASE82 + 1389 9082 @@ -1334,97 +1333,102 @@ under the License. -org.netbeans.api -org-netbeans-api-annotations-common -${org-netbeans-api-version} - - -org.netbeans.api -org-openide-windows -${org-netbeans-api-version} - - -org.netbeans.api -org-openide-util -${org-netbeans-version} - - -org.netbeans.api -
[04/31] syncope git commit: Fixing checkstyle
Fixing checkstyle Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b8aa7920 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b8aa7920 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b8aa7920 Branch: refs/heads/SYNCOPE-808 Commit: b8aa792013b5e27eae978c0e9bf208f5554ed7d3 Parents: 69afe1a Author: Francesco ChicchiriccòAuthored: Sun Feb 12 08:07:20 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 08:07:20 2017 +0100 -- .../core/provisioning/java/pushpull/PushJobDelegate.java | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b8aa7920/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushJobDelegate.java -- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushJobDelegate.java index be6ffe6..8e18ab5 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushJobDelegate.java @@ -146,9 +146,8 @@ public class PushJobDelegate extends AbstractProvisioningJobDelegate { // First OrgUnits... if (pushTask.getResource().getOrgUnit() != null) { -SyncopePushResultHandler rhandler = -(SyncopePushResultHandler) ApplicationContextProvider.getBeanFactory(). -createBean(RealmPushResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); +SyncopePushResultHandler rhandler = (SyncopePushResultHandler) ApplicationContextProvider.getBeanFactory(). +createBean(RealmPushResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); rhandler.setProfile(profile); for (Realm realm : realmDAO.findAll()) { @@ -165,9 +164,8 @@ public class PushJobDelegate extends AbstractProvisioningJobDelegate { } // ...then provisions for any types -AnyObjectPushResultHandler ahandler = -(AnyObjectPushResultHandler) ApplicationContextProvider.getBeanFactory(). -createBean(AnyObjectPushResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); +AnyObjectPushResultHandler ahandler = (AnyObjectPushResultHandler) ApplicationContextProvider.getBeanFactory(). +createBean(AnyObjectPushResultHandlerImpl.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); ahandler.setProfile(profile); UserPushResultHandler uhandler =
[11/31] syncope git commit: Working around ARCHETYPE-519
Working around ARCHETYPE-519 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/481ec8fc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/481ec8fc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/481ec8fc Branch: refs/heads/SYNCOPE-808 Commit: 481ec8fc922c0a637b5cf74dfe41af9554dff842 Parents: 2540fac Author: Francesco ChicchiriccòAuthored: Wed Feb 15 12:54:25 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 15 12:54:25 2017 +0100 -- src/main/asciidoc/getting-started/obtain.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/481ec8fc/src/main/asciidoc/getting-started/obtain.adoc -- diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc index e730ba0..d5a88b8 100644 --- a/src/main/asciidoc/getting-started/obtain.adoc +++ b/src/main/asciidoc/getting-started/obtain.adoc @@ -312,7 +312,7 @@ ifeval::["{snapshotOrRelease}" == "snapshot"] [subs="verbatim,attributes"] -mvn archetype:generate \ +mvn org.apache.maven.plugins:maven-archetype-plugin:2.4:generate \ -DarchetypeGroupId=org.apache.syncope \ -DarchetypeArtifactId=syncope-archetype \ -DarchetypeRepository=http://repository.apache.org/content/repositories/snapshots \
[15/31] syncope git commit: [SYNCOPE-1016] Adding PlainAttrListener
[SYNCOPE-1016] Adding PlainAttrListener Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/25bedf48 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/25bedf48 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/25bedf48 Branch: refs/heads/SYNCOPE-808 Commit: 25bedf482d1d8b8df60c7263907a27addd38ab5b Parents: 6a41ff2 Author: Francesco ChicchiriccòAuthored: Wed Feb 15 19:04:47 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 15 19:04:47 2017 +0100 -- .../jpa/entity/AbstractPlainAttr.java | 2 + .../jpa/entity/AbstractSysInfoListener.java | 47 .../jpa/entity/AnnotatedEntityListener.java | 23 +- .../jpa/entity/PlainAttrListener.java | 33 ++ .../core/persistence/jpa/outer/UserTest.java| 24 ++ 5 files changed, 108 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/25bedf48/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttr.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttr.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttr.java index d647854..cf210e8 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttr.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractPlainAttr.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.persistence.Column; +import javax.persistence.EntityListeners; import javax.persistence.FetchType; import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; @@ -38,6 +39,7 @@ import org.apache.syncope.core.persistence.jpa.validation.entity.PlainAttrCheck; @MappedSuperclass @PlainAttrCheck +@EntityListeners(value = PlainAttrListener.class) public abstract class AbstractPlainAttr> extends AbstractGeneratedKeyEntity implements PlainAttr { private static final long serialVersionUID = -9115431608821806124L; http://git-wip-us.apache.org/repos/asf/syncope/blob/25bedf48/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractSysInfoListener.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractSysInfoListener.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractSysInfoListener.java new file mode 100644 index 000..2009a78 --- /dev/null +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractSysInfoListener.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.core.persistence.jpa.entity; + +import java.util.Date; +import org.apache.syncope.core.persistence.api.entity.AnnotatedEntity; +import org.apache.syncope.core.spring.security.AuthContextUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractSysInfoListener { + +protected static final Logger LOG = LoggerFactory.getLogger(AnnotatedEntityListener.class); + +protected void setSysInfoOnAnnotatedEntity(final AnnotatedEntity entity) { +String username = AuthContextUtils.getUsername(); +LOG.debug("Set system properties for '{}'", entity); + +Date now = new Date(); + +if (entity.getCreationDate() == null) { +LOG.debug("Set creation date '{}' and creator '{}' for '{}'", now, username, entity); +entity.setCreationDate(now); +entity.setCreator(username); +} + +LOG.debug("Set last change date '{}' and modifier '{}' for
[18/31] syncope git commit: Upgrading jackson
Upgrading jackson Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dd9489d8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dd9489d8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dd9489d8 Branch: refs/heads/SYNCOPE-808 Commit: dd9489d8482e658461c7242d88316154a2b79399 Parents: b170c26 Author: Francesco ChicchiriccòAuthored: Tue Feb 21 15:27:45 2017 +0100 Committer: Francesco Chicchiriccò Committed: Tue Feb 21 15:27:45 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/dd9489d8/pom.xml -- diff --git a/pom.xml b/pom.xml index 68b2ba3..a28605b 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ under the License. 2.17.5 -2.8.6 +2.8.7 4.3.6.RELEASE 4.2.1.RELEASE
[21/31] syncope git commit: Fixing (harmless but annoying) NPE when starting up Maven projects in embedded mode
Fixing (harmless but annoying) NPE when starting up Maven projects in embedded mode Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2944f953 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2944f953 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2944f953 Branch: refs/heads/SYNCOPE-808 Commit: 2944f953a5de1a0913d8c071136e171e8b68b26c Parents: 3ec7492 Author: Francesco ChicchiriccòAuthored: Wed Feb 22 19:38:08 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 22 19:38:08 2017 +0100 -- .../src/main/resources/userWorkflow.bpmn20.xml | 572 +-- 1 file changed, 286 insertions(+), 286 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2944f953/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml -- diff --git a/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml b/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml index ce4281a..80ac1cd 100644 --- a/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml +++ b/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml @@ -277,429 +277,429 @@ try { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + - - - + + + - - - - + + + + + - - - + + + + + + + + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + - - - + + + + + - - - + + + + + - - - - - - - - - - + + + + - - + + - - - - - - - - + + + + - - - + + + - - - - - - - + + + - - - - - + + + - - - + + + - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + +
[14/31] syncope git commit: [SYNCOPE-1015] Fixing test exec
[SYNCOPE-1015] Fixing test exec Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6a41ff24 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6a41ff24 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6a41ff24 Branch: refs/heads/SYNCOPE-808 Commit: 6a41ff24d427745aa7a8f60c880d2a140f533e9d Parents: d4c7d74 Author: Francesco ChicchiriccòAuthored: Wed Feb 15 17:21:56 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 15 17:21:56 2017 +0100 -- .../src/test/resources/domains/MasterContent.xml| 2 +- .../org/apache/syncope/fit/core/UserSelfITCase.java | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/6a41ff24/core/persistence-jpa/src/test/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 7337f4f..9b70be9 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -97,7 +97,7 @@ under the License. + attribute_id="577c6c4d-7149-43c2-9821-9ab4510effbd" stringValue="userId"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/6a41ff24/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java -- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java index fef308f..b7b6f56 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java @@ -150,9 +150,17 @@ public class UserSelfITCase extends AbstractITCase { Pair
[01/31] syncope git commit: Upgrading AngularJS [Forced Update!]
Repository: syncope Updated Branches: refs/heads/SYNCOPE-808 b51a61676 -> cf18763b9 (forced update) Upgrading AngularJS Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e214daf0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e214daf0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e214daf0 Branch: refs/heads/SYNCOPE-808 Commit: e214daf0e034ef33ca9127f5f475cd9e263b31ed Parents: 605cadc Author: Francesco ChicchiriccòAuthored: Fri Feb 10 08:41:15 2017 +0100 Committer: Francesco Chicchiriccò Committed: Fri Feb 10 08:41:15 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e214daf0/pom.xml -- diff --git a/pom.xml b/pom.xml index 4735872..064910f 100644 --- a/pom.xml +++ b/pom.xml @@ -425,7 +425,7 @@ under the License. 0.10.11 7.0.1 -1.6.1 +1.6.2 0.3.2 1.3.3 0.19.6
[07/31] syncope git commit: [SYNCOPE-1013] Fixing test exec
[SYNCOPE-1013] Fixing test exec Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/72d5bda7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/72d5bda7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/72d5bda7 Branch: refs/heads/SYNCOPE-808 Commit: 72d5bda7981b92a699b92531dde0dc7d789b3d0a Parents: 9448637 Author: Francesco ChicchiriccòAuthored: Sun Feb 12 14:15:17 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 14:15:17 2017 +0100 -- .../syncope/core/provisioning/java/MailTemplateTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/72d5bda7/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/MailTemplateTest.java -- diff --git a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/MailTemplateTest.java b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/MailTemplateTest.java index 4784708..37c37d1 100644 --- a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/MailTemplateTest.java +++ b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/MailTemplateTest.java @@ -85,9 +85,11 @@ public class MailTemplateTest extends AbstractTest { assertNotNull(htmlBody); assertTrue(htmlBody.contains("a password reset was request for " + username + ".")); assertFalse(htmlBody.contains( - "http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=; + token)); + "http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=; ++ token)); assertTrue(htmlBody.contains( - "http://localhost:9080/syncope-enduser/app/#/confirmpasswordreset?token=; + token.replaceAll(" ", "%20"))); + "http://localhost:9080/syncope-enduser/app/#!/confirmpasswordreset?token=; ++ token.replaceAll(" ", "%20"))); } @Test
[03/31] syncope git commit: [SYNCOPE-1010] Missing mamagement in PushJobDelegate
[SYNCOPE-1010] Missing mamagement in PushJobDelegate Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69afe1a0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69afe1a0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69afe1a0 Branch: refs/heads/SYNCOPE-808 Commit: 69afe1a09a175dac1c9d5fc503875ef4e3efe1b1 Parents: e49ee07 Author: Francesco ChicchiriccòAuthored: Sun Feb 12 07:52:27 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 07:52:27 2017 +0100 -- .../pushpull/AbstractPushResultHandler.java | 20 ++-- .../java/pushpull/PushJobDelegate.java | 9 + .../pushpull/RealmPushResultHandlerImpl.java| 20 ++-- 3 files changed, 25 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/69afe1a0/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java -- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java index a93c239..9d4ab3e 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java @@ -214,7 +214,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan switch (profile.getTask().getUnmatchingRule()) { case ASSIGN: for (PushActions action : profile.getActions()) { -action.beforeAssign(this.getProfile(), any); +action.beforeAssign(profile, any); } if (!profile.getTask().isPerformCreate()) { @@ -227,7 +227,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan case PROVISION: for (PushActions action : profile.getActions()) { -action.beforeProvision(this.getProfile(), any); +action.beforeProvision(profile, any); } if (!profile.getTask().isPerformCreate()) { @@ -240,7 +240,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan case UNLINK: for (PushActions action : profile.getActions()) { -action.beforeUnlink(this.getProfile(), any); +action.beforeUnlink(profile, any); } if (!profile.getTask().isPerformUpdate()) { @@ -264,7 +264,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan switch (profile.getTask().getMatchingRule()) { case UPDATE: for (PushActions action : profile.getActions()) { -action.beforeUpdate(this.getProfile(), any); +action.beforeUpdate(profile, any); } if (!profile.getTask().isPerformUpdate()) { LOG.debug("PushTask not configured for update"); @@ -276,7 +276,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan case DEPROVISION: for (PushActions action : profile.getActions()) { -action.beforeDeprovision(this.getProfile(), any); +action.beforeDeprovision(profile, any); } if (!profile.getTask().isPerformDelete()) { @@ -289,7 +289,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan case UNASSIGN: for (PushActions action : profile.getActions()) { -action.beforeUnassign(this.getProfile(), any); +action.beforeUnassign(profile, any); } if (!profile.getTask().isPerformDelete()) { @@ -302,7 +302,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
[24/31] syncope git commit: Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/ide/netbeans/src/main/resources/META-INF/LICENSE -- diff --git a/ide/netbeans/src/main/resources/META-INF/LICENSE b/ide/netbeans/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..f34bfd3 --- /dev/null +++ b/ide/netbeans/src/main/resources/META-INF/LICENSE @@ -0,0 +1,896 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) +
[16/31] syncope git commit: [SYNCOPE-1015] Clarifying that schema for usage with authentication.attributes must impose the unique constraint
[SYNCOPE-1015] Clarifying that schema for usage with authentication.attributes must impose the unique constraint Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e5963f4b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e5963f4b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e5963f4b Branch: refs/heads/SYNCOPE-808 Commit: e5963f4bcaebea537edacdb53c771b01b98517dd Parents: 25bedf4 Author: Francesco ChicchiriccòAuthored: Thu Feb 16 08:40:01 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 16 08:40:01 2017 +0100 -- .../systemadministration/configurationparameters.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e5963f4b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc index b052ab8..d9550f6 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc @@ -40,8 +40,9 @@ processes, including < >; * `passwordReset.allowed` - whether the < > feature (typically via the enduser application) is allowed; * `passwordReset.securityQuestion` - whether the < > feature involves security questions; -* `authentication.attributes` - the list of attributes whose values can be passed as login name for authentication; -defaults to `username` +* `authentication.attributes` - the list of attributes whose values can be passed as login name for authentication, +defaults to `username`; please note that the related < must impose the unique constraint, for this +mechanism to work properly; * `authentication.statuses` - the list of < > statuses for which users are allowed to authenticate; [WARNING] Suspended Users are anyway not allowed to authenticate.
[23/31] syncope git commit: Added netbeans to syncope/ide
http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties -- diff --git a/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties new file mode 100644 index 000..17de78d --- /dev/null +++ b/ide/netbeans/src/main/resources/org/apache/syncope/netbeans/plugin/view/Bundle.properties @@ -0,0 +1,28 @@ +#Licensed to the Apache Software Foundation (ASF) under one +#or more contributor license agreements. See the NOTICE file +#distributed with this work for additional information +#regarding copyright ownership. The ASF licenses this file +#to you under the Apache License, Version 2.0 (the +#"License"); you may not use this file except in compliance +#with the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +#Unless required by applicable law or agreed to in writing, +#software distributed under the License is distributed on an +#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +#KIND, either express or implied. See the License for the +#specific language governing permissions and limitations +#under the License. + +TemplateViewTopComponent.jPanel1.TabConstraints.tabTitle=TEXT +TemplateViewTopComponent.jPanel2.TabConstraints.tabTitle=XML + +ServerDetailsView.jLabel1.text=URL +ServerDetailsView.jLabel4.text=Apache Syncope +ServerDetailsView.okButton.text=OK +ServerDetailsView.passwordTxt.text= +ServerDetailsView.userNameTxt.text= +ServerDetailsView.urlTxt.text= +ServerDetailsView.jLabel3.text=Password +ServerDetailsView.jLabel2.text=User Name http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/ide/pom.xml -- diff --git a/ide/pom.xml b/ide/pom.xml index c14a1e6..85c5ed4 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,6 +37,7 @@ under the License. eclipse +netbeans @@ -105,4 +104,4 @@ under the License. - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/b9f59a6d/pom.xml -- diff --git a/pom.xml b/pom.xml index a28605b..b3688b1 100644 --- a/pom.xml +++ b/pom.xml @@ -443,6 +443,11 @@ under the License. 3.0.0 0.23.1 +RELEASE802 +RELEASE82 +1.0-alpha-1 +3.0.0 + 1389 9082 @@ -1327,7 +1332,100 @@ under the License. httpmime ${httpclient.version} - + + +org.netbeans.api +org-netbeans-api-annotations-common +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-windows +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-util +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-ui +${org-netbeans-version} + + +org.netbeans.api +org-openide-util-lookup +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-awt +${org-netbeans-api-version} + + +org.netbeans.api +org-netbeans-modules-settings +${org-netbeans-api-version} + + +org.apache.syncope.common +syncope-common-lib +${project.version} + + +org.apache.syncope.client +syncope-client-lib +${project.version} + + +org.netbeans.api +org-openide-io +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-nodes +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-text +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-filesystems +${org-netbeans-api-version} + + +org.netbeans.api +org-openide-loaders +${org-netbeans-api-version} + + +org.netbeans.api +
[08/31] syncope git commit: [SYNCOPE-1014] CloseWindowsCallback missing
[SYNCOPE-1014] CloseWindowsCallback missing Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7419f26a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7419f26a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7419f26a Branch: refs/heads/SYNCOPE-808 Commit: 7419f26a814405e020f20e3a8080d25a3bb008bb Parents: 72d5bda Author: Francesco ChicchiriccòAuthored: Sun Feb 12 14:24:40 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 14:24:40 2017 +0100 -- .../console/approvals/ApprovalDirectoryPanel.java | 2 +- .../client/console/commons/TaskDataProvider.java| 2 +- .../syncope/client/console/panels/ParametersPanel.java | 2 +- .../client/console/panels/SecurityQuestionsPanel.java | 12 .../console/panels/TypeExtensionDirectoryPanel.java | 2 +- .../client/console/policies/PolicyDirectoryPanel.java | 2 +- .../console/policies/PolicyRuleDirectoryPanel.java | 2 +- .../client/console/reports/ReportDirectoryPanel.java| 2 +- .../client/console/reports/ReportletDirectoryPanel.java | 2 +- .../client/console/tasks/SchedTaskDirectoryPanel.java | 2 +- .../client/console/tasks/TaskDirectoryPanel.java| 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java index b515d19..61519ea 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java @@ -191,7 +191,7 @@ public class ApprovalDirectoryPanel public ApprovalProvider(final int paginatorRows) { super(paginatorRows); -setSort("createTime", SortOrder.DESCENDING); +setSort("createTime", SortOrder.ASCENDING); this.comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java index a03f30e..5e917d1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/TaskDataProvider.java @@ -39,7 +39,7 @@ public abstract class TaskDataProvider extends Directo super(paginatorRows); this.taskRestClient = taskRestClient; -setSort("start", SortOrder.DESCENDING); +setSort("start", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); this.taskType = taskType; } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java index 5d38339..29de93c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java @@ -214,7 +214,7 @@ public class ParametersPanel extends DirectoryPanel< private ParametersProvider(final int paginatorRows) { super(paginatorRows); -setSort("schema", SortOrder.DESCENDING); +setSort("schema", SortOrder.ASCENDING); comparator = new SortableDataProviderComparator<>(this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/7419f26a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
[20/31] syncope git commit: [SYNCOPE-1023] Moving the Activiti test content setup from the all profile into the embedded profile (with condition)
[SYNCOPE-1023] Moving the Activiti test content setup from the all profile into the embedded profile (with condition) Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3ec7492e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3ec7492e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3ec7492e Branch: refs/heads/SYNCOPE-808 Commit: 3ec7492e84b9c1a80e62b3b803e8ed63c51f2f0f Parents: d58f449 Author: Francesco ChicchiriccòAuthored: Wed Feb 22 18:59:41 2017 +0100 Committer: Francesco Chicchiriccò Committed: Wed Feb 22 18:59:41 2017 +0100 -- .../archetype-resources/console/pom.xml | 112 +-- .../resources/archetype-resources/core/pom.xml | 37 +- .../archetype-resources/enduser/pom.xml | 34 ++ 3 files changed, 36 insertions(+), 147 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/3ec7492e/archetype/src/main/resources/archetype-resources/console/pom.xml -- diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml index eae0ac8..4102c4e 100644 --- a/archetype/src/main/resources/archetype-resources/console/pom.xml +++ b/archetype/src/main/resources/archetype-resources/console/pom.xml @@ -192,117 +192,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/> - - - embedded - - - ${project.build.directory}/test-classes - - - - - org.apache.syncope.fit - syncope-fit-build-tools - ${syncope.version} - war - test - - - com.h2database - h2 - test - - - - -clean verify cargo:run - - - -org.apache.maven.plugins -maven-antrun-plugin -true - - -setupEmbeddedConf -package - - - - - - - - - - - - - - run - - - - - - -org.codehaus.cargo -cargo-maven2-plugin -true - - - - -com.h2database -h2 - - - - -standalone - - ${cargo.servlet.port} - ${cargo.tomcat.ajp.port} - ${cargo.rmi.port} - - -noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m - - - - - org.apache.syncope.fit - syncope-fit-build-tools - war - -syncope-fit-build-tools - - - - ../core/target/syncope - -syncope - - - - ${project.build.directory}/${project.build.finalName} - -syncope-console - - - - - - - - - + all http://git-wip-us.apache.org/repos/asf/syncope/blob/3ec7492e/archetype/src/main/resources/archetype-resources/core/pom.xml -- diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml b/archetype/src/main/resources/archetype-resources/core/pom.xml index 62558a1..24f7f19 100644 --- a/archetype/src/main/resources/archetype-resources/core/pom.xml +++ b/archetype/src/main/resources/archetype-resources/core/pom.xml @@ -178,42 +178,7 @@ under the License. - - - - -org.codehaus.mojo -xml-maven-plugin -true - - -prepare-package - - transform - - - - - - - ${project.build.directory}/test-classes - -domains/MasterContent.xml - -
[09/31] syncope git commit: [SYNCOPE-1014] Fixing test exec
[SYNCOPE-1014] Fixing test exec Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dd8cda6f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dd8cda6f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dd8cda6f Branch: refs/heads/SYNCOPE-808 Commit: dd8cda6fef424590d185824d32ad8a50d50bfd03 Parents: 7419f26 Author: Francesco ChicchiriccòAuthored: Sun Feb 12 14:41:48 2017 +0100 Committer: Francesco Chicchiriccò Committed: Sun Feb 12 14:41:48 2017 +0100 -- .../org/apache/syncope/fit/console/ParametersITCase.java | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/dd8cda6f/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java -- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java index ab88a4d..12e8f7e 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java @@ -40,7 +40,7 @@ public class ParametersITCase extends AbstractConsoleITCase { @Test public void readParameter() { TESTER.assertComponent("body:content:parametersPanel", WebMarkupContainer.class); -assertNotNull(findComponentByProp(SCHEMA, "body:content:parametersPanel", "token.expireTime")); +assertNotNull(findComponentByProp(SCHEMA, "body:content:parametersPanel", "authentication.statuses")); } @Test @@ -70,7 +70,7 @@ public class ParametersITCase extends AbstractConsoleITCase { public void updateParameter() { TESTER.assertComponent("body:content:parametersPanel", WebMarkupContainer.class); -Component result = findComponentByProp(SCHEMA, "body:content:parametersPanel", "token.expireTime"); +Component result = findComponentByProp(SCHEMA, "body:content:parametersPanel", "notification.maxRetries"); assertNotNull(result); TESTER.clickLink(result.getPageRelativePath() + ":cells:4:cell:panelEdit:editLink"); @@ -106,10 +106,6 @@ public class ParametersITCase extends AbstractConsoleITCase { TESTER.assertInfoMessages("Operation executed successfully"); TESTER.cleanupFeedbackMessages(); -TESTER.clickLink("body:content:parametersPanel:" -+ "container:content:searchContainer:resultTable:tablePanel:" -+ "groupForm:checkgroup:dataTable:bottomToolbars:toolbars:3:span:navigator:last"); - Component result = findComponentByProp(SCHEMA, "body:content:parametersPanel", "deleteParam"); assertNotNull(result); TESTER.clickLink(result.getPageRelativePath() + ":cells:4:cell:panelDelete:deleteLink");
[1/2] syncope git commit: Upgrading Payara
Repository: syncope Updated Branches: refs/heads/2_0_X 2944f953a -> 249793b07 refs/heads/master 72f10bade -> 2a9d9b105 Upgrading Payara Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/249793b0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/249793b0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/249793b0 Branch: refs/heads/2_0_X Commit: 249793b079abb4ee0c7a29ad2fa3e8d13945b927 Parents: 2944f95 Author: Francesco ChicchiriccòAuthored: Thu Feb 23 11:39:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 11:39:04 2017 +0100 -- fit/core-reference/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/249793b0/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 05a560e..19867f8 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -628,7 +628,7 @@ under the License. glassfish4x - https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.164/payara-4.1.1.164.zip + https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.171.0.1/payara-4.1.1.171.0.1.zip ${settings.localRepository}/org/codehaus/cargo/cargo-container-archives ${project.build.directory}/cargo/extract
[2/2] syncope git commit: Upgrading Payara
Upgrading Payara Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2a9d9b10 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2a9d9b10 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2a9d9b10 Branch: refs/heads/master Commit: 2a9d9b105c8f99c8f3a6abe2a500ef972e0406f7 Parents: 72f10ba Author: Francesco ChicchiriccòAuthored: Thu Feb 23 11:39:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Feb 23 11:39:15 2017 +0100 -- fit/core-reference/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2a9d9b10/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 70b9715..f702680 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -628,7 +628,7 @@ under the License. glassfish4x - https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.164/payara-4.1.1.164.zip + https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.1.171.0.1/payara-4.1.1.171.0.1.zip ${settings.localRepository}/org/codehaus/cargo/cargo-container-archives ${project.build.directory}/cargo/extract