Index: branches/dev/WEB-INF/src/com/showcase/util/BaseDAO.java
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/src/com/showcase/util/BaseDAO.java	(.../BaseDAO.java)	(revision 154)
+++ branches/dev/WEB-INF/src/com/showcase/util/BaseDAO.java	(.../BaseDAO.java)	(revision 204)
@@ -26,7 +26,7 @@
 
 			Context envCtx = (Context) ctx.lookup("java:comp/env");
 			//Look up our data source
-			DataSource ds = (DataSource) envCtx.lookup("jdbc");
+			DataSource ds = (DataSource) envCtx.lookup("jdbc/showcase");
 
 			if (ds != null) {
 				conn = ds.getConnection();
Index: branches/dev/WEB-INF/src/com/showcase/mainframe/general/JMainframeImpl.java
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/src/com/showcase/mainframe/general/JMainframeImpl.java	(.../JMainframeImpl.java)	(revision 154)
+++ branches/dev/WEB-INF/src/com/showcase/mainframe/general/JMainframeImpl.java	(.../JMainframeImpl.java)	(revision 204)
@@ -1,38 +1,34 @@
 package com.showcase.mainframe.general;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.sql.*;
-import java.text.SimpleDateFormat; 
-import java.text.Format; 
-//import com.sybase.jaguar.sql.*;
-//import com.sybase.jaguar.server.*;
-//import com.sybase.jaguar.jcm.*;
-//import com.sybase.jaguar.util.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.StringTokenizer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.showcase.util.JNDILookup;
 
 
+
 public class JMainframeImpl{
 	private static final Log log = LogFactory.getLog(JMainframeImpl.class);
 
-	//For connecting to mainframe from inside
+	String s_ip; 
+	int i_port; 
 	
-	//String s_ip_test = "10.2.40.22";
-	//int i_port_test = 10010;
-	
-	//String s_ip = "10.2.40.22";
-	//int i_port = 10010;
-	//For connecting to mainframe from lemansnet  
-	String s_ip = "192.168.0.11";
-	//String s_ip = "192.168.0.11";
-	int i_port = 10000;
-	//int i_port = 10000;
-	//10000 is production port , 10010 is test port
-	
 	String s_debugfile = "JMainframeImpl.dbg";
 	String s_msg = "";
 	String s_new = "";
@@ -51,32 +47,11 @@
 		//
 		// get system settings from props file
 		//
-		try
-		{
-			//InputStream in_props;
-			//in_props = new FileInputStream("JMainframeImpl.props");
-			//Properties props = new Properties();
-			//props.load(in_props);
-			//s_ip = props.getProperty("IP");
-
-			//i_port = Integer.parseInt(props.getProperty("Port"));
-			//String s_debug = props.getProperty("Debug");
-			
-			
-			ClassLoader loader = Thread.currentThread().getContextClassLoader();
-			
-			//Use context classloader to read ldap.properties
-			InputStream iStream = loader.getResourceAsStream("mainframe.properties");
-			Properties props = new Properties();
-			//Load the stream into the properties object directly
-			props.load(iStream);
-			
-			s_ip=props.getProperty("IP");
-			i_port=Integer.parseInt(props.getProperty("Port"));
-			
-//			i_port=Integer.parseInt("10000");
-			
-			String s_debug = "y";
+		try {
+			i_port = Integer.parseInt((String)JNDILookup.lookup("mf_port"));
+			s_ip = (String)JNDILookup.lookup("mf_ip");
+			String s_debug = (String)JNDILookup.lookup("mf_debug");
+		
 			if (s_debug.equals("y"))
 			{
 				//s_debugfile = props.getProperty("DebugFile");
Fisheye: Tag 204 refers to a dead (removed) revision in file `branches/dev/WEB-INF/src/mainframe.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/dev/WEB-INF/web.xml
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/web.xml	(.../web.xml)	(revision 154)
+++ branches/dev/WEB-INF/web.xml	(.../web.xml)	(revision 204)
@@ -208,7 +208,7 @@
 
   <resource-ref>
       <description>DB Connection</description>
-      <res-ref-name>jdbc</res-ref-name>
+      <res-ref-name>jdbc/showcase</res-ref-name>
       <res-type>javax.sql.DataSource</res-type>
       <res-auth>Container</res-auth>
   </resource-ref>
Fisheye: Tag 204 refers to a dead (removed) revision in file `branches/dev/WEB-INF/src/mainframe.production.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/dev/documentation/notes.txt
===================================================================
diff -u -r154 -r204
--- branches/dev/documentation/notes.txt	(.../notes.txt)	(revision 154)
+++ branches/dev/documentation/notes.txt	(.../notes.txt)	(revision 204)
@@ -17,7 +17,7 @@
 make sure that the first line doesn't close itself (singleton).
 
 <Context path="/showcase" reloadable="true" docBase="C:\projects\showcase.lemansnet.com" >
-	<Resource name="jdbc"
+	<Resource name="jdbc/showcase"
 		auth="Container"
 		type="javax.sql.DataSource"
 		factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"
@@ -42,4 +42,4 @@
 Things to do before deploy
 -------------------------------
 1) Check JMainframeImpl.java to see connection to mainframe
-2) Check web.xml for ip address of the domain controller
\ No newline at end of file
+2) Check web.xml for ip address of the domain controller
Index: branches/dev/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java	(.../ShowCaseEmailDAOImpl.java)	(revision 154)
+++ branches/dev/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java	(.../ShowCaseEmailDAOImpl.java)	(revision 204)
@@ -47,7 +47,7 @@
 					regionInfo.setId(regionCode);
 					regionInfo.setName(rs.getString("manager_name"));
 					regionInfo.setEmail(rs.getString("email_address"));
-					regions.put(regionCode, regionInfo);
+					regions.put(regionCode+"-"+rs.getString("manager_id"), regionInfo);
 				}	            	  
 	        }
 	        
