svn commit: r1728499 - in /felix/trunk/metatype: changelog.txt src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java

[jawi]

Author: jawi
Date: Thu Feb  4 16:10:34 2016
New Revision: 1728499

URL: http://svn.apache.org/viewvc?rev=1728499&view=rev
Log:
FELIX-5173 - Metatype service's BundleResources ignore properties provided by 
fragment bundles

- use getResource instead of getEntry to allow fragments to supply localization 
resources.


Modified:
    felix/trunk/metatype/changelog.txt
    
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
    
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java

Modified: felix/trunk/metatype/changelog.txt
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/changelog.txt?rev=1728499&r1=1728498&r2=1728499&view=diff
==============================================================================
--- felix/trunk/metatype/changelog.txt (original)
+++ felix/trunk/metatype/changelog.txt Thu Feb  4 16:10:34 2016
@@ -1,3 +1,10 @@
+Changes from 1.1.2 to ...
+-------------------------
+
+** Bug
+    * [FELIX-5173] - Metatype service's BundleResources ignore properties 
provided by fragment bundles
+
+
 Changes from 1.1.0 to 1.1.2
 ---------------------------
 
@@ -18,6 +25,7 @@ Changes from 1.0.10 to 1.0.12
 
 ** Improvement
        * [FELIX-4649] - Get MetaTypeInformation while bundle is starting
+       * [FELIX-4687] - Support v. 1.3 metatype namespace
 
 ** Bug
        * [FELIX-4644] - Designates with multiple Objects

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java?rev=1728499&r1=1728498&r2=1728499&view=diff
==============================================================================
--- 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
 (original)
+++ 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/DefaultMetaTypeProvider.java
 Thu Feb  4 16:10:34 2016
@@ -39,7 +39,7 @@ import org.osgi.service.metatype.ObjectC
 
 /**
  * The <code>DefaultMetaTypeProvider</code> class is an implementation of the
- * <code>MetaTypeProvider</code> interface whichis configured for a given
+ * <code>MetaTypeProvider</code> interface which is configured for a given
  * bundle using a {@link MetaData} object.
  * <p>
  * This class may be used by clients, e.g. <code>ManagedService</code> or

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java?rev=1728499&r1=1728498&r2=1728499&view=diff
==============================================================================
--- 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java
 (original)
+++ 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/l10n/BundleResources.java
 Thu Feb  4 16:10:34 2016
@@ -165,12 +165,14 @@ public class BundleResources
         resourceName += ".properties";
 
         Properties props = new Properties( parentProperties );
-        URL resURL = bundle.getEntry( resourceName );
+        // FELIX-5173 - allow the resource to be provided by fragments as 
well...
+        URL resURL = bundle.getResource( resourceName );
 
         // FELIX-607 backwards compatibility, support
         if ( resURL == null )
         {
-            resURL = bundle.getEntry( 
MetaTypeService.METATYPE_DOCUMENTS_LOCATION + "/" + resourceName );
+            // FELIX-5173 - allow the resource to be provided by fragments as 
well...
+            resURL = bundle.getResource( 
MetaTypeService.METATYPE_DOCUMENTS_LOCATION + "/" + resourceName );
         }
 
         if ( resURL != null )