1 files changed, 10 insertions, 9 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
index 9535c9aa3..9fc03e2df 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java
@@ -62,7 +62,7 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 	 * @param fileName the path to the properties file
 	 * @throws ConfigurationException if an error occurs during loading the properties file.
 	 */
-	public PropertyBasedAuthConfigurationProvider(String fileName) throws ConfigurationException {
+	public PropertyBasedAuthConfigurationProvider(URI fileName) throws ConfigurationException {
 		File propertiesFile = new File(fileName);
 		rootConfigFileDir = propertiesFile.getParent();
 		try {
@@ -72,14 +72,6 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 			throw new ConfigurationException("config.03", null, t);
 			
 		}
-				
-		System.getProperties().setProperty("location", "file:" + fileName);
-		context = new ClassPathXmlApplicationContext(
-				new String[] {  "moaid.configuration.beans.xml",
-								"configuration.beans.xml"
-								});
-		AutowireCapableBeanFactory acbFactory = context.getAutowireCapableBeanFactory();
-		acbFactory.autowireBean(this);
 		
 		FileInputStream in = null;
 		try {
@@ -87,6 +79,15 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide
 			properties.load(in);			
 			super.initial(properties);
 			
+//			JPAPropertiesWithJavaConfig.setLocalProperties(configProp);		
+//			System.getProperties().setProperty("location", "file:" + fileName);
+			context = new ClassPathXmlApplicationContext(
+					new String[] {  "moaid.configuration.beans.xml",
+									"configuration.beans.xml"
+									});
+			AutowireCapableBeanFactory acbFactory = context.getAutowireCapableBeanFactory();
+			acbFactory.autowireBean(this);
+			
 		} catch (FileNotFoundException e) {
 			throw new ConfigurationException("config.03", null, e);