Author: fmeschbe
Date: Thu May 31 13:48:16 2012
New Revision: 1344723
URL: http://svn.apache.org/viewvc?rev=1344723&view=rev
Log:
FELIX-3527 Check against Java 1.4 API; fix some Java 5 API uses;
add exception for ReentrantLock use in AbstractComponentManager$Jlock
Modified:
felix/trunk/scr/pom.xml
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
Modified: felix/trunk/scr/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1344723&r1=1344722&r2=1344723&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Thu May 31 13:48:16 2012
@@ -311,6 +311,36 @@
</plugin>
<!--
+ Ensure not using too recent Java API
+ - for now touch base on Java 1.4
+ - Ignore some known Java 5 classes (used in JLock)
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.7</version>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java14</artifactId>
+ <version>1.0</version>
+ </signature>
+ <ignores>
+
<ignore>java.util.concurrent.locks.ReentrantLock</ignore>
+ <ignore>java.util.concurrent.TimeUnit</ignore>
+ </ignores>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
Configure default compilation for Java 1.3 and integration
test compilation for Java 5 (since integration tests use
Java Annotations for Pax Exam).
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1344723&r1=1344722&r2=1344723&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Thu May 31 13:48:16 2012
@@ -160,7 +160,7 @@ public abstract class AbstractComponentM
catch ( InterruptedException e )
{
//TODO this is so wrong
- throw new IllegalStateException( e );
+ throw new IllegalStateException( "Could not obtain lock (Reason: "
+ e + ")" );
}
}
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java?rev=1344723&r1=1344722&r2=1344723&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
Thu May 31 13:48:16 2012
@@ -324,7 +324,7 @@ public class PropertyMetadata {
boolean[] array = new boolean[valueList.length];
for ( int i = 0; i < array.length; i++ )
{
- array[i] = Boolean.parseBoolean( valueList[i] );
+ array[i] = Boolean.valueOf( valueList[i] ).booleanValue();
}
return array;
}
