1 files changed, 17 insertions, 102 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java
index a2b1f120e..ccc7f33f1 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/NewConfigurationDBWrite.java
@@ -8,13 +8,14 @@
 //
 //import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 //import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.GenericConfiguration;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
-//import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentGeneral;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.ChainingModes;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.DefaultBKUs;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.GenericConfiguration;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
+//import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.SLRequestTemplates;
 //import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
+//import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 //
 ///**
 // * This class is used for writing to the key-value database.
@@ -30,108 +31,22 @@
 //		NewConfigurationDBWrite.conf = conf;
 //	}
 //	
-//	private static boolean saveAuthComponentGeneral(AuthComponentGeneral dbo) {
-//		return conf.set(MOAIDConfigurationConstants.AUTH_COMPONENT_GENERAL_KEY, dbo);
-//	}
-//
-//	private static boolean saveChainingModes(ChainingModes dbo) {
-//		return conf.set(MOAIDConfigurationConstants.CHAINING_MODES_KEY, dbo);
-//	}
-//
-//	private static boolean saveOnlineApplication(OnlineApplication dbo) {
-//
-//		List<OnlineApplication> storedObjects = conf.getList(MOAIDConfigurationConstants.ONLINE_APPLICATIONS_KEY, OnlineApplication.class);
-//		storedObjects.add(dbo);
-//		return conf.set(MOAIDConfigurationConstants.ONLINE_APPLICATIONS_KEY, storedObjects);
-//	}
-//
-//	private static boolean saveGenericConfiguration(GenericConfiguration dbo) {
-//		
-//		List<GenericConfiguration> storedObjects = conf.getList(MOAIDConfigurationConstants.GENERIC_CONFIGURATION_KEY, GenericConfiguration.class);
-//		storedObjects.add(dbo);
-//		return conf.set(MOAIDConfigurationConstants.GENERIC_CONFIGURATION_KEY, storedObjects);
-//	}
-//
-//	private static boolean saveTrustedCACertificates(String dbo) {
-//		return conf.set(MOAIDConfigurationConstants.TRUSTED_CERTIFICATES_KEY, dbo);
-//	}
-//
-//	private static boolean saveDefaultBKUs(DefaultBKUs dbo) {
-//		return conf.set(MOAIDConfigurationConstants.DEFAULT_BKUS_KEY, dbo);
-//	}
-//
-//	private static boolean saveSLRequestTemplates(SLRequestTemplates dbo) {
-//		return conf.set(MOAIDConfigurationConstants.SLREQUEST_TEMPLATES_KEY, dbo);
-//	}
-//
-//	private static boolean saveTimeStampItem(Date dbo) {
-//		return conf.set(MOAIDConfigurationConstants.TIMESTAMP_ITEM_KEY, dbo);
-//	}
-//
-//	private static boolean savePvp2RefreshItem(Date dbo) {
-//		return conf.set(MOAIDConfigurationConstants.PVP2REFRESH_ITEM_KEY, dbo);
-//	}
-//
-//	/**
-//	 * Saves the given list of {@link OnlineApplication} objects to database.
-//	 * @param oas the list
-//	 * @return {@code true} on success; {@code false} otherwise.
-//	 */
-//	public static boolean saveOnlineApplications(List<OnlineApplication> oas) {
-//		return conf.set(MOAIDConfigurationConstants.ONLINE_APPLICATIONS_KEY, oas);
-//	}
-//
-//	/**
-//	 * Saves the given list of {@link GenericConfiguration} objects to database.
-//	 * @param gcs the list
-//	 * @return {@code true} on success; {@code false} otherwise.
-//	 */
-//	public static boolean saveGenericConfigurations(List<GenericConfiguration> gcs) {
-//		return conf.set(MOAIDConfigurationConstants.GENERIC_CONFIGURATION_KEY, gcs);
-//	}
-//
-//
+//	
+//	
 //	/**
-//	 * Saves the given object to database
-//	 * @param dbo the object to save
-//	 * @return {@code true} on success; {@code false} otherwise.
+//	 * @param user
 //	 */
-//	public static boolean save(Object dbo) {
-//
-//		boolean result = false;
-//
-//		if (dbo instanceof OnlineApplication) {
-//
-//			result = saveOnlineApplication((OnlineApplication) dbo);
-//
-//		} else if (dbo instanceof MOAIDConfiguration) {
-//
-//			at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration moaconfig = 
-//					(at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration) dbo;
-//			result = true;
-//
-//			result &= saveAuthComponentGeneral(moaconfig.getAuthComponentGeneral());
-//			result &= saveChainingModes(moaconfig.getChainingModes());
-//			result &= saveDefaultBKUs(moaconfig.getDefaultBKUs());
-//			result &= saveGenericConfigurations(moaconfig.getGenericConfiguration());
-//			result &= savePvp2RefreshItem(moaconfig.getPvp2RefreshItem());
-//			result &= saveSLRequestTemplates(moaconfig.getSLRequestTemplates());
-//			result &= saveTrustedCACertificates(moaconfig.getTrustedCACertificates());
-//			result &= saveTimeStampItem(moaconfig.getTimestampItem());
-//
-//		} else if (dbo instanceof UserDatabase) {
-//			// TODO implement user handling
-//		}
-//
-//		return result;
+//	public void saveOrUpdate(UserDatabase user) throws MOADatabaseException{
+//		// TODO Auto-generated method stub
+//		
 //	}
 //
 //	/**
-//	 * Deletes the object associated with the given key.
-//	 * @param key the key
+//	 * @param dbuser
 //	 */
-//	public static void delete(String key) {
-//		conf.set(key, null);
+//	public void delete(UserDatabase dbuser) {
+//		// TODO Auto-generated method stub
+//		
 //	}
 //
 //}