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

webitm-sys/ibase/webitm/ejb/sys/AcctprdGenPrd.java

@@ -110,7 +110,7 @@ public class AcctprdGenPrd extends ActionHandlerEJB implements AcctprdGenPrdLoca
 			System.out.println("Total count for period for acctPrd [" + cnt + "]");
 			if (cnt > 0 )
 			{
-				errString = itmDBAccessEJB.getErrorString("","VMPRDEXT",userId);
+				errString = itmDBAccessEJB.getErrorString("","VMPRDEXT",userId,"",conn);
 				return errString;
 			}
 	
@@ -186,7 +186,7 @@ public class AcctprdGenPrd extends ActionHandlerEJB implements AcctprdGenPrdLoca
 			pstmtUpd.close();
 			pstmtUpd = null;
 			conn.commit();
-			errString = itmDBAccessEJB.getErrorString("","VMPRDGEN",userId);
+			errString = itmDBAccessEJB.getErrorString("","VMPRDGEN",userId,"",conn);
 		}
 		catch(Exception e)
 		{
@@ -194,7 +194,7 @@ public class AcctprdGenPrd extends ActionHandlerEJB implements AcctprdGenPrdLoca
 			try
 			{
 				conn.rollback();
-				errString = itmDBAccessEJB.getErrorString("","ERROR",userId);
+				errString = itmDBAccessEJB.getErrorString("","ERROR",userId,"",conn);
 			}
 			catch(Exception ex)
 			{

webitm-sys/ibase/webitm/ejb/sys/CallConfirmService.java

@@ -131,7 +131,7 @@ public class CallConfirmService extends ActionHandlerEJB implements CallConfirmS
 			System.out.println("Return string from NVO is:==>["+retString+"]");
 			Document dom= parseString(retString);
 			String errCode = getErrorCode(dom);
-			retString = new ibase.webitm.ejb.ITMDBAccessEJB().getErrorString("",errCode,"");
+			retString = new ibase.webitm.ejb.ITMDBAccessEJB().getErrorString("",errCode,"",",",conn);
 			System.out.println("Return string from ITMDBAccessEJB() is:==>["+retString+"]");
 		}
 		catch(Exception e)

webitm-sys/ibase/webitm/ejb/sys/CreateBatchPrc.java

@@ -177,7 +177,7 @@ public class CreateBatchPrc extends ProcessEJB implements  CreateBatchPrcLocal ,
 			{
 				System.out.println("File Not Found");
 				errCode = "VBFILEOPEN";
-				errString =	itmDBAccessEJB.getErrorString("",errCode,"");
+				errString =	itmDBAccessEJB.getErrorString("",errCode,"","",conn);
 				System.out.println("errString"+errString);
 			
 			}
@@ -533,7 +533,7 @@ public class CreateBatchPrc extends ProcessEJB implements  CreateBatchPrcLocal ,
 												System.out.println("Version::::"+version);
 									 			System.out.println("fldData::::"+fldData);
 												errCode = "VTEDIVER";
-												errString =	itmDBAccessEJB.getErrorString("",errCode,"");
+												errString =	itmDBAccessEJB.getErrorString("",errCode,"","",conn);
 												return errString; 
 												
 											}
@@ -550,7 +550,7 @@ public class CreateBatchPrc extends ProcessEJB implements  CreateBatchPrcLocal ,
 											System.out.println("identifier::::"+identifier);
 									 		System.out.println("fldData::::"+fldData);
 											errCode = "VTEDIIDT"; 
-											errString =	itmDBAccessEJB.getErrorString("",errCode,"");
+											errString =	itmDBAccessEJB.getErrorString("",errCode,"","",conn);
 											return errString;
 			 												
 										}
