Author: gnodet
Date: Tue Oct 13 16:15:09 2009
New Revision: 824829
URL: http://svn.apache.org/viewvc?rev=824829&view=rev
Log:
FELIX-1537: fileinstall should support xml syntax for properties file
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
URL:
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java?rev=824829&r1=824828&r2=824829&view=diff
==============================================================================
---
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
(original)
+++
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Tue Oct 13 16:15:09 2009
@@ -18,6 +18,7 @@
*/
package org.apache.felix.fileinstall.internal;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -68,10 +69,17 @@
boolean setConfig(File f) throws Exception
{
Properties p = new Properties();
- InputStream in = new FileInputStream(f);
+ InputStream in = new BufferedInputStream(new FileInputStream(f));
try
{
- p.load(in);
+ in.mark(1);
+ boolean isXml = in.read() == '<';
+ in.reset();
+ if (isXml) {
+ p.loadFromXML(in);
+ } else {
+ p.load(in);
+ }
}
finally
{