@@ -56,7 +56,7 @@
 	        rs = cstmt.getResultSet();
 	        while(rs.next()) {
 	        	if(rs.getString("region_code") != null) {
-	        		RegionInfo regionInfo = regions.get(rs.getString("region_code"));
+	        		RegionInfo regionInfo = regions.get(rs.getString("region_code")+"-"+rs.getString("manager_id"));
 	        		if( rs.getString("rep_id") != null) {
 	        			RepInfo repInfo = new RepInfo();
 	        			repInfo.setId( rs.getString("rep_id"));
@@ -72,7 +72,7 @@
 	        rs = cstmt.getResultSet();
 	        while(rs.next()) {
 	        	if(rs.getString("region_code") != null) {
-	        		RegionInfo regionInfo = regions.get(rs.getString("region_code"));
+	        		RegionInfo regionInfo = regions.get(rs.getString("region_code")+"-"+rs.getString("manager_id"));
 	        		if(rs.getString("rep_id") != null) {
 	        			RepInfo repInfo = regionInfo.getRepInfo(rs.getString("rep_id"));
 	        			String dealerId = rs.getString("dealer_id");
Fisheye: Tag 204 refers to a dead (removed) revision in file `branches/dev/WEB-INF/src/mainframe.stage.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/dev/WEB-INF/src/com/showcase/util/SendMail.java
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/src/com/showcase/util/SendMail.java	(.../SendMail.java)	(revision 154)
+++ branches/dev/WEB-INF/src/com/showcase/util/SendMail.java	(.../SendMail.java)	(revision 204)
@@ -36,8 +36,8 @@
 		
 		// send the email
 		Properties props = System.getProperties();
-//		props.put("mail.smtp.host", mx);
 		props.put("mail.smtp.host", "smtp.lemanscorp.com");
+		//props.put("mail.smtp.host", "localhost");
 		Session session = Session.getDefaultInstance(props, null);
 		Message msg = new MimeMessage(session);
 		msg.setFrom(new InternetAddress(from));
@@ -60,8 +60,8 @@
 		
 		// send the email
 		Properties props = System.getProperties();
+		//props.put("mail.smtp.host", "localhost");
 		props.put("mail.smtp.host", "smtp.lemanscorp.com");
-		//props.put("mail.smtp.host", "mail.parts-unltd.com");
 		Session session = Session.getDefaultInstance(props, null);
 
 		MimeMultipart multipart = new MimeMultipart("alternative");
Index: branches/dev/WEB-INF/src/com/showcase/mainframe/general/CustomResultSet.java
===================================================================
diff -u -r154 -r204
--- branches/dev/WEB-INF/src/com/showcase/mainframe/general/CustomResultSet.java	(.../CustomResultSet.java)	(revision 154)
+++ branches/dev/WEB-INF/src/com/showcase/mainframe/general/CustomResultSet.java	(.../CustomResultSet.java)	(revision 204)
@@ -7,10 +7,13 @@
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
+import java.sql.NClob;
 import java.sql.Ref;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.RowId;
 import java.sql.SQLException;
+import java.sql.SQLXML;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Enumeration;
@@ -734,6 +737,12 @@
 	{
 			throw new SQLException("getLong() is not implemented");
 	}
+
+	public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+
      /**
 	 * Not Implemented !
      * @see java.sql.ResultSet
@@ -742,6 +751,7 @@
 	{
 			throw new SQLException("getObject() is not implemented");
 	}
+
      /**
 	 * Not Implemented !
      * @see java.sql.ResultSet
@@ -750,6 +760,11 @@
 	{
 			throw new SQLException("getObject() is not implemented");
 	}
+
+	public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+	
      /**
 	 * Not Implemented !
      * @see java.sql.ResultSet
@@ -2055,5 +2070,53 @@
         { 
     		throw new SQLException("This is not implemented");
     	}
+
+	public RowId getRowId(int columnIndex) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public RowId getRowId(String columnLabel) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateRowId(int columnIndex, RowId x) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateRowId(String columnLabel, RowId x) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public NClob getNClob(int columnIndex) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public NClob getNClob(String columnLabel) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public SQLXML getSQLXML(int columnIndex) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public SQLXML getSQLXML(String columnLabel) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
         
-}
\ No newline at end of file
+}
Index: branches/dev/deploy/build.xml
===================================================================
diff -u -r154 -r204
--- branches/dev/deploy/build.xml	(.../build.xml)	(revision 154)
+++ branches/dev/deploy/build.xml	(.../build.xml)	(revision 204)
@@ -56,15 +56,14 @@
 	
 	<path id="compile.classpath">
 		<fileset dir="${root}/WEB-INF/lib" includes="**/*.jar" />
-		<fileset dir="/usr/share/tomcat6/lib" includes="**/*.jar" />
+		<fileset dir="/usr/share/tomcat7/lib" includes="**/*.jar" />
 	</path>
 
 	<target name="setProperties.stage">
 		<property name="deployName" value="Stage" />
 		<property name="production.log4j" value="${src}/log4j.production.properties" />
 		<property name="production.userloader" value="${src}/userloader.stage.properties" />
 		<property name="production.ldap" value="${src}/ldap.production.properties" />
-		<property name="production.mainframe" value="${src}/mainframe.stage.properties" />
 		<property name="production.context" value="context.stage.xml" />
 		<property name="tomcat.server" value="showcase.stage.lemansnet.com" />
 		<property name="tomcat.manager.url" value="http://${tomcat.server}:8080/manager" />
@@ -76,7 +75,6 @@
 		<property name="production.log4j" value="${src}/log4j.production.properties" />
 		<property name="production.userloader" value="${src}/userloader.production.properties" />
 		<property name="production.ldap" value="${src}/ldap.production.properties" />
-		<property name="production.mainframe" value="${src}/mainframe.production.properties" />
 		<property name="production.context" value="context.production.xml" />
 		<property name="tomcat.server" value="showcase.lemansnet.com" />
 		<property name="tomcat.manager.url" value="http://${tomcat.server}:8080/manager" />
@@ -133,7 +131,6 @@
 		<copy overwrite="true" file="${production.log4j}" tofile="${classes}/log4j.properties" />
 		<copy overwrite="true" file="${production.userloader}" tofile="${classes}/userloader.properties" />
 		<copy overwrite="true" file="${production.ldap}" tofile="${classes}/ldap.properties" />
-		<copy overwrite="true" file="${production.mainframe}" tofile="${classes}/mainframe.properties" />
 		<!-- copies the correct context.xml file into the META-INF folder -->
 		<copy overwrite="true" file="${production.context}" tofile="${metainf}/context.xml" />
 		<copy overwrite="true" file="${src}/MessageResources.properties" tofile="${classes}/MessageResources.properties" />
Index: branches/dev/WEB-INF/lib/log4j-1.2.8.jar
===================================================================
diff -u -r154 -r204
Binary files differ