svn commit: r771038 - in /felix/trunk/fileinstall: NOTICE doc/changelog.txt pom.xml src/main/java/org/apache/felix/fileinstall/util/Util.java src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java

[clement]

Author: clement
Date: Sun May  3 08:15:51 2009
New Revision: 771038

URL: http://svn.apache.org/viewvc?rev=771038&view=rev
Log:
Update changelog
Update to the new parent pom
Remove unused import
Fix some issue in the tests due to the new easymock version
The copyright year of the NOTICE was bad.

Modified:
    felix/trunk/fileinstall/NOTICE
    felix/trunk/fileinstall/doc/changelog.txt
    felix/trunk/fileinstall/pom.xml
    
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
    
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java

Modified: felix/trunk/fileinstall/NOTICE
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/NOTICE?rev=771038&r1=771037&r2=771038&view=diff
==============================================================================
--- felix/trunk/fileinstall/NOTICE (original)
+++ felix/trunk/fileinstall/NOTICE Sun May  3 08:15:51 2009
@@ -1,5 +1,5 @@
 Apache Felix File Install
-Copyright 2008 The Apache Software Foundation
+Copyright 2008-2009 The Apache Software Foundation
 
 
 I. Included Software

Modified: felix/trunk/fileinstall/doc/changelog.txt
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/doc/changelog.txt?rev=771038&r1=771037&r2=771038&view=diff
==============================================================================
--- felix/trunk/fileinstall/doc/changelog.txt (original)
+++ felix/trunk/fileinstall/doc/changelog.txt Sun May  3 08:15:51 2009
@@ -1,3 +1,12 @@
+Version 1.0.0
+-------------
+
+** Bug
+    * [FELIX-1036] - FileInstaller spawns multiple watchers for same directory
+
+** Improvement
+    * [FELIX-1055] - Making FileInstall bundle CDC-1.1/Foundation 1.1 
compatible
+
 Version 0.9.2
 --------------
 

Modified: felix/trunk/fileinstall/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/pom.xml?rev=771038&r1=771037&r2=771038&view=diff
==============================================================================
--- felix/trunk/fileinstall/pom.xml (original)
+++ felix/trunk/fileinstall/pom.xml Sun May  3 08:15:51 2009
@@ -17,16 +17,18 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.4</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
+       <parent>
+               <groupId>org.apache.felix</groupId>
+               <artifactId>felix-parent</artifactId>
+               <version>1.2.0</version>
+               <relativePath>../../pom/pom.xml</relativePath>
+       </parent>
+       
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
   <name>Apache Felix File Install</name>
   <description>A utility to automatically install bundles from a 
directory.</description>
+  <url>http://felix.apache.org/site/apache-felix-file-install.html</url>
   <version>0.9.3-SNAPSHOT</version>
   <artifactId>org.apache.felix.fileinstall</artifactId>
   <dependencies>

Modified: 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java?rev=771038&r1=771037&r2=771038&view=diff
==============================================================================
--- 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
 (original)
+++ 
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/util/Util.java
 Sun May  3 08:15:51 2009
@@ -22,7 +22,6 @@
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 
 public class Util

Modified: 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java?rev=771038&r1=771037&r2=771038&view=diff
==============================================================================
--- 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
 (original)
+++ 
felix/trunk/fileinstall/src/test/java/org/apache/felix/fileinstall/DirectoryWatcherTest.java
 Sun May  3 08:15:51 2009
@@ -159,7 +159,7 @@
         mockBundleContextControl.setReturnValue( null );
         mockBundleContextControl.replay();
         mockPackageAdmin.getBundleType( mockBundle );
-        mockPackageAdminControl.setReturnValue( 
PackageAdmin.BUNDLE_TYPE_FRAGMENT );
+        mockPackageAdminControl.setReturnValue( new 
Long(PackageAdmin.BUNDLE_TYPE_FRAGMENT) );
         mockPackageAdminControl.replay();
         mockBundleControl.replay();