felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1661583 - in /felix/sandbox/pderop/dependencymanager-samples: cnf/bin/ cnf/localrepo/ cnf/localrepo/org.apache.felix.dependencymanager.annotation/ cnf/localrepo/org.apache.felix.dependencymanager.runtime/ cnf/releaserepo/ org.apache.felix....
Date Sun, 22 Feb 2015 23:42:30 GMT
Author: pderop
Date: Sun Feb 22 23:42:29 2015
New Revision: 1661583

URL: http://svn.apache.org/r1661583
Log:
Use new ConfigurationDependency annotation pidclass attribute. 
Use new FactoryConfigurationAdapterService annotation factoryPidClass attribute.

Removed:
    felix/sandbox/pderop/dependencymanager-samples/cnf/bin/.gitignore
Modified:
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar
    felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.0.jar
    felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml
    felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml.sha
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryImpl.java
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java
    felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfigurationAnnot.java

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/index.xml.sha Sun Feb 22
23:42:29 2015
@@ -1 +1 @@
-9f24fa5b23b13833384ac4d32c4f81722cbda6d1017b7d766cc5633c27868336
\ No newline at end of file
+6043d06dd2ecfee2d07e76e40c7b507ce39dbe49e01ce66a09c318837d7169b8
\ No newline at end of file

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/localrepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.0.jar?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml.sha
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml.sha?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml.sha (original)
+++ felix/sandbox/pderop/dependencymanager-samples/cnf/releaserepo/index.xml.sha Sun Feb 22
23:42:29 2015
@@ -1 +1 @@
-9622906ea38561090eb4223d0cebcffd5db5cca39978d67ca1f297e8c097fa21
\ No newline at end of file
+e56b6f24aafd1514c2070403621c26762ee4d11caa1d664bee841b3e025d3b83
\ No newline at end of file

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
Sun Feb 22 23:42:29 2015
@@ -52,7 +52,7 @@ public class DictionaryAspect implements
      * Defines a configuration dependency for retrieving our english custom words (by default,
      * our PID is our full class name).
      */
-    @ConfigurationDependency(pid = "org.apache.felix.dependencymanager.samples.dictionary.annot.DictionaryAspectAnnotationConfiguration",
propagate = false)
+    @ConfigurationDependency(pidClass = DictionaryAspectAnnotationConfiguration.class, propagate
= false)
     protected void updated(Dictionary<String, ?> config) {
         if (config != null) {
             // We use the bnd "Configurable" helper in order to get an implementation for
our DictionaryConfiguration interface.

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryImpl.java?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryImpl.java
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryImpl.java
Sun Feb 22 23:42:29 2015
@@ -39,14 +39,9 @@ import aQute.bnd.annotation.metatype.Con
  * 
  * @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
  */
-@FactoryConfigurationAdapterService(factoryPid = "org.apache.felix.dependencymanager.samples.dictionary.annot.DictionaryAnnotationConfiguration",
propagate = true, updated = "updated")
+@FactoryConfigurationAdapterService(factoryPidClass = DictionaryAnnotationConfiguration.class,
propagate = true, updated = "updated")
 public class DictionaryImpl implements DictionaryService {
     /**
-     * The key of our config admin dictionary values.
-     */
-    final static String WORDS = "words";
-
-    /**
      * We store all configured words in a thread-safe data structure, because ConfigAdmin
      * may invoke our updated method at any time.
      */

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java
Sun Feb 22 23:42:29 2015
@@ -40,7 +40,7 @@ public class DynamicDependency {
 	/**
 	 * This is the first callback: we are injected with our configuration.
 	 */
-	@ConfigurationDependency(pid="org.apache.felix.dependencymanager.samples.dynamicdep.annot.DynamicDependencyConfigurationAnnot")
+	@ConfigurationDependency(pidClass=DynamicDependencyConfigurationAnnot.class)
 	public void updated(Dictionary<String, Object> properties) throws ConfigurationException
{
         // We use the bnd "Configurable" helper in order to get an implementation for our
DictionaryConfiguration interface.
 		DynamicDependencyConfigurationAnnot cnf = Configurable.createConfigurable(DynamicDependencyConfigurationAnnot.class,
properties);

Modified: felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfigurationAnnot.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfigurationAnnot.java?rev=1661583&r1=1661582&r2=1661583&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfigurationAnnot.java
(original)
+++ felix/sandbox/pderop/dependencymanager-samples/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfigurationAnnot.java
Sun Feb 22 23:42:29 2015
@@ -11,12 +11,14 @@ import aQute.bnd.annotation.metatype.Met
  */
 @OCD(description = "Declare here the configuration for the DynamicDependency component.")
 public interface DynamicDependencyConfigurationAnnot {
+    
     @AD(description = "Enter the storage type to use", 
-    		deflt = "mapdb", 
-    		optionLabels= {"Map DB Storage implementation", "File Storage implementation"},
-    		optionValues={"mapdb", "file"})
+        deflt = "mapdb", 
+        optionLabels = { "Map DB Storage implementation", "File Storage implementation" },
+        optionValues = { "mapdb", "file" })
     String storageType();
 
     @AD(description = "Specifies here is the storage dependency is required or not (if false,
a null object will be used)", deflt = "true")
     boolean storageRequired();
+
 }



Mime
View raw message