Refs #1698 Replace "service" with "type" in JMX bean names

modules/core/src/cuba-spring.xml

@@ -94,25 +94,25 @@
     <bean id="cuba_MBeanExporter" class="com.haulmont.cuba.jmxcontrol.export.MBeanExporter" lazy-init="false">
         <property name="beans">
             <map>
-                <entry key="${cuba.webContextName}.cuba:service=PersistenceManager"
+                <entry key="${cuba.webContextName}.cuba:type=PersistenceManager"
                        value-ref="cuba_PersistenceManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=ConfigStorage" value-ref="cuba_ConfigStorage"/>
-                <entry key="${cuba.webContextName}.cuba:service=DataCache" value-ref="cuba_DataCache"/>
-                <entry key="${cuba.webContextName}.cuba:service=UserSessions" value-ref="cuba_UserSessions"/>
-                <entry key="${cuba.webContextName}.cuba:service=UniqueNumbers" value-ref="cuba_UniqueNumbers"/>
-                <entry key="${cuba.webContextName}.cuba:service=Emailer" value-ref="cuba_Emailer"/>
-                <entry key="${cuba.webContextName}.cuba:service=EntityLog" value-ref="cuba_EntityLog"/>
-                <entry key="${cuba.webContextName}.cuba:service=FileStorage" value-ref="cuba_FileStorage"/>
-                <entry key="${cuba.webContextName}.cuba:service=LockManager" value-ref="cuba_LockManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=CachingFacade" value-ref="cuba_CachingFacade"/>
-                <entry key="${cuba.webContextName}.cuba:service=ClusterManager" value-ref="cuba_ClusterManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=ScriptingManager" value-ref="cuba_ScriptingManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=ServerInfo" value-ref="cuba_ServerInfo"/>
-                <entry key="${cuba.webContextName}.cuba:service=EmailManager" value-ref="cuba_EmailManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=Scheduling" value-ref="cuba_Scheduling"/>
-                <entry key="${cuba.webContextName}.cuba:service=ObjectsCacheManager"
+                <entry key="${cuba.webContextName}.cuba:type=ConfigStorage" value-ref="cuba_ConfigStorage"/>
+                <entry key="${cuba.webContextName}.cuba:type=DataCache" value-ref="cuba_DataCache"/>
+                <entry key="${cuba.webContextName}.cuba:type=UserSessions" value-ref="cuba_UserSessions"/>
+                <entry key="${cuba.webContextName}.cuba:type=UniqueNumbers" value-ref="cuba_UniqueNumbers"/>
+                <entry key="${cuba.webContextName}.cuba:type=Emailer" value-ref="cuba_Emailer"/>
+                <entry key="${cuba.webContextName}.cuba:type=EntityLog" value-ref="cuba_EntityLog"/>
+                <entry key="${cuba.webContextName}.cuba:type=FileStorage" value-ref="cuba_FileStorage"/>
+                <entry key="${cuba.webContextName}.cuba:type=LockManager" value-ref="cuba_LockManager"/>
+                <entry key="${cuba.webContextName}.cuba:type=CachingFacade" value-ref="cuba_CachingFacade"/>
+                <entry key="${cuba.webContextName}.cuba:type=ClusterManager" value-ref="cuba_ClusterManager"/>
+                <entry key="${cuba.webContextName}.cuba:type=ScriptingManager" value-ref="cuba_ScriptingManager"/>
+                <entry key="${cuba.webContextName}.cuba:type=ServerInfo" value-ref="cuba_ServerInfo"/>
+                <entry key="${cuba.webContextName}.cuba:type=EmailManager" value-ref="cuba_EmailManager"/>
+                <entry key="${cuba.webContextName}.cuba:type=Scheduling" value-ref="cuba_Scheduling"/>
+                <entry key="${cuba.webContextName}.cuba:type=ObjectsCacheManager"
                        value-ref="cuba_ObjectsCacheManager"/>
