Author: clement
Date: Tue Jun 22 19:40:39 2010
New Revision: 956996
URL: http://svn.apache.org/viewvc?rev=956996&view=rev
Log:
Fix FELIX-2438.
Temporal dependencies use proxies by default.
Modified:
felix/trunk/ipojo/handler/temporal/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
felix/trunk/ipojo/tests/handler/temporal/pom.xml
Modified:
felix/trunk/ipojo/handler/temporal/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java?rev=956996&r1=956995&r2=956996&view=diff
==============================================================================
---
felix/trunk/ipojo/handler/temporal/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
(original)
+++
felix/trunk/ipojo/handler/temporal/src/main/java/org/apache/felix/ipojo/handler/temporal/TemporalHandler.java
Tue Jun 22 19:40:39 2010
@@ -150,7 +150,16 @@ public class TemporalHandler extends Pri
}
String prox = deps[i].getAttribute("proxy");
- boolean proxy = prox != null && prox.equals("true");
+ //boolean proxy = prox != null && prox.equals("true");
+ // Use proxy by default except for array:
+ boolean proxy = prox == null || prox.equals("true");
+
+ if (prox == null && proxy) { // Proxy set because of the default.
+ if (agg && ! collection) { // Aggregate and array
+ proxy = false;
+ }
+ }
+
if (proxy && agg) {
if (! collection) {
error("Proxied aggregate temporal dependencies cannot be
an array. Only collections are supported");
Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=956996&r1=956995&r2=956996&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Tue Jun 22
19:40:39 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>2.0.5</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: felix/trunk/ipojo/tests/handler/temporal/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/temporal/pom.xml?rev=956996&r1=956995&r2=956996&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/temporal/pom.xml Tue Jun 22 19:40:39 2010
@@ -35,6 +35,11 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<version>1.7.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo.handler.temporal</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
@@ -93,6 +98,25 @@
</execution>
</executions>
</plugin>
+
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-junit4osgi-plugin</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <configuration>
+ <org.osgi.http.port>8083</org.osgi.http.port>
+ </configuration>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