@@ -761,10 +761,10 @@ public class CreateBatchPrc extends ProcessEJB implements  CreateBatchPrcLocal ,
 			{
 				//String batchNo = "CP114-000000008";
 				InitialContext ctx1 = null;
-				MasterApplyLocal maObj=null;
+				MasterApply maObj=new MasterApply();
 				AppConnectParm appConnect = new AppConnectParm();
 				ctx1 = new InitialContext(appConnect.getProperty());
-				 maObj = (MasterApplyLocal)ctx1.lookup("ibase/MasterApply/local");
+				// maObj = (MasterApplyLocal)ctx1.lookup("ibase/MasterApply/local");
 				//MasterApply maObj = maObjHome.create();
 				System.out.println("batchNo::::::::::::::"+ batchNo);
 				maObj.applyMasterTable(batchNo,xtraParam);

webitm-sys/ibase/webitm/ejb/sys/CreateXmlPrc.java

@@ -145,13 +145,15 @@ public class CreateXmlPrc extends ProcessEJB implements  CreateXmlPrcLocal , Cre
 			 
 			objName = winName.substring(2);
 			
-			AppConnectParm appConnect = new AppConnectParm();
-			InitialContext ctx = new InitialContext( appConnect.getProperty() );
-			CommonDBAccessLocal commonDBAccessLocal = (CommonDBAccessLocal)ctx.lookup("ibase/CommonDBAccessEJB/local");
+			/*AppConnectParm appConnect = new AppConnectParm();
+			InitialContext ctx = new InitialContext( appConnect.getProperty() );*/
+			//CommonDBAccessLocal commonDBAccessLocal = (CommonDBAccessLocal)ctx.lookup("ibase/CommonDBAccessEJB/local");
+			CommonDBAccessEJB commonDBAccessLocal = new CommonDBAccessEJB();
 			UserInfoBean userInfo = commonDBAccessLocal.createUserInfo( userId );
 			System.out.println("EDI : userInfo ["+userInfo.toString()+"]");
 
-			E12GenerateEDILocal generateEDILocal = (E12GenerateEDILocal)ctx.lookup("ibase/E12GenerateEDIEJB/local");
+			//E12GenerateEDILocal generateEDILocal = (E12GenerateEDILocal)ctx.lookup("ibase/E12GenerateEDIEJB/local");
+			E12GenerateEDIEJB generateEDILocal = new E12GenerateEDIEJB();
 			
 			generateEDILocal.generateEdi(objName, refId, "", userInfo, xtraParams);
 			generateEDILocal = null;
@@ -171,6 +173,7 @@ public class CreateXmlPrc extends ProcessEJB implements  CreateXmlPrcLocal , Cre
 				{
 					genericUtility = null;
 				}
+				
 				/*if( conn != null )
 				{
 					conn.close();

webitm-sys/ibase/webitm/ejb/sys/LoadBatch.java

@@ -83,7 +83,7 @@ public class LoadBatch extends ActionHandlerEJB implements LoadBatchLocal,LoadBa
 		   else
 		   {
 		     System.out.println("Batch Load:errCode:"+"VTLOBATCH");
-             errString = itmDBAccess.getErrorString("","VTLOBATCH","");
+             errString = itmDBAccess.getErrorString("","VTLOBATCH","","",conn);
              System.out.println("errString:"+errString+":");
 		   }
        }
@@ -110,19 +110,28 @@ public class LoadBatch extends ActionHandlerEJB implements LoadBatchLocal,LoadBa
     {
 	   String errString="";
 	   UserInfoBean userInfo=null;
-	   MasterApplyEJBLocal masterAppLocal=null;
+	   MasterApplyEJB masterAppLocal= new MasterApplyEJB() ;
 	   try
 	   {
-	   masterAppLocal =getComponent("MasterApplyEJB");
+	  // masterAppLocal =getComponent("MasterApplyEJB");
 	   userInfo=new UserInfoBean();
 	   masterAppLocal.applyMasterTable(tranId,xtraParams,userInfo);
 	   }catch(Exception e)
 	   {
 	   e.printStackTrace();
 	   }
+	   finally
+	   {
+		   if(masterAppLocal!=null)
+		   {
+			   masterAppLocal=null;
+		   }
+	    	 
+	   }
 	   
         return errString;
     }
+     
 	private MasterApplyEJBLocal getComponent( String EjbComponent) throws ITMException
 	{
 		InitialContext ctx = null;

webitm-sys/ibase/webitm/ejb/sys/SiteRegNoPrs.java

@@ -263,12 +263,12 @@ public class SiteRegNoPrs extends ValidatorEJB implements SiteRegNoPrsLocal, Sit
 
 							System.out.println("@@@@@@@@@@ update querry executed ....["+ cnt +"]");
 							ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
-                            retString = itmDBAccessLocal.getErrorString("","PRVDATUPDT","");
+                            retString = itmDBAccessLocal.getErrorString("","PRVDATUPDT","","",conn);
 					         }
 				         	else
 				         	{
 				         		System.out.println("@@@@@@@@@ invalid details @@@@@@@@@@@@");
-				         		errString = itmDBAccessEJB.getErrorString("","INVDATA5","");
+				         		errString = itmDBAccessEJB.getErrorString("","INVDATA5","","",conn);
                             }    	
 						}
 			/*
@@ -287,7 +287,7 @@ public class SiteRegNoPrs extends ValidatorEJB implements SiteRegNoPrsLocal, Sit
 					else
 					{
 						System.out.println("@@@@@@@ INVALID DATA : DATA FOUND ");
-						errString = itmDBAccessEJB.getErrorString("","INVDATA5","");
+						errString = itmDBAccessEJB.getErrorString("","INVDATA5","","",conn);
 					}		
 				}
 					 
@@ -339,7 +339,7 @@ public class SiteRegNoPrs extends ValidatorEJB implements SiteRegNoPrsLocal, Sit
 			 				
 			 				if( cnt > 0)
 			 				{
-			 					errString = itmDBAccessEJB.getErrorString("","VMSTRGEXIS","");
+			 					errString = itmDBAccessEJB.getErrorString("","VMSTRGEXIS","","",conn);
 								return errString;
 			 				}
 			 		
@@ -385,7 +385,7 @@ public class SiteRegNoPrs extends ValidatorEJB implements SiteRegNoPrsLocal, Sit
 								 
 								 if( effFromNew2.after(validUptoNext))
 								 {
-									 errString = itmDBAccessEJB.getErrorString("","INVDATE9","");
+									 errString = itmDBAccessEJB.getErrorString("","INVDATE9","","",conn);
 									 return errString;
 								 }
 								 sql=" UPDATE siteregno SET eff_from= ? " +

webitm-sys/ibase/webitm/ejb/sys/TrackActivityMaster.java

@@ -298,10 +298,10 @@ public class TrackActivityMaster extends ValidatorEJB implements TrackActivityMa
 					errFldName = errFields.get(count);
 					System.out.println("errCode .........." + errCode);
 				//	errString = getErrorString(errFldName, errCode, userId);
-					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId);
+					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
-					errString = itmDBAccessEJB.getErrorString("", errCode, userId);
+					errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
 					errorType = errorType(conn , errCode);

webitm-sys/ibase/webitm/ejb/sys/TrackReqMaster.java

@@ -435,10 +435,10 @@ public class TrackReqMaster extends ValidatorEJB implements TrackReqMasterLocal,
 					errFldName = errFields.get(count);
 					System.out.println("errCode .........." + errCode);
 				//	errString = getErrorString(errFldName, errCode, userId);
-					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId);
+					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
-					errString = itmDBAccessEJB.getErrorString("", errCode, userId);
+					errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
 					errorType = errorType(conn , errCode);

webitm-sys/ibase/webitm/ejb/sys/TrackSetMaster.java

@@ -437,10 +437,10 @@ public class TrackSetMaster extends ValidatorEJB implements TrackSetMasterLocal,
 					errFldName = errFields.get(count);
 					System.out.println("errCode .........." + errCode);
 				//	errString = getErrorString(errFldName, errCode, userId);
-					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId);
+					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
-					errString = itmDBAccessEJB.getErrorString("", errCode, userId);
+					errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
 					errorType = errorType(conn , errCode);

webitm-sys/ibase/webitm/ejb/sys/UpdateLoadStatus.java

@@ -87,13 +87,13 @@ public class UpdateLoadStatus extends ActionHandlerEJB implements UpdateLoadStat
 			
 			if( "Y".equalsIgnoreCase(loadStat) )
 			{
-				errString = itmDBAccessEJB.getErrorString("","VMLOADSTAY",userId);
+				errString = itmDBAccessEJB.getErrorString("","VMLOADSTAY",userId,"",conn);
 				return errString;
 			}
 			
 			if( "N".equalsIgnoreCase(loadStat) )
 			{
-				errString = itmDBAccessEJB.getErrorString("","VMLOADSTAN",userId);
+				errString = itmDBAccessEJB.getErrorString("","VMLOADSTAN",userId,"",conn);
 				return errString;
 			}
 			
@@ -129,7 +129,7 @@ public class UpdateLoadStatus extends ActionHandlerEJB implements UpdateLoadStat
 					conn.commit();  
 					System.out.println("@@@@ Transaction commit... ");
 					
-					errString = itmDBAccessEJB.getErrorString("","VMLOADSTAU",userId);
+					errString = itmDBAccessEJB.getErrorString("","VMLOADSTAU",userId,"",conn);
 					return errString;
 				}
 			}

webitm-sys/ibase/webitm/ejb/sys/User.java

@@ -306,10 +306,10 @@ public class User extends ValidatorEJB implements UserLocal,UserRemote
 					errFldName = errFields.get(count);
 					System.out.println("errCode .........." + errCode);
 				//	errString = getErrorString(errFldName, errCode, userId);
-					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId);
+					errString = itmDBAccessEJB.getErrorString(errFldName, errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
-					errString = itmDBAccessEJB.getErrorString("", errCode, userId);
+					errString = itmDBAccessEJB.getErrorString("", errCode, userId,"",conn);
 					System.out.println("errString........"+errString);
 					
 					errorType = errorType(conn , errCode);

webitm-sys/ibase/webitm/ejb/sys/WFAuditTraillScheduler.java

@@ -12,6 +12,7 @@ import javax.naming.InitialContext;
 import javax.xml.rpc.ParameterMode;
 
 import ibase.webitm.ejb.DBAccessRemote;
+import ibase.webitm.ejb.DBAccessEJB;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.utility.ITMException;
 //import ibase.webitm.utility.GenericUtility;
@@ -213,9 +214,10 @@ public String auditTrialSch(String xtraParams) throws Exception
 					
 			System.out.println("Generating XML String....");
 			
-			AppConnectParm appConnect = new AppConnectParm();
-			ctx = new InitialContext(appConnect.getProperty());
-			DBAccessRemote dbAccess = (DBAccessRemote)ctx.lookup("ibase/DBAccessEJB/remote");
+			/*AppConnectParm appConnect = new AppConnectParm();
+			ctx = new InitialContext(appConnect.getProperty());*/
+			//DBAccessRemote dbAccess = (DBAccessRemote)ctx.lookup("ibase/DBAccessEJB/remote");
+			DBAccessEJB dbAccess = new DBAccessEJB(); 
 			String query = "SELECT CHG_XML FROM AUDIT_TRAIL WHERE CHG_ID = ? AND OBJ_NAME=? AND TRIM(REF_ID)=?";
 			ArrayList bindVarValues = new ArrayList();
 			ArrayList bindVarTypes = new ArrayList();