Updated Clearspace connection setup page, and some language tweaks.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9911 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/openfire_i18n_cs_CZ.properties

@@ -2239,14 +2239,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2260,11 +2265,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_de.properties

@@ -2225,14 +2225,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2246,11 +2251,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_en.properties

@@ -333,6 +333,14 @@
 ##      Added key: 'user.properties.unlocksuccess'
 ##      Added key: 'sidebar.user-lockout'
 ##      Added key: 'sidebar.user-lockout.descr'
+##      Updated key: 'profile-settings.info'
+##      Added key: 'setup.clearspace.service.path'
+##      Added key: 'setup.clearspace.service.path_help'
+##      Added key: 'setup.clearspace.service.path_error'
+##      Added key: 'setup.clearspace.service.secure'
+##      Added key: 'setup.clearspace.service.secure_help'
+##      Added key: 'setup.clearspace.advanced'
+##      Added key: 'setup.clearspace.service.connectionURI'
 
 
 # Openfire
@@ -1629,7 +1637,9 @@ setup.profile.ldap_description=Integrate with a directory server such as Active
   as read-only.
 setup.profile.clearspace=Clearspace Integration
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
+
 
 # Setup LDAP pages
 
@@ -1789,18 +1799,25 @@ setup.ldap.group.test.group-not-found=No groups were found using the specified c
 
 setup.clearspace.continue=Save & Continue
 setup.clearspace.test=Test Settings
+setup.clearspace.advanced=Advanced Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.connection_settings=Connection Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.clearspace.service=Clearspace Service
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.port=Port
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
@@ -2528,8 +2545,8 @@ httpbind.settings.script.label_disable_info=Does not allow clients with limited
 
 profile-settings.title=Profile Settings
 profile-settings.info=The server is currently using the following user and group system. When using \
-    LDAP it is possible to alter current integration settings. However, if you want to change the user and group \
-    system then you will need to re-run the setup process.
+    LDAP or Clearspace integration it is possible to alter current integration settings. However, \
+    if you want to change the user and group system then you will need to re-run the setup process.
 profile-settings.ldap_mapping_info=LDAP Settings
 profile-settings.clearspace_mapping_info=Clearspace Settings
 

src/i18n/openfire_i18n_es.properties

@@ -2286,9 +2286,14 @@ setup.clearspace.service.host=Servidor
 setup.clearspace.service.host_error=Ingrese un nombre de servicio v\u00e1lido para Clearspace.
 setup.clearspace.service.host_help=Nombre del servicio de Clearspace; e.g. cs.example.com
 setup.clearspace.service.integration=Integraci\u00f3n con Clearspace
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.port=Puerto
 setup.clearspace.service.port_error=Ingrese un puerto de Clearspace v\u00e1lido.
-setup.clearspace.service.port_help=N\u00famero de puerto de Clearspace. El valor por defecto es 8080.
+setup.clearspace.service.port_help=N\u00famero de puerto de Clearspace. El valor por defecto es 80.
 setup.clearspace.service.secret=Secreto Compartido
 setup.clearspace.service.secret_error=Ingrese el mismo secreto compartido ingresado en Clearspace.
 setup.clearspace.service.secret_help=Secreto compartido entre Clearspace y Openfire.
@@ -2302,6 +2307,8 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Seteos de Conexi\u00f3n
 setup.clearspace.test=Probar Seteos
 setup.clearspace.title=Seteos de Perfil - Integraci\u00f3n con Clearspace
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Integraci\u00f3n con Clearspace
 setup.ldap.user.vcard.avatardb=Almacenar avatar en la base de datos si no existe en LDAP
 setup.profile.clearspace_description=Integrar con una instalaci\u00f3n existente de Clearspace. Usuarios y Grupos \

src/i18n/openfire_i18n_fr.properties

@@ -1845,14 +1845,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -1866,11 +1871,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_ja_JP.properties

@@ -2372,14 +2372,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2393,11 +2398,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_nl.properties

@@ -2236,14 +2236,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2257,11 +2262,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_pl_PL.properties

@@ -2205,14 +2205,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2226,11 +2231,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_pt_BR.properties

@@ -2239,14 +2239,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2260,11 +2265,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/i18n/openfire_i18n_zh_CN.properties

@@ -2016,14 +2016,19 @@ setup.clearspace.continue=Save & Continue
 setup.clearspace.profile=Profile Settings
 setup.clearspace.service=Clearspace Service
 setup.clearspace.service.connection_settings=Connection Settings
-setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.
+setup.clearspace.service.description=Configure connection settings for your Clearspace service below.  All fields are required, and the shared secret is configured from the Clearspace admin console.  Please be aware that Clearspace 2.0 or higher is required.
 setup.clearspace.service.host=Host
 setup.clearspace.service.host_error=Enter a valid Clearspace service host name.
 setup.clearspace.service.host_help=Clearspace service host name; e.g. cs.example.com, etc.
 setup.clearspace.service.integration=Clearspace Integration
 setup.clearspace.service.port=Port
 setup.clearspace.service.port_error=Enter a valid Clearspace service port number.
-setup.clearspace.service.port_help=Clearspace service port number. The default value is 8080.
+setup.clearspace.service.port_help=Clearspace service port number. The default value is 80.
+setup.clearspace.service.path=URI Path
+setup.clearspace.service.path_help=Clearspace URI path, without the / in front.  e.g. clearspace instead of /clearspace.
+setup.clearspace.service.path_error=Enter a valid Clearspace URI path.
+setup.clearspace.service.secure=Secure
+setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
 setup.clearspace.service.secret=Shared Secret
 setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
 setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
@@ -2037,11 +2042,14 @@ setup.clearspace.service.test.title=Test
 setup.clearspace.service.test.title-desc=Connection Settings
 setup.clearspace.test=Test Settings
 setup.clearspace.title=Profile Settings - Clearspace Integration
+setup.clearspace.advanced=Advanced Settings
+setup.clearspace.service.connectionURI=Connection URI:
 setup.profile.clearspace=Clearspace Integration
 setup.ldap.user.vcard.avatardb=Store avatar in database if not provided by LDAP
 setup.ldap.user.vcard.photo=Photo/Avatar
 setup.profile.clearspace_description=Integrate with an existing Clearspace installation.  Users and groups \
-  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users.
+  will be pulled directly from Clearspace. Clearspace will also be used for authenticating users. \
+  Please be aware that Clearspace 2.0 or higher is required.
 profile-settings.clearspace_mapping_info=Clearspace Settings
 admin.logged_in_as=Logged in as {0}
 muc.room.occupants.kick=Kick

src/java/org/jivesoftware/openfire/clearspace/ClearspaceManager.java

