You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by vv...@apache.org on 2010/10/26 09:19:16 UTC
svn commit: r1027391 - in /felix/trunk/webconsole/src/main:
java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java
native2ascii/OSGI-INF/l10n/bundle_bg.properties
resources/OSGI-INF/l10n/bundle.properties
Author: vvalchev
Date: Tue Oct 26 07:19:15 2010
New Revision: 1027391
URL: http://svn.apache.org/viewvc?rev=1027391&view=rev
Log:
Fixed FELIX-2668 /Add localization for the meta-type/
https://issues.apache.org/jira/browse/FELIX-2668
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java
felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java?rev=1027391&r1=1027390&r2=1027391&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/ConfigurationListener2.java Tue Oct 26 07:19:15 2010
@@ -25,6 +25,7 @@ import java.util.Locale;
import java.util.ResourceBundle;
import java.util.TreeMap;
+import org.apache.felix.webconsole.internal.Util;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.metatype.AttributeDefinition;
@@ -37,8 +38,22 @@ class ConfigurationListener2 extends Con
final String pid; // reduces visibility because access to this was made though synthetic accessor method
+ private final Object ocdLock = new Object();
+ private String ocdLocale;
private ObjectClassDefinition ocd;
private final OsgiManager osgiManager;
+
+ private static final String[] CONF_PROPS = new String[] {
+ OsgiManager.PROP_MANAGER_ROOT, OsgiManager.DEFAULT_MANAGER_ROOT, //
+ OsgiManager.PROP_HTTP_SERVICE_SELECTOR, OsgiManager.DEFAULT_HTTP_SERVICE_SELECTOR, //
+ OsgiManager.PROP_DEFAULT_RENDER, OsgiManager.DEFAULT_PAGE, //
+ OsgiManager.PROP_REALM, OsgiManager.DEFAULT_REALM, //
+ OsgiManager.PROP_USER_NAME, OsgiManager.DEFAULT_USER_NAME, //
+ OsgiManager.PROP_PASSWORD, OsgiManager.DEFAULT_PASSWORD, //
+ OsgiManager.PROP_LOCALE, "", //$NON-NLS-1$
+ };
+
+
static ServiceRegistration create( OsgiManager osgiManager )
@@ -64,7 +79,18 @@ class ConfigurationListener2 extends Con
// there is no locale support here
return null;
}
-
+
+ static final String getString(ResourceBundle rb, String key, String def)
+ {
+ try
+ {
+ return rb.getString(key);
+ }
+ catch (Throwable t)
+ {
+ return def;
+ }
+ }
public ObjectClassDefinition getObjectClassDefinition( String id, String locale )
{
@@ -73,112 +99,106 @@ class ConfigurationListener2 extends Con
return null;
}
- if ( ocd == null )
+ if (locale == null) locale = Locale.ENGLISH.getLanguage();
+
+ // check if OCD is already initialized and it's locale is the same as the requested one
+ synchronized (ocdLock)
{
+ if ( ocd != null && ocdLocale != null && ocdLocale.equals(locale) )
+ {
+ return ocd;
+ }
+ }
+
+ ObjectClassDefinition xocd = null;
+ final Locale localeObj = Util.parseLocaleString(locale);
+ final ResourceBundle rb = osgiManager.resourceBundleManager.getResourceBundle(osgiManager.getBundleContext().getBundle(), localeObj);
+
+ // simple configuration properties
+ final ArrayList adList = new ArrayList();
+ for (int i = 0; i < CONF_PROPS.length; i++)
+ {
+ final String key = CONF_PROPS[i++];
+ final String defaultValue = CONF_PROPS[i];
+ final String name = getString(rb, "metadata." + key + ".name", key); //$NON-NLS-1$ //$NON-NLS-2$
+ final String descr = getString(rb, "metadata." + key + ".description", key); //$NON-NLS-1$ //$NON-NLS-2$
+ adList.add( new AttributeDefinitionImpl(key, name, descr, defaultValue) );
+ }
+
+ // log level is select - so no simple default value; requires localized option labels
+ adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_LOG_LEVEL,
+ getString(rb, "metadata.loglevel.name", OsgiManager.PROP_LOG_LEVEL), //$NON-NLS-1$
+ getString(rb, "metadata.loglevel.description", OsgiManager.PROP_LOG_LEVEL), //$NON-NLS-1$
+ AttributeDefinition.INTEGER, // type
+ new String[] { String.valueOf( OsgiManager.DEFAULT_LOG_LEVEL ) }, // default values
+ 0, // cardinality
+ new String[] { // option labels
+ getString(rb, "log.level.debug", "Debug"), //$NON-NLS-1$ //$NON-NLS-2$
+ getString(rb, "log.level.info", "Information"), //$NON-NLS-1$ //$NON-NLS-2$
+ getString(rb, "log.level.warn", "Warn"), //$NON-NLS-1$ //$NON-NLS-2$
+ getString(rb, "log.level.error", "Error"), //$NON-NLS-1$ //$NON-NLS-2$
+ },
+ new String[] { "4", "3", "2", "1" } ) ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+ // list plugins - requires localized plugin titles
+ final TreeMap namesByClassName = new TreeMap();
+ final String[] defaultPluginsClasses = OsgiManager.PLUGIN_MAP;
+ for ( int i = 0; i < defaultPluginsClasses.length; i++ )
+ {
+ final String clazz = defaultPluginsClasses[i++];
+ final String label = defaultPluginsClasses[i];
+ final String name = getString(rb, label + ".pluginTitle", label); //$NON-NLS-1$
+ namesByClassName.put(clazz, name);
+ }
+ final String[] classes = ( String[] ) namesByClassName.keySet().toArray(
+ new String[namesByClassName.size()] );
+ final String[] names = ( String[] ) namesByClassName.values().toArray( new String[namesByClassName.size()] );
+
+ adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_ENABLED_PLUGINS,
+ getString(rb, "metadata.plugins.name", OsgiManager.PROP_ENABLED_PLUGINS), //$NON-NLS-1$
+ getString(rb, "metadata.plugins.description", OsgiManager.PROP_ENABLED_PLUGINS), //$NON-NLS-1$
+ AttributeDefinition.STRING, classes, Integer.MIN_VALUE, names, classes ) );
+
+ xocd = new ObjectClassDefinition()
+ {
+
+ private final AttributeDefinition[] attrs = ( AttributeDefinition[] ) adList
+ .toArray( new AttributeDefinition[adList.size()] );
+
+
+ public String getName()
+ {
+ return getString(rb, "metadata.name", "Apache Felix OSGi Management Console"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+
+ public InputStream getIcon( int arg0 )
+ {
+ return null;
+ }
+
+
+ public String getID()
+ {
+ return pid;
+ }
+
+
+ public String getDescription()
+ {
+ return getString(rb, "metadata.description", "Configuration of the Apache Felix OSGi Management Console."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+
+ public AttributeDefinition[] getAttributeDefinitions( int filter )
+ {
+ return ( filter == OPTIONAL ) ? null : attrs;
+ }
+ };
- final ArrayList adList = new ArrayList();
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_MANAGER_ROOT, "Root URI",
- "The root path to the OSGi Management Console.", OsgiManager.DEFAULT_MANAGER_ROOT ) );
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_HTTP_SERVICE_SELECTOR, "Http Service Selector",
- "The Http Service Selector is an OSGi filter used to select the Http Service to "
- + "which the Web Console binds. The value of this property (if not empty) is "
- + "combined the object class selection term to get the actual service selection "
- + "filter like (&(objectClass=org.osgi.service.http.HttpService)(selector)). This "
- + "property must not have leading an trailing parentheses. For example, to bind "
- + "to the service with service ID 15 set the selector to 'service.id=15' (without "
- + "the quotes). By default (if this property is not set or set to an empty "
- + "string) the Web Console binds with an Http Service available.",
- OsgiManager.DEFAULT_HTTP_SERVICE_SELECTOR ) );
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_DEFAULT_RENDER, "Default Page",
- "The name of the default configuration page when invoking the OSGi Management console.",
- OsgiManager.DEFAULT_PAGE ) );
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_REALM, "Realm",
- "The name of the HTTP Authentication Realm.", OsgiManager.DEFAULT_REALM ) );
- adList
- .add( new AttributeDefinitionImpl(
- OsgiManager.PROP_USER_NAME,
- "User Name",
- "The name of the user allowed to access the OSGi Management Console. To disable authentication clear this value.",
- OsgiManager.DEFAULT_USER_NAME ) );
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_PASSWORD, "Password",
- "The password for the user allowed to access the OSGi Management Console.",
- OsgiManager.DEFAULT_PASSWORD ) );
- adList
- .add( new AttributeDefinitionImpl(
- OsgiManager.PROP_LOCALE,
- "Locale",
- "If set, this locale forces the localization to use this locale instead of the one, requested by the web browser",
- "" ) );
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_LOG_LEVEL, "Log Level", "Logging Level",
- AttributeDefinition.INTEGER, new String[]
- { String.valueOf( OsgiManager.DEFAULT_LOG_LEVEL ) }, 0, new String[]
- { "Debug", "Information", "Warn", "Error" }, new String[]
- { "4", "3", "2", "1" } ) );
-
- final TreeMap namesByClassName = new TreeMap();
- final ClassLoader loader = getClass().getClassLoader();
- final String[] defaultPluginsClasses = OsgiManager.PLUGIN_MAP;
- for ( int i = 0; i < defaultPluginsClasses.length; i++ )
- {
- final String clazz = defaultPluginsClasses[i++];
- final String label = defaultPluginsClasses[i];
- String name = null;
- try
- {
- name = label + ".pluginTitle";
- final ResourceBundle rb = osgiManager.resourceBundleManager.getResourceBundle(osgiManager.getBundleContext().getBundle(), Locale.ENGLISH);
- name = rb.getString(name);
- }
- catch ( Throwable t )
- {
- name = label;
- // ignore
- }
- namesByClassName.put(clazz, name);
- }
- final String[] classes = ( String[] ) namesByClassName.keySet().toArray(
- new String[namesByClassName.size()] );
- final String[] names = ( String[] ) namesByClassName.values().toArray( new String[namesByClassName.size()] );
-
- adList.add( new AttributeDefinitionImpl( OsgiManager.PROP_ENABLED_PLUGINS, "Plugins",
- "Select active plugins", AttributeDefinition.STRING, classes, Integer.MIN_VALUE, names, classes ) );
-
- ocd = new ObjectClassDefinition()
- {
-
- private final AttributeDefinition[] attrs = ( AttributeDefinition[] ) adList
- .toArray( new AttributeDefinition[adList.size()] );
-
-
- public String getName()
- {
- return "Apache Felix OSGi Management Console";
- }
-
-
- public InputStream getIcon( int arg0 )
- {
- return null;
- }
-
-
- public String getID()
- {
- return pid;
- }
-
-
- public String getDescription()
- {
- return "Configuration of the Apache Felix OSGi Management Console.";
- }
-
-
- public AttributeDefinition[] getAttributeDefinitions( int filter )
- {
- return ( filter == OPTIONAL ) ? null : attrs;
- }
- };
+ synchronized(ocdLock) {
+ this.ocd = xocd;
+ this.ocdLocale = locale;
}
return ocd;
Modified: felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties?rev=1027391&r1=1027390&r2=1027391&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] (original)
+++ felix/trunk/webconsole/src/main/native2ascii/OSGI-INF/l10n/bundle_bg.properties [UTF-8] Tue Oct 26 07:19:15 2010
@@ -251,3 +251,45 @@ configStatus.wait.msg=Зареждане
</head><body>\
<p>Страницата, която търсите (вече) липсва. След 3 секунди ще бъдете препратени автоматично към Уеб конзолата. Ако това не се случи, моля кликнете <a href="{0}">тук</a></p>\
</body></html>
+
+
+# localized configuration meta-data
+metadata.name=Apache Felix OSGi Административна конзола
+metadata.description=Конфигурация на административната конзола
+
+metadata.manager.root.name=Начало
+metadata.manager.root.description=Адрес на сървъра, през който става достъпна административаната конзола
+
+metadata.http.service.filter.name=Избор на Http
+metadata.http.service.filter.description=\
+ Този атрибут е OSGi филтер, който се използва за избор на HTTP сървър, който административната\
+ конзола използва. Стойността на атрибута, ако е зададен се комбинира със стандартният филтър\
+ за идентификация на услугата: (&(objectClass=org.osgi.service.http.HttpService)(selector))\
+ Този атрибут не трабва да има скоби, нито в края, нито в началото, например за да избере\
+ услуга с ID 15, тогава селекторът е 'service.id=15' (без кавичките). По подразбиране\
+ стойността на този атрибут е празна, което означава че административната конзола ще използа\
+ всеки HTTP сървър.
+
+metadata.default.render.name=Главна добавка
+metadata.default.render.description=Името на страницата, която се показва по подразбиране при отваряне на административната конзола.
+
+metadata.realm.name=Realm
+metadata.realm.description=Името на HTTP Authentication Realm.
+
+metadata.username.name=Потребител
+metadata.username.description=Името на потребителя, който се използва за вход. За да забраните логването задайте празна стойност на това поле.
+
+metadata.password.name=Парола
+metadata.password.description=Паролата която се изисква от потребителя, за да се позволи той да използва административната конзола.
+
+metadata.plugins.name=Добавки
+metadata.plugins.description=Изберете активните добавки
+
+metadata.loglevel.name=Ниво на логване
+metadata.loglevel.description=Ниво на логване
+
+metadata.locale.name=Език
+metadata.locale.description=Ако е зададен, този атрибут указва езика използван от административната конзола.\
+ В противен случай той се избира автоматично в зависимост от настройките на Web Browser-a.
+
+
Modified: felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1027391&r1=1027390&r2=1027391&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties (original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties Tue Oct 26 07:19:15 2010
@@ -251,3 +251,44 @@ configStatus.wait.msg=Loading...
</head><body>\
<p>The requested page was not found. If you are not forwarded in 3 seconds to the Web Console, please click <a href="{0}">here</a></p>\
</body></html>
+
+
+# localized configuration meta-data
+metadata.name=Apache Felix OSGi Management Console
+metadata.description=Configuration of the Apache Felix OSGi Management Console.
+
+metadata.manager.root.name=Root URI
+metadata.manager.root.description=The root path to the OSGi Management Console.
+
+metadata.http.service.filter.name=Http Service Selector
+metadata.http.service.filter.description=\
+ The Http Service Selector is an OSGi filter used to select the Http Service to\
+ which the Web Console binds. The value of this property (if not empty) is\
+ combined the object class selection term to get the actual service selection\
+ filter like (&(objectClass=org.osgi.service.http.HttpService)(selector)). This\
+ property must not have leading an trailing parentheses. For example, to bind\
+ to the service with service ID 15 set the selector to 'service.id=15' (without\
+ the quotes). By default (if this property is not set or set to an empty\
+ string) the Web Console binds with an Http Service available."
+
+metadata.default.render.name=Default Page
+metadata.default.render.description=The name of the default configuration page when invoking the OSGi Management console.
+
+metadata.realm.name=Realm
+metadata.realm.description=The name of the HTTP Authentication Realm.
+
+metadata.username.name=User Name
+metadata.username.description=The name of the user allowed to access the OSGi Management Console. To disable authentication clear this value.
+
+metadata.password.name=Password
+metadata.password.description=The password for the user allowed to access the OSGi Management Console.
+
+metadata.plugins.name=Plugins
+metadata.plugins.description=Select active plugins
+
+metadata.loglevel.name=Log Level
+metadata.loglevel.description=Logging Level
+
+metadata.locale.name=Locale
+metadata.locale.description=If set, this locale forces the localization to use this locale instead of the one, requested by the web browser
+