svn commit: r1399635 - in /felix/trunk/metatype: pom.xml src/main/java/org/apache/felix/metatype/AD.java src/test/java/org/apache/felix/metatype/ADTest.java

[fm...@apache.org]

Author: fmeschbe
Date: Thu Oct 18 12:48:27 2012
New Revision: 1399635

URL: http://svn.apache.org/viewvc?rev=1399635&view=rev
Log:
FELIX-3167 Support new Password type for attributes
 - export the MetaType API as version 1.2 (from the OSGi R 4.3 Compendium library)
 - import ServiceTracker instead of embedding it

Modified:
    felix/trunk/metatype/pom.xml
    felix/trunk/metatype/src/main/java/org/apache/felix/metatype/AD.java
    felix/trunk/metatype/src/test/java/org/apache/felix/metatype/ADTest.java

Modified: felix/trunk/metatype/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/pom.xml?rev=1399635&r1=1399634&r2=1399635&view=diff
==============================================================================
--- felix/trunk/metatype/pom.xml (original)
+++ felix/trunk/metatype/pom.xml Thu Oct 18 12:48:27 2012
@@ -39,11 +39,13 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.0.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>4.0.0</version>
+            <version>4.3.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.sf.kxml</groupId>
@@ -57,7 +59,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.5</version>
+                <version>2.3.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -70,12 +72,11 @@
                         </Bundle-DocURL>
                         <Export-Package>
                             org.apache.felix.metatype; version=1.2,
-                            org.osgi.service.metatype; version=1.1;provide:=true
+                            org.osgi.service.metatype; provide:=true
                         </Export-Package>
                         <Private-Package>
                             org.apache.felix.metatype.internal,
-                            org.apache.felix.metatype.internal.l10n,
-                            org.osgi.util.tracker
+                            org.apache.felix.metatype.internal.l10n
                         </Private-Package>
                         <Bundle-Activator>
                             org.apache.felix.metatype.internal.Activator

Modified: felix/trunk/metatype/src/main/java/org/apache/felix/metatype/AD.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/AD.java?rev=1399635&r1=1399634&r2=1399635&view=diff
==============================================================================
--- felix/trunk/metatype/src/main/java/org/apache/felix/metatype/AD.java (original)
+++ felix/trunk/metatype/src/main/java/org/apache/felix/metatype/AD.java Thu Oct 18 12:48:27 2012
@@ -379,6 +379,10 @@ public class AD extends OptionalAttribut
         {
             return AttributeDefinition.SHORT;
         }
+        else if ( "Password".equals( typeString ) )
+        {
+            return AttributeDefinition.PASSWORD;
+        }
 
         // finally fall back to string for illegal values
         return AttributeDefinition.STRING;
@@ -469,6 +473,7 @@ public class AD extends OptionalAttribut
                     case AttributeDefinition.DOUBLE:
                         return Double.valueOf( value );
                     case AttributeDefinition.STRING:
+                    case AttributeDefinition.PASSWORD:
                     default:
                         return value;
                 }

Modified: felix/trunk/metatype/src/test/java/org/apache/felix/metatype/ADTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/metatype/src/test/java/org/apache/felix/metatype/ADTest.java?rev=1399635&r1=1399634&r2=1399635&view=diff
==============================================================================
--- felix/trunk/metatype/src/test/java/org/apache/felix/metatype/ADTest.java (original)
+++ felix/trunk/metatype/src/test/java/org/apache/felix/metatype/ADTest.java Thu Oct 18 12:48:27 2012
@@ -130,6 +130,7 @@ public class ADTest extends TestCase
         assertEquals( AttributeDefinition.CHARACTER, AD.toType( "Char" ) );
         assertEquals( AttributeDefinition.BOOLEAN, AD.toType( "Boolean" ) );
         assertEquals( AttributeDefinition.SHORT, AD.toType( "Short" ) );
+        assertEquals( AttributeDefinition.PASSWORD, AD.toType( "Password" ) );
         assertEquals( AttributeDefinition.STRING, AD.toType( "JohnDoe" ) );
     }
 }