Now is possible to load XML propertes.

TO specify holder type is no more required unless you need to subclass
it

Author: daneeldeveloper

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/PropertyCatalog.java

@@ -9,6 +9,11 @@
 
 public class PropertyCatalog extends ListMapCatalogConfig<PropertyHolder> {
 
+	public PropertyCatalog() {
+		super();
+		this.getGeneralProps().setProperty( ATT_TYPE , PropertyHolder.class.getName() );
+	}
+
 	public static final String PROP_DEFAULT_CATALOG = "default-catalog";
 
 	/**

fj-core/src/main/java/org/fugerit/java/core/cfg/xml/PropertyHolder.java

@@ -1,12 +1,16 @@
 package org.fugerit.java.core.cfg.xml;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
-import org.fugerit.java.core.util.PropsIO;
+import org.fugerit.java.core.lang.helpers.BooleanUtils;
+import org.fugerit.java.core.lang.helpers.ClassHelper;
 
 public class PropertyHolder extends BasicIdConfigType {
 
@@ -27,6 +31,8 @@ public class PropertyHolder extends BasicIdConfigType {
 
 	private String mode;
 
+	private String xml;
+	
 	private Properties props;
 
 	public String getDescription() {
@@ -52,19 +58,41 @@ public String getMode() {
 	public void setMode(String mode) {
 		this.mode = mode;
 	}
+
+	public String getXml() {
+		return xml;
+	}
+
+	public void setXml(String xml) {
+		this.xml = xml;
+	}
+
+	private static void loadWorker( InputStream is, Properties props, boolean xml ) throws IOException {
+		if ( xml ) {
+			props.loadFromXML( is );
+		} else {
+			props.load( is );
+		}
+	}
 
-	public static Properties load( String mode, String path ) throws IOException {
-		Properties props = null;
-		if ( MODE_FILE.equalsIgnoreCase( mode ) ) {
-			props = PropsIO.loadFromFile( path );
-		} else if ( MODE_CLASS_LOADER.equalsIgnoreCase( mode ) ) {
-			props = PropsIO.loadFromClassLoader( path );
+	public static Properties load( String mode, String path, String xml ) throws IOException {
+		Properties props = new Properties();
+		if ( MODE_CLASS_LOADER.equalsIgnoreCase( mode ) ) {
+			try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( path ) ) {
+				loadWorker( is , props, BooleanUtils.isTrue( xml ) );
+			} catch (Exception e) {
+				throw new IOException( e );
+			}
+		} else {
+			try ( InputStream is = new FileInputStream( new File( path ) ) ) {
+				loadWorker( is , props, BooleanUtils.isTrue( xml ) );
+			}
 		}
 		return props;
 	}
 
 	public void init() throws IOException {
-		this.props = load( this.getMode() , this.getPath() ); 
+		this.props = load( this.getMode() , this.getPath(), this.getXml() ); 
 	}
 
 	public boolean isEmpty() {