Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bf0289f1 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bf0289f1 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bf0289f1 Branch: refs/heads/master Commit: bf0289f143d23c2f19a64765eefbddb85ac44655 Parents: 72f1b3e Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Mar 9 19:36:50 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Mar 9 19:37:10 2017 +0100 ---------------------------------------------------------------------- .../syncope/client/console/SyncopeConsoleSession.java | 14 ++++++++++++-- .../NotificationDirectoryPanel.properties | 2 +- .../NotificationDirectoryPanel_it.properties | 2 +- .../NotificationDirectoryPanel_pt_BR.properties | 2 +- .../NotificationDirectoryPanel_ru.properties | 10 +++++----- 5 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/bf0289f1/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java index a001839..10cc9b9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java @@ -37,6 +37,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.syncope.client.lib.AnonymousAuthenticationHandler; import org.apache.syncope.client.lib.SyncopeClient; +import org.apache.syncope.client.lib.SyncopeClientFactoryBean; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.EntityTOUtils; import org.apache.syncope.common.lib.to.DomainTO; @@ -228,9 +229,18 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession { } public <T> T getService(final MediaType mediaType, final Class<T> serviceClass) { - T service = client.getService(serviceClass); + T service; + + synchronized (SyncopeConsoleApplication.get().getClientFactory()) { + SyncopeClientFactoryBean.ContentType preType = SyncopeConsoleApplication.get().getClientFactory(). + getContentType(); - WebClient.client(service).type(mediaType).accept(mediaType); + SyncopeConsoleApplication.get().getClientFactory(). + setContentType(SyncopeClientFactoryBean.ContentType.fromString(mediaType.toString())); + service = SyncopeConsoleApplication.get().getClientFactory().create(getJWT()).getService(serviceClass); + + SyncopeConsoleApplication.get().getClientFactory().setContentType(preType); + } return service; } http://git-wip-us.apache.org/repos/asf/syncope/blob/bf0289f1/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.properties index 70c7a20..d8a835d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. any.edit=Edit ${key} -any.new=New e-mail template +any.new=New notification any.finish=Submit any.cancel=Cancel http://git-wip-us.apache.org/repos/asf/syncope/blob/bf0289f1/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_it.properties index d0d15f8..dd9c305 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_it.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. any.edit=Modifica ${key} -any.new=Nuovo e-mail template +any.new=Nuova notifica any.finish=Invia any.cancel=Annulla http://git-wip-us.apache.org/repos/asf/syncope/blob/bf0289f1/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_pt_BR.properties index de37c65..6659431 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_pt_BR.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. any.edit=Editar ${key} -any.new=Novo e-mail template +any.new=Nova notifica\u00e7\u00e3o any.finish=Enviar any.cancel=Cancelar http://git-wip-us.apache.org/repos/asf/syncope/blob/bf0289f1/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_ru.properties index 4b9cd0a..137e8c3 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel_ru.properties @@ -15,11 +15,11 @@ # specific language governing permissions and limitations # under the License. # -# any.edit=ÐзмениÑÑ ${key} +# any.edit=\u00d0\u0098\u00d0\u00b7\u00d0\u00bc\u00d0\u00b5\u00d0\u00bd\u00d0\u00b8\u00d1\u0082\u00d1\u008c ${key} any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${key} -# any.new=СоздаÑÑ Ñаблон ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ -any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f -# any.finish=Ð¡Ð¾Ñ ÑаниÑÑ +# any.new=\u00d0\u00a1\u00d0\u00be\u00d0\u00b7\u00d0\u00b4\u00d0\u00b0\u00d1\u0082\u00d1\u008c \u00d1\u0088\u00d0\u00b0\u00d0\u00b1\u00d0\u00bb\u00d0\u00be\u00d0\u00bd \u00d1\u0083\u00d0\u00b2\u00d0\u00b5\u00d0\u00b4\u00d0\u00be\u00d0\u00bc\u00d0\u00bb\u00d0\u00b5\u00d0\u00bd\u00d0\u00b8\u00d1\u008f +any.new=\u041d\u043e\u0432\u043e\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 +# any.finish=\u00d0\u00a1\u00d0\u00be\u00d1\u0085\u00d1\u0080\u00d0\u00b0\u00d0\u00bd\u00d0\u00b8\u00d1\u0082\u00d1\u008c any.finish=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c -# any.cancel=ÐÑмена +# any.cancel=\u00d0\u009e\u00d1\u0082\u00d0\u00bc\u00d0\u00b5\u00d0\u00bd\u00d0\u00b0 any.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
