Author: pderop
Date: Tue Feb 9 21:44:38 2016
New Revision: 1729464
URL: http://svn.apache.org/viewvc?rev=1729464&view=rev
Log:
FELIX-5182: Cleanup DM samples.
FELIX-5077: implemented type-safe proxy configuration for the
@ConfigurationDependency annotation, which can now be applied
on an updated method which accepts a type-safe config proxy as argument. By
default, the pid is assumed to be the fqdn of the
config proxy object.
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/MyComponent.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/executor/
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/executor/ComponentExecutorFactoryImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun
Removed:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/ComponentExecutorFactoryImpl.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/RepeatableProperty.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/packageinfo
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant1.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant2.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant1.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant2.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathTracker.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceParameterImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceAccessConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceParameterImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspectConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/DictionaryAspectConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/DictionaryConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependency.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/DynamicDependencyConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/annot/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/DynamicDependencyConfiguration.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dynamicdep/api/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/annot/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/annot/ServiceConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/annot/ServiceProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/api/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/api/ServiceConsumer.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/hello/api/ServiceProviderImpl.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/README
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
Tue Feb 9 21:44:38 2016
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 4.0.4
+Bundle-Version: 4.1.0
-buildpath: \
osgi.core;version=4.2,\
de.twentyeleven.skysail.org.json-osgi;version=20080701.0,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
Tue Feb 9 21:44:38 2016
@@ -89,7 +89,7 @@ public @interface ConfigurationDependenc
/**
* Returns the pid from a class name. The full class name will be used as
the configuration PID.
- * You can use this method when you use an interface annoted with standard
bndtols metatype annotations.
+ * You can use this method when you use an interface annotated with
standard bndtols metatype annotations.
* (see http://www.aqute.biz/Bnd/MetaType).
* @return the pid class
*/
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/RepeatableProperty.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/RepeatableProperty.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/RepeatableProperty.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/RepeatableProperty.java
Tue Feb 9 21:44:38 2016
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
/**
* Annotation used to describe repeated Property annotation. You actually
don't have to use directly this annotation,
- * which is used used to allow to repeat several times the {@link Property}
annotation on a given component class.
+ * which is used to allow repeating several times the {@link Property}
annotation on a given component class.
*
* @author <a href="mailto:[email protected]";>Felix Project Team</a>
*/
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/packageinfo
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/packageinfo?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/packageinfo
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/api/packageinfo
Tue Feb 9 21:44:38 2016
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.1.0
\ No newline at end of file
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
Tue Feb 9 21:44:38 2016
@@ -21,6 +21,7 @@ package org.apache.felix.dm.annotation.p
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Dictionary;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -622,9 +623,58 @@ public class AnnotationCollector extends
EntryWriter writer = new
EntryWriter(EntryType.ConfigurationDependency);
m_writers.add(writer);
- // pid attribute (can be specified using the pid attribute, or using
the classPid attribute)
+ // The pid is either:
+ //
+ // - the fqdn of the configuration proxy type, if the callback accepts
an interface (not a Dictionary).
+ // - or the fqdn of the class specified by the pidFromClass attribute
+ // - or the value of the pid attribute
+ // - or by default the fdqn of the class where the annotation is found
+
String pidFromClass =
parseClassAttrValue(annotation.get(EntryParam.pidClass.toString()));
- String pid = pidFromClass != null ? pidFromClass : get(annotation,
EntryParam.pid.toString(), m_className);
+ String pid = pidFromClass != null ? pidFromClass : get(annotation,
EntryParam.pid.toString(), null);
+
+ // Check if annotation is applied on "updated(ConfigProxyType)"
+ String confProxyType = Patterns.parseClass(m_descriptor,
Patterns.BIND_CLASS5, 1, false);
+ if (confProxyType != null)
+ {
+ if (! Dictionary.class.getName().equals(confProxyType))
+ {
+ // It's a conf proxy type.
+ writer.put(EntryParam.confProxyType, confProxyType);
+ }
+ else
+ {
+ confProxyType = null;
+ }
+
+ }
+ else
+ {
+ // Check if annotation is applied on "updated(Component,
ConfigProxyType)"
+ confProxyType = Patterns.parseClass(m_descriptor,
Patterns.BIND_CLASS2, 2, false);
+ m_logger.warn("XX:%s/%s", m_descriptor, confProxyType);
+ if (! Dictionary.class.getName().equals(confProxyType))
+ {
+ // It's a conf proxy type.
+ writer.put(EntryParam.confProxyType, confProxyType);
+ }
+ else
+ {
+ confProxyType = null;
+ }
+ }
+
+ if (pid == null)
+ {
+ if (confProxyType != null)
+ {
+ pid = confProxyType;
+ }
+ else
+ {
+ pid = m_className;
+ }
+ }
writer.put(EntryParam.pid, pid);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
Tue Feb 9 21:44:38 2016
@@ -44,6 +44,7 @@ public enum EntryParam
autoConfig,
pid,
pidClass,
+ confProxyType, // inject a proxy configuration type
factoryPid,
factoryPidClass,
propagate,
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyBuilder.java
Tue Feb 9 21:44:38 2016
@@ -71,7 +71,7 @@ public class DependencyBuilder
break;
case ConfigurationDependency:
- dp = createConfigurationDependency(dm);
+ dp = createConfigurationDependency(b, dm);
break;
case BundleDependency:
@@ -137,17 +137,17 @@ public class DependencyBuilder
return sd;
}
- private Dependency createConfigurationDependency(DependencyManager dm)
+ private Dependency createConfigurationDependency(Bundle b,
DependencyManager dm) throws Exception
{
+ String confProxyType = m_metaData.getString(Params.confProxyType,
null);
String pid = m_metaData.getString(Params.pid);
boolean propagate =
"true".equals(m_metaData.getString(Params.propagate, "false"));
String callback = m_metaData.getString(Params.updated, "updated");
- Dependency dp = createConfigurationDependency(dm, pid, callback,
propagate);
- return dp;
+ return createConfigurationDependency(dm, b, pid, callback,
confProxyType, propagate);
}
- private Dependency createConfigurationDependency(DependencyManager dm,
String pid, String callback,
- boolean propagate)
+ private Dependency createConfigurationDependency(DependencyManager dm,
Bundle b, String pid, String callback, String confProxyType, boolean propagate)
+ throws ClassNotFoundException
{
if (pid == null)
{
@@ -156,7 +156,15 @@ public class DependencyBuilder
}
ConfigurationDependency cd = dm.createConfigurationDependency();
cd.setPid(pid);
- cd.setCallback(callback);
+ if (confProxyType != null)
+ {
+ Class<?> confProxyTypeClass = b.loadClass(confProxyType);
+ cd.setCallback(callback, confProxyTypeClass);
+ }
+ else
+ {
+ cd.setCallback(callback);
+ }
cd.setPropagate(propagate);
return cd;
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Params.java
Tue Feb 9 21:44:38 2016
@@ -64,5 +64,6 @@ public enum Params
dependencyManagerField,
componentField,
registered,
- unregistered
+ unregistered,
+ confProxyType
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
Tue Feb 9 21:44:38 2016
@@ -14,53 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.${tstamp}
-buildpath: \
- org.apache.felix.dependencymanager;version=latest,\
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
- org.apache.felix.gogo.runtime;version=latest,\
- org.apache.felix.dependencymanager.runtime;version=latest,\
- org.apache.felix.dependencymanager.annotation;version=latest,\
- biz.aQute.bnd.annotation
--runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
--runee: JavaSE-1.7
--runbundles: \
+ biz.aQute.bnd.annotation,\
org.apache.felix.dependencymanager;version=latest,\
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.gogo.runtime;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.webconsole;version=4.2.2,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
- org.apache.felix.dependencymanager.samples.hello.api;version=latest,\
- org.apache.felix.dependencymanager.samples.tpool;version=latest,\
- org.apache.felix.dependencymanager.samples.conf;version=latest,\
- org.apache.felix.dependencymanager.samples.device.api;version=latest
--runproperties: \
-
org.apache.felix.dependencymanager.parallel='!org.apache.felix.dependencymanager.samples.tpool,
*',\
- org.apache.felix.dependencymanager.runtime.log=warn,\
- org.apache.felix.dependencymanager.loglevel=2,\
- org.apache.felix.log.maxSize=100000,\
- org.apache.felix.log.storeDebug=true
--plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
-
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
-
+ org.apache.felix.dependencymanager.annotation;version=latest
-sub: \
*.bnd
-metatype: *
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL:
http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html
+Bundle-Vendor: The Apache Software Foundation
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
META-INF/=${workspace}/release/resources/changelog.txt
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL:
http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html
-Bundle-Vendor: The Apache Software Foundation
\ No newline at end of file
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.conf;version=latest,\
+ org.apache.felix.dependencymanager.samples.composite;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.conf;version=latest,\
+ org.apache.felix.dependencymanager.samples.compositefactory;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.customdep;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
Tue Feb 9 21:44:38 2016
@@ -17,4 +17,6 @@
Private-Package: \
org.apache.felix.dependencymanager.samples.device.annot
Bundle-Description: Dependency Manager device example with annotations
-Bundle-Name: Dependency Manager Device Example With Annotations
\ No newline at end of file
+Bundle-Name: Dependency Manager Device Example With Annotations
+-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
+
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.device.annot;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.runtime.log=false,\
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.device.api;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
Tue Feb 9 21:44:38 2016
@@ -17,4 +17,6 @@
Private-Package: \
org.apache.felix.dependencymanager.samples.dictionary.annot
Bundle-Description: Dependency Manager dictionary example with annotations
-Bundle-Name: Dependency Manager Dictionary Example With Annotations
\ No newline at end of file
+Bundle-Name: Dependency Manager Dictionary Example With Annotations
+-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
+
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
+ org.apache.felix.webconsole;version=4.2.2,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.dictionary.annot;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.runtime.log=false,\
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
+ org.apache.felix.webconsole;version=4.2.2,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.dictionary.api;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
Tue Feb 9 21:44:38 2016
@@ -17,4 +17,6 @@
Private-Package: \
org.apache.felix.dependencymanager.samples.dynamicdep.annot
Bundle-Description: Dependency Manager dynamic dependency example with
annotations
-Bundle-Name: Dependency Manager Dynamic Dependency Example With Annotations
\ No newline at end of file
+Bundle-Name: Dependency Manager Dynamic Dependency Example With Annotations
+-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
+
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
+ org.apache.felix.webconsole;version=4.2.2,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+
org.apache.felix.dependencymanager.samples.dynamicdep.annot;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.runtime.log=false,\
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,48 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
+ org.apache.felix.webconsole;version=4.2.2,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.dynamicdep.api;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.runtime.log=warn,\
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
Tue Feb 9 21:44:38 2016
@@ -17,4 +17,6 @@
Private-Package: \
org.apache.felix.dependencymanager.samples.hello.annot
Bundle-Description: Dependency Manager hello example with annotations
-Bundle-Name: Dependency Manager Hello Example With Annotations
\ No newline at end of file
+Bundle-Name: Dependency Manager Hello Example With Annotations
+-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
+
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.conf;version=latest,\
+ org.apache.felix.dependencymanager.samples.hello.annot;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.runtime.log=false,\
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
Added:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun?rev=1729464&view=auto
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
(added)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
Tue Feb 9 21:44:38 2016
@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
+-runee: JavaSE-1.8
+-runsystemcapabilities: ${native_capability}
+
+-resolve.effective: active;skip:="osgi.service"
+
+-runbundles: \
+ org.apache.felix.metatype;version=1.0.4,\
+ org.apache.felix.log;version=1.0.1,\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0,\
+ org.apache.felix.configadmin;version=1.8.6,\
+ org.apache.felix.eventadmin;version=1.4.3,\
+ biz.aQute.bndlib;version=2.3.0,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.runtime;version=latest,\
+ org.apache.felix.dependencymanager.samples.conf;version=latest,\
+ org.apache.felix.dependencymanager.samples.hello.api;version=latest
+
+-runproperties: \
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
+
+
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderImpl.java
Tue Feb 9 21:44:38 2016
@@ -45,7 +45,7 @@ public class ProviderImpl implements Pro
}
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderImpl.start(): participants=" +
m_participant1 + "," + m_participant2
+ m_log.log(LogService.LOG_WARNING, "ProviderImpl.start():
participants=" + m_participant1 + "," + m_participant2
+ ", conf=" + m_conf);
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant1.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant1.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant1.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant1.java
Tue Feb 9 21:44:38 2016
@@ -27,6 +27,11 @@ public class ProviderParticipant1 {
private volatile LogService m_log; // Injected
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderParticipant1.start()");
+ m_log.log(LogService.LOG_WARNING, "ProviderParticipant1.start()");
+ }
+
+ @Override
+ public String toString() {
+ return "ProviderParticipant1";
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant2.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant2.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant2.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/ProviderParticipant2.java
Tue Feb 9 21:44:38 2016
@@ -27,6 +27,11 @@ public class ProviderParticipant2 {
private volatile LogService m_log; // Injected
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderParticipant2.start()");
+ m_log.log(LogService.LOG_WARNING, "ProviderParticipant2.start()");
+ }
+
+ @Override
+ public String toString() {
+ return "ProviderParticipant2";
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/README?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/README
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/composite/README
Tue Feb 9 21:44:38 2016
@@ -17,11 +17,17 @@
This sample is an example usage of DM composite components. A composite
component is implemented
using a composition of multiple object instances, which are used to implement
a given complex
-service. Here, we define a "Provider" service, which is implemented by three
object instances:
-ProviderImpl, ProviderParticipant1, ProviderParticipant2.
+service. In this example, we define a "Provider" service, which is implemented
by three object instances:
+ProviderImpl (which is the main implementation class that provides the
service), ProviderParticipant1,
+and ProviderParticipant2.
Dependencies are injected in all objects being part of the composition.
-To see logs, type this command under the gogo shell:
+To test, run click on the bndtools "composite.bndrun" descriptor, and run it,
then type "log warn" in gogo shell:
+
+g! log warn
+
+2016.02.08 23:00:34 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.composite -
ProviderParticipant2.start()
+2016.02.08 23:00:34 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.composite -
ProviderParticipant1.start()
+2016.02.08 23:00:34 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.composite - ProviderImpl.start():
participants=ProviderParticipant1,ProviderParticipant2, conf={key=value,
service.pid=org.apache.felix.dependencymanager.samples.composite.ProviderImpl}
-g! log info|grep composite
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderImpl.java
Tue Feb 9 21:44:38 2016
@@ -41,6 +41,6 @@ public class ProviderImpl implements Pro
}
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderImpl.start(): participants=" +
m_participant1 + "," + m_participant2);
+ m_log.log(LogService.LOG_WARNING, "ProviderImpl.start():
participants=" + m_participant1 + "," + m_participant2);
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant1.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant1.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant1.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant1.java
Tue Feb 9 21:44:38 2016
@@ -27,6 +27,11 @@ public class ProviderParticipant1 {
private volatile LogService m_log; // Injected
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderParticipant1.start()");
+ m_log.log(LogService.LOG_WARNING, "ProviderParticipant1.start()");
+ }
+
+ @Override
+ public String toString() {
+ return "ProviderParticipant1";
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant2.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant2.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant2.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/ProviderParticipant2.java
Tue Feb 9 21:44:38 2016
@@ -27,6 +27,11 @@ public class ProviderParticipant2 {
private volatile LogService m_log; // Injected
void start() {
- m_log.log(LogService.LOG_INFO, "ProviderParticipant2.start()");
+ m_log.log(LogService.LOG_WARNING, "ProviderParticipant2.start()");
+ }
+
+ @Override
+ public String toString() {
+ return "ProviderParticipant2";
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/README?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/README
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/README
Tue Feb 9 21:44:38 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-This Activator is an example usage of DM composite components. A composite
component is implemented
+This Activator is an example usage of DM composite. A composite component is
implemented
using a composition of multiple object instances, which are used to implement
a given service.
The sample also uses a Factory approach in order to instantiate the
composition of objects: A
@@ -24,9 +24,10 @@ and configure all the composites.
Dependencies are injected in all objects in the composition.
-To see logs, type this command under the gogo shell:
-
-g! log info|grep compositefactory
-
+To test, run click on "compositefactory.bndrun" descriptor, and run it, then
type "log warn" in gogo shell:
+g! log warn
+2016.02.08 22:26:05 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.compositefactory -
ProviderParticipant2.start()
+2016.02.08 22:26:05 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.compositefactory -
ProviderParticipant1.start()
+2016.02.08 22:26:05 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.compositefactory -
ProviderImpl.start(): participants=ProviderParticipant1,ProviderParticipant2
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/conf/Configurator.java
Tue Feb 9 21:44:38 2016
@@ -38,8 +38,8 @@ public class Configurator {
public void start() {
try {
- System.out.println("Configuring sample components ... please
consult log service messages for each sample you want to play with.");
- System.out.println("For example: \"log info|grep
org.apache.felix.dependencymanager.samples.device.api\"");
+ System.out.println("Configuring sample components ... please
consult log messages to see example output, like this:");
+ System.out.println("\"log warn\"");
// Provide configuration to the hello.ServiceConsumer component
m_serviceConsumerConf =
m_ca.getConfiguration("org.apache.felix.dependencymanager.samples.hello.api.ServiceConsumer",
null);
Hashtable<String, String> props = new Hashtable<>();
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathTracker.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathTracker.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathTracker.java
Tue Feb 9 21:44:38 2016
@@ -24,18 +24,18 @@ public class PathTracker {
volatile LogService logService;
void start() {
- logService.log(LogService.LOG_INFO, "PathTracker.start");
+ logService.log(LogService.LOG_WARNING, "PathTracker.start");
}
void stop() {
- logService.log(LogService.LOG_INFO, "PathTracker.stop");
+ logService.log(LogService.LOG_WARNING, "PathTracker.stop");
}
void add(String path) {
- logService.log(LogService.LOG_INFO, "PathTracker.add: " + path);
+ logService.log(LogService.LOG_WARNING, "PathTracker.add: " + path);
}
void remove(String path) {
- logService.log(LogService.LOG_INFO, "PathTracker.remove: " + path);
+ logService.log(LogService.LOG_WARNING, "PathTracker.remove: " + path);
}
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/README?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/README
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/README
Tue Feb 9 21:44:38 2016
@@ -20,15 +20,15 @@ This dependency tracks all created files
The PathDependendency is a low level DM example, but shows how to create any
custom dependencies.
-To test this sample, start the samples under bndtools, then type:
+To test this sample, start the "customdep.bndrun" descriptor, then create a
file in /tmp:
- g! log info|grep customdep
+ $ echo "test" > /tmp/foo
-Then create a "test" file under /tmp:
+Then display logs (your Tracker component has normally been injected with the
added file and has been started):
- $ echo "test" > /tmp/test
-
-Then redisplay logs (your Tracker component has normally been injected with
the added file and has been started):
-
- g! log info|grep customdep
+ g! log warn
+
+2016.02.08 22:17:46 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.customdep - PathTracker.start
+2016.02.08 22:17:46 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.customdep - PathTracker.add: foo
+
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessConsumer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessConsumer.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessConsumer.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessConsumer.java
Tue Feb 9 21:44:38 2016
@@ -35,7 +35,7 @@ public class DeviceAccessConsumer {
// Injected after all required dependencies have been injected (including
our logger)
@ServiceDependency(required=false)
void add(Map<String, Object> props, DeviceAccess deviceAccess) {
- log.log(LogService.LOG_INFO, "Handling device access: id=" +
props.get("device.id")
+ log.log(LogService.LOG_WARNING, "Handling device access: id=" +
props.get("device.id")
+ "\n\t device=" + deviceAccess.getDevice()
+ "\n\t device parameter=" + deviceAccess.getDeviceParameter()
+ "\n\t device access properties=" + props);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceAccessImpl.java
Tue Feb 9 21:44:38 2016
@@ -43,7 +43,7 @@ public class DeviceAccessImpl implements
@Init
Map<String, String> init() {
- log.log(LogService.LOG_INFO, "DeviceAccessImpl.init: device id=" +
device.getDeviceId());
+ log.log(LogService.LOG_WARNING, "DeviceAccessImpl.init: device id=" +
device.getDeviceId());
// Dynamically configure our "deviceparam" dependency, using the
already injected device service.
Map<String, String> filters = new HashMap<>();
filters.put("deviceparam.filter", "(device.id=" + device.getDeviceId()
+ ")");
@@ -53,7 +53,7 @@ public class DeviceAccessImpl implements
@Start
Map<?, ?> start() {
- log.log(LogService.LOG_INFO, "DeviceAccessImpl.start");
+ log.log(LogService.LOG_WARNING, "DeviceAccessImpl.start");
// Dynamically add a service property, using the device.id
Map<String, Object> props = new Hashtable<>();
props.put("device.access.id", device.getDeviceId());
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceImpl.java
Tue Feb 9 21:44:38 2016
@@ -37,4 +37,10 @@ public class DeviceImpl implements Devic
public int getDeviceId() {
return id;
}
+
+
+ @Override
+ public String toString() {
+ return "Device #" + id;
+ }
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceParameterImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceParameterImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceParameterImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/DeviceParameterImpl.java
Tue Feb 9 21:44:38 2016
@@ -37,4 +37,9 @@ public class DeviceParameterImpl impleme
public int getDeviceId() {
return id;
}
+
+ @Override
+ public String toString() {
+ return "DeviceParameter #" + id;
+ }
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/README?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/README
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/annot/README
Tue Feb 9 21:44:38 2016
@@ -25,6 +25,20 @@ a "DeviceAccess" service, which provides
same device.id . The adapter also dynamically propagate the service properties
of the adapted Device
service.
-So see logs, just type this command under gogo shell:
+Start the test by clicking on the "device.annot.bndrun" descriptor, then run
it, and type under gogo shell:
+
+g! log warn
+
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot - Handling device
access: id=1
+ device=Device #1
+ device parameter=DeviceParameter #1
+ device access properties={service.bundleid=12, service.id=31,
service.scope=singleton, objectClass=[Ljava.lang.String;@6e38921c, device.id=1,
device.access.id=1}
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot - DeviceAccessImpl.start
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot -
DeviceAccessImpl.init: device id=1
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot - Handling device
access: id=0
+ device=Device #0
+ device parameter=DeviceParameter #0
+ device access properties={service.bundleid=12, service.id=28,
service.scope=singleton, device.id=0, objectClass=[Ljava.lang.String;@6e38921c,
device.access.id=0}
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot - DeviceAccessImpl.start
+2016.02.08 22:05:45 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.annot -
DeviceAccessImpl.init: device id=0
-g! log info|grep device.annot
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceAccessConsumer.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceAccessConsumer.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceAccessConsumer.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceAccessConsumer.java
Tue Feb 9 21:44:38 2016
@@ -29,7 +29,7 @@ public class DeviceAccessConsumer {
volatile LogService log;
void add(Map<String, Object> props, DeviceAccess deviceAccess) {
- log.log(LogService.LOG_INFO, "DeviceAccessConsumer: Handling device
access: id=" + props.get("device.id")
+ log.log(LogService.LOG_WARNING, "DeviceAccessConsumer: Handling device
access: id=" + props.get("device.id")
+ "\n\t device=" + deviceAccess.getDevice()
+ "\n\t device parameter=" + deviceAccess.getDeviceParameter()
+ "\n\t device access properties=" + props);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceImpl.java
Tue Feb 9 21:44:38 2016
@@ -32,4 +32,9 @@ public class DeviceImpl implements Devic
public int getDeviceId() {
return id;
}
+
+ @Override
+ public String toString() {
+ return "Device #" + id;
+ }
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceParameterImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceParameterImpl.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceParameterImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/DeviceParameterImpl.java
Tue Feb 9 21:44:38 2016
@@ -32,4 +32,9 @@ public class DeviceParameterImpl impleme
public int getDeviceId() {
return id;
}
+
+ @Override
+ public String toString() {
+ return "DeviceParameter #" + id;
+ }
}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/README
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/README?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/README
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/device/api/README
Tue Feb 9 21:44:38 2016
@@ -24,7 +24,17 @@ a "DeviceAccess" service, which provides
same device.id . The adapter also dynamically propagate the service properties
of the adapted Device
service.
-So see logs, just type this command under gogo shell:
+Start the test by clicking on the "device.api.bndrun" descriptor, then run it,
and type under gogo shell:
-g! log info|grep device.api
+g! log warn
+You will then see:
+
+2016.02.08 23:04:46 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.api - DeviceAccessConsumer:
Handling device access: id=2
+ device=Device #2
+ device parameter=DeviceParameter #2
+ device access properties={service.bundleid=12, service.id=28,
service.scope=singleton, objectClass=[Ljava.lang.String;@679b62af,
device.access.id=2, device.id=2}
+2016.02.08 23:04:46 WARNING - Bundle:
org.apache.felix.dependencymanager.samples.device.api - DeviceAccessConsumer:
Handling device access: id=1
+ device=Device #1
+ device parameter=DeviceParameter #1
+ device access properties={service.bundleid=12, service.id=29,
service.scope=singleton, objectClass=[Ljava.lang.String;@679b62af, device.id=1,
device.access.id=1}
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java?rev=1729464&r1=1729463&r2=1729464&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryAspect.java
Tue Feb 9 21:44:38 2016
@@ -52,12 +52,9 @@ public class DictionaryAspect implements
* Defines a configuration dependency for retrieving our english custom
words (by default,
* our PID is our full class name).
*/
- @ConfigurationDependency(pidClass = DictionaryAspectConfiguration.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.
- DictionaryConfiguration cnf = Configurable.createConfigurable(
- DictionaryConfiguration.class, config);
+ @ConfigurationDependency(propagate = false)
+ protected void updated(DictionaryAspectConfiguration cnf) {
+ if (cnf != null) {
m_words.clear();
for (String word : cnf.words()) {
m_words.add(word);
