Author: guillaume
Date: Tue Sep 3 08:43:11 2013
New Revision: 1519602
URL: http://svn.apache.org/r1519602
Log:
FELIX-4213 Temporal handler broken with iPOJO 1.10.1
* Fix compilation issue
Modified:
felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
Modified: felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/pom.xml?rev=1519602&r1=1519601&r2=1519602&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/pom.xml
(original)
+++ felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/pom.xml Tue
Sep 3 08:43:11 2013
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.1</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified:
felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java?rev=1519602&r1=1519601&r2=1519602&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
(original)
+++
felix/trunk/ipojo/handler/temporal/temporal-dependency-handler/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
Tue Sep 3 08:43:11 2013
@@ -32,6 +32,7 @@ import org.apache.felix.ipojo.parser.Met
import org.apache.felix.ipojo.parser.PojoMetadata;
import org.apache.felix.ipojo.util.DependencyModel;
import org.apache.felix.ipojo.util.DependencyStateListener;
+import org.apache.felix.ipojo.util.DependencyMetadataHelper;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -245,7 +246,7 @@ public class TemporalHandler extends Pri
}
}
- Class specification = DependencyModel.loadSpecification(spec,
getInstanceManager().getContext());
+ Class specification =
DependencyMetadataHelper.loadSpecification(spec,
getInstanceManager().getContext());
TemporalDependency dep = new TemporalDependency(specification,
agg, collection, proxy, filter, getInstanceManager().getContext(), timeout,
policy, di, this);
m_dependencies.add(dep);