You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2009/04/24 08:03:34 UTC

svn commit: r768149 - in /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall: DirectoryWatcher.java FileInstall.java Jar.java

Author: clement
Date: Fri Apr 24 06:03:34 2009
New Revision: 768149

URL: http://svn.apache.org/viewvc?rev=768149&view=rev
Log:
Fix issue Felix-1055
File Install is now compatible with J2ME Foundation Profile 1.1.


Modified:
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
    felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java

Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java?rev=768149&r1=768148&r2=768149&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java Fri Apr 24 06:03:34 2009
@@ -94,7 +94,7 @@
         Object value = properties.get(START_NEW_BUNDLES);
         if (value != null)
         {
-            startBundles = Boolean.parseBoolean((String) value);
+            startBundles = "true".equalsIgnoreCase((String)value);
         }
     }
 

Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java?rev=768149&r1=768148&r2=768149&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java Fri Apr 24 06:03:34 2009
@@ -68,7 +68,7 @@
         Object o = context.getProperty(key);
         if (o == null)
         {
-            o = System.getenv(key.toUpperCase().replaceAll(".", "_"));
+           o = System.getProperty(key.toUpperCase().replace('.', '_'));
             if (o == null)
             {
                 return;

Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java?rev=768149&r1=768148&r2=768149&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java Fri Apr 24 06:03:34 2009
@@ -18,13 +18,12 @@
  */
 package org.apache.felix.fileinstall;
 
-import org.osgi.framework.Bundle;
-
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.osgi.framework.Bundle;
+
 /**
  * This class is used to cache vital information of a jar file
  * that is used during later processing. It also overrides hashCode and