felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1750310 - in /felix/sandbox/cziegeler/configadmin-r7: ./ src/main/java/org/apache/felix/cm/impl/ src/test/java/org/apache/felix/cm/
Date Mon, 27 Jun 2016 08:20:37 GMT
Author: cziegeler
Date: Mon Jun 27 08:20:37 2016
New Revision: 1750310

URL: http://svn.apache.org/viewvc?rev=1750310&view=rev
Log:
Add stub implementation for R7 - RFC 227

Modified:
    felix/sandbox/cziegeler/configadmin-r7/pom.xml
    felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
    felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
    felix/sandbox/cziegeler/configadmin-r7/src/test/java/org/apache/felix/cm/MockBundleContext.java

Modified: felix/sandbox/cziegeler/configadmin-r7/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/configadmin-r7/pom.xml?rev=1750310&r1=1750309&r2=1750310&view=diff
==============================================================================
--- felix/sandbox/cziegeler/configadmin-r7/pom.xml (original)
+++ felix/sandbox/cziegeler/configadmin-r7/pom.xml Mon Jun 27 08:20:37 2016
@@ -22,17 +22,17 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>3</version>
-        <relativePath>../pom/pom.xml</relativePath>
+        <version>4</version>
+        <relativePath/>
     </parent>
 
     <artifactId>org.apache.felix.configadmin</artifactId>
-    <version>1.8.9-SNAPSHOT</version>
+    <version>1.8.9-R7-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Felix Configuration Admin Service</name>
     <description>
-        Implementation of the OSGi Configuration Admin Service Specification 1.5
+        Implementation of the OSGi Configuration Admin Service Specification 1.6
     </description>
 
     <scm>
@@ -77,29 +77,25 @@
     </properties>
 
     <dependencies>
-    
-        <!--
-            Depend on latest version to make use of generics. Still we
-            make sure to only require Framework API 1.5 (OSGi Core R4.2)
-        -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.annotation</artifactId>
+            <version>6.0.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>5.0.0</version>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
-        
-        <!--
-            Configuration Admin and other API from latest enterprise
-            which provides Config Admin 1.5 API
-        -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
-            <version>5.0.0</version>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.3.0</version>
             <scope>provided</scope>
         </dependency>
-
+        
         <!-- BND export annotations -->        
         <dependency>
             <groupId>biz.aQute</groupId>
@@ -160,7 +156,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>4.0.3</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -170,7 +166,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
+                <version>3.0.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -190,11 +186,10 @@
                             <!-- when the spec version changes, update the service property
that includes the spec version in ConfigurationManager -->
                             org.apache.felix.cm;
                             org.apache.felix.cm.file,
-                            org.osgi.service.cm;provide:=true;version=1.5
+                            org.osgi.service.cm;provide:=true;version=1.6
                         </Export-Package>
                         <Import-Package>
-                            org.osgi.service.cm;version="[1.5,1.6)",
-                            org.osgi.framework;version="[1.4,2)",
+                            org.osgi.service.cm;version="[1.6,1.7)",
 							org.osgi.service.log;resolution:=optional;version="1.3",
                             *
                         </Import-Package>

Modified: felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1750310&r1=1750309&r2=1750310&view=diff
==============================================================================
--- felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
(original)
+++ felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
Mon Jun 27 08:20:37 2016
@@ -168,9 +168,28 @@ public class ConfigurationAdapter implem
     }
 
 
+    public void setProperties(final Dictionary<String, ?> properties) throws IOException
{
+        // TODO
+        update(properties);
+    }
+
+
+    public void setLocked(boolean flag) throws IOException {
+        // TODO Auto-generated method stub
+
+    }
+
+
+    public boolean isLocked() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+
     /**
      * @see org.apache.felix.cm.impl.ConfigurationImpl#hashCode()
      */
+    @Override
     public int hashCode()
     {
         return delegatee.hashCode();
@@ -181,6 +200,7 @@ public class ConfigurationAdapter implem
      * @param obj
      * @see org.apache.felix.cm.impl.ConfigurationImpl#equals(java.lang.Object)
      */
+    @Override
     public boolean equals( Object obj )
     {
         return delegatee.equals( obj );
@@ -190,6 +210,7 @@ public class ConfigurationAdapter implem
     /**
      * @see org.apache.felix.cm.impl.ConfigurationImpl#toString()
      */
+    @Override
     public String toString()
     {
         return delegatee.toString();

Modified: felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java?rev=1750310&r1=1750309&r2=1750310&view=diff
==============================================================================
--- felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
(original)
+++ felix/sandbox/cziegeler/configadmin-r7/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
Mon Jun 27 08:20:37 2016
@@ -303,4 +303,17 @@ public class ConfigurationAdminImpl impl
 
         return this.configurationManager;
     }
+
+
+    public Configuration getFactoryConfiguration(String factoryPid, String alias, String
location) throws IOException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+
+    public Configuration getFactoryConfiguration(String factoryPid, String alias) throws
IOException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

Modified: felix/sandbox/cziegeler/configadmin-r7/src/test/java/org/apache/felix/cm/MockBundleContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/configadmin-r7/src/test/java/org/apache/felix/cm/MockBundleContext.java?rev=1750310&r1=1750309&r2=1750310&view=diff
==============================================================================
--- felix/sandbox/cziegeler/configadmin-r7/src/test/java/org/apache/felix/cm/MockBundleContext.java
(original)
+++ felix/sandbox/cziegeler/configadmin-r7/src/test/java/org/apache/felix/cm/MockBundleContext.java
Mon Jun 27 08:20:37 2016
@@ -30,7 +30,9 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleListener;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceObjects;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 
@@ -321,4 +323,17 @@ public class MockBundleContext implement
     {
         return null;
     }
+
+
+    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S>
factory,
+            Dictionary<String, ?> properties)
+    {
+        return null;
+    }
+
+
+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S>
reference)
+    {
+        return null;
+    }
 }



Mime
View raw message