@@ -92,8 +92,10 @@ public class ClearspaceManager {
 
 
     private String host;
-    private int port;
+    private int port = 80;
+    private String path = "clearspace";
     private String sharedSecret;
+    private boolean secure = true;
 
     private Map<String, String> properties;
 
@@ -117,12 +119,15 @@ public class ClearspaceManager {
     public ClearspaceManager(Map<String, String> properties) {
         this.properties = properties;
 
+        String secureStr = properties.get("clearspace.secure");
+        if (secureStr != null && (secureStr.equalsIgnoreCase("false") || secureStr.equals("0"))) {
+            secure = false;
+        }
         String host = properties.get("clearspace.host");
         if (host != null) {
             this.host = host;
         }
         String portStr = properties.get("clearspace.port");
-        port = 8080;
         if (portStr != null) {
             try {
                 this.port = Integer.parseInt(portStr);
@@ -131,13 +136,19 @@ public class ClearspaceManager {
                 Log.error(nfe);
             }
         }
+        String path = properties.get("clearspace.path");
+        if (path != null) {
+            this.path = path;
+        }
         sharedSecret = properties.get("clearspace.sharedSecret");
 
         StringBuilder buf = new StringBuilder();
         buf.append("Created new ClearspaceManager() instance, fields:\n");
         buf.append("\t host: ").append(host).append("\n");
         buf.append("\t port: ").append(port).append("\n");
+        buf.append("\t path: ").append(path).append("\n");
         buf.append("\t sharedSecret: ").append(sharedSecret).append("\n");
+        buf.append("\t secure: ").append(secure ? "yes" : "no").append("\n");
 
         if (Log.isDebugEnabled()) {
             Log.debug("ClearspaceManager: "+buf.toString());
@@ -158,6 +169,24 @@ public class ClearspaceManager {
         return true;
     }
 
+    /**
+     * Returns whether we will be making a secure connection or not.  (http vs https)
+     *
+     * @return True or false if we are using a secure connection to Clearspace.
+     */
+    public boolean isSecure() {
+        return secure;
+    }
+
+    /**
+     * Sets whether we will be using a secure (https) connection to Clearspace.
+     *
+     * @param secure True or false, whether secure connections will be enabled.
+     */
+    public void setSecure(boolean secure) {
+        this.secure = secure;
+    }
+
     /**
      * Returns the Clearspace service host; e.g. <tt>cs.example.org</tt>.
      * This value is stored as the Jive Property <tt>clearspace.host</tt>.
@@ -180,7 +209,7 @@ public class ClearspaceManager {
     }
 
     /**
-     * Returns the Clearspace service port number. The default is 8080. This value is
+     * Returns the Clearspace service port number. The default is 80. This value is
      * stored as the Jive Property <tt>clearspace.port</tt>.
      *
      * @return the Clearspace service port number.
@@ -190,7 +219,7 @@ public class ClearspaceManager {
     }
 
     /**
-     * Sets the Clearspace service port number. The default is 8080. This value is
+     * Sets the Clearspace service port number. The default is 80. This value is
      * stored as the Jive property <tt>clearspace.port</tt>.
      *
      * @param port the Clearspace service port number.
@@ -200,6 +229,26 @@ public class ClearspaceManager {
         properties.put("clearspace.port", Integer.toString(port));
     }
 
+    /**
+     * Returns the path component of the Clearspace connection URI, without the prefix /.
+     * Typically clearspace for https://hostname:port/clearspace.
+     *
+     * @return The path component of the URI.
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Sets the path component of the Clearspace connection URI, without the prefix /.
+     * Typically clearspace for https://hostname:port/clearspace.
+     *
+     * @param path the path component of the URI.
+     */
+    public void setPath(String path) {
+        this.path = path;
+    }
+
     /**
      * Returns the password, configured in Clearspace, that Openfire will use to authenticate
      * with Clearspace to perform it's integration.
@@ -219,4 +268,18 @@ public class ClearspaceManager {
         this.sharedSecret = sharedSecret;
         properties.put("clearspace.sharedSecret", sharedSecret);
     }
+
+    /**
+     * Returns the connection URI constructed from various settings from this manager.
+     *
+     * @return the URI that should be used to connect to Clearspace.
+     */
+    public String getConnectionURI() {
+        StringBuffer buf = new StringBuffer();
+        buf.append(secure ? "https" : "http").append("://");
+        buf.append(host).append(":").append(port);
+        buf.append("/").append(path);
+        return buf.toString();
+    }
+
 }
\ No newline at end of file

src/web/setup/clearspace-integration.jspf

@@ -7,8 +7,10 @@
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%
+    boolean secure;
     String host;
-    int port = 8080;
+    int port = 80;
+    String path;
     String sharedSecret;
 
     // Get parameters
@@ -19,6 +21,7 @@
     Map<String, String> errors = new HashMap<String, String>();
 
     if (save || test) {
+        secure = ParamUtils.getBooleanParameter(request, "secure", true);
         host = ParamUtils.getParameter(request, "host");
         if (host == null) {
             errors.put("host", LocaleUtils.getLocalizedString("setup.clearspace.service.host_error"));
@@ -27,20 +30,28 @@
         if (port <= 0) {
             errors.put("port", LocaleUtils.getLocalizedString("setup.clearspace.service.port_error"));
         }
+        path = ParamUtils.getParameter(request, "path", true);
         sharedSecret = ParamUtils.getParameter(request, "sharedSecret");
+        if (sharedSecret == null || sharedSecret.length() == 0) {
+            errors.put("secret", LocaleUtils.getLocalizedString("setup.clearspace.service.secret_error"));
+        }
 
         if (errors.isEmpty()) {
             // Store settings in a map and keep it in the session
             Map<String, String> settings = new HashMap<String, String>();
+            settings.put("clearspace.secure", secure ? "true" : "false");
             settings.put("clearspace.host", host);
             settings.put("clearspace.port", Integer.toString(port));
+            settings.put("clearspace.path", path);
             settings.put("clearspace.sharedSecret", sharedSecret);
             session.setAttribute("clearspaceSettings", settings);
 
             if (save) {
                 // Save settings and redirect
+                manager.setSecure(secure);
                 manager.setHost(host);
                 manager.setPort(port);
+                manager.setPath(path);
                 manager.setSharedSecret(sharedSecret);
 
                 // Enable the Clearspace user, auth, group, and vcard providers.
@@ -60,8 +71,10 @@
         }
     } else {
         // See if there are already values for the variables defined.
+        secure = manager.isSecure();
         host = manager.getHost();
         port = manager.getPort();
+        path = manager.getPath();
         sharedSecret = manager.getSharedSecret();
     }
 %>
@@ -73,7 +86,6 @@
     <% } %>
 </head>
 <body>
-
     <% if (test && errors.isEmpty()) { %>
 
         <a href="<%= testPage%>" id="lbmessage" title="<fmt:message key="global.test" />" style="display:none;"></a>
@@ -100,6 +112,8 @@
 
     <p><fmt:message key="setup.clearspace.service.description" /></p>
 
+    <p><strong><fmt:message key="setup.clearspace.service.connectionURI" /></strong> <span id="connectionUri">https://[hostname]:[port]/[path]</span> <img align="top" height="16" width="16" id="connectionUriStatus" src="" alt="" /></p>
+
     <%  if (errors.size() > 0) { %>
 
     <div class="error">
@@ -123,7 +137,7 @@
                     <table cellpadding="0" cellspacing="0" border="0" width="100%">
                     <tr>
                         <td width="1%" nowrap="nowrap">
-                            <input type="text" name="host" id="jiveCLEARSPACEhost" size="22" maxlength="50" value="<%= host!=null?host:"" %>">
+                            <input type="text" name="host" id="jiveCLEARSPACEhost" size="22" maxlength="50" value="<%= host!=null?host:"" %>" onKeyUp="updateURI()">
                         </td>
                         <td width="99%">
                             <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.host_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
@@ -136,7 +150,7 @@
                     <table cellpadding="0" cellspacing="0" border="0" width="100%">
                     <tr>
                         <td width="1%" nowrap="nowrap">
-                            <input type="text" name="port" id="jiveCLEARSPACEport" size="5" maxlength="5" value="<%= port %>">
+                            <input type="text" name="port" id="jiveCLEARSPACEport" size="5" maxlength="5" value="<%= port %>" onKeyUp="updateURI()">
                         </td>
                         <td width="99%">
                             <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.port_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span>
@@ -161,7 +175,33 @@
                 </td>
 			</tr>
 			</table>
-		</div>
+
+            <!-- BEGIN jiveAdvancedButton -->
+            <div class="jiveAdvancedButton jiveAdvancedButtonTopPad">
+                <a href="#" onclick="togglePanel(jiveAdvanced); return false;" id="jiveAdvancedLink"><fmt:message key="setup.clearspace.advanced" /></a>
+            </div>
+            <!-- END jiveAdvancedButton -->
+
+            <!-- BEGIN jiveAdvancedPanelu (advanced clearspace connection settings) -->
+                <div class="jiveadvancedPanelu" id="jiveAdvanced" style="display: none;">
+                    <div>
+                        <table border="0" cellpadding="0" cellspacing="2">
+                        <tr>
+                        <td align="right"><fmt:message key="setup.clearspace.service.path" />:</td>
+                        <td><input type="text" name="path" value="<%= path %>" id="jiveCLEARSPACEpath" size="22" maxlength="250" onKeyUp="updateURI()"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.path_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"/></td>
+                        </tr>
+                        <tr>
+                        <td align="right"><fmt:message key="setup.clearspace.service.secure" />:</td>
+                        <td><select name="secure" id="jiveCLEARSPACEsecure" onChange="updateURI()">
+                            <option value="true"<%= secure ? " selected='selected'" : "" %>><fmt:message key="global.yes"/></option>
+                            <option value="false"<%= !secure ? " selected='selected'" : "" %>><fmt:message key="global.no"/></option>
+                        </select><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.secure_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"/></td>
+                        </tr>
+                        </table>
+                    </div>
+                </div>
+            <!-- END jiveAdvancedPanelu (advanced clearspace connection settings) -->
+        </div>
 		<!-- END jive-contentBox_bluebox -->
 
         <!-- BEGIN jive-buttons -->
@@ -183,7 +223,48 @@
     </div>
     <!-- END jive-contentBox -->
 
+    <script type="text/javascript">
+        function updateURI() {
+            var uri = "";
+            var valid = true;
+            if (document.getElementById("jiveCLEARSPACEsecure").options[document.getElementById("jiveCLEARSPACEsecure").selectedIndex].value == "false") {
+                uri = uri + "http";
+            }
+            else {
+                uri = uri + "https";
+            }
+            uri = uri + "://";
+            if (document.getElementById("jiveCLEARSPACEhost").value != "") {
+                uri = uri + document.getElementById("jiveCLEARSPACEhost").value;
+            }
+            else {
+                uri = uri + "[hostname]";
+                valid = false;
+            }
+            uri = uri + ":";
+            if (document.getElementById("jiveCLEARSPACEport").value != "") {
+                uri = uri + document.getElementById("jiveCLEARSPACEport").value;
+            }
+            else {
+                uri = uri + "[port]";
+                valid = false;
+            }
+            uri = uri + "/";
+            if (document.getElementById("jiveCLEARSPACEpath").value != "") {
+                uri = uri + document.getElementById("jiveCLEARSPACEpath").value;
+            }
+            document.getElementById("connectionUri").innerHTML = uri;
+            if (valid) {
+                document.getElementById("connectionUriStatus").src = "/images/check-16x16.gif";
+            }
+            else {
+                document.getElementById("connectionUriStatus").src = "/images/error-16x16.gif"
+            }
+        }
 
+        // Initialize URI
+        updateURI();
+    </script>
 
 </body>
 </html>