Commit dbffd658 authored by Gabriel Guardincerri's avatar Gabriel Guardincerri Committed by gguardin

[JM-1329] Add CS tab page in OF. Reviewer Daniel Henninger.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10227 b35dd754-fafc-0310-a699-88a17e54d16e
parent 8d938f5a
......@@ -141,11 +141,9 @@ tab.tab-plugins.descr=Klikn\u011bte pro spr\u00e1vu v\u0161ech dopl\u0148k\u016f
sidebar.available-plugins.descr=Klikn\u011bte pro zobrazen\u00ed dostupn\u00fdch dopl\u0148k\u016f
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Zna\u010dka vlo\u017eena u\u017eivatelem {0} - {1} ---
......@@ -2361,8 +2359,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -140,11 +140,9 @@ tab.tab-plugins.descr=Click to manage all plugins
sidebar.available-plugins.descr=Click to browse available plugins
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Markerung eingef\u00fcgt von {0} am {1} ---
......@@ -2347,8 +2345,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -411,6 +411,34 @@
## Added key: 'clearspace.admin.title
## Added key: 'clearspace.admin.notconnected.title
## Added key: 'clearspace.admin.notconnected.description
## Removed key: 'clearspace.info.title'
## Removed key: 'clearspace.info.status.title'
## Removed key: 'clearspace.info.status.connected'
## Removed key: 'clearspace.info.status.disconnected'
## Removed key: 'clearspace.admin.title
## Removed key: 'clearspace.admin.notconnected.title
## Removed key: 'clearspace.admin.notconnected.description
## Added key: 'clearspace.info.title'
## Added key: 'clearspace.info.status.title'
## Added key: 'clearspace.info.status.config.error'
## Added key: 'clearspace.info.status.disconnected.error'
## Added key: 'clearspace.info.status.disconnected.of.title'
## Added key: 'clearspace.info.status.disconnected.of.description'
## Added key: 'clearspace.info.status.disconnected.cs.title'
## Added key: 'clearspace.info.status.disconnected.cs.description'
## Added key: 'clearspace.info.status.disconnected.of_and_cs.title'
## Added key: 'clearspace.info.status.disconnected.of_and_cs.description'
## Added key: 'clearspace.info.status.disconnected.buttons.description'
## Added key: 'clearspace.info.table.title'
## Added key: 'clearspace.info.label.num_components'
## Added key: 'clearspace.info.label.creation'
## Added key: 'clearspace.info.label.last_active'
## Added key: 'clearspace.info.label.statistics'
## Added key: 'clearspace.info.label.received'
## Added key: 'clearspace.info.label.hostname'
## Added key: 'clearspace.info.status.test'
## Added key: 'clearspace.info.status.admin'
## Added key: 'clearspace.info.status.configure'
# Openfire
......@@ -562,11 +590,10 @@ tab.tab-plugins.descr=Click to manage all plugins
sidebar.available-plugins.descr=Click to browse available plugins
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Marker inserted by {0} at {1} ---
......@@ -2857,11 +2884,23 @@ security.audit.viewer.view_url.url=URL
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
# Clearspace admin page
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -137,11 +137,9 @@ tab.tab-plugins.descr=Presione para administrar los plugins
sidebar.available-plugins.descr=Presione para ver plugins disponibles
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Marcador insertado por {0} en {1} ---
......@@ -2398,8 +2396,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -119,11 +119,9 @@ sidebar.available-plugins = Plugins Disponibles
sidebar.available-plugins.descr = Cliquez pour voir les plugins disponibles
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by = --- Marqueur ajout\u00E9 par {0} le {1} ---
......@@ -1969,8 +1967,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -320,11 +320,9 @@ tab.tab-plugins.descr=\u3059\u3079\u3066\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u30
sidebar.available-plugins.descr=\u5229\u7528\u53ef\u80fd\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u53c2\u7167\u3059\u308b\u5834\u5408\u306b\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Marker inserted by {0} at {1} ---
......@@ -2494,8 +2492,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -138,11 +138,9 @@ tab.tab-plugins.descr=Click to manage all plugins
sidebar.available-plugins.descr=Click to browse available plugins
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Markering ingevoegd door {0} om {1} ---
......@@ -2358,8 +2356,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -142,11 +142,9 @@ tab.tab-plugins.descr=Kliknij aby zarz\u0105dza\u0107 wszystkimi wtyczkami
sidebar.available-plugins.descr=Kliknij aby przegl\u0105da\u0107 dost\u0119pne wtyczki
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Zaznaczenie utworzone przez {0} w {1} ---
......@@ -2327,8 +2325,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -140,11 +140,9 @@ tab.tab-plugins.descr=Clique para gerenciar todos os plugins
sidebar.available-plugins.descr=Clique para listar plugins dispon\u00edveis
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- Marca inserida por {0} em {1} ---
......@@ -2361,8 +2359,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -141,11 +141,9 @@ tab.tab-plugins.descr=\u5355\u51fb\u7ba1\u7406\u6240\u6709\u7684\u63d2\u4ef6
sidebar.available-plugins.descr=\u5355\u51fb\u6d4f\u89c8\u6709\u6548\u7684\u63d2\u4ef6
tab.tab-clearspace=Clearspace
tab.tab-clearspace.descr=Click manage Clearspace integration
sidebar.sidebar-clearspace-admin=Clearspace Admin
sidebar.sidebar-clearspace=Clearspace Integration
sidebar.clearspace-info=Clearspace Information
sidebar.clearspace-info.descr=Information about Clearspace integration
sidebar.clearspace-admin=Admin Clearspace
sidebar.clearspace-admin.descr=Login into Clearspace admin console
# Log messages
log.marker_inserted_by=--- \u7531 {0} \u5728 {1} \u63d2\u5165\u7684\u6807\u8bb0 ---
......@@ -2139,8 +2137,23 @@ user.create.admin_info=Grants admin access to Openfire
user.properties.isadmin=User has administrative privileges.
clearspace.info.title=Clearspace information
clearspace.info.status.title=Connection status
clearspace.info.status.connected=Connected
clearspace.info.status.disconnected=Disconnected
clearspace.admin.title=Configuration problems
clearspace.admin.notconnected.title=Openfire and Clearspace are not connected
clearspace.admin.notconnected.description=Check the real time integration configuration in Clearspace and Openfire.
\ No newline at end of file
clearspace.info.status.config.error=Error trying to configure Clearspace.
clearspace.info.status.disconnected.error=Openfire and Clearspace are not connected.
clearspace.info.status.disconnected.of.title=Openfire is not connected to Clearspce
clearspace.info.status.disconnected.of.description=Please check the that Openfire is pointing to the right Clearspace URL {0}here{1}.
clearspace.info.status.disconnected.cs.title=Clearspace is not connected to Openfire
clearspace.info.status.disconnected.cs.description=The most common reason for this is that Openfire wasn't able to configure Clearsapce. Until that happen Openfire will try to configure it every minute.
clearspace.info.status.disconnected.of_and_cs.title=Openfire and Clearspace are currently not connected.
clearspace.info.status.disconnected.of_and_cs.description=Please check that they have the same shared secret and that Openfire is pointing to the right Clearspace URL. \
You can check Openfire configuration {0}here{1}. Or you can configure Clearspace at admin console then click on Real-Time tab and finally go to Connection menu item
clearspace.info.status.disconnected.buttons.description=You can test Openfire connection or try to force Clearspace configuration by using the following buttons:
clearspace.info.table.title=Clearspace Connection Details
clearspace.info.label.num_components=Number of Clearpace Nodes
clearspace.info.label.creation=Creation Date
clearspace.info.label.last_active=Last Activity
clearspace.info.label.statistics=Statistics
clearspace.info.label.received=Packets Received/Sent:
clearspace.info.label.hostname=Node IP / Hostname
clearspace.info.status.test=Test Connection
clearspace.info.status.admin=Clearspace Admin Console
clearspace.info.status.configure=Configure Clearspace
\ No newline at end of file
......@@ -375,20 +375,14 @@ public class AdminConsole {
clearspace.addAttribute("url", "clearspace-info.jsp");
clearspace.addAttribute("description", LocaleUtils.getLocalizedString("tab.tab-clearspace.descr"));
Element sidebar = clearspace.addElement("sidebar");
sidebar.addAttribute("id", "sidebar-clearspace-admin");
sidebar.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.sidebar-clearspace-admin"));
sidebar.addAttribute("id", "sidebar-clearspace");
sidebar.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.sidebar-clearspace"));
Element item = sidebar.addElement("item");
item.addAttribute("id", "clearspace-info");
item.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.clearspace-info"));
item.addAttribute("url", "clearspace-info.jsp");
item.addAttribute("description", LocaleUtils.getLocalizedString("sidebar.clearspace-info.descr"));
item = sidebar.addElement("item");
item.addAttribute("id", "clearspace-connection");
item.addAttribute("name", LocaleUtils.getLocalizedString("sidebar.clearspace-connection"));
item.addAttribute("url", "clearspace-connection.jsp");
item.addAttribute("description", LocaleUtils.getLocalizedString("sidebar.clearspace-connection.descr"));
}
}
......
......@@ -515,6 +515,29 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
XMPPServer.getInstance().getMultiUserChatManager().unregisterMultiUserChatService(MUC_SUBDOMAIN);
}
public synchronized boolean configClearspace() {
// If the task is running, stop it
if (configClearspaceTask != null) {
configClearspaceTask.cancel();
Log.debug("Stopping previous configuration Clearspace task.");
}
boolean configured = false;
try {
doConfigClearspace();
configured = true;
} catch (UnauthorizedException e) {
Log.info("Unauthorized to configure Clearspace.", e);
} catch (UnsupportedOperationException e) {
Log.info("Error configuring Clearspace.", e);
}
if (!configured) {
startClearspaceConfig();
}
return configured;
}
/**
*
*/
......@@ -532,7 +555,7 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
Log.debug("Starting configuration Clearspace task in 10 seconds.");
}
private synchronized void configClearspace() throws UnauthorizedException {
private synchronized void doConfigClearspace() throws UnauthorizedException {
Log.debug("Starting Clearspace configuration.");
......@@ -1121,7 +1144,7 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
public void run() {
try {
Log.debug("Trying to configure Clearspace.");
configClearspace();
doConfigClearspace();
} catch (UnauthorizedException e) {
Log.warn("Unauthorization problem trying to configure Clearspace, trying again in 1 minute", e);
// TODO: Mark that there is an authorization problem
......
<%--
- Copyright (C) 2005-2008 Jive Software. All rights reserved.
-
- This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution, or a commercial license
- agreement with Jive.
--%>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager,
org.jivesoftware.util.StringUtils"
errorPage="error.jsp"
%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %>
<%
boolean connected = ClearspaceManager.getInstance().testConnection();
String username = webManager.getUser().getUsername();
String secret = ClearspaceManager.getInstance().getSharedSecret();
String uri = ClearspaceManager.getInstance().getConnectionURI();
String nonce = ClearspaceManager.getInstance().getNonce();
if (connected && username != null && secret != null && uri != null) {
// Redirect to the admin console of Clearspace.
response.sendRedirect(uri + "admin/login.jsp?login=true&username=" + username + "&secret=" +
StringUtils.hash(username + ":" + secret + ":" + nonce) + "&nonce=" + nonce);
return;
}
%>
<html>
<head>
<title><fmt:message key="clearspace.admin.title"/></title>
<meta name="pageID" content="clearspace-admin"/>
<script src="dwr/engine.js" type="text/javascript"></script>
<script src="dwr/util.js" type="text/javascript"></script>
</head>
<style type="text/css">
.light-gray-border {
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 1px;
padding: 5px;
-moz-border-radius: 3px;
}
.table-header {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 0;
padding: 5px;
}
.table-header-align-right {
text-align: right;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 0;
padding: 5px;
}
.row-header {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0;
padding: 5px;
}
.table-header-left {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 1px;
padding: 5px;
}
.table-header-right {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0;
padding: 5px;
}
.line-bottom-border {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt;
border-color: #e3e3e3;
border-style: solid;
border-width: 0 0 1px 0;
padding: 5px;
}
</style>
<body>
<h3><fmt:message key="clearspace.admin.notconnected.title"/></h3>
<p><fmt:message key="clearspace.admin.notconnected.description"/></p>
</body>
</html>
\ No newline at end of file
......@@ -6,9 +6,16 @@
- agreement with Jive.
--%>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager"
<%@ page import="org.jivesoftware.openfire.SessionManager"
errorPage="error.jsp"
%>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager" %>
<%@ page import="org.jivesoftware.openfire.session.ComponentSession" %>
<%@ page import="org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.util.StringUtils" %>
<%@ page import="java.text.NumberFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Date" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -18,7 +25,66 @@
<%
boolean connected = ClearspaceManager.getInstance().testConnection();
boolean test = request.getParameter("test") != null;
boolean configure = request.getParameter("configure") != null;
boolean csAdmin = request.getParameter("csAdmin") != null;
String testPage = "setup/setup-clearspace-integration_test.jsp";
ClearspaceManager manager = ClearspaceManager.getInstance();
boolean configured = false;
if (configure) {
configured = manager.configClearspace();
}
// Checks if CS and OF are currently connected
boolean connectedCS = manager.isClearspaceConnected();
boolean connectedOF = manager.isOpenfireConnected();
if (csAdmin) {
String username = webManager.getUser().getUsername();
String secret = manager.getSharedSecret();
String uri = manager.getConnectionURI();
String nonce = manager.getNonce();
if (connectedOF && username != null && secret != null && uri != null) {
// Redirect to the admin console of Clearspace.
response.sendRedirect(uri + "admin/login.jsp?login=true&username=" + username + "&secret=" +
StringUtils.hash(username + ":" + secret + ":" + nonce) + "&nonce=" + nonce);
return;
}
}
Date creationDate = null;
Date lastActivity = null;
int numServerPackets = 0;
int numClientPackets = 0;
int numComponents = 0;
Collection<ComponentSession> componentSessions = null;
// If connected collects stats from Clearspace sessions
if (connectedCS && connectedOF) {
SessionManager sessionManager = webManager.getSessionManager();
componentSessions = sessionManager.getComponentSessions();
for (ComponentSession cs : componentSessions) {
// All Clearspace sessions start with "clearspace"
if (cs.getAddress().getDomain().startsWith("clearspace")) {
if (creationDate == null || cs.getCreationDate().before(creationDate)) {
creationDate = cs.getCreationDate();
}
if (lastActivity == null || cs.getLastActiveDate().after(lastActivity)) {
lastActivity = cs.getLastActiveDate();
}
numClientPackets += cs.getNumClientPackets();
numServerPackets += cs.getNumServerPackets();
numComponents++;
break;
}
}
}
// Number dateFormatter for all numbers on this page:
NumberFormat numFormatter = NumberFormat.getNumberInstance();
%>
<html>
......@@ -26,93 +92,189 @@
<title><fmt:message key="clearspace.info.title"/></title>
<meta name="pageID" content="clearspace-info"/>
<style type="text/css" title="setupStyle" media="screen">
@import "style/lightbox.css";
@import "style/ldap.css";
</style>
<script language="JavaScript" type="text/javascript" src="js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="js/tooltips/domTT.js"></script>
<script src="dwr/engine.js" type="text/javascript"></script>
<script src="dwr/util.js" type="text/javascript"></script>
</head>
<style type="text/css">
.light-gray-border {
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 1px;
padding: 5px;
-moz-border-radius: 3px;
}
.table-header {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 0;
padding: 5px;
}
.table-header-align-right {
text-align: right;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 0;
padding: 5px;
}
.row-header {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0;
padding: 5px;
}
.table-header-left {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 0 1px 1px;
padding: 5px;
}
.table-header-right {
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0;
padding: 5px;
}
.line-bottom-border {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt;
border-color: #e3e3e3;
border-style: solid;
border-width: 0 0 1px 0;
padding: 5px;
}
</style>
<body>
<h3><fmt:message key="clearspace.info.status.title"/></h3>
<% if (connected) {%>
<p><fmt:message key="clearspace.info.status.connected"/></p>
<% if (test) { %>
<a href="<%= testPage%>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"></a>
<script type="text/javascript">
function loadMsg() {
var lb = new lightbox(document.getElementById('lbmessage'));
lb.activate();
}
setTimeout('loadMsg()', 250);
</script>
<% } %>
<% if (!connectedCS || !connectedOF) { %>
<div class="error">
<fmt:message key="clearspace.info.status.disconnected.error"/>
</div>
<% if (configure && !configured) { %>
<div class="error">
<fmt:message key="clearspace.info.status.config.error"/>
</div>
<% } %>
<p>
<% if (!connectedCS && !connectedOF) { %>
<h3><fmt:message key="clearspace.info.status.disconnected.of_and_cs.title"/></h3>
<fmt:message key="clearspace.info.status.disconnected.of_and_cs.description">
<fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
<fmt:param value="<%= "</a>" %>" />
</fmt:message>
<% } else if (!connectedCS) { %>
<h3><fmt:message key="clearspace.info.status.disconnected.cs.title"/></h3>
<fmt:message key="clearspace.info.status.disconnected.cs.description">
<fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
<fmt:param value="<%= "</a>" %>" />
</fmt:message>
<% } else if (!connectedOF) { %>
<h3><fmt:message key="clearspace.info.status.disconnected.of.title"/></h3>
<fmt:message key="clearspace.info.status.disconnected.of.description">
<fmt:param value="<%= "<a href='clearspace-connection.jsp'>" %>" />
<fmt:param value="<%= "</a>" %>" />
</fmt:message>
<% } %>
<p>
<fmt:message key="clearspace.info.status.disconnected.buttons.description"/>
</p>
<form action="clearspace-info.jsp" method="post">
<!-- BEGIN jive-buttons -->
<div class="jive-buttons">
<!-- BEGIN right-aligned buttons -->
<div align="left">
<input type="Submit" name="test" value="<fmt:message key="clearspace.info.status.test" />" id="jive-clearspace-test" border="0">
<input type="Submit" name="configure" value="<fmt:message key="clearspace.info.status.configure" />" id="jive-clearspace-configure" border="0">
</div>
<!-- END right-aligned buttons -->
</div>
<!-- END jive-buttons -->
</form>
<% } else { %>
<div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th colspan="2">
<fmt:message key="clearspace.info.table.title" />
</th>
</tr>
</thead>
<tbody>
<% if (numComponents > 1) { %>
<tr>
<td class="c1">
<fmt:message key="clearspace.info.label.num_components" />
</td>
<td>
<%= numFormatter.format(numComponents) %>
</td>
</tr>
<% } %>
<tr>
<td class="c1">
<fmt:message key="clearspace.info.label.creation" />
</td>
<td>
<%= JiveGlobals.formatDateTime(creationDate) %>
</td>
</tr>
<tr>
<td class="c1">
<fmt:message key="clearspace.info.label.last_active" />
</td>
<td>
<%= JiveGlobals.formatDateTime(lastActivity) %>
</td>
</tr>
<tr>
<td class="c1">
<fmt:message key="clearspace.info.label.statistics" />
</td>
<td>
<fmt:message key="clearspace.info.label.received" />
<%= numFormatter.format(numClientPackets) %>/<%= numFormatter.format(numServerPackets) %>
</td>
</tr>
<% boolean first = true;
for (ComponentSession cs : componentSessions) {
if (first) {
first = false; %>
<tr>
<td rowsapn="<%= componentSessions.size() %>" class="c1">
<fmt:message key="clearspace.info.label.hostname" />
</td>
<td>
<%= cs.getHostAddress() %>
/
<%= cs.getHostName() %>
</td>
</tr>
<% } else { %>
<p><fmt:message key="clearspace.info.status.disconnected"/></p>
<tr>
<td>
<%= cs.getHostAddress() %>
/
<%= cs.getHostName() %>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>
<% } %>
<h3>Clearspace Admin Console</h3>
<br>
<p>Click the following button to go to Clearspace Admin console</p>
<form action="clearspace-info.jsp" method="post">
<!-- BEGIN jive-buttons -->
<div class="jive-buttons">
<!-- BEGIN right-aligned buttons -->
<div align="left">
<input type="Submit" name="csAdmin" value="<fmt:message key="clearspace.info.status.admin" />" id="jive-clearspace-admin" border="0">
</div>
<!-- END right-aligned buttons -->
</div>
<!-- END jive-buttons -->
</form>
<% } %>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment