[Compiere-cvslog] CVS: dbPort/src/org/compiere Compiere.java,1.78,1.79

[Jorg J. <jj...@us...>]

Update of /cvsroot/compiere/dbPort/src/org/compiere
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18830/src/org/compiere

Modified Files:
	Compiere.java 
Log Message:


Index: Compiere.java
===================================================================
RCS file: /cvsroot/compiere/dbPort/src/org/compiere/Compiere.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** Compiere.java	18 Jul 2005 03:50:19 -0000	1.78
--- Compiere.java	20 Jul 2005 19:28:28 -0000	1.79
***************
*** 37,43 ****
  	static public final String	MAIN_VERSION	= "Release 2.5.2e";
  	/** Detail Version as date      Used for Client/Server		*/
! 	static public final String	DATE_VERSION	= "2005-06-29";
  	/** Database Version as date    Compared with AD_System		*/
! 	static public final String	DB_VERSION		= "2005-06-29";
  
  	/** Product Name            */
--- 37,43 ----
  	static public final String	MAIN_VERSION	= "Release 2.5.2e";
  	/** Detail Version as date      Used for Client/Server		*/
! 	static public final String	DATE_VERSION	= "2005-07-20";
  	/** Database Version as date    Compared with AD_System		*/
! 	static public final String	DB_VERSION		= "2005-07-20";
  
  	/** Product Name            */
***************
*** 452,455 ****
--- 452,470 ----
  		{
  			MSystem system = MSystem.get(Env.getCtx());	//	Initializes Base Context too
+ 			String className = system.getEncryptionKey();
+ 			if (className == null || className.length() == 0)
+ 			{
+ 				className = System.getProperty(SecureInterface.COMPIERE_SECURE);
+ 				if (className != null && className.length() > 0
+ 					&& !className.equals(SecureInterface.COMPIERE_SECURE_DEFAULT))
+ 				{
+ 					SecureEngine.init(className);	//	test it
+ 					system.setEncryptionKey(className);
+ 					system.save();
+ 				}
+ 			}
+ 			SecureEngine.init(className);
+ 			
+ 			//
  			if (isClient)	
  				MClient.get(Env.getCtx(),0);			//	Login Client loaded later