Changes done in bellow components of adm for E12GenericUtility, Connection and other changes:

webitm-adm/src/ibase/webitm/ejb/adm/EmpComplete.java
webitm-adm/src/ibase/webitm/ejb/adm/EmpBondDefinitionPrs.java
webitm-adm/src/ibase/webitm/ejb/adm/EmpBondAmount.java
webitm-adm/src/ibase/webitm/ejb/adm/EmpBasicInfoPos.java
webitm-adm/src/ibase/webitm/ejb/adm/CopyCadreAdParamPrs.java
webitm-adm/src/ibase/webitm/ejb/adm/BondRecoveryRemote.java
webitm-adm/src/ibase/webitm/ejb/adm/BondRecoveryLocal.java
webitm-adm/src/ibase/webitm/ejb/adm/BondRecovery.java
webitm-adm/src/ibase/webitm/ejb/adm/AttendanceTrace.java
webitm-adm/src/ibase/webitm/ejb/adm/AttendanceAttdDedn.java
webitm-adm/src/ibase/webitm/ejb/adm/AttdSingleIC.java
webitm-adm/src/ibase/webitm/ejb/adm/AttdProcess.java
webitm-adm/src/ibase/webitm/ejb/adm/AttdDailyPos.java
webitm-adm/src/ibase/webitm/ejb/adm/AdvanceAddPos.java
webitm-adm/src/ibase/webitm/ejb/adm/AdChangePrs.java
webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217806 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/AdChangePrs.java

