diff --git a/SingleServer/pom.xml b/SingleServer/pom.xml index 2efa5e4..2442b81 100644 --- a/SingleServer/pom.xml +++ b/SingleServer/pom.xml @@ -20,14 +20,14 @@ asys singleserver - 0.3 + 0.4 bundle asys api - 0.6 + 0.8 org.osgi diff --git a/SingleServer/src/main/java/asys/singleserver/Activator.java b/SingleServer/src/main/java/asys/singleserver/Activator.java index e267af9..7cd1b9c 100644 --- a/SingleServer/src/main/java/asys/singleserver/Activator.java +++ b/SingleServer/src/main/java/asys/singleserver/Activator.java @@ -13,7 +13,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; -import java.io.*; +import java.io.FileReader; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -60,20 +61,8 @@ public class Activator implements BundleActivator { final String propsFileName = "asys-singleserver.properties"; Path propsPath = Paths.get(confDir).resolve(propsFileName); if (Files.notExists(propsPath)) { - propsPath.toFile().getParentFile().mkdirs(); - - InputStream resourceAsStream = getClass().getResourceAsStream("/"+propsFileName); try { - BufferedWriter bw = new BufferedWriter(new FileWriter(propsPath.toFile())); - BufferedReader br = new BufferedReader(new InputStreamReader(resourceAsStream)); - String line; - while ((line = br.readLine()) != null) { - bw.write(line); - bw.write("\n"); - } - bw.flush(); - bw.close(); - br.close(); + ASysUtils.SaveResource("/"+propsFileName, propsPath.toFile()); } catch (IOException e) { e.printStackTrace(); return null; @@ -82,7 +71,7 @@ public class Activator implements BundleActivator { Properties properties = new Properties(); try { - properties.load(new java.io.FileReader(propsPath.toFile())); + properties.load(new FileReader(propsPath.toFile())); return properties; } catch (IOException e) { e.printStackTrace(); }