-                <entry key="${cuba.webContextName}.cuba:service=PasswordEncryptionSupport"
+                <entry key="${cuba.webContextName}.cuba:type=PasswordEncryptionSupport"
                        value-ref="cuba_PasswordEncryptionSupport"/>
             </map>
         </property>

modules/portal/src/cuba-portal-spring.xml

@@ -38,7 +38,7 @@
     <bean id="cuba_web_MBeanExporter" class="com.haulmont.cuba.jmxcontrol.export.MBeanExporter" lazy-init="false">
         <property name="beans">
             <map>
-                <entry key="${cuba.webContextName}.cuba:service=Configuration"
+                <entry key="${cuba.webContextName}.cuba:type=Configuration"
                        value-ref="cuba_PortalConfigurationMBean"/>
             </map>
         </property>

modules/web/src/com/haulmont/cuba/web/ui/jmxcontrol/messages.properties

@@ -7,7 +7,7 @@ mbean.className = Class name
 mbean.objectName = Object name
 mbean.description = Description
 mbean.domain = Domain
-mbean.name = Name
+mbean.name = ObjectName
 mbean.propertyList = Property list
 mbean.operations = Operations
 mbean.operations.none = None
@@ -44,4 +44,4 @@ invokeOperation.conversionError = Failed to convert attributes
 close = Close
 refresh = Refresh
 
-searchByObjectName = Search by Name:
+searchByObjectName = Search by ObjectName:

modules/web/src/com/haulmont/cuba/web/ui/jmxcontrol/messages_fr.properties

@@ -4,7 +4,7 @@
 # Use is subject to license terms.
 #
 
-searchByObjectName = Recherche par nom :
+searchByObjectName = Recherche par ObjectName :
 mbean.domain = Domaine
 mbean.operations = Opérations
 mbean.attribute.access = Accès
@@ -14,7 +14,7 @@ operationResult.void = L'opération a été invoquée avec succès sans valeur r
 inspectMbean.title = Inspecter MBean
 operationResult.exception = Une exception s'est produite, avec le message :
 close = Fermer
-mbean.objectName = Nom objet
+mbean.objectName = ObjectName
 mbean.operation.invoke = Invoquer
 displayMbeans.title = Console JMX
 inspectmbean.error = L'erreur s'est produite lors de l'inspection de MBean

modules/web/src/com/haulmont/cuba/web/ui/jmxcontrol/messages_ru.properties

@@ -6,7 +6,7 @@ inspectMbean.title.format = Просмотр MBean объекта "%s"
 mbean.className = Класс
 mbean.description = Описание
 mbean.domain = Домен
-mbean.name = Имя
+mbean.name = ObjectName
 mbean.propertyList = Список Свойств
 mbean.operations = Операции
 mbean.operations.none = Нет
@@ -43,4 +43,4 @@ invokeOperation.conversionError = Не удалось привести атри
 close = Закрыть
 refresh = Обновить
 
-searchByObjectName = Поиск по имени:
+searchByObjectName = Поиск по ObjectName:

modules/web/src/cuba-web-spring.xml

@@ -33,9 +33,9 @@
     <bean id="cuba_web_MBeanExporter" class="com.haulmont.cuba.jmxcontrol.export.MBeanExporter" lazy-init="false">
         <property name="beans">
             <map>
-                <entry key="${cuba.webContextName}.cuba:service=Configuration" value-ref="cuba_ConfigurationMBean"/>
-                <entry key="${cuba.webContextName}.cuba:service=Caching" value-ref="cuba_CachingMBean"/>
-                <entry key="${cuba.webContextName}.cuba:service=FileUploading" value-ref="cuba_FileUploading"/>
+                <entry key="${cuba.webContextName}.cuba:type=Configuration" value-ref="cuba_ConfigurationMBean"/>
+                <entry key="${cuba.webContextName}.cuba:type=Caching" value-ref="cuba_CachingMBean"/>
+                <entry key="${cuba.webContextName}.cuba:type=FileUploading" value-ref="cuba_FileUploading"/>
             </map>
         </property>
     </bean>