[portal-commits] JBoss Portal SVN: r9582 - in branches/JBoss_Portal_Branch_2_6: core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2008-01-23 11:57:42 -0500 (Wed, 23 Jan 2008)
New Revision: 9582
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java
Log:
Fixing instance metadata bug
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2008-01-23
16:39:54 UTC (rev 9581)
+++
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2008-01-23
16:57:42 UTC (rev 9582)
@@ -184,7 +184,7 @@
}
// Set display name
- if (pwa != null)
+ if (localizedStringMD.getValues().isEmpty())
{
ResourceBundleManager bundleMgr =
MetaDataResourceBundleFactory.createResourceBundleManager(pwa.getClassLoader(),
supportedLocales, resourceBundle);
LocalizedString localizedString =
bundleMgr.getLocalizedValue("org.jboss.portal.instance.name." + instanceName,
instanceName);
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties 2008-01-23
16:39:54 UTC (rev 9581)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource.properties 2008-01-23
16:57:42 UTC (rev 9582)
@@ -23,4 +23,6 @@
javax.portlet.preference.name.RssXml=RSS feed URL
javax.portlet.preference.name.expires=Expiration time
-org.jboss.portal.object.name.Weather=Weather
\ No newline at end of file
+org.jboss.portal.object.name.Weather=Weather
+
+org.jboss.portal.instance.name.WeatherPortletInstance=Weather Portlet