You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2016/06/06 14:29:36 UTC
syncope git commit: [SYNCOPE-852] provide resource exclusion from
maven filtering
Repository: syncope
Updated Branches:
refs/heads/master 1389a9376 -> f4a9e2cf5
[SYNCOPE-852] provide resource exclusion from maven filtering
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f4a9e2cf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f4a9e2cf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f4a9e2cf
Branch: refs/heads/master
Commit: f4a9e2cf5ce4777a9139d6bcf4041a0c52de1f64
Parents: 1389a93
Author: fmartelli <fa...@gmail.com>
Authored: Mon Jun 6 16:29:14 2016 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Mon Jun 6 16:29:14 2016 +0200
----------------------------------------------------------------------
client/console/pom.xml | 10 ++++++++++
.../console/SyncopeConsoleApplication.java | 8 --------
.../src/main/resources/console.properties | 1 -
.../client/console/pages/Realms_it.properties | 2 +-
.../client/console/pages/Realms_pt_BR.properties | 2 +-
.../panels/GroupDirectoryPanel.properties | 17 +++++++++++++++++
.../panels/GroupDirectoryPanel_it.properties | 17 +++++++++++++++++
.../panels/GroupDirectoryPanel_pt_BR.properties | 17 +++++++++++++++++
.../panels/GroupDirectoryPanel_ru.properties | 19 +++++++++++++++++++
.../console/panels/UserDirectoryPanel.properties | 17 +++++++++++++++++
.../panels/UserDirectoryPanel_it.properties | 17 +++++++++++++++++
.../panels/UserDirectoryPanel_pt_BR.properties | 17 +++++++++++++++++
.../panels/UserDirectoryPanel_ru.properties | 19 +++++++++++++++++++
.../policies/PolicyDirectoryPanel.properties | 8 ++++----
.../policies/PolicyDirectoryPanel_it.properties | 8 ++++----
.../PolicyDirectoryPanel_pt_BR.properties | 8 ++++----
.../policies/PolicyDirectoryPanel_ru.properties | 8 ++++----
.../reports/ReportDirectoryPanel.properties | 6 +++---
.../reports/ReportDirectoryPanel_it.properties | 6 +++---
.../ReportDirectoryPanel_pt_BR.properties | 6 +++---
.../reports/ReportDirectoryPanel_ru.properties | 6 +++---
.../src/main/resources/console.properties | 1 -
.../syncope/fit/console/ReportsITCase.java | 5 +++++
.../src/test/resources/console.properties | 1 -
24 files changed, 185 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/pom.xml
----------------------------------------------------------------------
diff --git a/client/console/pom.xml b/client/console/pom.xml
index c143ee7..6647c9a 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -157,6 +157,16 @@ under the License.
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
+ <excludes>
+ <exclude>org/apache/syncope/**/*.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>org/apache/syncope/**/*.properties</include>
+ </includes>
</resource>
<resource>
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 7ac21a3..2ea2ffd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -84,8 +84,6 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
private String site;
- private String license;
-
private String anonymousUser;
private String anonymousKey;
@@ -142,8 +140,6 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
Args.notNull(version, "<version> not set");
site = props.getProperty("site");
Args.notNull(site, "<site> not set");
- license = props.getProperty("license");
- Args.notNull(license, "<license> not set");
anonymousUser = props.getProperty("anonymousUser");
Args.notNull(anonymousUser, "<anonymousUser> not set");
anonymousKey = props.getProperty("anonymousKey");
@@ -274,10 +270,6 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication {
return site;
}
- public String getLicense() {
- return license;
- }
-
public String getAnonymousUser() {
return anonymousUser;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/console.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/console.properties b/client/console/src/main/resources/console.properties
index 36e2394..03326ff 100644
--- a/client/console/src/main/resources/console.properties
+++ b/client/console/src/main/resources/console.properties
@@ -18,7 +18,6 @@ console.directory=${conf.directory}
version=${syncope.version}
site=${project.parent.url}
-license=${licenseUrl}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties
index d3d65f1..7151e21 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
newRealm=New Realm
-editRealm=Edit Realm ${key}
+editRealm=Edit Realm ${fullPath}
inner.template.edit=Modifica ${left} template per '${right.fullPath}'
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_pt_BR.properties
index d8eaba6..3f7890a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_pt_BR.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
newRealm=New Realm
-editRealm=Edit Realm ${key}
+editRealm=Edit Realm ${fullPath}
inner.template.edit=Edit ${left} template for '${right.fullPath}'
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel.properties
new file mode 100644
index 0000000..51ada13
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Edit ${anyTO.type} ${anyTO.name}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_it.properties
new file mode 100644
index 0000000..624f59d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_it.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Modifica ${anyTO.type} ${anyTO.name}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_pt_BR.properties
new file mode 100644
index 0000000..70a509d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_pt_BR.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Alterar ${anyTO.type} ${anyTO.name}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_ru.properties
new file mode 100644
index 0000000..b881032
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/GroupDirectoryPanel_ru.properties
@@ -0,0 +1,19 @@
+# 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.
+#
+# any.edit=\u00d0\u0098\u00d0\u00b7\u00d0\u00bc\u00d0\u00b5\u00d0\u00bd\u00d0\u00b8\u00d1\u0082\u00d1\u008c ${anyTO.type} ${anyTO.key}
+any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} ${anyTO.name}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties
new file mode 100644
index 0000000..2812ae6
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Edit ${anyTO.type} ${anyTO.username}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties
new file mode 100644
index 0000000..981d6ad
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Modifica ${anyTO.type} ${anyTO.username}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties
new file mode 100644
index 0000000..993254d
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties
@@ -0,0 +1,17 @@
+# 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.
+any.edit=Alterar ${anyTO.type} ${anyTO.username}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties
new file mode 100644
index 0000000..a3c4c77
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties
@@ -0,0 +1,19 @@
+# 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.
+#
+# any.edit=\u00d0\u0098\u00d0\u00b7\u00d0\u00bc\u00d0\u00b5\u00d0\u00bd\u00d0\u00b8\u00d1\u0082\u00d1\u008c ${anyTO.type} ${anyTO.key}
+any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} ${anyTO.username}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
index 5c2d7fa..462153d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
@@ -22,8 +22,8 @@ maxAuthenticationAttempts=Max Authentication Attempts
propagateSuspension=Propagate Suspension
historyLength=History Length
allowNullPassword=Allow Null Password
-policy.rule.conf=Policy '${key}' Rule Configuration
-any.edit=Edit ${key}
+policy.rule.conf=Policy '${description}' Rule Configuration
+any.edit=Edit ${description}
any.new=New Policy
-any.finish=Submit ${key}
-any.cancel=Cancel ${key}
+any.finish=Submit ${description}
+any.cancel=Cancel ${description}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
index 2b6d87c..2175135 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
@@ -22,8 +22,8 @@ maxAuthenticationAttempts=Numero Massimo Tentativi Authenticazione
propagateSuspension=Propagare Sospensione
historyLength=Lunghezza Storico
allowNullPassword=Permetti Password Nulla
-policy.rule.conf=Configurazione Regola Policy '${key}'
-any.edit=Modifica ${key}
+policy.rule.conf=Configurazione Regola Policy '${description}'
+any.edit=Modifica ${description}
any.new=Nuova Policy
-any.finish=Invia ${key}
-any.cancel=Annulla ${key}
+any.finish=Invia ${description}
+any.cancel=Annulla ${description}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
index 5c2d7fa..462153d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
@@ -22,8 +22,8 @@ maxAuthenticationAttempts=Max Authentication Attempts
propagateSuspension=Propagate Suspension
historyLength=History Length
allowNullPassword=Allow Null Password
-policy.rule.conf=Policy '${key}' Rule Configuration
-any.edit=Edit ${key}
+policy.rule.conf=Policy '${description}' Rule Configuration
+any.edit=Edit ${description}
any.new=New Policy
-any.finish=Submit ${key}
-any.cancel=Cancel ${key}
+any.finish=Submit ${description}
+any.cancel=Cancel ${description}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
index 064b0e6..b443266 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
@@ -24,8 +24,8 @@ maxAuthenticationAttempts=Max Authentication Attempts
propagateSuspension=Propagate Suspension
historyLength=History Length
allowNullPassword=Allow Null Password
-policy.rule.conf=Policy '${key}' Rule Configuration
-any.edit=Edit ${key}
+policy.rule.conf=Policy '${description}' Rule Configuration
+any.edit=Edit ${description}
any.new=New Policy
-any.finish=Submit ${key}
-any.cancel=Cancel ${key}
+any.finish=Submit ${description}
+any.cancel=Cancel ${description}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel.properties
index d63f1c0..708ee3d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel.properties
@@ -28,10 +28,10 @@ latestExecStatus=Last execution status
active=Active
-any.edit=Edit Report ${key}
+any.edit=Edit Report ${name}
any.new=New Report
any.finish=Submit Report
any.cancel=Cancel Report
-report.view=Executions of report '${key}'
-reportlet.conf=Reportlet configuration for ${key}
+report.view=Executions of report '${name}'
+reportlet.conf=Reportlet configuration for ${name}
close=Close
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_it.properties
index 8449d96..2bedb4a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_it.properties
@@ -28,10 +28,10 @@ latestExecStatus=Stato ultima esecuzione
active=Active
-any.edit=Modifica Report ${key}
+any.edit=Modifica Report ${name}
any.new=Nuovo Report
any.finish=Conferma Report
any.cancel=Annulla Report
-report.view=Esecuzioni del report '${key}'
-reportlet.conf=Configurazione reportlet per ${key}
+report.view=Esecuzioni del report '${name}'
+reportlet.conf=Configurazione reportlet per ${name}
close=Close
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
index a0ad069..bda2b2e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
@@ -28,10 +28,10 @@ latestExecStatus=Stato ultima esecuzione
active=Active
-any.edit=Edit Report ${key}
+any.edit=Edit Report ${name}
any.new=New Report
any.finish=Submit Report
any.cancel=Cancel Report
-report.view=Executions of report '${key}'
-reportlet.conf=Reportlet configuration for ${key}
+report.view=Executions of report '${name}'
+reportlet.conf=Reportlet configuration for ${name}
close=Close
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_ru.properties
index f6124f7..5562fde 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_ru.properties
@@ -35,11 +35,11 @@ latestExecStatus=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u
active=Active
-any.edit=Edit Report ${key}
+any.edit=Edit Report ${name}
any.new=New Report
any.finish=Submit Report
any.cancel=Cancel Report
# task.view=\u00d0\u0097\u00d0\u00b0\u00d0\u00bf\u00d1\u0083\u00d1\u0081\u00d0\u00ba\u00d0\u00b8 \u00d0\u00b7\u00d0\u00b0\u00d0\u00b4\u00d0\u00b0\u00d1\u0087\u00d0\u00b8
-report.view=Executions of report '${key}'
-reportlet.conf=Reportlet configuration for ${key}
+report.view=Executions of report '${name}'
+reportlet.conf=Reportlet configuration for ${name}
close=Close
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/fit/console-reference/src/main/resources/console.properties
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties
index f87b8d7..00834e6 100644
--- a/fit/console-reference/src/main/resources/console.properties
+++ b/fit/console-reference/src/main/resources/console.properties
@@ -18,7 +18,6 @@ console.directory=${conf.directory}
version=${syncope.version}
site=${project.parent.url}
-license=${licenseUrl}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
index c6c524d..77e8792 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
@@ -131,6 +131,8 @@ public class ReportsITCase extends AbstractConsoleITCase {
wicketTester.clickLink(result.getPageRelativePath() + ":cells:10:cell:panelView:viewLink");
+ wicketTester.assertModelValue(
+ "body:content:tabbedPanel:panel:secondLevelContainer:title", "Executions of report 'test'");
result = findComponentByProp("status", "body:content:tabbedPanel:panel:secondLevelContainer:second:executions:"
+ "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:"
+ "checkgroup:dataTable", "SUCCESS");
@@ -232,6 +234,9 @@ public class ReportsITCase extends AbstractConsoleITCase {
wicketTester.clickLink(result.getPageRelativePath() + ":cells:10:cell:panelEdit:editLink");
+ wicketTester.assertModelValue("body:content:tabbedPanel:panel:firstLevelContainer:first:outerObjectsRepeater:"
+ + "0:outer:dialog:header:header-label", "Edit Report updateReport");
+
FormTester formTester = wicketTester.newFormTester(
"body:content:tabbedPanel:panel:firstLevelContainer:first:outerObjectsRepeater:0:outer:form");
formTester.setValue("content:form:view:template:dropDownChoiceField", "1");
http://git-wip-us.apache.org/repos/asf/syncope/blob/f4a9e2cf/fit/core-reference/src/test/resources/console.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/resources/console.properties b/fit/core-reference/src/test/resources/console.properties
index f87b8d7..00834e6 100644
--- a/fit/core-reference/src/test/resources/console.properties
+++ b/fit/core-reference/src/test/resources/console.properties
@@ -18,7 +18,6 @@ console.directory=${conf.directory}
version=${syncope.version}
site=${project.parent.url}
-license=${licenseUrl}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}