@@ -10,12 +10,18 @@ import javax.ejb.*;
 import org.w3c.dom.*;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import javax.ejb.Stateless; // added for ejb3
 @Stateless
 public class AdChangePrs extends ValidatorEJB implements AdChangePrsLocal, AdChangePrsRemote 
 //public class AdChangePrs extends ValidatorEJB implements SessionBean  // implements for ejb3
 {
+
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
+	
 	// implements for ejb3
 	/*
 	public void ejbCreate() throws RemoteException, CreateException 
@@ -48,7 +54,9 @@ public class AdChangePrs extends ValidatorEJB implements AdChangePrsLocal, AdCha
 		{
 			if (xmlString1 != null && xmlString1.trim().length() > 0)
 			{
-				dom = GenericUtility.getInstance().parseString(xmlString1);
+				// Modified on 12/03/2020 [To use E12GenericUtility]
+				// dom = GenericUtility.getInstance().parseString(xmlString1);
+				dom = genericUtility.parseString(xmlString1);
 				retString = executepreSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
 			}			
 		}
@@ -77,7 +85,8 @@ public class AdChangePrs extends ValidatorEJB implements AdChangePrsLocal, AdCha
 		try
 		{
 			conn.setAutoCommit(false);
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
 			AdmCommon admCommon = new AdmCommon();
 			System.out.println("dom.............:: "+ dom);

webitm-adm/src/ibase/webitm/ejb/adm/AdmCommon.java

@@ -42,7 +42,7 @@ import ibase.utility.E12GenericUtility;
 import ibase.webitm.bean.adm.LogWriterDatabase;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.sys.UtilMethods;
-import ibase.webitm.utility.GenericUtility;
+// import ibase.webitm.utility.GenericUtility; // 12/03/2020
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
 //Modified By Dipesh.P on [07/02/2020]Start
@@ -342,7 +342,9 @@ public class AdmCommon
 		try
 		{
 			conn.setAutoCommit(false);
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
 			relativeDate = getRelativeDate(effDate,-1);
 			System.out.println("relativeDate...::" + relativeDate);
 
@@ -465,11 +467,23 @@ public class AdmCommon
 		String empSite="";
 		String paySite ="";
 		// Modified by chetna on [06-09-2014][To incorporate changes of ITM in RCP Migration].End
+		// Modified on 12/03/2020 [For login code and term id].Start
+		String loginCode = "";
+		String termId = "";
+		// Modified on 12/03/2020 [For login code and term id].End
 
 		try
 		{
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
+
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
+			// Modified on 12/03/2020 [For login code and term id].Start
+			loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
+			termId = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
+			// Modified on 12/03/2020 [For login code and term id].End
+
 			conn.setAutoCommit(false);
 			stmt = conn.createStatement();
 			adBasic = getEnv("999999", "BASIC", conn);
@@ -615,8 +629,14 @@ public class AdmCommon
 								pstmt.setString(4,status);
 								pstmt.setString(5,procType);
 								pstmt.setTimestamp(6,new java.sql.Timestamp(System.currentTimeMillis()));
+								// Modified on 12/03/2020 [For login code and termid].Start
+								/*
 								pstmt.setString(7,GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
 								pstmt.setString(8,GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"termId"));
+								*/
+								pstmt.setString(7, loginCode);
+								pstmt.setString(8, termId);
+								// Modified on 12/03/2020 [For login code and termid].End
 								int insCnt = pstmt.executeUpdate();
 								if (insCnt == 1)
 								{
@@ -770,7 +790,9 @@ public class AdmCommon
 
 		try
 		{
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
 			//Start
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			java.util.Date newDate =  new java.util.Date();
@@ -855,7 +877,10 @@ public class AdmCommon
 
 		try
 		{
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
+			
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			date1 = sdf.parse(effDate);
 			Calendar calObject = Calendar.getInstance();
@@ -911,8 +936,10 @@ public class AdmCommon
 
 		try
 		{
+			// Modified on 12/03/2020 [To use E12GenericUtility]
+			// GenericUtility genericUtility = GenericUtility.getInstance();	
+			E12GenericUtility genericUtility = new E12GenericUtility();
 
-			GenericUtility genericUtility = GenericUtility.getInstance();	
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			SimpleDateFormat sdformat = new SimpleDateFormat(genericUtility.getDBDateFormat());
 
@@ -1448,7 +1475,9 @@ public class AdmCommon
 	public String relativeDate(Date sourceDate , int days)
 	{
 		String returnDate =  "";
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 		try
 		{
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -1477,7 +1506,9 @@ public class AdmCommon
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		java.util.Date relieveDate = null;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
+		E12GenericUtility genericUtility = new E12GenericUtility();
 
 		System.out.println("worksite is" + empSite);
 		System.out.println("login site is" + loginSite);

webitm-adm/src/ibase/webitm/ejb/adm/AdvanceAddPos.java

@@ -6,12 +6,18 @@
 package ibase.webitm.ejb.adm;
 
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.adm.AdmCommon;
+//12/03/2020 [Not Required].Start
+/*
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.fin.FinCommon;
+*/
+//12/03/2020 [Not Required].End
 import ibase.webitm.ejb.sys.CreateRCPXML;
 import ibase.webitm.ejb.sys.UtilMethods;
 import ibase.webitm.utility.TransIDGenerator;
@@ -31,6 +37,9 @@ import org.w3c.dom.*;
 @javax.ejb.Stateless
 public class AdvanceAddPos extends ValidatorEJB implements AdvanceAddPosLocal, AdvanceAddPosRemote
 {
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
+
 	public String postSave()throws RemoteException,ITMException
 	{
 		return "";
@@ -84,7 +93,8 @@ public class AdvanceAddPos extends ValidatorEJB implements AdvanceAddPosLocal, A
 
 		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();		
 		AdmCommon admCommon = new AdmCommon();
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 
 		SimpleDateFormat sdfAppl = null;
 		String tranDateStr = "";

webitm-adm/src/ibase/webitm/ejb/adm/AttdDailyPos.java

 package ibase.webitm.ejb.adm;
 
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+//12/03/2020 [Not Required].Start
+// import ibase.webitm.utility.GenericUtility;
+//12/03/2020 [Not Required].End
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.adm.AdmCommon;
+// 12/03/2020 [Not Required].Start
+/*
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.fin.FinCommon;
+*/
+//12/03/2020 [Not Required].End
 import ibase.webitm.ejb.sys.CreateRCPXML;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.utility.CommonConstants;
@@ -31,6 +37,10 @@ import org.apache.axis.encoding.XMLType;
 @javax.ejb.Stateless
 public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, AttdDailyPosRemote
 {
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
+
+	
 	public String postSave()throws RemoteException,ITMException
 	{
 		return "";
@@ -64,7 +74,8 @@ public class AttdDailyPos extends ValidatorEJB implements AttdDailyPosLocal, Att
 
 		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();		
 		AdmCommon admCommon = new AdmCommon();
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 
 		SimpleDateFormat sdfAppl = null;
 

webitm-adm/src/ibase/webitm/ejb/adm/AttdProcess.java

@@ -35,7 +35,8 @@ import javax.ejb.CreateException;
 
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;

webitm-adm/src/ibase/webitm/ejb/adm/AttdSingleIC.java

@@ -18,7 +18,8 @@ import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.sys.UtilMethods;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 public class AttdSingleIC extends ValidatorEJB implements AttdSingleICLocal,AttdSingleICRemote
@@ -396,7 +397,8 @@ public class AttdSingleIC extends ValidatorEJB implements AttdSingleICLocal,Attd
 		Document dom1 = null;
 		Document dom2 = null;
 		String errFields = null;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 		try 
 		{
 			System.out.println("xmlString [" + xmlString + "]");

webitm-adm/src/ibase/webitm/ejb/adm/AttendanceAttdDedn.java

@@ -12,12 +12,15 @@ import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.*;
 import ibase.webitm.ejb.*;
 import javax.ejb.Stateless; // added for ejb3
+import ibase.utility.E12GenericUtility; // 12/03/2020 [To use E12GenericUtility]
 
 @Stateless // added for ejb3
 
 public class AttendanceAttdDedn extends ValidatorEJB implements  AttendanceAttdDednLocal,AttendanceAttdDednRemote // SessionBean
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	// GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 
 	/*public void ejbCreate() throws RemoteException, CreateException 
@@ -355,8 +358,14 @@ public class AttendanceAttdDedn extends ValidatorEJB implements  AttendanceAttdD
 						String startTime = "";
 						String endTime = "";
 						
+						// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].Start
+						/*
 						startTime = GenericUtility.getInstance().getColumnValue("start_time",dom);
 						endTime = GenericUtility.getInstance().getColumnValue("end_time",dom);
+						*/
+						startTime = genericUtility.getColumnValue("start_time",dom);
+						endTime = genericUtility.getColumnValue("end_time",dom);
+						// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].End
 						
 						System.out.println("StartTime :"+startTime );
 						System.out.println("EndTime :"+endTime );

webitm-adm/src/ibase/webitm/ejb/adm/AttendanceTrace.java

@@ -2,7 +2,9 @@ package ibase.webitm.ejb.adm;
 
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.*;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.text.*;
@@ -17,6 +19,10 @@ import javax.ejb.Stateless; // added for ejb3
 
 public class AttendanceTrace extends ValidatorEJB implements AttendanceTraceLocal,AttendanceTraceRemote	//SessionBean
 {
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new 	E12GenericUtility(); 
+
+
 	/*public void ejbCreate() throws RemoteException, CreateException 
 	{
 		System.out.println("Create Method Called...");
@@ -86,7 +92,8 @@ public class AttendanceTrace extends ValidatorEJB implements AttendanceTraceLoca
 
 		int currentFormNo = 0;
 
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 		userId = getValueFromXTRA_PARAMS(xtraParams,"userId");
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>");
 		System.out.println("=================== Itemchange Starts =====================");
@@ -326,7 +333,8 @@ public class AttendanceTrace extends ValidatorEJB implements AttendanceTraceLoca
 		Document dom1 = null;
 		Document dom2 = null;
 		String errString = " ";
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 		try
 		{ 			
 			if(xmlString != null && xmlString.trim().length()!=0)
@@ -381,7 +389,8 @@ public class AttendanceTrace extends ValidatorEJB implements AttendanceTraceLoca
 		int noOfChilds = 0;
 		int currentFormNo = 0;
 		int count = 0;
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 		try
 		{
 			

webitm-adm/src/ibase/webitm/ejb/adm/BondRecovery.java

@@ -2,7 +2,9 @@ package ibase.webitm.ejb.adm;
 
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.util.*;
 import java.rmi.RemoteException;
@@ -21,6 +23,9 @@ import ibase.webitm.ejb.adm.AdmCommon;
 
 public class BondRecovery extends ValidatorEJB implements BondRecoveryLocal, BondRecoveryRemote
 {	
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
+
 	public String wfValData() throws RemoteException,ITMException
 	{
 		return "";
@@ -134,7 +139,8 @@ public class BondRecovery extends ValidatorEJB implements BondRecoveryLocal, Bon
 		int currentFormNo=0;
 		int childNodeListLength;				
 		String empCode="",siteCode = "",recAmtAct="",bondAmt="",recAmtDone="",acctcode="",cctrcode="",analCode="";
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
 		try
 		{
 			ConnDriver connDriver = new ConnDriver();
@@ -473,8 +479,14 @@ public class BondRecovery extends ValidatorEJB implements BondRecoveryLocal, Bon
 		
 		try
 		{
+			// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].Start
+			/*
 			GenericUtility genericUtility = GenericUtility.getInstance();
 			loginEmpCode = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
+			*/
+			loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
+			// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].End
+
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			Timestamp timestamp = new Timestamp(System.currentTimeMillis());
 			conn = connDriver.getConnectDB("DriverITM");

webitm-adm/src/ibase/webitm/ejb/adm/BondRecoveryLocal.java

 package ibase.webitm.ejb.adm;
 
-import ibase.webitm.ejb.dis.DistCommon;
+// import ibase.webitm.ejb.dis.DistCommon; // 12/03/2020 [Tot needed]
 import java.rmi.RemoteException;
 import org.w3c.dom.*;
 

webitm-adm/src/ibase/webitm/ejb/adm/BondRecoveryRemote.java

 package ibase.webitm.ejb.adm;
 
-import ibase.webitm.ejb.dis.DistCommon;
+// import ibase.webitm.ejb.dis.DistCommon; // 12/03/2020 [Not Needed]
 import java.rmi.RemoteException;
 import org.w3c.dom.*;
 

webitm-adm/src/ibase/webitm/ejb/adm/CopyCadreAdParamPrs.java

@@ -18,7 +18,9 @@ import java.text.SimpleDateFormat;
 import java.rmi.RemoteException;
 import org.w3c.dom.*;
 import ibase.webitm.utility.ITMException;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.*;
 
 import javax.ejb.Stateless; // added for ejb3
@@ -29,6 +31,8 @@ import javax.swing.JOptionPane;
 @Stateless // added for ejb3
 public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdParamPrsLocal, CopyCadreAdParamPrsRemote
 {
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	
 	public String preSaveRec() throws RemoteException, ITMException
 	{
@@ -45,7 +49,10 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 		{
 			if (xmlString1 != null && xmlString1.trim().length() > 0)
 			{
-				dom = GenericUtility.getInstance().parseString(xmlString1);
+				// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].Start
+				// dom = GenericUtility.getInstance().parseString(xmlString1);
+				dom = genericUtility.parseString(xmlString1);
+				// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].End
 				errString = executepreSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
 				if (errString == null || errString.trim().length() == 0)
 				{
@@ -90,15 +97,20 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 		int cnt = 0,updCnt = 0;
 	 
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
-		GenericUtility genericUtility = GenericUtility.getInstance();		
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].Start
+		// GenericUtility genericUtility = GenericUtility.getInstance();		
+		// Modified on 12/03/2020 [To use E12GenericUtility defined at class level].End
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		String errString = "";
 		boolean insertFlag=false;
 		try
-		{	
+		{	// Modified on 12/03/2020 [No need to create new connection as connection is passed].Start
+			/*
 			ConnDriver connDriver = new ConnDriver();			
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
+			*/
+			// Modified on 12/03/2020 [No need to create new connection as connection is passed].End
 			pay_table = genericUtility.getColumnValue("pay_table",dom);
 			//varName = genericUtility.getColumnValue("var_name",dom);
 			new_pay_table = genericUtility.getColumnValue("new_pay_table",dom);
@@ -355,6 +367,8 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 		}
 		finally
 		{
+			// Modified on 12/03/2020 [Should not close connection as this is passed from caller].Start
+			/*
 			try
 			{
 				conn.close();
@@ -364,6 +378,8 @@ public class CopyCadreAdParamPrs extends ValidatorEJB implements CopyCadreAdPara
 			{
 				throw new ITMException(e);
 			}
+			*/
+			// Modified on 12/03/2020 [Should not close connection as this is passed from caller].End
 		}
 		return errString ;
 	}
@@ -396,17 +412,19 @@ public Timestamp getTimestamp(String str) throws Exception{
  
 	
 	
-	public int checkValidity(String retrival, String column_name, String table_name,  Connection from_site_conn) throws SQLException{
+	// Modified on 12/03/2020 [Changed connection argument name to avoid another connection variable]
+	// public int checkValidity(String retrival, String column_name, String table_name,  Connection from_site_conn) throws SQLException{
+	public int checkValidity(String retrival, String column_name, String table_name,  Connection conn) throws SQLException{
 		boolean flag=false;
 		PreparedStatement pstmt=null;
 		ResultSet rs=null;
 		String Query="";
-		Connection conn=null;
+		// Connection conn=null; // Modified on 12/03/2020 [Used argument connection]
 		int count=0;
-		Connection localConnection =null;
+		// Connection localConnection =null; // Modified on 12/03/2020 [Used argument connection]
 			
 		try{
-			       conn = from_site_conn;
+			       // conn = from_site_conn; // Modified on 12/03/2020 [Used argument connection]
 			       Query="select count("+column_name+")  from "+table_name+" where "+column_name+"='"+retrival+"'";
 			       System.out.println("====QUERY=="+Query);
 			       pstmt=conn.prepareStatement(Query);

webitm-adm/src/ibase/webitm/ejb/adm/EmpBasicInfoPos.java

@@ -15,12 +15,17 @@ import ibase.webitm.ejb.*;
 import ibase.webitm.utility.*;
 import ibase.system.config.*;
 import ibase.webitm.utility.ITMException;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.utility.CommonConstants;
 
 @javax.ejb.Stateless
 public class EmpBasicInfoPos extends ValidatorEJB implements EmpBasicInfoPosLocal, EmpBasicInfoPosRemote
 {	
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
+	
 	public String postSave()throws RemoteException,ITMException
 	{
 		return "";
@@ -53,7 +58,8 @@ public class EmpBasicInfoPos extends ValidatorEJB implements EmpBasicInfoPosLoca
 		{
 			conn.setAutoCommit( false );
 
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
 			
 			System.out.println("domString EmpBasicInfoPos ["+domString+"]");	
 			dom = genericUtility.parseString(domString);

webitm-adm/src/ibase/webitm/ejb/adm/EmpBondAmount.java

@@ -4,7 +4,8 @@ package ibase.webitm.ejb.adm;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import java.rmi.RemoteException;
 import java.sql.Connection;

webitm-adm/src/ibase/webitm/ejb/adm/EmpBondDefinitionPrs.java

@@ -2,7 +2,9 @@ package ibase.webitm.ejb.adm;
 
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [To use E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
 
 
@@ -30,6 +32,8 @@ import javax.xml.transform.stream.StreamResult;
 @Stateless 
 public class EmpBondDefinitionPrs extends ValidatorEJB implements EmpBondDefinitionPrsLocal,EmpBondDefinitionPrsRemote 
 {
+	// Modified on 12/03/2020 [To use E12GenericUtility]
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	
 	public String preSave() throws RemoteException,ITMException
 	{
@@ -148,7 +152,9 @@ public class EmpBondDefinitionPrs extends ValidatorEJB implements EmpBondDefinit
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
 			connDriver = null;
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			// Modified on 12/03/2020 [To use E12GenericUtility defined at class level]
+			// GenericUtility genericUtility = GenericUtility.getInstance();
+			
 			simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			

webitm-adm/src/ibase/webitm/ejb/adm/EmpComplete.java

@@ -3,7 +3,8 @@ import ibase.system.config.ConnDriver;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
+// Modified on 12/03/2020 [Used E12GenericUtility]
+// import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.sys.*;
 
@@ -114,7 +115,9 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 			stmt = conn.createStatement();
 			userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			loginSite = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
-			GenericUtility genericUtility = GenericUtility.getInstance(); 
+			// Modified on 12/03/2020 [Used E12GenericUtility defined at class level]
+			// GenericUtility genericUtility = GenericUtility.getInstance(); 
+			
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			if(objContext != null && objContext.trim().length()>0)
 			{
@@ -2054,7 +2057,9 @@ public class EmpComplete extends ValidatorEJB  implements EmpCompleteLocal,EmpCo
 	private String getAppDateFormat(Timestamp timestamp)
 	{
 		String s = "";				  
-		GenericUtility genericUtility = GenericUtility.getInstance();
+		// Modified on 12/03/2020 [Used E12GenericUtility defined at class level]
+		// GenericUtility genericUtility = GenericUtility.getInstance();
+		
 		try
 		{
 			java.util.Date date = null;