Menu
▾
▴
itracker-commits — itracker CVS commits are distributed through this mailinglist. Join to develop.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(217) |
Nov
(180) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(58) |
Feb
(370) |
Mar
(105) |
Apr
(165) |
May
(93) |
Jun
(37) |
Jul
|
Aug
(21) |
Sep
(131) |
Oct
(40) |
Nov
(113) |
Dec
(401) |
| 2007 |
Jan
(180) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2008 |
Jan
(163) |
Feb
(78) |
Mar
|
Apr
(4) |
May
(28) |
Jun
(2) |
Jul
|
Aug
|
Sep
(96) |
Oct
(189) |
Nov
(413) |
Dec
(121) |
| 2009 |
Jan
(34) |
Feb
(18) |
Mar
(24) |
Apr
(16) |
May
(3) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(16) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
(35) |
Jun
|
Jul
(17) |
Aug
(7) |
Sep
|
Oct
(9) |
Nov
|
Dec
|
|
From: Marky G. <mar...@us...> - 2005-10-23 14:55:19
|
Update of /cvsroot/itracker/itracker/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5671/web Modified Files: Tag: itrackerhibernate view_issue.jsp Log Message: corrected some errors... Index: view_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/view_issue.jsp,v retrieving revision 1.47.4.2 retrieving revision 1.47.4.3 diff -C2 -d -r1.47.4.2 -r1.47.4.3 *** view_issue.jsp 23 Oct 2005 14:26:35 -0000 1.47.4.2 --- view_issue.jsp 23 Oct 2005 14:55:11 -0000 1.47.4.3 *************** *** 18,24 **** <% ! //InitialContext ic = new InitialContext(); ! ! //Object ihRef = ic.lookup("java:comp/env/" + IssueHandler.JNDI_NAME); IssueHandler ih = new IssueHandlerBean(); --- 18,22 ---- <% ! IssueHandler ih = new IssueHandlerBean(); |
|
From: Marky G. <mar...@us...> - 2005-10-23 14:28:42
|
Update of /cvsroot/itracker/itracker/web/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32144/web/help Modified Files: Tag: itrackerhibernate help_about.jsp Log Message: removing some errors from the help pages. Index: help_about.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/help/help_about.jsp,v retrieving revision 1.17.4.1 retrieving revision 1.17.4.2 diff -C2 -d -r1.17.4.1 -r1.17.4.2 *** help_about.jsp 18 Oct 2005 00:13:13 -0000 1.17.4.1 --- help_about.jsp 23 Oct 2005 14:28:33 -0000 1.17.4.2 *************** *** 5,16 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> <%@ page import="java.rmi.*" %> <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> ! <%! SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss"); %> --- 5,21 ---- <%@ taglib uri="/struts-logic.tld" prefix="logic" %> + <%@ page import="java.io.*" %> <%@ page import="java.rmi.*" %> <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> + <%@ page import="javax.ejb.*" %> <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.ejb.beans.session.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> + <%@ page import="cowsultants.itracker.ejb.client.models.*" %> + <%@ page import="cowsultants.itracker.ejb.client.resources.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> ! <%@ page import="cowsultants.itracker.web.util.*" %> <%! SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss"); %> *************** *** 19,38 **** String versionNumber = ""; long startTimeMillis = 0; ! try { ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); versionNumber = sc.getProperty("version", "Unknown"); startTimeMillis = Long.parseLong(sc.getProperty("start_time_millis", "")); ! } catch(CreateException ce) { ! } catch(NamingException ne) { ! Logger.logError("Exception while looking up home interfaces.", ne); ! } catch(NumberFormatException nfe) { ! startTimeMillis = new Date().getTime(); ! } ! %> <center><span class="pageHeader"><u><it:message key="itracker.web.helpabout.title"/></u></span></center> --- 24,34 ---- String versionNumber = ""; long startTimeMillis = 0; ! ! ! SystemConfiguration sc = new SystemConfigurationBean(); versionNumber = sc.getProperty("version", "Unknown"); startTimeMillis = Long.parseLong(sc.getProperty("start_time_millis", "")); ! %> <center><span class="pageHeader"><u><it:message key="itracker.web.helpabout.title"/></u></span></center> |
|
From: Marky G. <mar...@us...> - 2005-10-23 14:28:29
|
Update of /cvsroot/itracker/itracker/web/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32060/web/images Modified Files: Tag: itrackerhibernate logo.gif Added Files: Tag: itrackerhibernate logo_sumol.gif Log Message: comitting 2 logos... (we will update the itracker logo soon!) Index: logo.gif =================================================================== RCS file: /cvsroot/itracker/itracker/web/images/logo.gif,v retrieving revision 1.1.1.1.8.1 retrieving revision 1.1.1.1.8.2 diff -C2 -d -r1.1.1.1.8.1 -r1.1.1.1.8.2 Binary files /tmp/cvst2r7pe and /tmp/cvsui350I differ --- NEW FILE: logo_sumol.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Marky G. <mar...@us...> - 2005-10-23 14:27:55
|
Update of /cvsroot/itracker/itracker/web/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31934/web/includes Modified Files: Tag: itrackerhibernate header.jsp Added Files: Tag: itrackerhibernate header_gruposumol.jsp Log Message: reapplying the original itracker header, backup the "existing" one in header_gruposumol.jsp --- NEW FILE: header_gruposumol.jsp --- <%@ page import="java.io.*" %> <%@ page import="java.rmi.*" %> <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.resources.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.web.util.*" %> <%@ page import="cowsultants.itracker.ejb.beans.session.*" %> <% boolean allowForgotPassword = true; boolean allowSelfRegister = false; boolean allowSaveLogin = true; String alternateLogo = null; SystemConfiguration headerSC = new SystemConfigurationBean(); allowForgotPassword = headerSC.getBooleanProperty("allow_forgot_password", true); allowSelfRegister = headerSC.getBooleanProperty("allow_self_register", false); allowSaveLogin = headerSC.getBooleanProperty("allow_save_login", true); alternateLogo = headerSC.getProperty("alternate_logo", null); %> <html> <head> <title>ITracker: <it:message key="<%= pageTitleKey %>" arg0="<%= pageTitleArg %>"/></title> <link rel="STYLESHEET" type="text/css" href="<html:rewrite page="/includes/styles.css"/>"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Expires" content="Tue, 01 Jan 1980 1:00:00 GMT"> <meta http-equiv="Pragma" content="no-cache"> <script language="JavaScript" src="<html:rewrite page="/includes/calendar.js"/>"></script> </head> <body> <form name="lookupForm" action="<html:rewrite forward="viewissue"/>"> <table width="100%" cellpadding="0" cellspacing="0"> <tr> <td width="10%" rowspan="2" > <a target="_top" href="http://intranet/sumolnet"> <img border="0" src="/itracker/images/Logo_GrupoSumol.jpg"></a></td> <td width="80%" align="center"> <img border="0" src="/itracker/images/Banner_Sumoldesk.gif"></td> <td width="10%" align="center"> <img border="0" src="/itracker/images/LogoSumol.gif"></td> </tr> <tr> <td width="100%" colspan="3" align="right" valign="bottom" class="headerText"> <it:message key="itracker.web.header.welcome"/> <%= (currUser == null ? ITrackerResources.getString("itracker.web.header.guest", currLocale) : currUser.getFirstName() + " " + currUser.getLastName()) %> </td> </tr> <tr><td colspan="3" bgcolor="#39AA42"><html:img page="/images/blank.gif" height="2"/></td></tr></table> <!-- antiga tabela header itracker --> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td class="headerLinks" align="left"> <% if(currLogin != null) { %> <html:link href="" titleKey="itracker.web.header.quickview.alt" styleClass="headerLinks"> <it:message key="itracker.web.header.quickview"/> </html:link> <input type="text" name="id" size="5" class="lookupBox" > <% } %> </td> <td class="headerLinks" align="right"> <html:link forward="index" styleClass="headerLinks" titleKey="itracker.web.header.menu.home.alt"> <it:message key="itracker.web.header.menu.home"/></html:link> <% if(currLogin != null) { %> | <html:link forward="listprojects" styleClass="headerLinks" titleKey="itracker.web.header.menu.projectlist.alt"> <it:message key="itracker.web.header.menu.projectlist"/></html:link> | <html:link forward="searchissues" styleClass="headerLinks" titleKey="itracker.web.header.menu.search.alt"> <it:message key="itracker.web.header.menu.search"/></html:link> <% if(UserUtilities.hasPermission(currPermissions, UserUtilities.PERMISSION_VIEW_ALL)) { %> | <html:link forward="listreports" styleClass="headerLinks" titleKey="itracker.web.header.menu.reports.alt"> <it:message key="itracker.web.header.menu.reports"/></html:link> <% } %> <% if(UserUtilities.hasPermission(currPermissions, UserUtilities.PERMISSION_USER_ADMIN)) { %> | <html:link page="/admin/index.jsp" styleClass="headerLinks" titleKey="itracker.web.header.menu.admin.alt"> <it:message key="itracker.web.header.menu.admin"/></html:link> <% } else if(UserUtilities.hasPermission(currPermissions, UserUtilities.PERMISSION_PRODUCT_ADMIN)) { %> | <html:link page="/admin/list_projects.jsp" styleClass="headerLinks" titleKey="itracker.web.header.menu.projectadmin.alt"> <it:message key="itracker.web.header.menu.projectadmin"/></html:link> <% } %> | <html:link forward="editpreferences" styleClass="headerLinks" titleKey="itracker.web.header.menu.preferences.alt"> <it:message key="itracker.web.header.menu.preferences"/></html:link> | <html:link forward="help" styleClass="headerLinks" target="help" titleKey="itracker.web.header.menu.help.alt"> <it:message key="itracker.web.header.menu.help"/></html:link> | <html:link action="/logoff" styleClass="headerLinks" titleKey="itracker.web.header.menu.logout.alt"> <it:message key="itracker.web.header.menu.logout"/></html:link> <% } else { %> <% if(allowForgotPassword) { %> | <html:link forward="forgotpassword" styleClass="headerLinks" titleKey="itracker.web.header.menu.forgotpass.alt"> <it:message key="itracker.web.header.menu.forgotpass"/></html:link> <% } %> <% if(allowSelfRegister) { %> | <html:link forward="selfregistration" styleClass="headerLinks" titleKey="itracker.web.header.menu.selfreg.alt"> <it:message key="itracker.web.header.menu.selfreg"/></html:link> <% } %> <% } %> </td> </tr> </table> </form> <br/> <br/> <p class="pageHeader"><it:message key="<%= pageTitleKey %>" arg0="<%= pageTitleArg %>"/></p> <br/> Index: header.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/includes/header.jsp,v retrieving revision 1.26.4.3 retrieving revision 1.26.4.4 diff -C2 -d -r1.26.4.3 -r1.26.4.4 *** header.jsp 18 Oct 2005 00:13:13 -0000 1.26.4.3 --- header.jsp 23 Oct 2005 14:27:45 -0000 1.26.4.4 *************** *** 3,8 **** --- 3,10 ---- <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> + <%@ page import="javax.ejb.*" %> <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.ejb.beans.session.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> *************** *** 10,14 **** <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.web.util.*" %> - <%@ page import="cowsultants.itracker.ejb.beans.session.*" %> <% --- 12,15 ---- *************** *** 18,27 **** String alternateLogo = null; - SystemConfiguration headerSC = new SystemConfigurationBean(); ! allowForgotPassword = headerSC.getBooleanProperty("allow_forgot_password", true); ! allowSelfRegister = headerSC.getBooleanProperty("allow_self_register", false); ! allowSaveLogin = headerSC.getBooleanProperty("allow_save_login", true); ! alternateLogo = headerSC.getProperty("alternate_logo", null); %> --- 19,30 ---- String alternateLogo = null; ! SystemConfiguration headerSC = new SystemConfigurationBean(); ! ! allowForgotPassword = headerSC.getBooleanProperty("allow_forgot_password", true); ! allowSelfRegister = headerSC.getBooleanProperty("allow_self_register", false); ! allowSaveLogin = headerSC.getBooleanProperty("allow_save_login", true); ! alternateLogo = headerSC.getProperty("alternate_logo", null); ! %> *************** *** 29,33 **** <html> <head> ! <title>ITracker: <it:message key="<%= pageTitleKey %>" arg0="<%= pageTitleArg %>"/></title> <link rel="STYLESHEET" type="text/css" href="<html:rewrite page="/includes/styles.css"/>"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> --- 32,36 ---- <html> <head> ! <title><it:message key="itracker.web.generic.itracker"/>: <it:message key="<%= pageTitleKey %>" arg0="<%= pageTitleArg %>"/></title> <link rel="STYLESHEET" type="text/css" href="<html:rewrite page="/includes/styles.css"/>"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> *************** *** 39,70 **** <body> <form name="lookupForm" action="<html:rewrite forward="viewissue"/>"> ! ! <table width="100%" cellpadding="0" cellspacing="0"> ! <tr> ! <td width="10%" rowspan="2" > ! <a target="_top" href="http://intranet/sumolnet"> ! <img border="0" src="/itracker/images/Logo_GrupoSumol.jpg"></a></td> ! <td width="80%" align="center"> ! <img border="0" src="/itracker/images/Banner_Sumoldesk.gif"></td> ! <td width="10%" align="center"> ! <img border="0" src="/itracker/images/LogoSumol.gif"></td> ! </tr> ! <tr> ! <td width="100%" colspan="3" align="right" valign="bottom" class="headerText"> ! <it:message key="itracker.web.header.welcome"/> ! <%= (currUser == null ? ITrackerResources.getString("itracker.web.header.guest", currLocale) : currUser.getFirstName() + " " + currUser.getLastName()) %> ! </td> ! </tr> ! <tr><td colspan="3" bgcolor="#39AA42"><html:img page="/images/blank.gif" height="2"/></td></tr></table> ! ! <!-- antiga tabela header itracker --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td class="headerLinks" align="left"> <% if(currLogin != null) { %> ! <html:link href="" titleKey="itracker.web.header.quickview.alt" styleClass="headerLinks"> ! <it:message key="itracker.web.header.quickview"/> </html:link> <input type="text" name="id" size="5" class="lookupBox" > <% } %> --- 42,68 ---- <body> <form name="lookupForm" action="<html:rewrite forward="viewissue"/>"> ! <table border="0" cellpadding="0" cellspacing="0" width="100%"> ! <tr> ! <td> ! <% if(alternateLogo != null && ! alternateLogo.equals("")) { %> ! <img src="<%= alternateLogo %>"> ! <% } else { %> ! <html:img page="/images/logo.gif"/> ! <% } %> ! </td> ! <td align="right" valign="bottom" class="headerText"> ! <it:message key="itracker.web.header.welcome"/> ! <%= (currUser == null ? ITrackerResources.getString("itracker.web.header.guest", currLocale) : currUser.getFirstName() + " " + currUser.getLastName()) %> ! </td> ! <tr> ! <tr><td colspan="2" bgcolor="#919AF5"><html:img page="/images/blank.gif" height="2"/></td></tr> ! </table> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td class="headerLinks" align="left"> <% if(currLogin != null) { %> ! <a title="<%= ITrackerResources.getString("itracker.web.header.quickview.alt", currLocale) %>" class="headerLinks"> ! <it:message key="itracker.web.header.quickview"/> </a> <input type="text" name="id" size="5" class="lookupBox" > <% } %> |
|
From: Marky G. <mar...@us...> - 2005-10-23 14:26:46
|
Update of /cvsroot/itracker/itracker/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31756/web Modified Files: Tag: itrackerhibernate create_issue.jsp view_issue.jsp edit_issue.jsp Log Message: removing jsp errors. Index: edit_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/edit_issue.jsp,v retrieving revision 1.62 retrieving revision 1.62.4.1 diff -C2 -d -r1.62 -r1.62.4.1 *** edit_issue.jsp 22 Aug 2005 11:41:29 -0000 1.62 --- edit_issue.jsp 23 Oct 2005 14:26:35 -0000 1.62.4.1 *************** *** 43,46 **** --- 43,47 ---- <bean:define id="pageTitleKey" value="itracker.web.editissue.title"/> <bean:define id="pageTitleArg" value="<%= issue.getId().toString() %>"/> + <%@ include file="/includes/header.jsp" %> Index: view_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/view_issue.jsp,v retrieving revision 1.47.4.1 retrieving revision 1.47.4.2 diff -C2 -d -r1.47.4.1 -r1.47.4.2 *** view_issue.jsp 11 Oct 2005 01:21:05 -0000 1.47.4.1 --- view_issue.jsp 23 Oct 2005 14:26:35 -0000 1.47.4.2 *************** *** 14,17 **** --- 14,18 ---- <it:checkLogin/> + <%@ include file="/includes/page_init.jsp" %> Index: create_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/create_issue.jsp,v retrieving revision 1.44.4.1 retrieving revision 1.44.4.2 diff -C2 -d -r1.44.4.1 -r1.44.4.2 *** create_issue.jsp 11 Oct 2005 01:21:05 -0000 1.44.4.1 --- create_issue.jsp 23 Oct 2005 14:26:35 -0000 1.44.4.2 *************** *** 12,15 **** --- 12,16 ---- <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> + <%@ page import="cowsultants.itracker.ejb.client.interfaces.UserHandler" %> <it:checkLogin/> *************** *** 18,25 **** <% - //InitialContext ic = new InitialContext(); - - //Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); - //UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); UserHandler uh = new UserHandlerBean(); --- 19,22 ---- |
|
From: Marky G. <mar...@us...> - 2005-10-23 12:46:32
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13661/src/cowsultants/itracker/web/servlets Modified Files: Tag: itrackerhibernate SchedulerController.java ReportDownloadController.java Log Message: removed not used imports Index: ReportDownloadController.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/ReportDownloadController.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** ReportDownloadController.java 11 Oct 2005 01:21:05 -0000 1.6.4.1 --- ReportDownloadController.java 23 Oct 2005 12:46:23 -0000 1.6.4.2 *************** *** 20,25 **** import java.io.*; - import java.rmi.*; - import java.util.*; import javax.ejb.*; import javax.rmi.*; --- 20,23 ---- Index: SchedulerController.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/SchedulerController.java,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -C2 -d -r1.7.4.1 -r1.7.4.2 *** SchedulerController.java 11 Oct 2005 01:21:05 -0000 1.7.4.1 --- SchedulerController.java 23 Oct 2005 12:46:23 -0000 1.7.4.2 *************** *** 19,34 **** package cowsultants.itracker.web.servlets; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.scheduler.*; public class SchedulerController extends GenericController { --- 19,36 ---- package cowsultants.itracker.web.servlets; ! import java.io.IOException; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletConfig; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! ! import cowsultants.itracker.ejb.client.interfaces.SchedulerHandler; ! import cowsultants.itracker.ejb.client.interfaces.SchedulerHandlerHome; ! import cowsultants.itracker.ejb.client.models.ScheduledTaskModel; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.web.scheduler.Scheduler; public class SchedulerController extends GenericController { |
|
From: Marky G. <mar...@us...> - 2005-10-23 12:46:20
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13635/src/cowsultants/itracker/web/reports Modified Files: Tag: itrackerhibernate ProjectTableModel.java Log Message: removed not used imports Index: ProjectTableModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/reports/ProjectTableModel.java,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** ProjectTableModel.java 11 Oct 2005 01:21:05 -0000 1.4.4.1 --- ProjectTableModel.java 23 Oct 2005 12:46:12 -0000 1.4.4.2 *************** *** 22,26 **** import cowsultants.itracker.ejb.client.models.*; - import cowsultants.itracker.ejb.client.resources.*; import cowsultants.itracker.ejb.client.util.*; --- 22,25 ---- |
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13583/src/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate EditVersionFormAction.java ForgotPasswordAction.java EditReportFormAction.java SearchIssuesAction.java RemoveCustomFieldAction.java OrderCustomFieldValueAction.java ImportDataVerifyAction.java ImportDataProcessAction.java EditReportAction.java EditIssueAction.java Log Message: removed not used imports Index: ImportDataProcessAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ImportDataProcessAction.java,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** ImportDataProcessAction.java 11 Oct 2005 01:21:04 -0000 1.11.4.1 --- ImportDataProcessAction.java 23 Oct 2005 12:46:01 -0000 1.11.4.2 *************** *** 19,44 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; ! import org.apache.struts.validator.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.util.*; --- 19,66 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import java.util.HashSet; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.interfaces.IssueHandler; ! import cowsultants.itracker.ejb.client.interfaces.IssueHandlerHome; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandlerHome; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.interfaces.UserHandler; ! import cowsultants.itracker.ejb.client.interfaces.UserHandlerHome; ! import cowsultants.itracker.ejb.client.models.ComponentModel; ! import cowsultants.itracker.ejb.client.models.ConfigurationModel; ! import cowsultants.itracker.ejb.client.models.CustomFieldModel; ! import cowsultants.itracker.ejb.client.models.GenericModel; ! import cowsultants.itracker.ejb.client.models.ImportDataModel; ! import cowsultants.itracker.ejb.client.models.IssueAttachmentModel; ! import cowsultants.itracker.ejb.client.models.IssueFieldModel; ! import cowsultants.itracker.ejb.client.models.IssueHistoryModel; ! import cowsultants.itracker.ejb.client.models.IssueModel; ! import cowsultants.itracker.ejb.client.models.LanguageModel; ! import cowsultants.itracker.ejb.client.models.ProjectModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.models.VersionModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; ! import cowsultants.itracker.ejb.client.util.CustomFieldUtilities; ! import cowsultants.itracker.ejb.client.util.ImportExportUtilities; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.web.util.Constants; Index: ForgotPasswordAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ForgotPasswordAction.java,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** ForgotPasswordAction.java 11 Oct 2005 01:21:04 -0000 1.9.4.1 --- ForgotPasswordAction.java 23 Oct 2005 12:46:01 -0000 1.9.4.2 *************** *** 19,43 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.util.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.forms.*; ! import cowsultants.itracker.web.util.*; --- 19,49 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import javax.ejb.CreateException; ! import javax.naming.InitialContext; ! import javax.naming.NamingException; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.PasswordException; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.interfaces.UserHandler; ! import cowsultants.itracker.ejb.client.interfaces.UserHandlerHome; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; ! import cowsultants.itracker.ejb.client.util.EmailHandler; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.UserUtilities; Index: ImportDataVerifyAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ImportDataVerifyAction.java,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** ImportDataVerifyAction.java 11 Oct 2005 01:21:04 -0000 1.9.4.1 --- ImportDataVerifyAction.java 23 Oct 2005 12:46:01 -0000 1.9.4.2 *************** *** 19,44 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; ! import org.apache.struts.validator.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.util.*; --- 19,59 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; ! import org.apache.struts.upload.FormFile; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.ImportExportException; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandlerHome; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.interfaces.UserHandler; ! import cowsultants.itracker.ejb.client.interfaces.UserHandlerHome; ! import cowsultants.itracker.ejb.client.models.ConfigurationModel; ! import cowsultants.itracker.ejb.client.models.CustomFieldModel; ! import cowsultants.itracker.ejb.client.models.GenericModel; ! import cowsultants.itracker.ejb.client.models.ImportDataModel; ! import cowsultants.itracker.ejb.client.models.IssueModel; ! import cowsultants.itracker.ejb.client.models.ProjectModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; ! import cowsultants.itracker.ejb.client.util.ImportExportUtilities; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.web.util.Constants; Index: RemoveCustomFieldAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveCustomFieldAction.java,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** RemoveCustomFieldAction.java 11 Oct 2005 01:21:04 -0000 1.4.4.1 --- RemoveCustomFieldAction.java 23 Oct 2005 12:46:01 -0000 1.4.4.2 *************** *** 19,43 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.util.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.scheduler.*; ! import cowsultants.itracker.web.util.*; --- 19,46 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import javax.naming.InitialContext; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.models.CustomFieldModel; ! import cowsultants.itracker.ejb.client.models.CustomFieldValueModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; ! import cowsultants.itracker.ejb.client.util.CustomFieldUtilities; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; Index: OrderCustomFieldValueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/OrderCustomFieldValueAction.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** OrderCustomFieldValueAction.java 11 Oct 2005 01:21:04 -0000 1.6.4.1 --- OrderCustomFieldValueAction.java 23 Oct 2005 12:46:01 -0000 1.6.4.2 *************** *** 19,42 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.util.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.scheduler.*; ! import cowsultants.itracker.web.util.*; --- 19,44 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import javax.naming.InitialContext; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.models.CustomFieldModel; ! import cowsultants.itracker.ejb.client.models.CustomFieldValueModel; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; Index: EditIssueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditIssueAction.java,v retrieving revision 1.21.4.1 retrieving revision 1.21.4.2 diff -C2 -d -r1.21.4.1 -r1.21.4.2 *** EditIssueAction.java 11 Oct 2005 01:21:04 -0000 1.21.4.1 --- EditIssueAction.java 23 Oct 2005 12:46:01 -0000 1.21.4.2 *************** *** 19,42 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; ! import org.apache.struts.validator.*; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.util.*; --- 19,66 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import java.util.HashMap; ! import java.util.HashSet; ! import java.util.Iterator; ! import java.util.Locale; ! import java.util.Vector; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; ! import org.apache.struts.upload.FormFile; ! import org.apache.struts.validator.DynaValidatorForm; ! ! import cowsultants.itracker.ejb.client.interfaces.IssueHandler; ! import cowsultants.itracker.ejb.client.interfaces.IssueHandlerHome; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandlerHome; ! import cowsultants.itracker.ejb.client.models.CustomFieldModel; ! import cowsultants.itracker.ejb.client.models.IssueAttachmentModel; ! import cowsultants.itracker.ejb.client.models.IssueFieldModel; ! import cowsultants.itracker.ejb.client.models.IssueHistoryModel; ! import cowsultants.itracker.ejb.client.models.IssueModel; ! import cowsultants.itracker.ejb.client.models.ProjectModel; ! import cowsultants.itracker.ejb.client.models.ProjectScriptModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.models.VersionModel; ! import cowsultants.itracker.ejb.client.util.IssueUtilities; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.NotificationUtilities; ! import cowsultants.itracker.ejb.client.util.ProjectUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.ejb.client.util.WorkflowUtilities; ! import cowsultants.itracker.web.util.AttachmentUtilities; ! import cowsultants.itracker.web.util.Constants; *************** *** 53,58 **** } if(! isTokenValid(request)) { ! Logger.logDebug("Invalid request token while editing issue."); ! errors.add( ActionErrors.GLOBAL_ERROR, new ActionError( "itracker.web.error.transaction" ) ); saveErrors( request, errors ); return mapping.findForward("listprojects"); --- 77,82 ---- } if(! isTokenValid(request)) { ! Logger.logDebug("Invalid request token while editing issue."); ! errors.add( ActionErrors.GLOBAL_ERROR, new ActionError( "itracker.web.error.transaction" ) ); saveErrors( request, errors ); return mapping.findForward("listprojects"); Index: EditReportFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditReportFormAction.java,v retrieving revision 1.8.4.1 retrieving revision 1.8.4.2 diff -C2 -d -r1.8.4.1 -r1.8.4.2 *** EditReportFormAction.java 11 Oct 2005 01:21:04 -0000 1.8.4.1 --- EditReportFormAction.java 23 Oct 2005 12:46:01 -0000 1.8.4.2 *************** *** 19,43 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; ! import org.apache.struts.validator.*; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.scheduler.*; ! import cowsultants.itracker.web.util.*; --- 19,47 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import java.util.HashMap; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; ! import org.apache.struts.validator.DynaValidatorForm; ! ! import cowsultants.itracker.ejb.client.interfaces.ReportHandler; ! import cowsultants.itracker.ejb.client.interfaces.ReportHandlerHome; ! import cowsultants.itracker.ejb.client.models.ReportModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.web.util.Constants; Index: EditVersionFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditVersionFormAction.java,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -C2 -d -r1.7.4.1 -r1.7.4.2 *** EditVersionFormAction.java 11 Oct 2005 01:21:04 -0000 1.7.4.1 --- EditVersionFormAction.java 23 Oct 2005 12:46:01 -0000 1.7.4.2 *************** *** 19,42 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; ! import org.apache.struts.validator.*; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.util.*; --- 19,48 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import java.util.HashMap; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; ! import org.apache.struts.validator.DynaValidatorForm; ! ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; ! import cowsultants.itracker.ejb.client.interfaces.ProjectHandlerHome; ! import cowsultants.itracker.ejb.client.models.ProjectModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.models.VersionModel; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.web.util.Constants; Index: EditReportAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditReportAction.java,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** EditReportAction.java 11 Oct 2005 01:21:04 -0000 1.9.4.1 --- EditReportAction.java 23 Oct 2005 12:46:01 -0000 1.9.4.2 *************** *** 19,43 **** package cowsultants.itracker.web.actions; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.rmi.*; ! import javax.naming.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import org.apache.commons.beanutils.*; ! import org.apache.struts.action.*; ! import org.apache.struts.upload.*; ! import org.apache.struts.util.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.interfaces.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; ! import cowsultants.itracker.web.util.*; --- 19,51 ---- package cowsultants.itracker.web.actions; ! import java.io.IOException; ! import java.util.HashMap; ! import javax.naming.InitialContext; ! import javax.rmi.PortableRemoteObject; ! import javax.servlet.ServletException; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! ! import org.apache.commons.beanutils.PropertyUtils; ! import org.apache.struts.action.ActionError; ! import org.apache.struts.action.ActionErrors; ! import org.apache.struts.action.ActionForm; ! import org.apache.struts.action.ActionForward; ! import org.apache.struts.action.ActionMapping; ! import org.apache.struts.upload.FormFile; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.interfaces.ReportHandler; ! import cowsultants.itracker.ejb.client.interfaces.ReportHandlerHome; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; ! import cowsultants.itracker.ejb.client.models.LanguageModel; ! import cowsultants.itracker.ejb.client.models.ReportModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; ! import cowsultants.itracker.ejb.client.util.Logger; ! import cowsultants.itracker.ejb.client.util.ReportUtilities; ! import cowsultants.itracker.ejb.client.util.UserUtilities; ! import cowsultants.itracker.web.util.Constants; Index: SearchIssuesAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/SearchIssuesAction.java,v retrieving revision 1.16.4.3 retrieving revision 1.16.4.4 diff -C2 -d -r1.16.4.3 -r1.16.4.4 *** SearchIssuesAction.java 18 Oct 2005 20:38:49 -0000 1.16.4.3 --- SearchIssuesAction.java 23 Oct 2005 12:46:01 -0000 1.16.4.4 *************** *** 23,28 **** import java.util.HashMap; - import javax.naming.InitialContext; - import javax.rmi.PortableRemoteObject; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; --- 23,26 ---- *************** *** 41,45 **** import cowsultants.itracker.ejb.client.exceptions.IssueSearchException; import cowsultants.itracker.ejb.client.interfaces.IssueSearch; - import cowsultants.itracker.ejb.client.interfaces.IssueSearchHome; import cowsultants.itracker.ejb.client.models.IssueModel; import cowsultants.itracker.ejb.client.models.IssueSearchQueryModel; --- 39,42 ---- |
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13510/src/cowsultants/itracker/ejb/client/util Modified Files: Tag: itrackerhibernate UserUtilities.java EmailHandler.java WorkflowUtilities.java ImportExportUtilities.java Log Message: removed not used imports Index: ImportExportUtilities.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/util/ImportExportUtilities.java,v retrieving revision 1.20.4.1 retrieving revision 1.20.4.2 diff -C2 -d -r1.20.4.1 -r1.20.4.2 *** ImportExportUtilities.java 11 Oct 2005 01:21:04 -0000 1.20.4.1 --- ImportExportUtilities.java 23 Oct 2005 12:45:47 -0000 1.20.4.2 *************** *** 23,27 **** import org.xml.sax.InputSource; - import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; --- 23,26 ---- Index: UserUtilities.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/util/UserUtilities.java,v retrieving revision 1.27.4.1 retrieving revision 1.27.4.2 diff -C2 -d -r1.27.4.1 -r1.27.4.2 *** UserUtilities.java 11 Oct 2005 01:21:04 -0000 1.27.4.1 --- UserUtilities.java 23 Oct 2005 12:45:47 -0000 1.27.4.2 *************** *** 23,28 **** import java.util.*; import sun.misc.BASE64Encoder; - import sun.misc.CharacterEncoder; - import cowsultants.itracker.ejb.client.exceptions.*; import cowsultants.itracker.ejb.client.models.*; --- 23,26 ---- Index: EmailHandler.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/util/EmailHandler.java,v retrieving revision 1.13.4.1 retrieving revision 1.13.4.2 diff -C2 -d -r1.13.4.1 -r1.13.4.2 *** EmailHandler.java 11 Oct 2005 01:21:04 -0000 1.13.4.1 --- EmailHandler.java 23 Oct 2005 12:45:47 -0000 1.13.4.2 *************** *** 19,34 **** package cowsultants.itracker.ejb.client.util; ! import java.io.*; ! import java.rmi.*; ! import java.util.*; ! import javax.ejb.*; ! import javax.naming.*; ! import javax.mail.*; ! import javax.mail.internet.*; ! import javax.rmi.*; - import cowsultants.itracker.ejb.util.*; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.interfaces.*; public class EmailHandler { --- 19,41 ---- package cowsultants.itracker.ejb.client.util; ! import java.io.UnsupportedEncodingException; ! import java.util.Date; ! import java.util.HashSet; ! import java.util.Iterator; ! import java.util.Properties; ! ! import javax.ejb.EJBException; ! import javax.mail.Authenticator; ! import javax.mail.MessagingException; ! import javax.mail.PasswordAuthentication; ! import javax.mail.Transport; ! import javax.mail.internet.AddressException; ! import javax.mail.internet.InternetAddress; ! import javax.mail.internet.MimeMessage; ! import javax.naming.InitialContext; ! import javax.naming.NamingException; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; ! import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; public class EmailHandler { Index: WorkflowUtilities.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/util/WorkflowUtilities.java,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -C2 -d -r1.7.4.1 -r1.7.4.2 *** WorkflowUtilities.java 11 Oct 2005 01:21:04 -0000 1.7.4.1 --- WorkflowUtilities.java 23 Oct 2005 12:45:47 -0000 1.7.4.2 *************** *** 19,33 **** package cowsultants.itracker.ejb.client.util; ! import java.text.SimpleDateFormat; ! import java.util.*; ! import org.apache.struts.action.*; import org.apache.struts.validator.DynaValidatorForm; import bsh.Interpreter; ! ! import cowsultants.itracker.ejb.client.exceptions.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.resources.*; /** --- 19,34 ---- package cowsultants.itracker.ejb.client.util; ! import java.util.HashMap; ! import java.util.Locale; ! import java.util.Vector; ! import org.apache.struts.action.ActionErrors; import org.apache.struts.validator.DynaValidatorForm; import bsh.Interpreter; ! import cowsultants.itracker.ejb.client.exceptions.WorkflowException; ! import cowsultants.itracker.ejb.client.models.NameValuePairModel; ! import cowsultants.itracker.ejb.client.models.ProjectScriptModel; ! import cowsultants.itracker.ejb.client.resources.ITrackerResources; /** |
|
From: Marky G. <mar...@us...> - 2005-10-23 12:45:43
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13421/src/cowsultants/itracker/ejb/client/models Modified Files: Tag: itrackerhibernate ProjectScriptModel.java CustomFieldValueModel.java LanguageModel.java IssueModel.java ReportModel.java IssueRelationModel.java SystemConfigurationModel.java WorkflowScriptModel.java CustomFieldModel.java Log Message: removed not used imports Index: LanguageModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/LanguageModel.java,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.2 diff -C2 -d -r1.7.4.1 -r1.7.4.2 *** LanguageModel.java 11 Oct 2005 01:21:04 -0000 1.7.4.1 --- LanguageModel.java 23 Oct 2005 12:45:27 -0000 1.7.4.2 *************** *** 19,24 **** package cowsultants.itracker.ejb.client.models; - import java.io.Serializable; - public class LanguageModel extends GenericModel { private String locale; --- 19,22 ---- Index: ProjectScriptModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/ProjectScriptModel.java,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** ProjectScriptModel.java 11 Oct 2005 01:21:04 -0000 1.5.4.1 --- ProjectScriptModel.java 23 Oct 2005 12:45:27 -0000 1.5.4.2 *************** *** 19,27 **** package cowsultants.itracker.ejb.client.models; ! import java.io.Serializable; ! import java.util.*; ! ! import cowsultants.itracker.ejb.client.resources.*; ! import cowsultants.itracker.ejb.client.util.*; public class ProjectScriptModel extends GenericModel implements Comparator { --- 19,23 ---- package cowsultants.itracker.ejb.client.models; ! import java.util.Comparator; public class ProjectScriptModel extends GenericModel implements Comparator { Index: ReportModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/ReportModel.java,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** ReportModel.java 11 Oct 2005 01:21:04 -0000 1.11.4.1 --- ReportModel.java 23 Oct 2005 12:45:27 -0000 1.11.4.2 *************** *** 21,26 **** import java.util.Comparator; - import cowsultants.itracker.ejb.client.util.ReportUtilities; - public class ReportModel extends GenericModel implements Comparator { private String name; --- 21,24 ---- Index: IssueRelationModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/IssueRelationModel.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** IssueRelationModel.java 11 Oct 2005 01:21:04 -0000 1.6.4.1 --- IssueRelationModel.java 23 Oct 2005 12:45:27 -0000 1.6.4.2 *************** *** 21,25 **** import java.util.Comparator; - import cowsultants.itracker.ejb.client.util.IssueUtilities; public class IssueRelationModel extends GenericModel implements Comparator { --- 21,24 ---- Index: CustomFieldValueModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/CustomFieldValueModel.java,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** CustomFieldValueModel.java 11 Oct 2005 01:21:04 -0000 1.9.4.1 --- CustomFieldValueModel.java 23 Oct 2005 12:45:27 -0000 1.9.4.2 *************** *** 19,28 **** package cowsultants.itracker.ejb.client.models; - import java.io.Serializable; import java.util.*; - import cowsultants.itracker.ejb.client.resources.*; - import cowsultants.itracker.ejb.client.util.*; - public class CustomFieldValueModel extends GenericModel implements Comparator { private Integer customFieldId; --- 19,24 ---- Index: CustomFieldModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/CustomFieldModel.java,v retrieving revision 1.20.4.1 retrieving revision 1.20.4.2 diff -C2 -d -r1.20.4.1 -r1.20.4.2 *** CustomFieldModel.java 11 Oct 2005 01:21:04 -0000 1.20.4.1 --- CustomFieldModel.java 23 Oct 2005 12:45:27 -0000 1.20.4.2 *************** *** 19,23 **** package cowsultants.itracker.ejb.client.models; - import java.io.Serializable; import java.util.*; --- 19,22 ---- Index: WorkflowScriptModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/WorkflowScriptModel.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** WorkflowScriptModel.java 11 Oct 2005 01:21:04 -0000 1.6.4.1 --- WorkflowScriptModel.java 23 Oct 2005 12:45:27 -0000 1.6.4.2 *************** *** 19,27 **** package cowsultants.itracker.ejb.client.models; - import java.io.Serializable; - import java.util.*; - - import cowsultants.itracker.ejb.client.resources.*; - import cowsultants.itracker.ejb.client.util.*; public class WorkflowScriptModel extends GenericModel { --- 19,22 ---- Index: SystemConfigurationModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/SystemConfigurationModel.java,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** SystemConfigurationModel.java 11 Oct 2005 01:21:04 -0000 1.11.4.1 --- SystemConfigurationModel.java 23 Oct 2005 12:45:27 -0000 1.11.4.2 *************** *** 19,24 **** package cowsultants.itracker.ejb.client.models; - import java.io.Serializable; - import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; --- 19,22 ---- Index: IssueModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/IssueModel.java,v retrieving revision 1.27.4.1 retrieving revision 1.27.4.2 diff -C2 -d -r1.27.4.1 -r1.27.4.2 *** IssueModel.java 11 Oct 2005 01:21:04 -0000 1.27.4.1 --- IssueModel.java 23 Oct 2005 12:45:27 -0000 1.27.4.2 *************** *** 20,26 **** import java.util.Comparator; - import java.util.HashMap; - import cowsultants.itracker.ejb.client.util.IssueUtilities; public class IssueModel extends GenericModel implements Comparator { --- 20,24 ---- |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:49:51
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22471/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate EditIssueFormAction.java Log Message: migrated EJB lookups to service layer creation Index: EditIssueFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditIssueFormAction.java,v retrieving revision 1.19.4.2 retrieving revision 1.19.4.3 diff -C2 -d -r1.19.4.2 -r1.19.4.3 *** EditIssueFormAction.java 16 Oct 2005 12:08:45 -0000 1.19.4.2 --- EditIssueFormAction.java 22 Oct 2005 16:49:43 -0000 1.19.4.3 *************** *** 28,33 **** import java.util.Vector; - import javax.naming.InitialContext; - import javax.rmi.PortableRemoteObject; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; --- 28,31 ---- *************** *** 42,49 **** import org.apache.struts.validator.DynaValidatorForm; import cowsultants.itracker.ejb.client.interfaces.IssueHandler; - import cowsultants.itracker.ejb.client.interfaces.IssueHandlerHome; import cowsultants.itracker.ejb.client.interfaces.UserHandler; - import cowsultants.itracker.ejb.client.interfaces.UserHandlerHome; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; --- 40,47 ---- import org.apache.struts.validator.DynaValidatorForm; + import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; + import cowsultants.itracker.ejb.beans.session.UserHandlerBean; import cowsultants.itracker.ejb.client.interfaces.IssueHandler; import cowsultants.itracker.ejb.client.interfaces.UserHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; *************** *** 83,95 **** try { ! InitialContext ic = new InitialContext(); ! ! Object ihRef = ic.lookup("java:comp/env/" + IssueHandler.JNDI_NAME); ! IssueHandlerHome ihHome = (IssueHandlerHome) PortableRemoteObject.narrow(ihRef, IssueHandlerHome.class); ! IssueHandler ih = ihHome.create(); ! ! Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); ! UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); ! UserHandler uh = uhHome.create(); Integer issueId = new Integer((request.getParameter("id") == null ? "-1" : (request.getParameter("id")))); --- 81,86 ---- try { ! IssueHandler ih = new IssueHandlerBean(); ! UserHandler uh = new UserHandlerBean(); Integer issueId = new Integer((request.getParameter("id") == null ? "-1" : (request.getParameter("id")))); |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:39
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/ejb/client/models Modified Files: Tag: itrackerhibernate IssueActivityModel.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: IssueActivityModel.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/models/IssueActivityModel.java,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** IssueActivityModel.java 11 Oct 2005 01:21:04 -0000 1.9.4.1 --- IssueActivityModel.java 22 Oct 2005 16:37:28 -0000 1.9.4.2 *************** *** 35,49 **** } ! public IssueActivityModel(int type, String description, Integer issueId, Integer userId) { this.setType(type); this.setDescription(description); this.setIssueId(issueId); this.setUserId(userId); ! } ! public IssueActivityModel(int type, String description, boolean notificationSent, Integer issueId, Integer userId) { this(type, description, issueId, userId); this.setNotificationSent(notificationSent); ! } public int getType() { --- 35,49 ---- } ! /*public IssueActivityModel(int type, String description, Integer issueId, Integer userId) { this.setType(type); this.setDescription(description); this.setIssueId(issueId); this.setUserId(userId); ! }*/ ! /*public IssueActivityModel(int type, String description, boolean notificationSent, Integer issueId, Integer userId) { this(type, description, issueId, userId); this.setNotificationSent(notificationSent); ! }*/ public int getType() { |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:38
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/ejb/beans/entity Modified Files: Tag: itrackerhibernate IssueActivityBean.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: IssueActivityBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/IssueActivityBean.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** IssueActivityBean.java 11 Oct 2005 01:21:04 -0000 1.6.4.1 --- IssueActivityBean.java 22 Oct 2005 16:37:28 -0000 1.6.4.2 *************** *** 1,105 **** ! /* ! * This software was designed and created by Jason Carroll. ! * Copyright (c) 2002, 2003, 2004 Jason Carroll. ! * The author can be reached at jca...@co... ! * ITracker website: http://www.cowsultants.com ! * ITracker forums: http://www.cowsultants.com/phpBB/index.php ! * ! * This program is free software; you can redistribute it and/or modify ! * it only under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. ! */ ! ! package cowsultants.itracker.ejb.beans.entity; ! ! import java.sql.Timestamp; ! import java.util.Date; ! ! import cowsultants.itracker.ejb.client.models.IssueActivityModel; ! ! public class IssueActivityBean extends GenericBean { ! ! private UserBean user; ! ! private int type; ! ! private String description; ! ! private int notificationSent; ! ! private IssueBean issue; ! ! public int getType() { ! return type; ! } ! ! public void setType(int value) { ! type = value; ! } ! ! public String getDescription() { ! return description; ! } ! ! public void setDescription(String value) { ! this.description = value; ! } ! ! public int getNotificationSent() { ! return notificationSent; ! } ! ! public void setNotificationSent(int value) { ! this.notificationSent = value; ! } ! ! public IssueBean getIssue() { ! return (issue); ! } ! ! public void setIssue(IssueBean value) { ! this.issue = value; ! } ! ! public UserBean getUser() { ! return user; ! } ! ! public void setUser(UserBean user) { ! this.user = user; ! } ! ! public IssueActivityModel getModel() { ! IssueActivityModel model = new IssueActivityModel(); ! model.setId(this.getId()); ! model.setType(this.getType()); ! model.setDescription(this.getDescription()); ! model.setNotificationSent((this.getNotificationSent() == 1 ? true : false)); ! model.setLastModifiedDate(this.getLastModifiedDate()); ! model.setCreateDate(this.getCreateDate()); ! ! model.setIssueId(this.getIssue().getId()); ! ! model.setUserId(this.getUser().getId()); ! model.setUserLogin(this.getUser().getLogin()); ! model.setUserFirstName(this.getUser().getFirstName()); ! model.setUserLastName(this.getUser().getLastName()); ! model.setUserEmail(this.getUser().getEmail()); ! ! return model; ! } ! ! public void setModel(IssueActivityModel model) { ! this.setType(model.getType()); ! this.setDescription(model.getDescription()); ! this.setNotificationSent((model.getNotificationSent() ? 1 : 0)); ! this.setLastModifiedDate(new Timestamp(new Date().getTime())); ! } ! ! } --- 1,101 ---- ! /* ! * This software was designed and created by Jason Carroll. ! * Copyright (c) 2002, 2003, 2004 Jason Carroll. ! * The author can be reached at jca...@co... ! * ITracker website: http://www.cowsultants.com ! * ITracker forums: http://www.cowsultants.com/phpBB/index.php ! * ! * This program is free software; you can redistribute it and/or modify ! * it only under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. ! */ ! ! package cowsultants.itracker.ejb.beans.entity; ! ! ! public class IssueActivityBean extends GenericBean { ! ! private UserBean user; ! ! private int type; ! ! private String description; ! ! private int notificationSent; ! ! private IssueBean issue; ! ! public int getType() { ! return type; ! } ! ! public void setType(int value) { ! type = value; ! } ! ! public String getDescription() { ! return description; ! } ! ! public void setDescription(String value) { ! this.description = value; ! } ! ! public int getNotificationSent() { ! return notificationSent; ! } ! ! public void setNotificationSent(int value) { ! this.notificationSent = value; ! } ! ! public IssueBean getIssue() { ! return (issue); ! } ! ! public void setIssue(IssueBean value) { ! this.issue = value; ! } ! ! public UserBean getUser() { ! return user; ! } ! ! public void setUser(UserBean user) { ! this.user = user; ! } ! ! /*public IssueActivityModel getModel() { ! IssueActivityModel model = new IssueActivityModel(); ! model.setId(this.getId()); ! model.setType(this.getType()); ! model.setDescription(this.getDescription()); ! model.setNotificationSent((this.getNotificationSent() == 1 ? true : false)); ! model.setLastModifiedDate(this.getLastModifiedDate()); ! model.setCreateDate(this.getCreateDate()); ! ! model.setIssueId(this.getIssue().getId()); ! ! model.setUserId(this.getUser().getId()); ! model.setUserLogin(this.getUser().getLogin()); ! model.setUserFirstName(this.getUser().getFirstName()); ! model.setUserLastName(this.getUser().getLastName()); ! model.setUserEmail(this.getUser().getEmail()); ! ! return model; ! }*/ ! ! /*public void setModel(IssueActivityModel model) { ! this.setType(model.getType()); ! this.setDescription(model.getDescription()); ! this.setNotificationSent((model.getNotificationSent() ? 1 : 0)); ! this.setLastModifiedDate(new Timestamp(new Date().getTime())); ! }*/ ! ! } |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:37
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/web/scheduler Modified Files: Tag: itrackerhibernate Scheduler.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: Scheduler.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler/Scheduler.java,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** Scheduler.java 11 Oct 2005 01:21:05 -0000 1.4.4.1 --- Scheduler.java 22 Oct 2005 16:37:28 -0000 1.4.4.2 *************** *** 19,31 **** package cowsultants.itracker.web.scheduler; ! import java.io.*; ! import java.text.*; ! import java.util.*; ! import java.lang.reflect.*; ! import javax.servlet.*; ! import javax.servlet.http.*; ! import cowsultants.itracker.ejb.client.models.*; ! import cowsultants.itracker.ejb.client.util.*; /** --- 19,30 ---- package cowsultants.itracker.web.scheduler; ! import java.text.SimpleDateFormat; ! import java.util.Calendar; ! import java.util.Date; ! import java.util.GregorianCalendar; ! import java.util.Vector; ! import cowsultants.itracker.ejb.client.models.ScheduledTaskModel; ! import cowsultants.itracker.ejb.client.util.Logger; /** |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:37
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/message In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/ejb/beans/message Modified Files: Tag: itrackerhibernate NotificationMessageBean.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: NotificationMessageBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/message/NotificationMessageBean.java,v retrieving revision 1.24.4.1 retrieving revision 1.24.4.2 diff -C2 -d -r1.24.4.1 -r1.24.4.2 *** NotificationMessageBean.java 11 Oct 2005 01:21:04 -0000 1.24.4.1 --- NotificationMessageBean.java 22 Oct 2005 16:37:28 -0000 1.24.4.2 *************** *** 33,36 **** --- 33,37 ---- import javax.rmi.PortableRemoteObject; + import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.interfaces.IssueHandler; *************** *** 38,42 **** import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.ComponentModel; - import cowsultants.itracker.ejb.client.models.IssueActivityModel; import cowsultants.itracker.ejb.client.models.IssueHistoryModel; import cowsultants.itracker.ejb.client.models.IssueModel; --- 39,42 ---- *************** *** 157,161 **** IssueModel issue = ih.getIssue(issueId); ! IssueActivityModel[] activity = ih.getIssueActivity(issueId, false); IssueHistoryModel history = ih.getLastIssueHistory(issueId); ComponentModel[] components = ih.getIssueComponents(issueId); --- 157,161 ---- IssueModel issue = ih.getIssue(issueId); ! IssueActivityBean[] activity = ih.getIssueActivity(issueId, false); IssueHistoryModel history = ih.getLastIssueHistory(issueId); ComponentModel[] components = ih.getIssueComponents(issueId); |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:37
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate CreateIssueAction.java EditConfigurationAction.java RemoveConfigurationItemAction.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: CreateIssueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/CreateIssueAction.java,v retrieving revision 1.15.4.1 retrieving revision 1.15.4.2 diff -C2 -d -r1.15.4.1 -r1.15.4.2 *** CreateIssueAction.java 11 Oct 2005 01:21:04 -0000 1.15.4.1 --- CreateIssueAction.java 22 Oct 2005 16:37:28 -0000 1.15.4.2 *************** *** 80,90 **** try { - //InitialContext ic = new InitialContext(); - //Object ihRef = ic.lookup("java:comp/env/" + IssueHandler.JNDI_NAME); - //IssueHandlerHome ihHome = (IssueHandlerHome) PortableRemoteObject.narrow(ihRef, IssueHandlerHome.class); IssueHandler ih = new IssueHandlerBean(); - - //Object phRef = ic.lookup("java:comp/env/" + ProjectHandler.JNDI_NAME); - //ProjectHandlerHome phHome = (ProjectHandlerHome) PortableRemoteObject.narrow(phRef, ProjectHandlerHome.class); ProjectHandler ph = new ProjectHandlerBean(); --- 80,84 ---- *************** *** 154,158 **** issueFields = new IssueFieldModel[issueFieldsVector.size()]; issueFieldsVector.copyInto(issueFields); ! } ih.setIssueFields(issue.getId(), issueFields); --- 148,152 ---- issueFields = new IssueFieldModel[issueFieldsVector.size()]; issueFieldsVector.copyInto(issueFields); ! } ih.setIssueFields(issue.getId(), issueFields); Index: EditConfigurationAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditConfigurationAction.java,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -C2 -d -r1.10.4.2 -r1.10.4.3 *** EditConfigurationAction.java 16 Oct 2005 12:08:45 -0000 1.10.4.2 --- EditConfigurationAction.java 22 Oct 2005 16:37:28 -0000 1.10.4.3 *************** *** 37,40 **** --- 37,41 ---- import org.apache.struts.action.ActionMapping; + import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; *************** *** 43,47 **** import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.ConfigurationModel; - import cowsultants.itracker.ejb.client.models.IssueActivityModel; import cowsultants.itracker.ejb.client.models.IssueModel; import cowsultants.itracker.ejb.client.models.LanguageModel; --- 44,47 ---- *************** *** 170,176 **** issues[i].setStatus(newStatus); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityModel activity = new IssueActivityModel(IssueUtilities.ACTIVITY_SYSTEM_UPDATE, ! ITrackerResources.getString("itracker.activity.system.status"), issues[i].getId(), currUserId); ! ih.addIssueActivity(activity); } } --- 170,179 ---- issues[i].setStatus(newStatus); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityBean activity = new IssueActivityBean(); ! activity.setType(IssueUtilities.ACTIVITY_SYSTEM_UPDATE); ! activity.setDescription(ITrackerResources.getString("itracker.activity.system.status")); ! // TODO need to fix this RJST ! //activity.setIssue(issues[i]); ! //.getId(), currUserId); } } Index: RemoveConfigurationItemAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveConfigurationItemAction.java,v retrieving revision 1.8.4.2 retrieving revision 1.8.4.3 diff -C2 -d -r1.8.4.2 -r1.8.4.3 *** RemoveConfigurationItemAction.java 16 Oct 2005 12:08:45 -0000 1.8.4.2 --- RemoveConfigurationItemAction.java 22 Oct 2005 16:37:28 -0000 1.8.4.3 *************** *** 35,38 **** --- 35,39 ---- import org.apache.struts.action.ActionMapping; + import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; *************** *** 41,45 **** import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.ConfigurationModel; - import cowsultants.itracker.ejb.client.models.IssueActivityModel; import cowsultants.itracker.ejb.client.models.IssueModel; import cowsultants.itracker.ejb.client.models.UserModel; --- 42,45 ---- *************** *** 123,129 **** issues[i].setSeverity(newSeverity); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityModel activity = new IssueActivityModel(IssueUtilities.ACTIVITY_SYSTEM_UPDATE, ! ITrackerResources.getString("itracker.activity.system.severity"), issues[i].getId(), currUserId); ! ih.addIssueActivity(activity); } } --- 123,132 ---- issues[i].setSeverity(newSeverity); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityBean activity = new IssueActivityBean(); ! activity.setType(IssueUtilities.ACTIVITY_SYSTEM_UPDATE); ! activity.setDescription(ITrackerResources.getString("itracker.activity.system.severity")); ! //, issues[i].getId(), currUserId) ! // TODO: need to fix this - RJST ! //ih.addIssueActivity(activity); } } *************** *** 171,177 **** issues[i].setStatus(newStatus); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityModel activity = new IssueActivityModel(IssueUtilities.ACTIVITY_SYSTEM_UPDATE, ! ITrackerResources.getString("itracker.activity.system.status"), issues[i].getId(), currUserId); ! ih.addIssueActivity(activity); } } --- 174,183 ---- issues[i].setStatus(newStatus); issues[i] = ih.updateIssue(issues[i], currUserId); ! IssueActivityBean activity = new IssueActivityBean(); ! activity.setType(IssueUtilities.ACTIVITY_SYSTEM_UPDATE); ! activity.setDescription(ITrackerResources.getString("itracker.activity.system.status")); ! // TODO fix this - RJST ! //, issues[i].getId(), currUserId ! //ih.addIssueActivity(activity); } } |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:36
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/ejb/beans/session Modified Files: Tag: itrackerhibernate CustomFieldFactory.java CustomFieldFactoryImpl.java IssueFactory.java IssueFactoryImpl.java IssueHandlerBean.java SystemConfigurationBean.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: CustomFieldFactoryImpl.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/CustomFieldFactoryImpl.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** CustomFieldFactoryImpl.java 11 Oct 2005 01:36:08 -0000 1.1.2.1 --- CustomFieldFactoryImpl.java 22 Oct 2005 16:37:28 -0000 1.1.2.2 *************** *** 5,14 **** import net.sf.hibernate.Criteria; import net.sf.hibernate.HibernateException; - - import org.springframework.orm.hibernate.support.HibernateDaoSupport; - import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; ! public class CustomFieldFactoryImpl extends HibernateDaoSupport implements CustomFieldFactory { public CustomFieldBean findByPrimaryKey(Integer customFieldId) { --- 5,11 ---- import net.sf.hibernate.Criteria; import net.sf.hibernate.HibernateException; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; ! public class CustomFieldFactoryImpl extends BaseHibernateFactoryImpl implements CustomFieldFactory { public CustomFieldBean findByPrimaryKey(Integer customFieldId) { Index: SystemConfigurationBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/SystemConfigurationBean.java,v retrieving revision 1.31.4.2 retrieving revision 1.31.4.3 diff -C2 -d -r1.31.4.2 -r1.31.4.3 *** SystemConfigurationBean.java 18 Oct 2005 21:20:40 -0000 1.31.4.2 --- SystemConfigurationBean.java 22 Oct 2005 16:37:28 -0000 1.31.4.3 *************** *** 1 **** ! /* * This software was designed and created by Jason Carroll. * Copyright (c) 2002, 2003, 2004 Jason Carroll. * The author can be reached at jca...@co... * ITracker website: http://www.cowsultants.com * ITracker forums: http://www.cowsultants.com/phpBB/index.php * * This program is free software; you can redistribute it and/or modify * it only under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ package cowsultants.itracker.ejb.beans.session; import java.sql.Timestamp; import java.util.Arrays; import java.util.Date; import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Properties; import java.util.Vector; import javax.naming.InitialContext; import cowsultants.itracker.ejb.beans.entity.ConfigurationBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldValueBean; import cowsultants.itracker.ejb.beans.entity.LanguageBean; import cowsultants.itracker.ejb.beans.entity.WorkflowScriptBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.ConfigurationModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.CustomFieldValueModel; import cowsultants.itracker.ejb.client.models.LanguageModel; import cowsultants.itracker.ejb.client.models.NameValuePairModel; import cowsultants.itracker.ejb.client.models.SystemConfigurationModel; import cowsultants.itracker.ejb.client.models.WorkflowScriptModel; import cowsultants.itracker.ejb.client.resources.ITrackerResources; import cowsultants.itracker.ejb.client.util.IssueUtilities; import cowsultants.itracker.ejb.client.util.Logger; import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; import cowsultants.itracker.ejb.util.PropertiesFileHandler; /** * * Implimetation of the SystemConfiguration Interface. * * @see SystemConfiguration * */ public class SystemConfigurationBean implements SystemConfiguration { private static Properties props = null; InitialContext ic = null; ConfigurationFactory cHome = null; CustomFieldFactory cfHome = null; CustomFieldValueFactory cfvHome = null; LanguageFactory lHome = null; WorkflowScriptFactory wsHome = null; public SystemConfigurationBean() { if (props == null) { props = new Properties(); // try { // ic = new InitialContext(); // NamingEnumeration bindings = ic.listBindings("java:comp/env"); // while(bindings.hasMoreElements()) { // try { // Binding namePair = (Binding) bindings.nextElement(); // Logger.logDebug("Setting property " + namePair.getName() + " from // env-entry to value '" + ((Object) // namePair.getObject()).toString() + "'"); // props.setProperty(namePair.getName(), ((Object) // namePair.getObject()).toString()); // } catch(ClassCastException cce) { // Logger.logError("ClassCastException while loading application // properties.", cce); // } // } // } catch(NamingException ne) { // Logger.logError("NamingException while loading application // properties.", ne); // } PropertiesFileHandler filePropertiesHandler = new PropertiesFileHandler(); filePropertiesHandler.addProperties("/itrackerApplication.properties"); filePropertiesHandler.addProperties("/itrackerVersion.properties"); Properties fileProps = filePropertiesHandler.getProperties(); for (Enumeration e = fileProps.propertyNames(); e.hasMoreElements();) { String propName = (String) e.nextElement(); Logger.logDebug("Setting property " + propName + " from file to value '" + fileProps.getProperty(propName) + "'"); props.setProperty(propName, fileProps.getProperty(propName)); } props.setProperty("start_time_millis", Long.toString(new java.util.Date().getTime())); /* * try { * * InitialContext ic = new InitialContext(); * * try { * * DataSource ds = (DataSource) * ic.lookup(props.getProperty("default_ds", * SystemConfigurationUtilities.DEFAULT_DATASOURCE)); * } catch(NamingException testne) { * * DataSource ds = (DataSource) ic.lookup("java:/" + * props.getProperty("default_ds")); * * props.setProperty("default_ds", "java:/" + * props.getProperty("default_ds")); * * Logger.logWarn("Error in datasource, changed to '" + * props.getProperty("default_ds") + "'"); * } * } catch(NamingException ne) { * * Logger.logError("NamingException while checking DataSource.", * ne); * } */ } // initialize Factories... cHome = SpringFactories.getConfigurationFactory(); lHome = SpringFactories.getLanguageFactory(); cfHome = SpringFactories.getCustomFieldFactory(); } public String getProperty(String name) { return props.getProperty(name); } public String getProperty(String name, String defaultValue) { return props.getProperty(name, defaultValue); } public boolean getBooleanProperty(String name, boolean defaultValue) { String value = props.getProperty(name); return (value == null ? defaultValue : new Boolean(value).booleanValue()); } public int getIntegerProperty(String name, int defaultValue) { String value = props.getProperty(name); try { return (value == null ? defaultValue : Integer.parseInt(value)); } catch (NumberFormatException nfe) { return defaultValue; } } public long getLongProperty(String name, long defaultValue) { String value = props.getProperty(name); try { return (value == null ? defaultValue : Long.parseLong(value)); } catch (NumberFormatException nfe) { return defaultValue; } } public Properties getProperties() { return props; } public ConfigurationModel getConfigurationItem(Integer id) { ConfigurationBean configItem = cHome.findByPrimaryKey(id); return configItem.getModel(); } public ConfigurationModel[] getConfigurationItemsByType(int type) throws DataException { ConfigurationModel[] items = new ConfigurationModel[0]; Collection configItems = cHome.findByType(type); items = new ConfigurationModel[configItems.size()]; int i = 0; for (Iterator iter = configItems.iterator(); iter.hasNext(); i++) { items[i] = ((ConfigurationBean) iter.next()).getModel(); } Arrays.sort(items, new ConfigurationModel()); return items; } public ConfigurationModel[] getConfigurationItemsByType(int type, Locale locale) throws DataException { ConfigurationModel[] items = getConfigurationItemsByType(type); for (int i = 0; i < items.length; i++) { if (items[i].getType() == SystemConfigurationUtilities.TYPE_STATUS) { items[i].setName(IssueUtilities.getStatusName(items[i].getValue(), locale)); } else if (items[i].getType() == SystemConfigurationUtilities.TYPE_SEVERITY) { items[i].setName(IssueUtilities.getSeverityName(items[i].getValue(), locale)); } else if (items[i].getType() == SystemConfigurationUtilities.TYPE_RESOLUTION) { items[i].setName(IssueUtilities.getResolutionName(items[i].getValue(), locale)); } } return items; } public ConfigurationModel createConfigurationItem(ConfigurationModel model) { ConfigurationBean configurationItem = new ConfigurationBean(); configurationItem.setModel(model); return configurationItem.getModel(); // Logger.logDebug("Unable to create new configuration item."); } public ConfigurationModel updateConfigurationItem(ConfigurationModel model) { if (model != null) { ConfigurationBean configurationItem = cHome.findByPrimaryKey(model.getId()); configurationItem.setModel(model); return configurationItem.getModel(); } return (null); } public ConfigurationModel[] updateConfigurationItems(ConfigurationModel[] models, int type) throws DataException { removeConfigurationItems(type); for (int i = 0; i < models.length; i++) { ConfigurationBean configurationItem = new ConfigurationBean(); configurationItem.setModel(models[i]); models[i] = configurationItem.getModel(); } Arrays.sort(models, new ConfigurationModel()); return models; // Logger.logDebug("Unable to create new language item."); // return new ConfigurationModel[0]; } public void removeConfigurationItem(Integer id) { // cHome.remove(id); // Logger.logDebug("Unable to remove configuration item " + id + "."); } public void removeConfigurationItems(int type) throws DataException { Collection currentItems = cHome.findByType(type); for (Iterator iter = currentItems.iterator(); iter.hasNext();) { ConfigurationBean config = (ConfigurationBean) iter.next(); // config.remove(); } } public void removeConfigurationItems(ConfigurationModel model) throws DataException { Vector currentIds = new Vector(); Collection currentItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); for (Iterator iter = currentItems.iterator(); iter.hasNext();) { // ((ConfigurationBean) iter.next()).remove(); } } public boolean configurationItemExists(ConfigurationModel model) throws DataException { if (model != null && model.getVersion() != null) { Collection configItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); if (configItems != null && configItems.size() > 0) { return true; } } return false; } public boolean configurationItemUpToDate(ConfigurationModel model) throws DataException { long currentVersion = 0; if (model != null && model.getVersion() != null) { Collection configItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); for (Iterator iter = configItems.iterator(); iter.hasNext();) { ConfigurationBean configItem = (ConfigurationBean) iter.next(); if (configItem != null) { currentVersion = Math.max(SystemConfigurationUtilities.getVersionAsLong(configItem.getVersion()), currentVersion); } } if (currentVersion >= SystemConfigurationUtilities.getVersionAsLong(model.getVersion())) { return true; } } return false; } public void resetConfigurationCache() throws DataException { IssueUtilities.setResolutions(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION)); IssueUtilities.setSeverities(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY)); IssueUtilities.setStatuses(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_STATUS)); IssueUtilities.setCustomFields(getCustomFields()); } public void resetConfigurationCache(int type) throws DataException { if (type == SystemConfigurationUtilities.TYPE_RESOLUTION) { IssueUtilities.setResolutions(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION)); } else if (type == SystemConfigurationUtilities.TYPE_SEVERITY) { IssueUtilities.setSeverities(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY)); } else if (type == SystemConfigurationUtilities.TYPE_STATUS) { IssueUtilities.setStatuses(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_STATUS)); } else if (type == SystemConfigurationUtilities.TYPE_CUSTOMFIELD) { IssueUtilities.setCustomFields(getCustomFields()); } } public WorkflowScriptModel getWorkflowScript(Integer id) { WorkflowScriptBean workflowScript = wsHome.findByPrimaryKey(id); return workflowScript.getModel(); } public WorkflowScriptModel[] getWorkflowScripts() { WorkflowScriptModel[] scripts = new WorkflowScriptModel[0]; Collection workflowScripts = wsHome.findAll(); scripts = new WorkflowScriptModel[workflowScripts.size()]; int i = 0; for (Iterator iter = workflowScripts.iterator(); iter.hasNext(); i++) { scripts[i] = ((WorkflowScriptBean) iter.next()).getModel(); } return scripts; } public WorkflowScriptModel createWorkflowScript(WorkflowScriptModel model) { // try { WorkflowScriptBean workflowScript = new WorkflowScriptBean(); workflowScript.setModel(model); model.setId(workflowScript.getId()); return workflowScript.getModel(); // } catch(CreateException ce) { // Logger.logDebug("Unable to create new workflow script.", ce); // } // return null; } public WorkflowScriptModel updateWorkflowScript(WorkflowScriptModel model) { if (model != null) { WorkflowScriptBean workflowScript = wsHome.findByPrimaryKey(model.getId()); workflowScript.setModel(model); return workflowScript.getModel(); } return null; } public CustomFieldModel getCustomField(Integer id) throws DataException { CustomFieldBean customField = cfHome.findByPrimaryKey(id); return customField.getModel(); } public CustomFieldModel[] getCustomFields() throws DataException { CustomFieldModel[] fields = new CustomFieldModel[0]; Collection customFields = cfHome.findAll(); fields = new CustomFieldModel[customFields.size()]; int i = 0; for (Iterator iter = customFields.iterator(); iter.hasNext(); i++) { fields[i] = ((CustomFieldBean) iter.next()).getModel(); } return fields; } public CustomFieldModel[] getCustomFields(Locale locale) throws DataException { CustomFieldModel[] fields = getCustomFields(); for (int i = 0; i < fields.length; i++) { fields[i].setLabels(locale); } return fields; } public CustomFieldModel createCustomField(CustomFieldModel model) throws DataException { CustomFieldBean customField = new CustomFieldBean(); customField.setModel(model); model.setId(customField.getId()); if (model.getOptions().length > 0) { removeCustomFieldValues(customField.getId()); CustomFieldValueModel[] newOptions = model.getOptions(); for (int i = 0; i < newOptions.length; i++) { newOptions[i].setCustomFieldId(customField.getId()); createCustomFieldValue(newOptions[i]); } } return customField.getModel(); // Logger.logDebug("Unable to create new custom field.", ce); } public CustomFieldModel updateCustomField(CustomFieldModel model) throws DataException { if (model != null) { CustomFieldBean customField = cfHome.findByPrimaryKey(model.getId()); customField.setModel(model); if (model.getOptions().length > 0) { removeCustomFieldValues(customField.getId()); CustomFieldValueModel[] newOptions = model.getOptions(); for (int i = 0; i < newOptions.length; i++) { createCustomFieldValue(newOptions[i]); } } return customField.getModel(); } return null; } public void removeCustomField(Integer customFieldId) throws DataException { CustomFieldBean customField = cfHome.findByPrimaryKey(customFieldId); // customField.remove(); } public CustomFieldValueModel getCustomFieldValue(Integer id) { // CustomFieldValueBean customFieldValue = cfvHome.findByPrimaryKey(id); // return customFieldValue.getModel(); return (null); } public CustomFieldValueModel createCustomFieldValue(CustomFieldValueModel model) throws DataException { if (model == null || model.getCustomFieldId() == null) { return null; } CustomFieldBean customField = cfHome.findByPrimaryKey(model.getCustomFieldId()); CustomFieldValueBean customFieldValue = new CustomFieldValueBean(); customFieldValue.setModel(model); customFieldValue.setCustomField(customField); return customFieldValue.getModel(); // Logger.logDebug("Unable to create new custom field value: " + // ce.getMessage()); // Logger.logDebug("Unable to create new custom field value, custom // field not found: " + fe.getMessage()); } public CustomFieldValueModel updateCustomFieldValue(CustomFieldValueModel model) { // if(model != null) { // CustomFieldValueBean customFieldValue = // cfvHome.findByPrimaryKey(model.getId()); // customFieldValue.setModel(model); // return customFieldValue.getModel(); // } return null; } public CustomFieldValueModel[] updateCustomFieldValues(Integer customFieldId, CustomFieldValueModel[] models) throws DataException { CustomFieldValueModel[] values = new CustomFieldValueModel[0]; if (customFieldId != null) { CustomFieldBean customField = cfHome.findByPrimaryKey(customFieldId); Collection currValues = customField.getValues(); for (Iterator iter = currValues.iterator(); iter.hasNext();) { if (models == null || models.length == 0) { // ((CustomFieldValueBean) iter.next()).remove(); } else { CustomFieldValueBean value = (CustomFieldValueBean) iter.next(); for (int i = 0; i < models.length; i++) { if (value.getId().equals(models[i].getId())) { value.setModel(models[i]); models[i] = value.getModel(); break; } } } } } Arrays.sort(models, new CustomFieldValueModel()); return models; } public void removeCustomFieldValue(Integer customFieldValueId) { // CustomFieldValueBean customFieldValue = // cfvHome.findByPrimaryKey(customFieldValueId); // customFieldValue.remove(); } public void removeCustomFieldValues(Integer customFieldId) { // Collection currentValues = cfvHome.findByCustomField(customFieldId); // for(Iterator iter = currentValues.iterator(); iter.hasNext(); ) { // // //((CustomFieldValueBean) iter.next()).remove(); // } } public LanguageModel getLanguageItemByKey(String key, Locale locale) throws DataException { LanguageModel model = null; if (key != null) { LanguageBean languageItem = lHome.findByKeyAndLocale(key, ITrackerResources.BASE_LOCALE); model = languageItem.getModel(); if (locale != null && !"".equals(locale.getLanguage())) { languageItem = lHome.findByKeyAndLocale(key, locale.getLanguage()); model = languageItem.getModel(); if (!"".equals(locale.getCountry())) { languageItem = lHome.findByKeyAndLocale(key, locale.toString()); model = languageItem.getModel(); } } } return model; } public LanguageModel[] getLanguageItemsByKey(String key) throws DataException { LanguageModel[] items = new LanguageModel[0]; Collection languageItems = lHome.findByKey(key); items = new LanguageModel[languageItems.size()]; int i = 0; for (Iterator iter = languageItems.iterator(); iter.hasNext(); i++) { items[i] = ((LanguageBean) iter.next()).getModel(); } return items; } public LanguageModel updateLanguageItem(LanguageModel model) throws DataException { LanguageBean languageItem; try { languageItem = lHome.findByKeyAndLocale(model.getResourceKey(), model.getLocale()); languageItem.setModel(model); } catch (NoSuchEntityException fe) { languageItem = new LanguageBean(); languageItem.setCreateDate(new Timestamp(new Date().getTime())); languageItem.setModel(model); lHome.saveOrUpdate(languageItem); } return languageItem.getModel(); } public void removeLanguageKey(String key) throws DataException { Vector currentIds = new Vector(); Collection languageItems = lHome.findByKey(key); for (Iterator iter = languageItems.iterator(); iter.hasNext();) { currentIds.add(((LanguageBean) iter.next()).getId()); } for (int i = 0; i < currentIds.size(); i++) { // lHome.remove((Integer) currentIds.elementAt(i)); } // } catch(FinderException ce) { // Logger.logDebug("Unable to find any language items with key" + key + // " for removal."); // } } public void removeLanguageItem(LanguageModel model) throws DataException { LanguageBean languageItem = lHome.findByKeyAndLocale(model.getResourceKey(), model.getLocale()); // lHome.remove(languageItem.getId()); // Logger.logDebug("Unable to remove language item " + model.toString() // + "."); } public String[] getSortedKeys() throws DataException { String[] sortedKeys = new String[0]; int i = 0; Collection items = lHome.findByLocale(ITrackerResources.BASE_LOCALE); sortedKeys = new String[items.size()]; for (Iterator iter = items.iterator(); iter.hasNext(); i++) { LanguageBean item = (LanguageBean) iter.next(); sortedKeys[i] = item.getResourceKey(); } // Now sort the list of keys in a logical manner Arrays.sort(sortedKeys); return sortedKeys; } public HashMap getDefinedKeys(String locale) throws DataException { HashMap keys = new HashMap(); if (locale == null || locale.equals("")) { locale = ITrackerResources.BASE_LOCALE; } Collection items = lHome.findByLocale(locale); for (Iterator iter = items.iterator(); iter.hasNext();) { LanguageBean item = (LanguageBean) iter.next(); keys.put(item.getResourceKey(), item.getResourceValue()); } return keys; } public NameValuePairModel[] getDefinedKeysAsArray(String locale) throws DataException { NameValuePairModel[] keys = new NameValuePairModel[0]; if (locale == null || locale.equals("")) { locale = ITrackerResources.BASE_LOCALE; } int i = 0; Collection items = lHome.findByLocale(locale); keys = new NameValuePairModel[items.size()]; for (Iterator iter = items.iterator(); iter.hasNext(); i++) { LanguageBean item = (LanguageBean) iter.next(); keys[i] = new NameValuePairModel(item.getResourceKey(), item.getResourceValue()); } Arrays.sort(keys, new NameValuePairModel()); return keys; } public int getNumberDefinedKeys(String locale) throws DataException { return getDefinedKeys(locale).size(); } public LanguageModel[] getLanguage(Locale locale) throws DataException { LanguageModel[] languageArray = new LanguageModel[0]; HashMap language = new HashMap(); Collection baseItems = lHome.findByLocale(ITrackerResources.BASE_LOCALE); for (Iterator iterator = baseItems.iterator(); iterator.hasNext();) { LanguageBean item = (LanguageBean) iterator.next(); language.put(item.getResourceKey(), item.getResourceValue()); } if (locale != null && !"".equals(locale.getLanguage())) { Collection languageItems = lHome.findByLocale(locale.getLanguage()); for (Iterator iterator = languageItems.iterator(); iterator.hasNext();) { LanguageBean item = (LanguageBean) iterator.next(); language.put(item.getResourceKey(), item.getResourceValue()); } if (!"".equals(locale.getCountry())) { Collection countryItems = lHome.findByLocale(locale.toString()); for (Iterator iterator = countryItems.iterator(); iterator.hasNext();) { LanguageBean item = (LanguageBean) iterator.next(); language.put(item.getResourceKey(), item.getResourceValue()); } } } languageArray = new LanguageModel[language.size()]; int i = 0; String localeString = (locale == null ? ITrackerResources.BASE_LOCALE : locale.toString()); for (Iterator iterator = language.keySet().iterator(); iterator.hasNext(); i++) { String key = (String) iterator.next(); languageArray[i] = new LanguageModel(localeString, key, (String) language.get(key)); } return languageArray; } public HashMap getAvailableLanguages() throws DataException { HashMap languages = new HashMap(); ConfigurationModel[] locales = getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_LOCALE); for (int i = 0; i < locales.length; i++) { if (ITrackerResources.BASE_LOCALE.equalsIgnoreCase(locales[i].getValue())) { continue; } if (locales[i].getValue().length() == 2) { languages.put(locales[i].getValue(), new Vector()); } } for (int i = 0; i < locales.length; i++) { if (ITrackerResources.BASE_LOCALE.equalsIgnoreCase(locales[i].getValue())) { continue; } String locale = locales[i].getValue(); if (locale.length() == 5 && locale.indexOf('_') == 2) { String baseLanguage = locale.substring(0, 2); Vector languageVector = (Vector) languages.get(baseLanguage); if (languageVector != null) { languageVector.addElement(locale); } } } return languages; } public int getNumberAvailableLanguages() throws DataException { int numLanguages = 0; HashMap availableLanguages = getAvailableLanguages(); for (Iterator iter = availableLanguages.keySet().iterator(); iter.hasNext();) { Vector language = (Vector) availableLanguages.get((String) iter.next()); if (language != null && language.size() > 0) { numLanguages += language.size(); } else { numLanguages += 1; } } return numLanguages; } public void updateLanguage(Locale locale, LanguageModel[] items) throws DataException { if (locale != null && items != null) { ConfigurationModel configItem = new ConfigurationModel(SystemConfigurationUtilities.TYPE_LOCALE, locale .toString(), props.getProperty("version")); updateLanguage(locale, items, configItem); } } public void updateLanguage(Locale locale, LanguageModel[] items, ConfigurationModel configItem) throws DataException { if (items == null || locale == null || configItem == null) { return; } for (int i = 0; i < items.length; i++) { if (items[i] != null) { if (items[i].getAction() == SystemConfigurationUtilities.ACTION_REMOVE) { removeLanguageItem(items[i]); } else { updateLanguageItem(items[i]); } } } removeConfigurationItems(configItem); createConfigurationItem(configItem); } public SystemConfigurationModel getSystemConfiguration(Locale locale) throws DataException { SystemConfigurationModel config = new SystemConfigurationModel(); // Load the basic system configuration ConfigurationModel[] resolutions = getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION); for (int i = 0; i < resolutions.length; i++) { resolutions[i].setName(ITrackerResources.getString(SystemConfigurationUtilities .getLanguageKey(resolutions[i]), locale)); } config.setResolutions(resolutions); ConfigurationModel[] severities = getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY); for (int i = 0; i < severities.length; i++) { severities[i].setName(ITrackerResources.getString(SystemConfigurationUtilities .getLanguageKey(severities[i]), locale)); } config.setSeverities(severities); ConfigurationModel[] statuses = getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_STATUS); for (int i = 0; i < statuses.length; i++) { statuses[i].setName(ITrackerResources.getString(SystemConfigurationUtilities.getLanguageKey(statuses[i]), locale)); } config.setStatuses(statuses); // Now load the CustomFields config.setCustomFields(IssueUtilities.getCustomFields(locale)); // Now set the system version config.setVersion(props.getProperty("version")); return config; } public boolean initializeLocale(String locale, boolean forceReload) throws DataException { boolean result = false; ConfigurationModel localeConfig = new ConfigurationModel(SystemConfigurationUtilities.TYPE_LOCALE, locale, props.getProperty("version")); if (!configurationItemUpToDate(localeConfig) || forceReload) { Logger.logDebug("Loading database with locale " + locale); PropertiesFileHandler localePropertiesHandler = new PropertiesFileHandler( "/cowsultants/itracker/ejb/client/resources/ITracker" + (ITrackerResources.BASE_LOCALE.equals(locale) ? "" : "_" + locale) + ".properties"); if (localePropertiesHandler.hasProperties()) { Properties localeProperties = localePropertiesHandler.getProperties(); Logger.logDebug("Locale " + locale + " contains " + localeProperties.size() + " properties."); for (Enumeration propertiesEnumeration = localeProperties.propertyNames(); propertiesEnumeration .hasMoreElements();) { String key = (String) propertiesEnumeration.nextElement(); String value = localeProperties.getProperty(key); updateLanguageItem(new LanguageModel(locale, key, value)); } removeConfigurationItems(localeConfig); createConfigurationItem(localeConfig); ITrackerResources.clearBundle(ITrackerResources.getLocale(locale)); result = true; } else { Logger.logInfo("Locale " + locale + " contained no properties."); } } return result; } public void initializeConfiguration() { // Need to eventually add in code that detects the current version of // the config and update // if necessary try { ConfigurationModel[] initialized = getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_INITIALIZED); if (initialized == null || initialized.length != 1) { Logger.logDebug("System does not appear to be initialized, initializing system configuration."); LanguageModel[] baseLanguage = getLanguage(ITrackerResources.getLocale(ITrackerResources.BASE_LOCALE)); if (baseLanguage == null || baseLanguage.length == 0) { throw new SystemConfigurationException( "Languages must be initialized before the system configuration can be loaded."); } // Remove any previous configuration information, possibly left // over from previous failed initialization Logger.logDebug("Removing previous incomplete initialization information."); removeConfigurationItems(SystemConfigurationUtilities.TYPE_STATUS); removeConfigurationItems(SystemConfigurationUtilities.TYPE_SEVERITY); removeConfigurationItems(SystemConfigurationUtilities.TYPE_RESOLUTION); for (int i = 0; i < baseLanguage.length; i++) { if (baseLanguage[i].getResourceKey().startsWith(ITrackerResources.KEY_BASE_RESOLUTION)) { try { String resolutionString = baseLanguage[i].getResourceKey().substring(20); Logger.logDebug("Adding new configuration resolution value: " + resolutionString); int resolutionNumber = Integer.parseInt(resolutionString); createConfigurationItem(new ConfigurationModel( SystemConfigurationUtilities.TYPE_RESOLUTION, resolutionString, props .getProperty("version"), resolutionNumber)); } catch (Exception e) { Logger.logError("Unable to load resolution value: " + baseLanguage[i].getResourceKey(), e); } } if (baseLanguage[i].getResourceKey().startsWith(ITrackerResources.KEY_BASE_SEVERITY)) { try { String severityString = baseLanguage[i].getResourceKey().substring(18); Logger.logDebug("Adding new configuration severity value: " + severityString); int severityNumber = Integer.parseInt(severityString); createConfigurationItem(new ConfigurationModel(SystemConfigurationUtilities.TYPE_SEVERITY, severityString, props.getProperty("version"), severityNumber)); } catch (Exception e) { Logger.logError("Unable to load severity value: " + baseLanguage[i].getResourceKey(), e); } } if (baseLanguage[i].getResourceKey().startsWith(ITrackerResources.KEY_BASE_STATUS)) { try { String statusString = baseLanguage[i].getResourceKey().substring(16); Logger.logDebug("Adding new configuration status value: " + statusString); int statusNumber = Integer.parseInt(statusString); createConfigurationItem(new ConfigurationModel(SystemConfigurationUtilities.TYPE_STATUS, statusString, props.getProperty("version"), statusNumber)); } catch (Exception e) { Logger.logError("Unable to load status value: " + baseLanguage[i].getResourceKey(), e); } } } createConfigurationItem(new ConfigurationModel(SystemConfigurationUtilities.TYPE_INITIALIZED, "1", props.getProperty("version"))); } } catch (Exception e) { Logger.logError("Unable to initialize system configuration.", e); } } } \ No newline at end of file --- 1 ---- ! /* * This software was designed and created by Jason Carroll. * Copyright (c) 2002, 2003, 2004 Jason Carroll. * The author can be reached at jca...@co... * ITracker website: http://www.cowsultants.com * ITracker forums: http://www.cowsultants.com/phpBB/index.php * * This program is free software; you can redistribute it and/or modify * it only under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ package cowsultants.itracker.ejb.beans.session; import java.sql.Timestamp; import java.util.Arrays; import java.util.Date; import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Properties; import java.util.Vector; import javax.naming.InitialContext; import cowsultants.itracker.ejb.beans.entity.ConfigurationBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldValueBean; import cowsultants.itracker.ejb.beans.entity.LanguageBean; import cowsultants.itracker.ejb.beans.entity.WorkflowScriptBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.ConfigurationModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.CustomFieldValueModel; import cowsultants.itracker.ejb.client.models.LanguageModel; import cowsultants.itracker.ejb.client.models.NameValuePairModel; import cowsultants.itracker.ejb.client.models.SystemConfigurationModel; import cowsultants.itracker.ejb.client.models.WorkflowScriptModel; import cowsultants.itracker.ejb.client.resources.ITrackerResources; import cowsultants.itracker.ejb.client.util.IssueUtilities; import cowsultants.itracker.ejb.client.util.Logger; import cowsultants.itracker.ejb.client.util.SystemConfigurationUtilities; import cowsultants.itracker.ejb.util.PropertiesFileHandler; /** * * Implimetation of the SystemConfiguration Interface. * * @see SystemConfiguration * */ public class SystemConfigurationBean implements SystemConfiguration { private static Properties props = null; InitialContext ic = null; ConfigurationFactory cHome = null; CustomFieldFactory cfHome = null; CustomFieldValueFactory cfvHome = null; LanguageFactory lHome = null; WorkflowScriptFactory wsHome = null; public SystemConfigurationBean() { if (props == null) { props = new Properties(); // try { // ic = new InitialContext(); // NamingEnumeration bindings = ic.listBindings("java:comp/env"); // while(bindings.hasMoreElements()) { // try { // Binding namePair = (Binding) bindings.nextElement(); // Logger.logDebug("Setting property " + namePair.getName() + " from // env-entry to value '" + ((Object) // namePair.getObject()).toString() + "'"); // props.setProperty(namePair.getName(), ((Object) // namePair.getObject()).toString()); // } catch(ClassCastException cce) { // Logger.logError("ClassCastException while loading application // properties.", cce); // } // } // } catch(NamingException ne) { // Logger.logError("NamingException while loading application // properties.", ne); // } PropertiesFileHandler filePropertiesHandler = new PropertiesFileHandler(); filePropertiesHandler.addProperties("/itrackerApplication.properties"); filePropertiesHandler.addProperties("/itrackerVersion.properties"); Properties fileProps = filePropertiesHandler.getProperties(); for (Enumeration e = fileProps.propertyNames(); e.hasMoreElements();) { String propName = (String) e.nextElement(); Logger.logDebug("Setting property " + propName + " from file to value '" + fileProps.getProperty(propName) + "'"); props.setProperty(propName, fileProps.getProperty(propName)); } props.setProperty("start_time_millis", Long.toString(new java.util.Date().getTime())); /* * try { * * InitialContext ic = new InitialContext(); * * try { * * DataSource ds = (DataSource) * ic.lookup(props.getProperty("default_ds", * SystemConfigurationUtilities.DEFAULT_DATASOURCE)); * } catch(NamingException testne) { * * DataSource ds = (DataSource) ic.lookup("java:/" + * props.getProperty("default_ds")); * * props.setProperty("default_ds", "java:/" + * props.getProperty("default_ds")); * * Logger.logWarn("Error in datasource, changed to '" + * props.getProperty("default_ds") + "'"); * } * } catch(NamingException ne) { * * Logger.logError("NamingException while checking DataSource.", * ne); * } */ } // initialize Factories... cHome = SpringFactories.getConfigurationFactory(); lHome = SpringFactories.getLanguageFactory(); cfHome = SpringFactories.getCustomFieldFactory(); wsHome = SpringFactories.getWorkflowScriptFactory(); } public String getProperty(String name) { return props.getProperty(name); } public String getProperty(String name, String defaultValue) { return props.getProperty(name, defaultValue); } public boolean getBooleanProperty(String name, boolean defaultValue) { String value = props.getProperty(name); return (value == null ? defaultValue : new Boolean(value).booleanValue()); } public int getIntegerProperty(String name, int defaultValue) { String value = props.getProperty(name); try { return (value == null ? defaultValue : Integer.parseInt(value)); } catch (NumberFormatException nfe) { return defaultValue; } } public long getLongProperty(String name, long defaultValue) { String value = props.getProperty(name); try { return (value == null ? defaultValue : Long.parseLong(value)); } catch (NumberFormatException nfe) { return defaultValue; } } public Properties getProperties() { return props; } public ConfigurationModel getConfigurationItem(Integer id) { ConfigurationBean configItem = cHome.findByPrimaryKey(id); return configItem.getModel(); } public ConfigurationModel[] getConfigurationItemsByType(int type) throws DataException { ConfigurationModel[] items = new ConfigurationModel[0]; Collection configItems = cHome.findByType(type); items = new ConfigurationModel[configItems.size()]; int i = 0; for (Iterator iter = configItems.iterator(); iter.hasNext(); i++) { items[i] = ((ConfigurationBean) iter.next()).getModel(); } Arrays.sort(items, new ConfigurationModel()); return items; } public ConfigurationModel[] getConfigurationItemsByType(int type, Locale locale) throws DataException { ConfigurationModel[] items = getConfigurationItemsByType(type); for (int i = 0; i < items.length; i++) { if (items[i].getType() == SystemConfigurationUtilities.TYPE_STATUS) { items[i].setName(IssueUtilities.getStatusName(items[i].getValue(), locale)); } else if (items[i].getType() == SystemConfigurationUtilities.TYPE_SEVERITY) { items[i].setName(IssueUtilities.getSeverityName(items[i].getValue(), locale)); } else if (items[i].getType() == SystemConfigurationUtilities.TYPE_RESOLUTION) { items[i].setName(IssueUtilities.getResolutionName(items[i].getValue(), locale)); } } return items; } public ConfigurationModel createConfigurationItem(ConfigurationModel model) { ConfigurationBean configurationItem = new ConfigurationBean(); configurationItem.setModel(model); return configurationItem.getModel(); // Logger.logDebug("Unable to create new configuration item."); } public ConfigurationModel updateConfigurationItem(ConfigurationModel model) { if (model != null) { ConfigurationBean configurationItem = cHome.findByPrimaryKey(model.getId()); configurationItem.setModel(model); return configurationItem.getModel(); } return (null); } public ConfigurationModel[] updateConfigurationItems(ConfigurationModel[] models, int type) throws DataException { removeConfigurationItems(type); for (int i = 0; i < models.length; i++) { ConfigurationBean configurationItem = new ConfigurationBean(); configurationItem.setModel(models[i]); models[i] = configurationItem.getModel(); } Arrays.sort(models, new ConfigurationModel()); return models; // Logger.logDebug("Unable to create new language item."); // return new ConfigurationModel[0]; } public void removeConfigurationItem(Integer id) { // cHome.remove(id); // Logger.logDebug("Unable to remove configuration item " + id + "."); } public void removeConfigurationItems(int type) throws DataException { Collection currentItems = cHome.findByType(type); for (Iterator iter = currentItems.iterator(); iter.hasNext();) { ConfigurationBean config = (ConfigurationBean) iter.next(); // config.remove(); } } public void removeConfigurationItems(ConfigurationModel model) throws DataException { Vector currentIds = new Vector(); Collection currentItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); for (Iterator iter = currentItems.iterator(); iter.hasNext();) { // ((ConfigurationBean) iter.next()).remove(); } } public boolean configurationItemExists(ConfigurationModel model) throws DataException { if (model != null && model.getVersion() != null) { Collection configItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); if (configItems != null && configItems.size() > 0) { return true; } } return false; } public boolean configurationItemUpToDate(ConfigurationModel model) throws DataException { long currentVersion = 0; if (model != null && model.getVersion() != null) { Collection configItems = cHome.findByTypeAndValue(model.getType(), model.getValue()); for (Iterator iter = configItems.iterator(); iter.hasNext();) { ConfigurationBean configItem = (ConfigurationBean) iter.next(); if (configItem != null) { currentVersion = Math.max(SystemConfigurationUtilities.getVersionAsLong(configItem.getVersion()), currentVersion); } } if (currentVersion >= SystemConfigurationUtilities.getVersionAsLong(model.getVersion())) { return true; } } return false; } public void resetConfigurationCache() throws DataException { IssueUtilities.setResolutions(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION)); IssueUtilities.setSeverities(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY)); IssueUtilities.setStatuses(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_STATUS)); IssueUtilities.setCustomFields(getCustomFields()); } public void resetConfigurationCache(int type) throws DataException { if (type == SystemConfigurationUtilities.TYPE_RESOLUTION) { IssueUtilities.setResolutions(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION)); } else if (type == SystemConfigurationUtilities.TYPE_SEVERITY) { IssueUtilities.setSeverities(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY)); } else if (type == SystemConfigurationUtilities.TYPE_STATUS) { IssueUtilities.setStatuses(getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_STATUS)); } else if (type == SystemConfigurationUtilities.TYPE_CUSTOMFIELD) { IssueUtilities.setCustomFields(getCustomFields()); } } public WorkflowScriptModel getWorkflowScript(Integer id) { WorkflowScriptBean workflowScript = wsHome.findByPrimaryKey(id); return workflowScript.getModel(); } public WorkflowScriptModel[] getWorkflowScripts() { WorkflowScriptModel[] scripts = new WorkflowScriptModel[0]; Collection workflowScripts = wsHome.findAll(); scripts = new WorkflowScriptModel[workflowScripts.size()]; int i = 0; for (Iterator iter = workflowScripts.iterator(); iter.hasNext(); i++) { scripts[i] = ((WorkflowScriptBean) iter.next()).getModel(); } return scripts; } public WorkflowScriptModel createWorkflowScript(WorkflowScriptModel model) { // try { WorkflowScriptBean workflowScript = new WorkflowScriptBean(); workflowScript.setModel(model); model.setId(workflowScript.getId()); return workflowScript.getModel(); // } catch(CreateException ce) { // Logger.logDebug("Unable to create new workflow script.", ce); // } // return null; } public WorkflowScriptModel updateWorkflowScript(WorkflowScriptModel model) { if (model != null) { WorkflowScriptBean workflowScript = wsHome.findByPrimaryKey(model.getId()); workflowScript.setModel(model); return workflowScript.getModel(); } return null; } public CustomFieldModel getCustomField(Integer id) throws DataException { CustomFieldBean customField = cfHome.findByPrimaryKey(id); return customField.getModel(); } public CustomFieldModel[] getCustomFields() throws DataException { CustomFieldModel[] fields = new CustomFieldModel[0]; Collection customFields = cfHome.findAll(); fields = new CustomFieldModel[customFields.size()]; int i = 0; for (Iterator iter = customFields.iterator(); iter.hasNext(); i++) { fields[i] = ((CustomFieldBean) iter.next()).getModel(); } return fields; } public CustomFieldModel[] getCustomFields(Locale locale) throws DataException { CustomFieldModel[] fields = getCustomFields(); for (int i = 0; i < fields.length; i++) { fields[i].setLabels(locale); } return fields; } public CustomFieldModel createCustomField(CustomFieldModel model) throws DataException { CustomFieldBean customField = new CustomFieldBean(); customField.setModel(model); model.setId(customField.getId()); if (model.getOptions().length > 0) { removeCustomFieldValues(customField.getId()); CustomFieldValueModel[] newOptions = model.getOptions(); for (int i = 0; i < newOptions.length; i++) { newOptions[i].setCustomFieldId(customField.getId()); createCustomFieldValue(newOptions[i]); } } return customField.getModel(); // Logger.logDebug("Unable to create new custom field.", ce); } public CustomFieldModel updateCustomField(CustomFieldModel model) throws DataException { if (model != null) { CustomFieldBean customField = cfHome.findByPrimaryKey(model.getId()); customField.setModel(model); if (model.getOptions().length > 0) { removeCustomFieldValues(customField.getId()); CustomFieldValueModel[] newOptions = model.getOptions(); for (int i = 0; i < newOptions.length; i++) { createCustomFieldValue(newOptions[i]); } } return customField.getModel(); } return null; } public void removeCustomField(Integer customFieldId) throws DataException { CustomFieldBean customField = cfHome.findByPrimaryKey(customFieldId); // customField.remove(); } public CustomFieldValueModel getCustomFieldValue(Integer id) { // CustomFieldValueBean customFieldValue = cfvHome.findByPrimaryKey(id); // return customFieldValue.getModel(); return (null); } public CustomFieldValueModel createCustomFieldValue(CustomFieldValueModel model) throws DataException { if (model == null || model.getCustomFieldId() == null) { return null; } CustomFieldBean customField = cfHome.findByPrimaryKey(model.getCustomFieldId()); CustomFieldValueBean customFieldValue = new CustomFieldValueBean(); customFieldValue.setModel(model); customFieldValue.setCustomField(customField); return customFieldValue.getModel(); // Logger.logDebug("Unable to create new custom field value: " + // ce.getMessage()); // Logger.logDebug("Unable to create new custom field value, custom // field not found: " + fe.getMessage()); } public CustomFieldValueModel updateCustomFieldValue(CustomFieldValueModel model) { // if(model != null) { // CustomFieldValueBean customFieldValue = // cfvHome.findByPrimaryKey(model.getId()); // customFieldValue.setModel(model); // return customFieldValue.getModel(); // } return null; } public CustomFieldValueModel[] updateCustomFieldValues(Integer customFieldId, CustomFieldValueModel[] models) throws DataException { CustomFieldValueModel[] values = new CustomFieldValueModel[0]; if (customFieldId != null) { CustomFieldBean customField = cfHome.findByPrimaryKey(customFieldId); Collection currValues = customField.getValues(); for (Iterator iter = currValues.iterator(); iter.hasNext();) { if (models == null || models.length == 0) { // ((CustomFieldValueBean) iter.next()).remove(); } else { CustomFieldValueBean value = (CustomFieldValueBean) iter.next(); for (int i = 0; i < models.length; i++) { if (value.getId().equals(models[i].getId())) { value.setModel(models[i]); models[i] = value.getModel(); break; } } } } } Arrays.sort(models, new CustomFieldValueModel()); return models; } public void removeCustomFieldValue(Integer customFieldValueId) { // CustomFieldValueBean customFieldValue = // cfvHome.findByPrimaryKey(customFieldValueId); // customFieldValue.remove(); } public void removeCustomFieldValues(Integer customFieldId) { // Collection currentValues = cfvHome.findByCustomField(customFieldId); // for(Iterator iter = currentValues.iterator(); iter.hasNext(); ) { // // //((CustomFieldValueBean) iter.next()).remove(); // } } public LanguageModel getLanguageItemByKey(String key, Locale locale) throws DataException { LanguageModel model = null; if (key != null) { LanguageBean languageItem = lHome.findByKeyAndLocale... [truncated message content] |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:37:36
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20473/cowsultants/itracker/ejb/client/interfaces Modified Files: Tag: itrackerhibernate IssueHandler.java Log Message: removed usage of IssueActivityModel, for proof of concept now issues can be created again (an error message still appears, but the issue is created) Index: IssueHandler.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/interfaces/IssueHandler.java,v retrieving revision 1.34.4.1 retrieving revision 1.34.4.2 diff -C2 -d -r1.34.4.1 -r1.34.4.2 *** IssueHandler.java 11 Oct 2005 01:21:04 -0000 1.34.4.1 --- IssueHandler.java 22 Oct 2005 16:37:28 -0000 1.34.4.2 *************** *** 19,38 **** package cowsultants.itracker.ejb.client.interfaces; ! import java.util.Date; ! import java.util.HashSet; ! ! import cowsultants.itracker.ejb.beans.session.DataException; ! import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; ! import cowsultants.itracker.ejb.client.models.ComponentModel; ! import cowsultants.itracker.ejb.client.models.IssueActivityModel; ! import cowsultants.itracker.ejb.client.models.IssueAttachmentModel; ! import cowsultants.itracker.ejb.client.models.IssueFieldModel; ! import cowsultants.itracker.ejb.client.models.IssueHistoryModel; ! import cowsultants.itracker.ejb.client.models.IssueModel; ! import cowsultants.itracker.ejb.client.models.IssueRelationModel; ! import cowsultants.itracker.ejb.client.models.NotificationModel; ! import cowsultants.itracker.ejb.client.models.ProjectModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.models.VersionModel; public interface IssueHandler { --- 19,23 ---- package cowsultants.itracker.ejb.client.interfaces; ! import java.util.Date; import java.util.HashSet; import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; import cowsultants.itracker.ejb.beans.session.DataException; import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.IssueAttachmentModel; import cowsultants.itracker.ejb.client.models.IssueFieldModel; import cowsultants.itracker.ejb.client.models.IssueHistoryModel; import cowsultants.itracker.ejb.client.models.IssueModel; import cowsultants.itracker.ejb.client.models.IssueRelationModel; import cowsultants.itracker.ejb.client.models.NotificationModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public interface IssueHandler { *************** *** 98,102 **** public boolean addIssueHistory(IssueHistoryModel model) throws DataException; public boolean addIssueRelation(Integer issueId, Integer relatedIssueId, int relationType, Integer userId) throws DataException; ! public boolean addIssueActivity(IssueActivityModel model) throws DataException; public void updateIssueActivityNotification(Integer issueId, boolean notificationSent); public boolean addIssueAttachment(IssueAttachmentModel model, byte[] data) throws DataException; --- 83,87 ---- public boolean addIssueHistory(IssueHistoryModel model) throws DataException; public boolean addIssueRelation(Integer issueId, Integer relatedIssueId, int relationType, Integer userId) throws DataException; ! //public boolean addIssueActivity(IssueActivityModel model) throws DataException; public void updateIssueActivityNotification(Integer issueId, boolean notificationSent); public boolean addIssueAttachment(IssueAttachmentModel model, byte[] data) throws DataException; *************** *** 134,139 **** public IssueRelationModel getIssueRelation(Integer relationId) throws DataException; ! public IssueActivityModel[] getIssueActivity(Integer issueId); ! public IssueActivityModel[] getIssueActivity(Integer issueId, boolean notificationSent); public IssueAttachmentModel[] getAllIssueAttachments() throws DataException; public long[] getAllIssueAttachmentsSizeAndCount(); --- 119,124 ---- public IssueRelationModel getIssueRelation(Integer relationId) throws DataException; ! public IssueActivityBean[] getIssueActivity(Integer issueId); ! public IssueActivityBean[] getIssueActivity(Integer issueId, boolean notificationSent); public IssueAttachmentModel[] getAllIssueAttachments() throws DataException; public long[] getAllIssueAttachmentsSizeAndCount(); |
|
From: Ricardo T. <rj...@us...> - 2005-10-22 16:36:04
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20242/cowsultants/itracker/ejb/beans/entity Modified Files: Tag: itrackerhibernate issuebean.hbm.xml projectbean.hbm.xml userbean.hbm.xml Log Message: made more collections lazy, to help performance Index: projectbean.hbm.xml =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/Attic/projectbean.hbm.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** projectbean.hbm.xml 11 Oct 2005 01:36:07 -0000 1.1.2.1 --- projectbean.hbm.xml 22 Oct 2005 16:35:56 -0000 1.1.2.2 *************** *** 16,20 **** <property name="status" not-null="true" unique="false"/> <property name="options" not-null="true" unique="false"/> ! <bag name="customFields" table="project_field_rel"> <key> <column name="project_id"/> --- 16,20 ---- <property name="status" not-null="true" unique="false"/> <property name="options" not-null="true" unique="false"/> ! <bag name="customFields" table="project_field_rel" lazy="true"> <key> <column name="project_id"/> *************** *** 22,26 **** <many-to-many class="cowsultants.itracker.ejb.beans.entity.CustomFieldBean" column="field_id"/> </bag> ! <bag name="components" table="ComponentBean" cascade="all"> <key> <column name="project_id"/> --- 22,26 ---- <many-to-many class="cowsultants.itracker.ejb.beans.entity.CustomFieldBean" column="field_id"/> </bag> ! <bag name="components" table="ComponentBean" cascade="all" lazy="true"> <key> <column name="project_id"/> *************** *** 28,32 **** <one-to-many class="cowsultants.itracker.ejb.beans.entity.ComponentBean"/> </bag> ! <bag name="versions" table="VersionBean" cascade="all"> <key> <column name="project_id"/> --- 28,32 ---- <one-to-many class="cowsultants.itracker.ejb.beans.entity.ComponentBean"/> </bag> ! <bag name="versions" table="VersionBean" cascade="all" lazy="true"> <key> <column name="project_id"/> *************** *** 46,50 **** <one-to-many class="cowsultants.itracker.ejb.beans.entity.PermissionBean"/> </bag> ! <bag name="owners" table="project_owner_rel"> <key> <column name="project_id"/> --- 46,50 ---- <one-to-many class="cowsultants.itracker.ejb.beans.entity.PermissionBean"/> </bag> ! <bag name="owners" table="project_owner_rel" lazy="true"> <key> <column name="project_id"/> *************** *** 52,56 **** <many-to-many class="cowsultants.itracker.ejb.beans.entity.UserBean" column="user_id"/> </bag> ! <bag name="scripts" table="ProjectScriptBean" cascade="all"> <key> <column name="project_id"/> --- 52,56 ---- <many-to-many class="cowsultants.itracker.ejb.beans.entity.UserBean" column="user_id"/> </bag> ! <bag name="scripts" table="ProjectScriptBean" cascade="all" lazy="true"> <key> <column name="project_id"/> Index: issuebean.hbm.xml =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/Attic/issuebean.hbm.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** issuebean.hbm.xml 11 Oct 2005 01:36:07 -0000 1.1.2.1 --- issuebean.hbm.xml 22 Oct 2005 16:35:56 -0000 1.1.2.2 *************** *** 45,49 **** <one-to-many class="cowsultants.itracker.ejb.beans.entity.IssueAttachmentBean"/> </bag> ! <bag name="fields" table="IssueFieldBean" cascade="all"> <key> <column name="issue_id"/> --- 45,49 ---- <one-to-many class="cowsultants.itracker.ejb.beans.entity.IssueAttachmentBean"/> </bag> ! <bag name="fields" table="IssueFieldBean" cascade="all" lazy="true"> <key> <column name="issue_id"/> Index: userbean.hbm.xml =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/Attic/userbean.hbm.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** userbean.hbm.xml 11 Oct 2005 01:36:07 -0000 1.1.2.1 --- userbean.hbm.xml 22 Oct 2005 16:35:56 -0000 1.1.2.2 *************** *** 22,26 **** <property name="registrationType" column="registration_type" not-null="true" unique="false"/> <many-to-one name="preferences" column="preferences_id" class="cowsultants.itracker.ejb.beans.entity.UserPreferencesBean"/> ! <bag name="permissions" table="Permission" cascade="all"> <key> <column name="user_id"/> --- 22,26 ---- <property name="registrationType" column="registration_type" not-null="true" unique="false"/> <many-to-one name="preferences" column="preferences_id" class="cowsultants.itracker.ejb.beans.entity.UserPreferencesBean"/> ! <bag name="permissions" table="Permission" cascade="all" lazy="true"> <key> <column name="user_id"/> |
|
From: Marc B. <mb...@us...> - 2005-10-22 16:12:44
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13825/web/admin Modified Files: Tag: itrackerhibernate list_tasks.jsp Log Message: bugfix: length is not a field but a method() on a string object Index: list_tasks.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_tasks.jsp,v retrieving revision 1.10 retrieving revision 1.10.4.1 diff -C2 -d -r1.10 -r1.10.4.1 *** list_tasks.jsp 22 Aug 2005 11:41:29 -0000 1.10 --- list_tasks.jsp 22 Oct 2005 16:12:31 -0000 1.10.4.1 *************** *** 59,63 **** if(tasks[i].getClassName() != null) { int dotIndex = tasks[i].getClassName().lastIndexOf("."); ! taskName = (dotIndex > -1 && (dotIndex + 1) < tasks[i].getClassName().length ? tasks[i].getClassName().substring(dotIndex + 1) : tasks[i].getClassName()); } else { taskName = ITrackerResources.getString("itracker.web.generic.unassigned"); --- 59,63 ---- if(tasks[i].getClassName() != null) { int dotIndex = tasks[i].getClassName().lastIndexOf("."); ! taskName = (dotIndex > -1 && (dotIndex + 1) < tasks[i].getClassName().length() ? tasks[i].getClassName().substring(dotIndex + 1) : tasks[i].getClassName()); } else { taskName = ITrackerResources.getString("itracker.web.generic.unassigned"); |
|
From: Marc B. <mb...@us...> - 2005-10-22 16:04:13
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10436/web/admin Modified Files: Tag: itrackerhibernate create_language_key.jsp edit_configuration.jsp edit_customfield.jsp list_attachments.jsp list_configuration.jsp list_languages.jsp list_reports.jsp list_workflow.jsp Log Message: replaced sily import statements introduced by myself Index: list_reports.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_reports.jsp,v retrieving revision 1.11.4.3 retrieving revision 1.11.4.4 diff -C2 -d -r1.11.4.3 -r1.11.4.4 *** list_reports.jsp 22 Oct 2005 15:40:41 -0000 1.11.4.3 --- list_reports.jsp 22 Oct 2005 16:03:59 -0000 1.11.4.4 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.ReportHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.ReportHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: edit_customfield.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_customfield.jsp,v retrieving revision 1.10.4.1 retrieving revision 1.10.4.2 diff -C2 -d -r1.10.4.1 -r1.10.4.2 *** edit_customfield.jsp 22 Oct 2005 15:30:22 -0000 1.10.4.1 --- edit_customfield.jsp 22 Oct 2005 16:03:59 -0000 1.10.4.2 *************** *** 8,12 **** <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 8,12 ---- <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: edit_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_configuration.jsp,v retrieving revision 1.9.4.1 retrieving revision 1.9.4.2 diff -C2 -d -r1.9.4.1 -r1.9.4.2 *** edit_configuration.jsp 22 Oct 2005 15:30:22 -0000 1.9.4.1 --- edit_configuration.jsp 22 Oct 2005 16:03:59 -0000 1.9.4.2 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: list_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_configuration.jsp,v retrieving revision 1.10.4.1 retrieving revision 1.10.4.2 diff -C2 -d -r1.10.4.1 -r1.10.4.2 *** list_configuration.jsp 22 Oct 2005 15:30:22 -0000 1.10.4.1 --- list_configuration.jsp 22 Oct 2005 16:03:59 -0000 1.10.4.2 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: list_workflow.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_workflow.jsp,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** list_workflow.jsp 22 Oct 2005 15:30:22 -0000 1.5.4.1 --- list_workflow.jsp 22 Oct 2005 16:03:59 -0000 1.5.4.2 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: list_languages.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_languages.jsp,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -C2 -d -r1.12.4.1 -r1.12.4.2 *** list_languages.jsp 22 Oct 2005 15:30:22 -0000 1.12.4.1 --- list_languages.jsp 22 Oct 2005 16:03:59 -0000 1.12.4.2 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: list_attachments.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_attachments.jsp,v retrieving revision 1.17.4.1 retrieving revision 1.17.4.2 diff -C2 -d -r1.17.4.1 -r1.17.4.2 *** list_attachments.jsp 22 Oct 2005 15:30:22 -0000 1.17.4.1 --- list_attachments.jsp 22 Oct 2005 16:03:59 -0000 1.17.4.2 *************** *** 8,12 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.client.session.IssueHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 8,12 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.IssueHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> Index: create_language_key.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/create_language_key.jsp,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** create_language_key.jsp 22 Oct 2005 15:28:02 -0000 1.6.4.1 --- create_language_key.jsp 22 Oct 2005 16:03:59 -0000 1.6.4.2 *************** *** 7,11 **** <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> ! <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> |
|
From: Marc B. <mb...@us...> - 2005-10-22 15:40:48
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4741 Modified Files: Tag: itrackerhibernate list_reports.jsp Log Message: corrected typo. Sorry about this... Index: list_reports.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_reports.jsp,v retrieving revision 1.11.4.2 retrieving revision 1.11.4.3 diff -C2 -d -r1.11.4.2 -r1.11.4.3 *** list_reports.jsp 22 Oct 2005 15:37:24 -0000 1.11.4.2 --- list_reports.jsp 22 Oct 2005 15:40:41 -0000 1.11.4.3 *************** *** 54,58 **** <% ! ReportHandler rc = new ReportHandlerBean(); ReportModel[] reports = rh.getAllReports(); --- 54,58 ---- <% ! ReportHandler rh = new ReportHandlerBean(); ReportModel[] reports = rh.getAllReports(); |
|
From: Marc B. <mb...@us...> - 2005-10-22 15:37:32
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4183 Modified Files: Tag: itrackerhibernate list_reports.jsp Log Message: added missing ReportHandler Index: list_reports.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_reports.jsp,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** list_reports.jsp 22 Oct 2005 15:30:22 -0000 1.11.4.1 --- list_reports.jsp 22 Oct 2005 15:37:24 -0000 1.11.4.2 *************** *** 53,56 **** --- 53,58 ---- <% + + ReportHandler rc = new ReportHandlerBean(); ReportModel[] reports = rh.getAllReports(); |
|
From: Marc B. <mb...@us...> - 2005-10-22 15:30:32
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3200/web/admin Modified Files: Tag: itrackerhibernate edit_configuration.jsp edit_customfield.jsp edit_customfieldvalue.jsp edit_project.jsp list_attachments.jsp list_configuration.jsp list_languages.jsp list_reports.jsp list_workflow.jsp Log Message: instantiate service layer objects instead of narrowing them from PortableRemoteObject Index: list_reports.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_reports.jsp,v retrieving revision 1.11 retrieving revision 1.11.4.1 diff -C2 -d -r1.11 -r1.11.4.1 *** list_reports.jsp 22 Aug 2005 11:41:29 -0000 1.11 --- list_reports.jsp 22 Oct 2005 15:30:22 -0000 1.11.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.client.session.ReportHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 52,61 **** <% - InitialContext ic = new InitialContext(); - - Object rhRef = ic.lookup("java:comp/env/" + ReportHandler.JNDI_NAME); - ReportHandlerHome rhHome = (ReportHandlerHome) PortableRemoteObject.narrow(rhRef, ReportHandlerHome.class); - ReportHandler rh = rhHome.create(); - ReportModel[] reports = rh.getAllReports(); --- 53,56 ---- Index: edit_project.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_project.jsp,v retrieving revision 1.36 retrieving revision 1.36.4.1 diff -C2 -d -r1.36 -r1.36.4.1 *** edit_project.jsp 22 Aug 2005 11:41:29 -0000 1.36 --- edit_project.jsp 22 Oct 2005 15:30:22 -0000 1.36.4.1 *************** *** 8,11 **** --- 8,13 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.ejb.beans.session.ProjectHandlerBean" %> + <%@ page import="cowsultants.itracker.ejb.beans.session.UserHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> *************** *** 17,30 **** <% ! InitialContext ic = new InitialContext(); ! ! Object phRef = ic.lookup("java:comp/env/" + ProjectHandler.JNDI_NAME); ! ProjectHandlerHome phHome = (ProjectHandlerHome) PortableRemoteObject.narrow(phRef, ProjectHandlerHome.class); ! ProjectHandler ph = phHome.create(); ! ! Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); ! UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); ! UserHandler uh = uhHome.create(); ! boolean allowPermissionUpdate = uh.allowPermissionUpdates(null, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); --- 19,25 ---- <% ! ProjectHandler ph = new ProjectHandlerBean(); ! UserHandler uh = new UserHandlerBean(); ! boolean allowPermissionUpdate = uh.allowPermissionUpdates(null, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); Index: edit_customfieldvalue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_customfieldvalue.jsp,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** edit_customfieldvalue.jsp 22 Aug 2005 11:41:29 -0000 1.6 --- edit_customfieldvalue.jsp 22 Oct 2005 15:30:22 -0000 1.6.4.1 *************** *** 51,59 **** <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); HashMap languages = sc.getAvailableLanguages(); --- 51,55 ---- <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); Index: edit_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_configuration.jsp,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -C2 -d -r1.9 -r1.9.4.1 *** edit_configuration.jsp 22 Aug 2005 11:41:29 -0000 1.9 --- edit_configuration.jsp 22 Oct 2005 15:30:22 -0000 1.9.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.ejb.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 47,56 **** <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); ! HashMap languages = sc.getAvailableLanguages(); %> --- 48,53 ---- <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! SystemConfiguration sc = SystemConfigurationBean(); ! HashMap languages = sc.getAvailableLanguages(); %> Index: list_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_configuration.jsp,v retrieving revision 1.10 retrieving revision 1.10.4.1 diff -C2 -d -r1.10 -r1.10.4.1 *** list_configuration.jsp 22 Aug 2005 11:41:29 -0000 1.10 --- list_configuration.jsp 22 Oct 2005 15:30:22 -0000 1.10.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 14,23 **** <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); ! ConfigurationModel[] resolutions = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION); ConfigurationModel[] severities = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY); --- 15,20 ---- <% ! SystemConfiguration sc = new SystemConfigurationBean(); ! ConfigurationModel[] resolutions = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION); ConfigurationModel[] severities = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_SEVERITY); Index: list_workflow.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_workflow.jsp,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** list_workflow.jsp 22 Aug 2005 11:41:29 -0000 1.5 --- list_workflow.jsp 22 Oct 2005 15:30:22 -0000 1.5.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 49,58 **** <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); ! WorkflowScriptModel[] workflowScripts = sc.getWorkflowScripts(); --- 50,55 ---- <% ! SystemConfiguration sc = new SystemConfigurationBean(); ! WorkflowScriptModel[] workflowScripts = sc.getWorkflowScripts(); Index: list_languages.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_languages.jsp,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -C2 -d -r1.12 -r1.12.4.1 *** list_languages.jsp 22 Aug 2005 11:41:29 -0000 1.12 --- list_languages.jsp 22 Oct 2005 15:30:22 -0000 1.12.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 21,29 **** <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); HashMap languages = sc.getAvailableLanguages(); --- 22,26 ---- <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); Index: list_attachments.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/list_attachments.jsp,v retrieving revision 1.17 retrieving revision 1.17.4.1 diff -C2 -d -r1.17 -r1.17.4.1 *** list_attachments.jsp 22 Aug 2005 11:41:29 -0000 1.17 --- list_attachments.jsp 22 Oct 2005 15:30:22 -0000 1.17.4.1 *************** *** 8,11 **** --- 8,12 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.client.session.IssueHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 36,45 **** <% ! InitialContext ic = new InitialContext(); ! ! Object ihRef = ic.lookup("java:comp/env/" + IssueHandler.JNDI_NAME); ! IssueHandlerHome ihHome = (IssueHandlerHome) PortableRemoteObject.narrow(ihRef, IssueHandlerHome.class); ! IssueHandler ih = ihHome.create(); ! IssueAttachmentModel[] attachments = ih.getAllIssueAttachments(); --- 37,42 ---- <% ! IssueHandler ih = new IssueHandlerBean(); ! IssueAttachmentModel[] attachments = ih.getAllIssueAttachments(); Index: edit_customfield.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/edit_customfield.jsp,v retrieving revision 1.10 retrieving revision 1.10.4.1 diff -C2 -d -r1.10 -r1.10.4.1 *** edit_customfield.jsp 22 Aug 2005 11:41:29 -0000 1.10 --- edit_customfield.jsp 22 Oct 2005 15:30:22 -0000 1.10.4.1 *************** *** 7,10 **** --- 7,12 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + + <%@ page import="cowsultants.itracker.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 52,61 **** <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); ! HashMap languages = sc.getAvailableLanguages(); %> --- 54,59 ---- <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); ! HashMap languages = sc.getAvailableLanguages(); %> |
|
From: Marc B. <mb...@us...> - 2005-10-22 15:28:19
|
Update of /cvsroot/itracker/itracker/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2750/web/admin Modified Files: Tag: itrackerhibernate create_language_key.jsp Log Message: create SystemConfigurationBean instead of narrowing SystemConfiguration interface from PortableRemoteObject Index: create_language_key.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/admin/create_language_key.jsp,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** create_language_key.jsp 22 Aug 2005 11:41:29 -0000 1.6 --- create_language_key.jsp 22 Oct 2005 15:28:02 -0000 1.6.4.1 *************** *** 7,10 **** --- 7,11 ---- <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> + <%@ page import="cowsultants.itracker.ejb.client.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> *************** *** 23,32 **** <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! InitialContext ic = new InitialContext(); ! ! Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = scHome.create(); ! HashMap languages = sc.getAvailableLanguages(); %> --- 24,29 ---- <table border="0" cellspacing="0" cellpadding="0" width="90%" align="center"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); ! HashMap languages = sc.getAvailableLanguages(); %> |