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: Ricardo T. <rj...@us...> - 2005-11-01 17:22:59
|
Update of /cvsroot/itracker/itracker In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1898 Removed Files: Tag: itrackerhibernate Moving to Hibernate Log Message: removed file with initial migration notes, now it's all in the wiki and on SF --- Moving to Hibernate DELETED --- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:22:09
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1732/themes/standardtheme/includes Modified Files: Tag: itrackerhibernate page_init.jsp Log Message: unused imports Index: page_init.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/includes/Attic/page_init.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** page_init.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- page_init.jsp 1 Nov 2005 17:22:02 -0000 1.1.2.2 *************** *** 2,7 **** <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> - <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <%@ page import="cowsultants.itracker.web.util.*" %> --- 2,5 ---- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:20:45
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1516/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate EditReportAction.java Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring Index: EditReportAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditReportAction.java,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** EditReportAction.java 29 Oct 2005 01:49:17 -0000 1.9.4.4 --- EditReportAction.java 1 Nov 2005 17:20:37 -0000 1.9.4.5 *************** *** 35,39 **** 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.SystemConfiguration; --- 35,38 ---- *************** *** 108,112 **** } else if("create".equals(action)) { // If it was a create, add a new language key in the base for it. ! SystemConfiguration sc = new SystemConfigurationBean(); sc.updateLanguageItem(new LanguageModel(ITrackerResources.BASE_LOCALE, report.getNameKey(), report.getName())); --- 107,111 ---- } else if("create".equals(action)) { // If it was a create, add a new language key in the base for it. ! SystemConfiguration sc = getITrackerServices().getSystemConfiguration(); sc.updateLanguageItem(new LanguageModel(ITrackerResources.BASE_LOCALE, report.getNameKey(), report.getName())); |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:18:34
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv993/cowsultants/itracker/ejb/beans/session Modified Files: Tag: itrackerhibernate ITrackerServices.java ITrackerServicesImpl.java Log Message: added issue search to services interface Index: ITrackerServicesImpl.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ITrackerServicesImpl.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** ITrackerServicesImpl.java 1 Nov 2005 17:14:36 -0000 1.1.2.5 --- ITrackerServicesImpl.java 1 Nov 2005 17:18:25 -0000 1.1.2.6 *************** *** 2,5 **** --- 2,6 ---- import cowsultants.itracker.ejb.client.interfaces.IssueHandler; + import cowsultants.itracker.ejb.client.interfaces.IssueSearch; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.interfaces.ReportHandler; *************** *** 40,43 **** --- 41,45 ---- private SchedulerHandler schedulerHandler; private ReportHandler reportHandler; + private IssueSearch issueSearch; public ScheduledTaskFactory getScheduledTaskFactory() { *************** *** 203,206 **** --- 205,212 ---- public ReportHandler getReportHandler() { return reportHandler; + } + + public IssueSearch getIssueSearch() { + return issueSearch; } } Index: ITrackerServices.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ITrackerServices.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** ITrackerServices.java 1 Nov 2005 17:14:36 -0000 1.1.2.5 --- ITrackerServices.java 1 Nov 2005 17:18:25 -0000 1.1.2.6 *************** *** 2,5 **** --- 2,6 ---- import cowsultants.itracker.ejb.client.interfaces.IssueHandler; + import cowsultants.itracker.ejb.client.interfaces.IssueSearch; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.interfaces.ReportHandler; *************** *** 91,93 **** --- 92,96 ---- public ReportHandler getReportHandler(); + + public IssueSearch getIssueSearch(); } |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:18:33
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv993/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate SearchIssuesAction.java Log Message: added issue search to services interface Index: SearchIssuesAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/SearchIssuesAction.java,v retrieving revision 1.16.4.5 retrieving revision 1.16.4.6 diff -C2 -d -r1.16.4.5 -r1.16.4.6 *** SearchIssuesAction.java 23 Oct 2005 15:33:52 -0000 1.16.4.5 --- SearchIssuesAction.java 1 Nov 2005 17:18:25 -0000 1.16.4.6 *************** *** 36,40 **** import org.apache.struts.validator.DynaValidatorForm; - import cowsultants.itracker.ejb.beans.session.IssueSearchBean; import cowsultants.itracker.ejb.client.exceptions.IssueSearchException; import cowsultants.itracker.ejb.client.interfaces.IssueSearch; --- 36,39 ---- *************** *** 66,70 **** try { ! IssueSearch is = new IssueSearchBean(); IssueSearchQueryModel isqm = (IssueSearchQueryModel) session.getAttribute(Constants.SEARCH_QUERY_KEY); --- 65,69 ---- try { ! IssueSearch is = getITrackerServices().getIssueSearch(); IssueSearchQueryModel isqm = (IssueSearchQueryModel) session.getAttribute(Constants.SEARCH_QUERY_KEY); |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:15:50
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32619/cowsultants/itracker/ejb/client/interfaces Modified Files: Tag: itrackerhibernate IssueHandler.java Log Message: removed unused JNDI_NAME constant Index: IssueHandler.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/interfaces/IssueHandler.java,v retrieving revision 1.34.4.2 retrieving revision 1.34.4.3 diff -C2 -d -r1.34.4.2 -r1.34.4.3 *** IssueHandler.java 22 Oct 2005 16:37:28 -0000 1.34.4.2 --- IssueHandler.java 1 Nov 2005 17:15:41 -0000 1.34.4.3 *************** *** 22,27 **** public interface IssueHandler { - public static final String JNDI_NAME = "ejb/IssueHandler"; - public IssueModel getIssue(Integer issueId) throws DataException; public IssueModel[] getAllIssues() throws DataException; --- 22,25 ---- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:14:44
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32388/cowsultants/itracker/ejb/beans/session Modified Files: Tag: itrackerhibernate ITrackerServices.java ITrackerServicesImpl.java Log Message: added reportHandler to the services interface Index: ITrackerServicesImpl.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ITrackerServicesImpl.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** ITrackerServicesImpl.java 30 Oct 2005 16:52:11 -0000 1.1.2.4 --- ITrackerServicesImpl.java 1 Nov 2005 17:14:36 -0000 1.1.2.5 *************** *** 3,6 **** --- 3,7 ---- import cowsultants.itracker.ejb.client.interfaces.IssueHandler; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; + import cowsultants.itracker.ejb.client.interfaces.ReportHandler; import cowsultants.itracker.ejb.client.interfaces.SchedulerHandler; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; *************** *** 38,41 **** --- 39,43 ---- private SystemConfiguration systemConfigurationHandler; private SchedulerHandler schedulerHandler; + private ReportHandler reportHandler; public ScheduledTaskFactory getScheduledTaskFactory() { *************** *** 197,200 **** --- 199,206 ---- public void setSchedulerHandler(SchedulerHandler schedulerHandler) { this.schedulerHandler = schedulerHandler; + } + + public ReportHandler getReportHandler() { + return reportHandler; } } Index: ITrackerServices.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ITrackerServices.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** ITrackerServices.java 30 Oct 2005 16:52:11 -0000 1.1.2.4 --- ITrackerServices.java 1 Nov 2005 17:14:36 -0000 1.1.2.5 *************** *** 3,6 **** --- 3,7 ---- import cowsultants.itracker.ejb.client.interfaces.IssueHandler; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; + import cowsultants.itracker.ejb.client.interfaces.ReportHandler; import cowsultants.itracker.ejb.client.interfaces.SchedulerHandler; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; *************** *** 89,91 **** --- 90,93 ---- public SchedulerHandler getSchedulerHandler(); + public ReportHandler getReportHandler(); } |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:14:20
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32206/cowsultants/itracker/ejb/client/interfaces Removed Files: Tag: itrackerhibernate IssueSearchHome.java Log Message: removed the last home interfaces added reportHandler to the services interface --- IssueSearchHome.java DELETED --- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:14:08
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32206/cowsultants/itracker/web/servlets Modified Files: Tag: itrackerhibernate ReportDownloadController.java Log Message: removed the last home interfaces added reportHandler to the services interface Index: ReportDownloadController.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/ReportDownloadController.java,v retrieving revision 1.6.4.3 retrieving revision 1.6.4.4 diff -C2 -d -r1.6.4.3 -r1.6.4.4 *** ReportDownloadController.java 29 Oct 2005 01:44:25 -0000 1.6.4.3 --- ReportDownloadController.java 1 Nov 2005 17:14:00 -0000 1.6.4.4 *************** *** 19,30 **** package cowsultants.itracker.web.servlets; ! import cowsultants.itracker.ejb.beans.session.ReportHandlerBean; ! import java.io.*; ! import javax.servlet.*; ! import javax.servlet.http.*; - import cowsultants.itracker.ejb.client.interfaces.*; - import cowsultants.itracker.ejb.client.models.*; - import cowsultants.itracker.ejb.client.util.*; public class ReportDownloadController extends GenericController { --- 19,38 ---- package cowsultants.itracker.web.servlets; ! import java.io.IOException; ! ! import javax.naming.InitialContext; ! import javax.naming.NamingException; ! import javax.servlet.ServletConfig; ! import javax.servlet.ServletException; ! import javax.servlet.ServletOutputStream; ! import javax.servlet.http.HttpServletRequest; ! import javax.servlet.http.HttpServletResponse; ! import javax.servlet.http.HttpSession; ! ! import cowsultants.itracker.ejb.client.interfaces.ReportHandler; ! import cowsultants.itracker.ejb.client.models.ReportModel; ! import cowsultants.itracker.ejb.client.models.UserModel; ! import cowsultants.itracker.ejb.client.util.Logger; public class ReportDownloadController extends GenericController { *************** *** 44,48 **** UserModel user = (UserModel) session.getAttribute("user"); try { ! ReportHandler rh = new ReportHandlerBean(); Integer reportId = null; --- 52,56 ---- UserModel user = (UserModel) session.getAttribute("user"); try { ! ReportHandler rh = this.getITrackerServices().getReportHandler(); Integer reportId = null; |
|
From: Marky G. <mar...@us...> - 2005-11-01 15:01:09
|
Update of /cvsroot/itracker/itracker/web/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32581/web/reports Modified Files: Tag: itrackerhibernate issue_severity.jsp Log Message: tried to temporary resolve includes.. Index: issue_severity.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/reports/issue_severity.jsp,v retrieving revision 1.18.4.1 retrieving revision 1.18.4.2 diff -C2 -d -r1.18.4.1 -r1.18.4.2 *** issue_severity.jsp 27 Oct 2005 20:13:40 -0000 1.18.4.1 --- issue_severity.jsp 1 Nov 2005 15:01:01 -0000 1.18.4.2 *************** *** 20,27 **** <it:checkLogin/> ! <%@ include file="/includes/page_init.jsp" %> <bean:define id="pageTitleKey" value="itracker.web.listreports.report.issueseverity"/> <bean:define id="pageTitleArg" value=""/> ! <%@ include file="/includes/header.jsp" %> <table border="0" cellspacing="0" cellspacing="1" width="100%"align="left"> --- 20,27 ---- <it:checkLogin/> ! <%@ include file="/themes/standardtheme/includes/page_init.jsp" %> <bean:define id="pageTitleKey" value="itracker.web.listreports.report.issueseverity"/> <bean:define id="pageTitleArg" value=""/> ! <%@ include file="/themes/standardtheme/includes/header.jsp" %> <table border="0" cellspacing="0" cellspacing="1" width="100%"align="left"> *************** *** 144,146 **** ! <%@ include file="/includes/footer.jsp" %> --- 144,146 ---- ! <%@ include file="/themes/standardtheme/includes/footer.jsp" %> |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 14:46:57
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28781/cowsultants/itracker/ejb/beans/entity Modified Files: Tag: itrackerhibernate issuebean.hbm.xml Added Files: Tag: itrackerhibernate issueactivitybean.hbm.xml Log Message: fixed issue activity (wasn't mapped in hibernate) --- NEW FILE: issueactivitybean.hbm.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 2.0//EN" "" rel="nofollow">http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd"> <hibernate-mapping auto-import="true" package="cowsultants.itracker.ejb.beans.entity"> <class name="IssueActivityBean"> <id name="id" column="id" type="int" unsaved-value="null"> <generator class="identity"/> </id> <property name="type" column="activity_type" not-null="true" unique="false"/> <property name="description" not-null="true" unique="false"/> <property name="notificationSent" column="notification_sent" not-null="true" unique="false"/> <property name="createDate" column="create_date" not-null="true" unique="false"/> <property name="lastModifiedDate" column="last_modified" not-null="true" unique="false"/> <many-to-one name="issue" column="issue_id" class="IssueBean"/> <many-to-one name="user" column="user_id" class="UserBean"/> </class> </hibernate-mapping> 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.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** issuebean.hbm.xml 22 Oct 2005 16:35:56 -0000 1.1.2.2 --- issuebean.hbm.xml 1 Nov 2005 14:46:46 -0000 1.1.2.3 *************** *** 63,67 **** <one-to-many class="cowsultants.itracker.ejb.beans.entity.IssueRelationBean"/> </bag> </class> - </hibernate-mapping> --- 63,72 ---- <one-to-many class="cowsultants.itracker.ejb.beans.entity.IssueRelationBean"/> </bag> + <bag name="activities" table="IssueActivityBean" cascade="all" lazy="true"> + <key> + <column name="issue_id"/> + </key> + <one-to-many class="cowsultants.itracker.ejb.beans.entity.IssueActivityBean"/> + </bag> </class> </hibernate-mapping> |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 14:46:54
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28781/cowsultants/itracker/ejb/beans/session Modified Files: Tag: itrackerhibernate IssueActivityFactory.java IssueHandlerBean.java Added Files: Tag: itrackerhibernate IssueActivityFactoryImpl.java Log Message: fixed issue activity (wasn't mapped in hibernate) --- NEW FILE: IssueActivityFactoryImpl.java --- package cowsultants.itracker.ejb.beans.session; import java.util.Collection; import cowsultants.itracker.ejb.beans.entity.IssueBean; public class IssueActivityFactoryImpl extends BaseHibernateFactoryImpl implements IssueActivityFactory { private IssueFactory issueFactory; public IssueActivityFactoryImpl(IssueFactory userFactory) { this.issueFactory = userFactory; } public Collection findByIssueId(Integer issueId) { IssueBean user = issueFactory.findByPrimaryKey(issueId); return(user.getActivities()); } public Collection findByIssueIdAndNotification(Integer issueId, int i) { // TODO Auto-generated method stub return null; } } Index: IssueActivityFactory.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/IssueActivityFactory.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 *** IssueActivityFactory.java 11 Oct 2005 01:36:08 -0000 1.1.2.1 --- IssueActivityFactory.java 1 Nov 2005 14:46:46 -0000 1.1.2.2 *************** *** 3,17 **** import java.util.Collection; ! public class IssueActivityFactory { ! public static Collection findByIssueId(Integer issueId) { ! // TODO Auto-generated method stub ! return null; ! } ! public static Collection findByIssueIdAndNotification(Integer issueId, int i) { ! // TODO Auto-generated method stub ! return null; ! } } --- 3,11 ---- import java.util.Collection; ! public interface IssueActivityFactory extends BaseFactory { ! public Collection findByIssueId(Integer issueId); ! public Collection findByIssueIdAndNotification(Integer issueId, int i); } Index: IssueHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/IssueHandlerBean.java,v retrieving revision 1.57.4.5 retrieving revision 1.57.4.6 diff -C2 -d -r1.57.4.5 -r1.57.4.6 *** IssueHandlerBean.java 30 Oct 2005 16:52:10 -0000 1.57.4.5 --- IssueHandlerBean.java 1 Nov 2005 14:46:46 -0000 1.57.4.6 *************** *** 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.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Vector; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; import cowsultants.itracker.ejb.beans.entity.IssueAttachmentBean; import cowsultants.itracker.ejb.beans.entity.IssueBean; import cowsultants.itracker.ejb.beans.entity.IssueFieldBean; import cowsultants.itracker.ejb.beans.entity.IssueHistoryBean; import cowsultants.itracker.ejb.beans.entity.IssueRelationBean; import cowsultants.itracker.ejb.beans.entity.NotificationBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.beans.message.NotificationMessageBean; import cowsultants.itracker.ejb.client.exceptions.IssueException; import cowsultants.itracker.ejb.client.interfaces.IssueHandler; 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; import cowsultants.itracker.ejb.client.resources.ITrackerResources; import cowsultants.itracker.ejb.client.util.AuthenticationConstants; 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; /** * Issue related service layer. A bit "fat" at this time, because of being a direct EJB porting. * Going go get thinner over time * * @author ricardo * */ public class IssueHandlerBean implements IssueHandler { private static String notificationFactoryName = NotificationMessageBean.DEFAULT_CONNECTION_FACTORY; private static String notificationQueueName = NotificationMessageBean.DEFAULT_QUEUE_NAME; private static String systemBaseURL = ""; private CustomFieldFactory cfHome = null; private UserFactory userFactory = null; private ProjectFactory projectFactory; private IssueFactory issueFactory; private IssueHistoryFactory ihfHome = null; private NotificationFactory notificationFactory; private IssueRelationFactory issuerelationfactory = null; private ComponentFactory componentFactory = null; public IssueHandlerBean() { ihfHome = SpringFactories.getIssueHistoryFactory(); issuerelationfactory = SpringFactories.getIssueRelationFactory(); componentFactory = SpringFactories.getComponentFactory(); cfHome = SpringFactories.getCustomFieldFactory(); } public IssueModel getIssue(Integer issueId) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(issueId); return issue.getModel(); } public IssueModel[] getAllIssues() throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = issueFactory.findAll(); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public int getNumberIssues() throws DataException { Collection issues = issueFactory.findAll(); return issues.size(); } public IssueModel[] getIssuesCreatedByUser(Integer userId) throws DataException { return getIssuesCreatedByUser(userId, true); } public IssueModel[] getIssuesCreatedByUser(Integer userId, boolean availableProjectsOnly) throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = (availableProjectsOnly ? issueFactory.findByCreatorInAvailableProjects(userId, IssueUtilities.STATUS_CLOSED) : issueFactory.findByCreator(userId, IssueUtilities.STATUS_CLOSED)); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public IssueModel[] getIssuesOwnedByUser(Integer userId) throws DataException { return getIssuesOwnedByUser(userId, true); } public IssueModel[] getIssuesOwnedByUser(Integer userId, boolean availableProjectsOnly) throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = (availableProjectsOnly ? issueFactory.findByOwnerInAvailableProjects(userId, IssueUtilities.STATUS_RESOLVED) : issueFactory.findByOwner(userId, IssueUtilities.STATUS_RESOLVED)); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public IssueModel[] getIssuesWatchedByUser(Integer userId) throws DataException { return getIssuesWatchedByUser(userId, true); } public IssueModel[] getIssuesWatchedByUser(Integer userId, boolean availableProjectsOnly) throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = (availableProjectsOnly ? issueFactory.findByNotificationInAvailableProjects(userId, IssueUtilities.STATUS_CLOSED) : issueFactory.findByNotification(userId, IssueUtilities.STATUS_CLOSED)); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public IssueModel[] getUnassignedIssues() throws DataException { return getUnassignedIssues(true); } public IssueModel[] getUnassignedIssues(boolean availableProjectsOnly) throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = (availableProjectsOnly ? issueFactory .findByStatusLessThanEqualToInAvailableProjects(IssueUtilities.STATUS_UNASSIGNED) : issueFactory .findByStatusLessThanEqualTo(IssueUtilities.STATUS_UNASSIGNED)); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } /** * * Returns all issues with a status equal to the given status number * * * * @param status * * the status to compare * * @return an array of IssueModels that match the criteria * */ public IssueModel[] getIssuesWithStatus(int status) { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = issueFactory.findByStatus(status); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } /** * * Returns all issues with a status less than the given status number * * * * @param status * * the status to compare * * @return an array of IssueModels that match the criteria * * @throws DataException * */ public IssueModel[] getIssuesWithStatusLessThan(int status) throws DataException { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = issueFactory.findByStatusLessThan(status); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } /** * * Returns all issues with a severity equal to the given severity number * * * * @param severity * * the severity to compare * * @return an array of IssueModels that match the criteria * */ public IssueModel[] getIssuesWithSeverity(int severity) { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = issueFactory.findBySeverity(severity); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public IssueModel[] getIssuesByProjectId(Integer projectId) { return getIssuesByProjectId(projectId, IssueUtilities.STATUS_END); } public IssueModel[] getIssuesByProjectId(Integer projectId, int status) { int i = 0; IssueModel[] issueArray = new IssueModel[0]; Collection issues = issueFactory.findByProjectIdAndLowerStatus(projectId, status); issueArray = new IssueModel[issues.size()]; for (Iterator iterator = issues.iterator(); iterator.hasNext(); i++) { issueArray[i] = ((IssueBean) iterator.next()).getModel(); } return issueArray; } public UserModel getIssueCreator(Integer issueId) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(issueId); UserBean user = issue.getCreator(); return (user != null ? user.getModel() : null); } public UserModel getIssueOwner(Integer issueId) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(issueId); UserBean user = issue.getOwner(); return (user != null ? user.getModel() : null); } public ComponentModel[] getIssueComponents(Integer issueId) throws DataException { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection components = issue.getComponents(); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel[] getIssueVersions(Integer issueId) throws DataException { int i = 0; VersionModel[] versionArray = new VersionModel[0]; IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection versions = issue.getVersions(); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public IssueAttachmentModel[] getIssueAttachments(Integer issueId) throws DataException { int i = 0; IssueAttachmentModel[] attachmentsArray = new IssueAttachmentModel[0]; IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection attachments = issue.getAttachments(); attachmentsArray = new IssueAttachmentModel[attachments.size()]; for (Iterator iterator = attachments.iterator(); iterator.hasNext(); i++) { attachmentsArray[i] = ((IssueAttachmentBean) iterator.next()).getModel(); } return attachmentsArray; } /** * Old implementation is left here, commented, because it checked for * history entry status. This feature was not finished, I think (RJST) */ public IssueHistoryModel[] getIssueHistory(Integer issueId) { return (issueFactory.findByPrimaryKey(issueId).getModel().getHistory()); /* * int i = 0; * * IssueHistoryModel[] historyArray = new IssueHistoryModel[0]; * * Vector results = new Vector(); * * new IssueBean().getModel().getHistory() * * Collection history = ifHome.findByIssueId(issueId); * * historyArray = new IssueHistoryModel[history.size()]; * * for (Iterator iterator = history.iterator(); iterator.hasNext(); i++) { * * IssueHistoryBean entry = (IssueHistoryBean) iterator.next(); * * if (entry.getStatus() == IssueUtilities.HISTORY_STATUS_AVAILABLE) { * * results.addElement(entry.getModel()); } } * * historyArray = new IssueHistoryModel[results.size()]; * * results.copyInto(historyArray); * * * * return historyArray; */ } public IssueModel createIssue(IssueModel model, Integer projectId, Integer userId, Integer createdById) throws DataException { try { ProjectBean project = projectFactory.findByPrimaryKey(projectId); UserBean creator = userFactory.findByPrimaryKey(userId); if (project.getStatus() != ProjectUtilities.STATUS_ACTIVE) { throw new IssueException("Project is not active."); } IssueBean issue = new IssueBean(); if (issue != null) { if (createdById == null || createdById.equals(userId)) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_ISSUE_CREATED); activity.setUser(creator); activity.setIssue(issue); } else { UserBean createdBy = userFactory.findByPrimaryKey(createdById); IssueActivityBean activity = new IssueActivityBean(); activity.setDescription(ITrackerResources.getString("itracker.activity.system.createdfor") + " " + creator.getFirstName() + " " + creator.getLastName()); activity.setUser(createdBy); activity.setIssue(issue); NotificationModel watchModel = new NotificationModel(); watchModel.setUserId(createdById); watchModel.setIssueId(issue.getId()); watchModel.setNotificationRole(NotificationUtilities.ROLE_IP); addIssueNotification(watchModel); } issue.setModel(model); issue.setProject(project); issue.setCreator(creator); // save issue.setCreateDate(new Timestamp(new Date().getTime())); issueFactory.save(issue); return issue.getModel(); } } catch (IssueException ie) { Logger.logInfo("Error while creating new issue: " + ie.getMessage()); } return null; } public IssueModel updateIssue(IssueModel model, Integer userId) throws DataException { try { String existingTargetVersion = null; IssueBean issue = issueFactory.findByPrimaryKey(model.getId()); UserBean user = userFactory.findByPrimaryKey(userId); if (issue.getProject().getStatus() != ProjectUtilities.STATUS_ACTIVE) { throw new IssueException("Project is not active."); } if (issue.getDescription() != null && model.getDescription() != null && !issue.getDescription().equalsIgnoreCase(model.getDescription())) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_DESCRIPTION_CHANGE); activity.setDescription(ITrackerResources.getString("itracker.web.generic.from") + ": " + issue.getDescription()); activity.setUser(user); activity.setIssue(issue); } if (issue.getResolution() != null && model.getResolution() != null && !issue.getResolution().equalsIgnoreCase(model.getResolution())) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_RESOLUTION_CHANGE); activity.setDescription(ITrackerResources.getString("itracker.web.generic.from") + ": " + issue.getResolution()); activity.setIssue(issue); activity.setUser(user); } if (issue.getStatus() != model.getStatus() && model.getStatus() != -1) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_STATUS_CHANGE); activity.setDescription(IssueUtilities.getStatusName(issue.getStatus()) + " " + ITrackerResources.getString("itracker.web.generic.to") + " " + IssueUtilities.getStatusName(model.getStatus())); activity.setIssue(issue); activity.setUser(user); } if (issue.getSeverity() != model.getSeverity() && model.getSeverity() != -1) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_SEVERITY_CHANGE); activity.setDescription(IssueUtilities.getSeverityName(issue.getSeverity()) + " " + ITrackerResources.getString("itracker.web.generic.to") + " " + IssueUtilities.getSeverityName(model.getSeverity())); activity.setIssue(issue); activity.setUser(user); } if (issue.getTargetVersion() != null && model.getTargetVersion() != null && !issue.getTargetVersion().getId().equals(model.getTargetVersionId())) { existingTargetVersion = issue.getTargetVersion().getNumber(); } issue.setModel(model); if (model.getTargetVersion() != null) { VersionBean version = VersionFactory.findByPrimaryKey(model.getTargetVersionId()); issue.setTargetVersion(version); IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_TARGETVERSION_CHANGE); String description = existingTargetVersion + " " + ITrackerResources.getString("itracker.web.generic.to") + " "; description += version.getNumber(); activity.setDescription(description); activity.setUser(user); activity.setIssue(issue); } else { issue.setTargetVersion(null); } // save issueFactory.saveOrUpdate(issue); return issue.getModel(); } catch (IssueException ie) { Logger.logInfo("Error while updating new issue: " + ie.getMessage()); } return null; } /** * * Moves an issues from its current project to a new project. * * * * @param issue * * an IssueModel of the issue to move * * @param projectId * * the id of the target project * * @param userId * * the id of the user that is moving the issue * * @return an IssueModel of the issue after it has been moved * * @throws DataException * */ public IssueModel moveIssue(IssueModel model, Integer projectId, Integer userId) throws DataException { if (model == null) { return null; } IssueBean issue = issueFactory.findByPrimaryKey(model.getId()); ProjectBean project = projectFactory.findByPrimaryKey(projectId); UserBean user = userFactory.findByPrimaryKey(userId); IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_ISSUE_MOVE); activity.setDescription(model.getProjectName() + " " + ITrackerResources.getString("itracker.web.generic.to") + " " + project.getName()); activity.setUser(user); activity.setIssue(issue); issue.setProject(project); // The versions and components are per project so we need to delete // these setIssueComponents(issue.getId(), new HashSet(), userId); setIssueVersions(issue.getId(), new HashSet(), userId); return issue.getModel(); } public boolean deleteIssue(IssueModel model) throws DataException { if (model != null) { IssueBean issue = issueFactory.findByPrimaryKey(model.getId()); issueFactory.delete(issue); return true; } return false; } /** * this should not exist. adding an history entry should be adding the history entry * to the domain object and saving the object... */ public boolean addIssueHistory(IssueHistoryModel model) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(model.getIssueId()); UserBean user = userFactory.findByPrimaryKey(model.getUserId()); IssueHistoryBean history = new IssueHistoryBean(); history.setModel(model); history.setIssue(issue); history.setUser(user); history.setCreateDate(new Timestamp(new Date().getTime())); issueFactory.saveOrUpdate(history); return true; } public boolean setIssueFields(Integer issueId, IssueFieldModel[] fields) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection issueFields = issue.getFields(); for (Iterator iter = issueFields.iterator(); iter.hasNext();) { // try { IssueFieldBean field = (IssueFieldBean) iter.next(); // iter.remove(); // field.remove(); // } catch(RemoveException re) { // Logger.logInfo("Unable to remove issue field value. Manual // database cleanup may be necessary."); // } } if (fields.length > 0) { for (int i = 0; i < fields.length; i++) { IssueFieldBean field = new IssueFieldBean(); CustomFieldBean customField = cfHome.findByPrimaryKey(fields[i].getCustomFieldId()); field.setModel(fields[i]); field.setCustomField(customField); field.setIssue(issue); field.setDateValue(new Timestamp(new Date().getTime())); issueFields.add(field); } } return true; } public boolean setIssueComponents(Integer issueId, HashSet componentIds, Integer userId) throws DataException { boolean wasChanged = false; StringBuffer changesBuf = new StringBuffer(); IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection components = issue.getComponents(); if (componentIds.isEmpty() && components != null && !components.isEmpty()) { wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.all") + " " + ITrackerResources.getString("itracker.web.generic.removed")); components.clear(); } else { for (Iterator iterator = components.iterator(); iterator.hasNext();) { ComponentBean component = (ComponentBean) iterator.next(); if (componentIds.contains(component.getId())) { componentIds.remove(component.getId()); } else { wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.removed") + ": " + component.getName() + "; "); iterator.remove(); } } for (Iterator iterator = componentIds.iterator(); iterator.hasNext();) { Integer componentId = (Integer) iterator.next(); ComponentBean component = componentFactory.findByPrimaryKey(componentId); wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.added") + ": " + component.getName() + "; "); components.add(component); } } if (wasChanged) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_COMPONENTS_MODIFIED); activity.setDescription(changesBuf.toString()); activity.setIssue(issue); // activity.setUser(); // userId); -> I think we need to set user here } return true; } public boolean setIssueVersions(Integer issueId, HashSet versionIds, Integer userId) throws DataException { boolean wasChanged = false; StringBuffer changesBuf = new StringBuffer(); IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection versions = issue.getVersions(); if (versionIds.isEmpty() && versions != null && !versions.isEmpty()) { wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.all") + " " + ITrackerResources.getString("itracker.web.generic.removed")); versions.clear(); } else { for (Iterator iterator = versions.iterator(); iterator.hasNext();) { VersionBean version = (VersionBean) iterator.next(); if (versionIds.contains(version.getId())) { versionIds.remove(version.getId()); } else { wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.removed") + ": " + version.getNumber() + "; "); iterator.remove(); } } for (Iterator iterator = versionIds.iterator(); iterator.hasNext();) { Integer versionId = (Integer) iterator.next(); VersionBean version = VersionFactory.findByPrimaryKey(versionId); wasChanged = true; changesBuf.append(ITrackerResources.getString("itracker.web.generic.added") + ": " + version.getNumber() + "; "); versions.add(version); } } if (wasChanged) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_VERSIONS_MODIFIED); activity.setDescription(changesBuf.toString()); activity.setIssue(issue); // need to set user here // userId); } return true; } public IssueRelationModel getIssueRelation(Integer relationId) throws DataException { IssueRelationBean issueRelation = issuerelationfactory.findByPrimaryKey(relationId); return issueRelation.getModel(); } public boolean addIssueRelation(Integer issueId, Integer relatedIssueId, int relationType, Integer userId) throws DataException { if (issueId != null && relatedIssueId != null) { int matchingRelationType = IssueUtilities.getMatchingRelationType(relationType); // if(matchingRelationType < 0) { // throw new CreateException("Unable to find matching relation type // for type: " + relationType); // } IssueBean issue = issueFactory.findByPrimaryKey(issueId); IssueBean relatedIssue = issueFactory.findByPrimaryKey(relatedIssueId); IssueRelationBean relationA = new IssueRelationBean(); relationA.setRelationType(relationType); // relationA.setMatchingRelationId(relationBId); relationA.setIssue(issue); relationA.setRelatedIssue(relatedIssue); relationA.setLastModifiedDate(new java.sql.Timestamp(new java.util.Date().getTime())); IssueRelationBean relationB = new IssueRelationBean(); relationB.setRelationType(matchingRelationType); // relationB.setMatchingRelationId(relationAId); relationB.setIssue(relatedIssue); relationB.setRelatedIssue(issue); relationB.setLastModifiedDate(new java.sql.Timestamp(new java.util.Date().getTime())); IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_RELATION_ADDED); activity.setDescription(ITrackerResources.getString("itracker.activity.relation.add")); // probably add this to description // new Object[] {IssueUtilities.getRelationName(relationType), // relatedIssueId }; activity.setIssue(issue); // need to set user here... userId); // need to save here activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_RELATION_ADDED); activity.setDescription(ITrackerResources.getString("itracker.activity.relation.add", new Object[] { IssueUtilities.getRelationName(matchingRelationType) })); activity.setIssue(relatedIssue); // net to save and set user here.. userId); return true; } return false; } public Integer removeIssueRelation(Integer relationId, Integer userId) { Integer issueId = new Integer(-1); try { IssueRelationBean issueRelation = issuerelationfactory.findByPrimaryKey(relationId); issueId = issueRelation.getIssue().getId(); Integer relatedIssueId = issueRelation.getRelatedIssue().getId(); Integer matchingRelationId = issueRelation.getMatchingRelationId(); if (matchingRelationId != null) { IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_RELATION_REMOVED); activity.setDescription(ITrackerResources.getString("itracker.activity.relation.removed", issueId .toString())); // need to fix the commented code and save // activity.setIssue(relatedIssueId); // activity.setUser(userId); // IssueRelationFactory.remove(matchingRelationId); } IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_RELATION_REMOVED); activity.setDescription(ITrackerResources.getString("itracker.activity.relation.removed", relatedIssueId .toString())); // activity.setIssue(issueId); // activity.setUser(userId); // irHome.remove(relationId); // need to save } catch (Exception e) { Logger.logDebug("Exception while removing issue relation.", e); } return issueId; } public boolean assignIssue(Integer issueId, Integer userId) throws DataException { return assignIssue(issueId, userId, userId); } public boolean assignIssue(Integer issueId, Integer userId, Integer assignedByUserId) throws DataException { if (userId.intValue() == -1) { return unassignIssue(issueId, assignedByUserId); } UserBean assignedByUser; IssueBean issue = issueFactory.findByPrimaryKey(issueId); UserBean user = userFactory.findByPrimaryKey(userId); if (assignedByUserId.equals(userId)) { assignedByUser = user; } else { assignedByUser = userFactory.findByPrimaryKey(assignedByUserId); } UserBean currOwner = issue.getOwner(); if (currOwner == null || !currOwner.getId().equals(user.getId())) { if (currOwner != null && !hasIssueNotification(issueId, currOwner.getId(), NotificationUtilities.ROLE_CONTRIBUTER)) { NotificationBean notification = new NotificationBean(); NotificationModel model = new NotificationModel(NotificationUtilities.ROLE_CONTRIBUTER); notification.setModel(model); notification.setIssue(issue); notification.setUser(currOwner); } IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_OWNER_CHANGE); activity.setDescription((currOwner == null ? "[" + ITrackerResources.getString("itracker.web.generic.unassigned") + "]" : currOwner.getLogin()) + " " + ITrackerResources.getString("itracker.web.generic.to") + " " + user.getLogin()); activity.setUser(assignedByUser); activity.setIssue(issue); issue.setOwner(user); if (issue.getStatus() < IssueUtilities.STATUS_ASSIGNED) { issue.setStatus(IssueUtilities.STATUS_ASSIGNED); } } return true; } public boolean unassignIssue(Integer issueId, Integer assignedByUserId) throws DataException { UserBean assignedByUser = userFactory.findByPrimaryKey(assignedByUserId); IssueBean issue = issueFactory.findByPrimaryKey(issueId); if (issue.getOwner() != null) { if (!hasIssueNotification(issueId, issue.getOwner().getId(), NotificationUtilities.ROLE_CONTRIBUTER)) { NotificationBean notification = new NotificationBean(); NotificationModel model = new NotificationModel(NotificationUtilities.ROLE_CONTRIBUTER); notification.setModel(model); notification.setIssue(issue); notification.setUser(issue.getOwner()); } IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_OWNER_CHANGE); activity.setDescription((issue.getOwner() == null ? "[" + ITrackerResources.getString("itracker.web.generic.unassigned") + "]" : issue.getOwner() .getLogin()) + " " + ITrackerResources.getString("itracker.web.generic.to") + " [" + ITrackerResources.getString("itracker.web.generic.unassigned") + "]"); activity.setUser(assignedByUser); activity.setIssue(issue); issue.setOwner(null); if (issue.getStatus() >= IssueUtilities.STATUS_ASSIGNED) { issue.setStatus(IssueUtilities.STATUS_UNASSIGNED); } } return true; } /* * public boolean addIssueActivity(IssueActivityModel model) throws * DataException { * * IssueBean issue = ifHome.findByPrimaryKey(model.getIssueId()); * * UserBean user = ufHome.findByPrimaryKey(model.getUserId()); * * //return addIssueActivity(model, issue, user); return * addIssueActivity(null, issue, user); } */ /* * public boolean addIssueActivity(IssueActivityModel model, IssueBean * issue) throws DataException { * * UserBean user = ufHome.findByPrimaryKey(model.getUserId()); * * return true;//addIssueActivity(model, issue, user); } */ /** * I think this entire method is useless - RJST * * @param model * @param issue * @param user * @return */ /* * public boolean addIssueActivity(IssueActivityBean model, IssueBean issue, * UserBean user) { * * IssueActivityBean activity = new IssueActivityBean(); * * //activity.setModel(model); * * activity.setIssue(issue); * * activity.setUser(user); * * return true; } */ public void updateIssueActivityNotification(Integer issueId, boolean notificationSent) { if (issueId == null) { return; } Collection activity = IssueActivityFactory.findByIssueId(issueId); for (Iterator iter = activity.iterator(); iter.hasNext();) { ((IssueActivityBean) iter.next()).setNotificationSent((notificationSent ? 1 : 0)); } } public boolean addIssueAttachment(IssueAttachmentModel model, byte[] data) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(model.getIssueId()); UserBean user = userFactory.findByPrimaryKey(model.getUserId()); IssueAttachmentBean attachment = new IssueAttachmentBean(); model.setFileName("attachment" + attachment.getId()); attachment.setModel(model); attachment.setFileData((data == null ? new byte[0] : data)); attachment.setIssue(issue); attachment.setUser(user); return true; } public boolean setIssueAttachmentData(Integer attachmentId, byte[] data) { if (attachmentId != null && data != null) { IssueAttachmentBean attachment = IssueAttachmentFactory.findByPrimaryKey(attachmentId); attachment.setFileData(data); return true; } return false; } public boolean setIssueAttachmentData(String fileName, byte[] data) { if (fileName != null && data != null) { IssueAttachmentBean attachment = IssueAttachmentFactory.findByFileName(fileName); attachment.setFileData(data); return true; } return false; } public boolean removeIssueAttachment(Integer attachmentId) { IssueAttachmentFactory.remove(attachmentId); return true; } public Integer removeIssueHistoryEntry(Integer entryId, Integer userId) throws DataException { IssueHistoryBean history = ihfHome.findByPrimaryKey(entryId); if (history != null) { history.setStatus(IssueUtilities.HISTORY_STATUS_REMOVED); history.setLastModifiedDate(new Timestamp(new Date().getTime())); IssueActivityBean activity = new IssueActivityBean(); activity.setType(IssueUtilities.ACTIVITY_REMOVE_HISTORY); activity.setDescription(ITrackerResources.getString("itracker.web.generic.entry") + " " + entryId + " " + ITrackerResources.getString("itracker.web.generic.removed") + "."); // need to fix this - RJST // activity.setIssue(history.getIssue().getId()); // activity.setUser(userId); return history.getIssue().getId(); } return new Integer(-1); } public ProjectModel getIssueProject(Integer issueId) throws DataException { IssueBean issue = issueFactory.findByPrimaryKey(issueId); ProjectBean project = issue.getProject(); return (project != null ? project.getModel() : null); } public HashSet getIssueComponentIds(Integer issueId) throws DataException { HashSet componentIds = new HashSet(); IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection components = issue.getComponents(); for (Iterator iterator = components.iterator(); iterator.hasNext();) { componentIds.add(((ComponentBean) iterator.next()).getId()); } return componentIds; } public HashSet getIssueVersionIds(Integer issueId) throws DataException { HashSet versionIds = new HashSet(); IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection versions = issue.getVersions(); for (Iterator iterator = versions.iterator(); iterator.hasNext();) { versionIds.add(((VersionBean) iterator.next()).getId()); } return versionIds; } public IssueActivityBean[] getIssueActivity(Integer issueId) { int i = 0; IssueActivityBean[] activityArray = new IssueActivityBean[0]; Collection activity = IssueActivityFactory.findByIssueId(issueId); activityArray = new IssueActivityBean[activity.size()]; for (Iterator iterator = activity.iterator(); iterator.hasNext(); i++) { activityArray[i] = ((IssueActivityBean) iterator.next());// .getModel(); } return activityArray; } public IssueActivityBean[] getIssueActivity(Integer issueId, boolean notificationSent) { int i = 0; IssueActivityBean[] activityArray = new IssueActivityBean[0]; Collection activity = IssueActivityFactory.findByIssueIdAndNotification(issueId, (notificationSent ? 1 : 0)); activityArray = new IssueActivityBean[activity.size()]; for (Iterator iterator = activity.iterator(); iterator.hasNext(); i++) { activityArray[i] = ((IssueActivityBean) iterator.next());// .getModel(); } return activityArray; } public IssueAttachmentModel[] getAllIssueAttachments() { int i = 0; IssueAttachmentModel[] attachmentArray = new IssueAttachmentModel[0]; Collection attachments = IssueAttachmentFactory.findAll(); attachmentArray = new IssueAttachmentModel[attachments.size()]; for (Iterator iterator = attachments.iterator(); iterator.hasNext(); i++) { attachmentArray[i] = ((IssueAttachmentBean) iterator.next()).getModel(); } return attachmentArray; } public long[] getAllIssueAttachmentsSizeAndCount() { long[] sizeAndCount = new long[2]; int i = 0; Collection attachments = IssueAttachmentFactory.findAll(); sizeAndCount[1] = attachments.size(); for (Iterator iterator = attachments.iterator(); iterator.hasNext(); i++) { sizeAndCount[0] += ((IssueAttachmentBean) iterator.next()).getSize(); } return sizeAndCount; } public IssueAttachmentModel getIssueAttachment(Integer attachmentId) { IssueAttachmentModel attachmentModel = null; IssueAttachmentBean attachment = IssueAttachmentFactory.findByPrimaryKey(attachmentId); attachmentModel = attachment.getModel(); return attachmentModel; } public byte[] getIssueAttachmentData(Integer attachmentId) { byte[] data = new byte[0]; IssueAttachmentBean attachment = IssueAttachmentFactory.findByPrimaryKey(attachmentId); data = attachment.getFileData(); return data; } public int getIssueAttachmentCount(Integer issueId) throws DataException { int i = 0; IssueBean issue = issueFactory.findByPrimaryKey(issueId); Collection attachments = issue.getAttachments(); i = attachments.size(); return i; } /** * * Returns the latest issue history entry for a particular issue. * * * * @param issueId * * the id of the issue to return the history entry for. * * @return the latest IssueHistoryModel, or null if no entries could be * * found * * @throws DataException * */ public IssueHistoryModel getLastIssueHistory(Integer issueId) throws DataException { IssueHistoryModel model = null; IssueHistoryBean lastEntry = null; Collection history = ihfHome.findByIssueId(issueId); Iterator iterator = history.iterator(); while (iterator.hasNext()) { IssueHistoryBean nextEntry = (IssueHistoryBean) iterator.next(); if (nextEntry != null) { if (lastEntry == null && nextEntry.getLastModifiedDate() != null) { lastEntry = nextEntry; } else if (nextEntry.getLastModifiedDate() != null && nextEntry.getLastModifiedDate().equals(lastEntry.getLastModifiedDate()) && nextEntry.getId().compareTo(lastEntry.getId()) > 0) { lastEntry = nextEntry; } else if (nextEntry.getLastModifiedDate() != null && nextEntry.getLastModifiedDate().after(lastEntry.getLastModifiedDate())) { lastEntry = nextEntry; } } } if (lastEntry != null) { model = lastEntry.getModel(); } return model; } /** * * Retrieves the primary issue notifications. Primary notifications are * * defined as the issue owner (or creator if not assigned), and any project * * owners. This should encompass the list of people that should be notified * * so that action can be taken on an issue that needs immediate attention. * * * * @param issueId * * the id of the issue to find notifications for * * @throws DataException * * @returns an array of NotificationModels * */ public NotificationModel[] getPrimaryIssueNotifications(Integer issueId) throws DataException { return getIssueNotifications(issueId, true, false); } /** * * Retrieves all notifications for an issue where the notification's user is * * also active. * * * * @param issueId * * the id of the issue to find notifications for * * @throws DataException * * @returns an array of NotificationModels * */ public NotificationModel[] getIssueNotifications(Integer issueId) throws DataException { return getIssueNotifications(issueId, false, true); } /** * * Retrieves an array of issue notifications. The notifications by default * * is the creator and owner of the issue, all project admins for the issue's * * project, and anyone else that has a notfication on file. * * * * @param issueId * * the id of the issue to find notifications for * * @param pimaryOnly * * only include the primary notifications * * @param activeOnly * * only include the notification if the user is currently active * * (not locked or deleted) * * @throws DataException * * @returns an array of NotificationModels * * @see IssueHandlerBean#getPrimaryIssueNotifications * */ public NotificationModel[] getIssueNotifications(Integer issueId, boolean primaryOnly, boolean activeOnly) throws DataException { NotificationModel[] notificationArray = new NotificationModel[0]; Vector notificationVector = new Vector(); IssueBean issue = null; if (!primaryOnly) { Collection notifications = notificationFactory.findByIssueId(issueId); for (Iterator iterator = notifications.iterator(); iterator.hasNext();) { NotificationBean notification = (NotificationBean) iterator.next(); UserBean notificationUser = notification.getUser(); if (!activeOnly || notificationUser.getStatus() == UserUtilities.STATUS_ACTIVE) { notificationVector.add(notification.getModel()); } } } // Now add in other notifications like owner, creator, project owners, // etc... boolean hasOwner = false; issue = issueFactory.findByPrimaryKey(issueId); if (issue.getOwner() != null) { UserModel ownerModel = issue.getOwner().getModel(); if (ownerModel != null && (!activeOnly || ownerModel.getStatus() == UserUtilities.STATUS_ACTIVE)) { notificationVector.add(new NotificationModel(ownerModel, issueId, NotificationUtilities.ROLE_OWNER)); hasOwner = true; } } if (!primaryOnly || !hasOwner) { UserModel creatorModel = issue.getCreator().getModel(); if (creatorModel != null && (!activeOnly || creatorModel.getStatus() == UserUtilities.STATUS_ACTIVE)) { notificationVector .add(new NotificationModel(creatorModel, issueId, NotificationUtilities.ROLE_CREATOR)); } } if (issue != null) { ProjectBean project = projectFactory.findByPrimaryKey(issue.getProject().getId()); Collection projectOwners = project.getOwners(); for (Iterator iterator = projectOwners.iterator(); iterator.hasNext();) { UserBean projectOwner = (UserBean) iterator.next(); if (projectOwner != null && (!activeOnly || projectOwner.getStatus() == UserUtilities.STATUS_ACTIVE)) { notificationVector.add(new NotificationModel(projectOwner.getModel(), issueId, NotificationUtilities.ROLE_PO)); } } } notificationArray = new NotificationModel[notificationVector.size()]; notificationVector.copyInto(notificationArray); return notificationArray; } public boolean addIssueNotification(NotificationModel model) throws DataException { if (model != null) { UserBean user = userFactory.findByPrimaryKey(model.getUserId()); IssueBean issue = issueFactory.findByPrimaryKey(model.getIssueId()); NotificationBean notification = new NotificationBean(); notification.setModel(model); notification.setIssue(issue); notification.setUser(user); return true; } return false; } public boolean hasIssueNotification(Integer issueId, Integer userId) throws DataException { return hasIssueNotification(issueId, userId, NotificationUtilities.ROLE_ANY); } public boolean hasIssueNotification(Integer issueId, Integer userId, int role) throws DataException { if (issueId != null && userId != null) { NotificationModel[] notifications = getIssueNotifications(issueId, false, false); for (int i = 0; i < notifications.length; i++) { if (role == NotificationUtilities.ROLE_ANY || notifications[i].getNotificationRole() == role) { if (notifications[i].getUserId().equals(userId)) { return true; } } } } return false; } public int getOpenIssueCountByProjectId(Integer projectId) { Collection issues = issueFactory.findByProjectIdAndLowerStatus(projectId, IssueUtilities.STATUS_RESOLVED); return issues.size(); } public int getResolvedIssueCountByProjectId(Integer projectId) { Collection issues = issueFactory.findByProjectIdAndHigherStatus(projectId, IssueUtilities.STATUS_RESOLVED); return issues.size(); } public int getTotalIssueCountByProjectId(Integer projectId) { Collection issues = issueFactory.findByProjectId(projectId); return issues.size(); } public Date getLatestIssueDateByProjectId(Integer projectId) { return issueFactory.latestModificationDate(projectId); } public void sendNotification(Integer issueId, int type, String baseURL) { sendNotification(issueId, type, baseURL, null, null); } public void sendNotification(Integer issueId, int type, String baseURL, HashSet addresses, Integer lastModifiedDays) { // notifications are disabled for now /* * try { * * QueueConnectionFactory factory = (QueueConnectionFactory) * ic.lookup("java:comp/env/" + notificationFactoryName); * * Queue notificationQueue = (Queue) ic.lookup("java:comp/env/" + * notificationQueueName); QueueConnection connect = * factory.createQueueConnection(); QueueSession session = * connect.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); * QueueSender sender = session.createSender(notificationQueue); * MapMessage message = session.createMapMessage(); * message.setInt("issueId", issueId.intValue()); message.setInt("type", * type); message.setObject("lastModifiedDays", (lastModifiedDays == * null ? new Integer(-1) : lastModifiedDays)); * * if (systemBaseURL != null && !systemBaseURL.equals("")) { * * message.setString("baseURL", systemBaseURL); } else if (baseURL != * null) { * * message.setString("baseURL", baseURL); } * * if (addresses != null) { * * try { * * ByteArrayOutputStream baos = new ByteArrayOutputStream(); * * ObjectOutputStream oos = new ObjectOutputStream(baos); * * oos.writeObject(addresses); * * message.setObject("addresses", baos.toByteArray()); } catch * (Exception e) { * * Logger.logDebug("Unable to write address list for notification: " + * e.getMessage()); } } * * sender.send(message); } catch (NamingException ne) { * * Logger.logError("Error looking up ConnectionFactory/Queue " + * notificationFactoryName + "/" + notificationQueueName + ".", ne); } * catch (JMSException jmse) { * * Logger.logWarn("Error sending notification message", jmse); } */ } public boolean canViewIssue(Integer issueId, UserModel user) throws DataException { IssueModel issue = getIssue(issueId); HashMap permissions = userFactory.getUserPermissions(user, AuthenticationConstants.REQ_SOURCE_WEB); return IssueUtilities.canViewIssue(issue, user.getId(), permissions); } public boolean canViewIssue(IssueModel issue, UserModel user) { HashMap permissions = userFactory.getUserPermissions(user, AuthenticationConstants.REQ_SOURCE_WEB); return IssueUtilities.canViewIssue(issue, user.getId(), permissions); } public UserFactory getUserFactory() { return userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public NotificationFactory getNotificationFactory() { return notificationFactory; } public void setNotificationFactory(NotificationFactory nfHome) { this.notificationFactory = nfHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } } \ 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.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Vector; import cowsultants.itracker.ejb.beans... [truncated message content] |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 14:45:48
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28497/themes/standardtheme Modified Files: Tag: itrackerhibernate view_issue_activity.jsp Log Message: fixed issue activity (wasn't mapped in hibernate) Index: view_issue_activity.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/view_issue_activity.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** view_issue_activity.jsp 31 Oct 2005 10:21:40 -0000 1.1.2.2 --- view_issue_activity.jsp 1 Nov 2005 14:45:40 -0000 1.1.2.3 *************** *** 60,64 **** <% ! Arrays.sort(activity, new IssueActivityModel()); for(int i = 0; i < activity.length; i++) { --- 60,67 ---- <% ! // TODO: we need a comparation strategy, we don't have one now... ! // probably will be done on the action ! //Arrays.sort(activity, new IssueActivityModel()); ! //Arrays.sort(activity); for(int i = 0; i < activity.length; i++) { |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 14:45:48
|
Update of /cvsroot/itracker/itracker/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28497/WEB-INF Modified Files: Tag: itrackerhibernate applicationContext.xml Log Message: fixed issue activity (wasn't mapped in hibernate) Index: applicationContext.xml =================================================================== RCS file: /cvsroot/itracker/itracker/web/WEB-INF/Attic/applicationContext.xml,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** applicationContext.xml 30 Oct 2005 17:01:42 -0000 1.1.2.7 --- applicationContext.xml 1 Nov 2005 14:45:40 -0000 1.1.2.8 *************** *** 108,112 **** </property> </bean> ! <!-- A proxy to the entity factory, after the Hibernate interceptor is applied --> <!-- Application code uses this object --> --- 108,120 ---- </property> </bean> ! ! <!-- The workflow script factory --> ! <bean id="issueActivityFactoryTarget" class="cowsultants.itracker.ejb.beans.session.IssueActivityFactoryImpl"> ! <property name="sessionFactory"> ! <ref bean="sessionFactory"/> ! </property> ! <constructor-arg ref="issueFactory"/> ! </bean> ! <!-- A proxy to the entity factory, after the Hibernate interceptor is applied --> <!-- Application code uses this object --> *************** *** 388,392 **** </property> </bean> ! <!-- Datasource configuration --> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> --- 396,420 ---- </property> </bean> ! ! <!-- A proxy to the workflow script factory, after the Hibernate interceptor is applied --> ! <!-- Application code uses this object --> ! <bean id="issueActivityFactory" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> ! <property name="transactionManager" ref="transactionManager"/> ! <property name="transactionAttributes"> ! <props> ! <prop key="*">PROPAGATION_REQUIRED</prop> ! </props> ! </property> ! <property name="target" ref="issueActivityFactoryTarget"/> ! <property name="proxyInterfaces"> ! <value>cowsultants.itracker.ejb.beans.session.IssueActivityFactory</value> ! </property> ! <property name="postInterceptors"> ! <list> ! <ref bean="myHibernateInterceptor"/> ! </list> ! </property> ! </bean> ! <!-- Datasource configuration --> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> *************** *** 428,431 **** --- 456,460 ---- <value>/cowsultants/itracker/ejb/beans/entity/issuerelationbean.hbm.xml</value> <value>/cowsultants/itracker/ejb/beans/entity/notificationbean.hbm.xml</value> + <value>/cowsultants/itracker/ejb/beans/entity/issueactivitybean.hbm.xml</value> </list> </property> |
|
From: Marky G. <mar...@us...> - 2005-11-01 12:51:11
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19314/src/cowsultants/itracker/ejb/test Modified Files: Tag: itrackerhibernate TestApplicationProperties.java Log Message: removing unused imports Index: TestApplicationProperties.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/test/TestApplicationProperties.java,v retrieving revision 1.8.4.3 retrieving revision 1.8.4.4 diff -C2 -d -r1.8.4.3 -r1.8.4.4 *** TestApplicationProperties.java 30 Oct 2005 16:44:29 -0000 1.8.4.3 --- TestApplicationProperties.java 1 Nov 2005 12:51:02 -0000 1.8.4.4 *************** *** 26,30 **** import junit.framework.TestCase; import junit.framework.TestSuite; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; --- 26,29 ---- |
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19314/src/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate ExportAttachmentsAction.java InitializeLanguagesAction.java RemoveConfigurationItemAction.java ExportLanguageAction.java OrderConfigurationItemAction.java RemoveIssueAttachmentAction.java RemoveCustomFieldValueAction.java AddIssueRelationAction.java RemoveCustomFieldAction.java RemoveHistoryEntryAction.java EditWorkflowScriptFormAction.java ForgotPasswordAction.java AssignIssueAction.java EditWorkflowScriptAction.java LockUserAction.java EditUserFormAction.java OrderCustomFieldValueAction.java Log Message: removing unused imports Index: ExportAttachmentsAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ExportAttachmentsAction.java,v retrieving revision 1.6.4.4 retrieving revision 1.6.4.5 diff -C2 -d -r1.6.4.4 -r1.6.4.5 *** ExportAttachmentsAction.java 30 Oct 2005 16:38:23 -0000 1.6.4.4 --- ExportAttachmentsAction.java 1 Nov 2005 12:51:01 -0000 1.6.4.5 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import java.io.IOException; import java.util.zip.ZipEntry; --- 19,22 ---- Index: RemoveIssueAttachmentAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveIssueAttachmentAction.java,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -C2 -d -r1.7.4.4 -r1.7.4.5 *** RemoveIssueAttachmentAction.java 30 Oct 2005 16:35:45 -0000 1.7.4.4 --- RemoveIssueAttachmentAction.java 1 Nov 2005 12:51:02 -0000 1.7.4.5 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import java.io.File; import java.io.IOException; --- 19,22 ---- *************** *** 32,36 **** 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.SystemConfiguration; --- 31,34 ---- Index: RemoveHistoryEntryAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveHistoryEntryAction.java,v retrieving revision 1.6.4.4 retrieving revision 1.6.4.5 diff -C2 -d -r1.6.4.4 -r1.6.4.5 *** RemoveHistoryEntryAction.java 30 Oct 2005 16:35:45 -0000 1.6.4.4 --- RemoveHistoryEntryAction.java 1 Nov 2005 12:51:02 -0000 1.6.4.5 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import java.io.IOException; import javax.servlet.ServletException; --- 19,22 ---- Index: AddIssueRelationAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/AddIssueRelationAction.java,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** AddIssueRelationAction.java 29 Oct 2005 16:45:23 -0000 1.4.4.5 --- AddIssueRelationAction.java 1 Nov 2005 12:51:02 -0000 1.4.4.6 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import java.io.IOException; import java.util.HashMap; --- 19,22 ---- Index: ForgotPasswordAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ForgotPasswordAction.java,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** ForgotPasswordAction.java 30 Oct 2005 16:38:23 -0000 1.9.4.4 --- ForgotPasswordAction.java 1 Nov 2005 12:51:02 -0000 1.9.4.5 *************** *** 32,37 **** import org.apache.struts.action.ActionMapping; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; - import cowsultants.itracker.ejb.beans.session.UserHandlerBean; import cowsultants.itracker.ejb.client.exceptions.PasswordException; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; --- 32,35 ---- Index: LockUserAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/LockUserAction.java,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** LockUserAction.java 30 Oct 2005 16:35:59 -0000 1.5.4.4 --- LockUserAction.java 1 Nov 2005 12:51:02 -0000 1.5.4.5 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.UserHandlerBean; import java.io.IOException; --- 19,22 ---- Index: RemoveCustomFieldAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveCustomFieldAction.java,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** RemoveCustomFieldAction.java 30 Oct 2005 16:35:45 -0000 1.4.4.5 --- RemoveCustomFieldAction.java 1 Nov 2005 12:51:02 -0000 1.4.4.6 *************** *** 32,36 **** 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; --- 32,35 ---- Index: OrderCustomFieldValueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/OrderCustomFieldValueAction.java,v retrieving revision 1.6.4.5 retrieving revision 1.6.4.6 diff -C2 -d -r1.6.4.5 -r1.6.4.6 *** OrderCustomFieldValueAction.java 30 Oct 2005 16:35:45 -0000 1.6.4.5 --- OrderCustomFieldValueAction.java 1 Nov 2005 12:51:02 -0000 1.6.4.6 *************** *** 32,36 **** 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; --- 32,35 ---- Index: RemoveConfigurationItemAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveConfigurationItemAction.java,v retrieving revision 1.8.4.5 retrieving revision 1.8.4.6 diff -C2 -d -r1.8.4.5 -r1.8.4.6 *** RemoveConfigurationItemAction.java 30 Oct 2005 16:35:45 -0000 1.8.4.5 --- RemoveConfigurationItemAction.java 1 Nov 2005 12:51:01 -0000 1.8.4.6 *************** *** 19,23 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import java.io.IOException; --- 19,22 ---- *************** *** 35,39 **** import cowsultants.itracker.ejb.beans.entity.IssueActivityBean; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; import cowsultants.itracker.ejb.client.interfaces.IssueHandler; --- 34,37 ---- Index: ExportLanguageAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/ExportLanguageAction.java,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** ExportLanguageAction.java 30 Oct 2005 16:38:23 -0000 1.9.4.4 --- ExportLanguageAction.java 1 Nov 2005 12:51:01 -0000 1.9.4.5 *************** *** 33,37 **** import org.apache.struts.action.ActionMapping; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.NameValuePairModel; --- 33,36 ---- Index: AssignIssueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/AssignIssueAction.java,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** AssignIssueAction.java 29 Oct 2005 16:47:32 -0000 1.5.4.4 --- AssignIssueAction.java 1 Nov 2005 12:51:02 -0000 1.5.4.5 *************** *** 19,24 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; - import cowsultants.itracker.ejb.beans.session.ProjectHandlerBean; import java.io.IOException; import java.util.HashMap; --- 19,22 ---- Index: EditUserFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditUserFormAction.java,v retrieving revision 1.10.4.4 retrieving revision 1.10.4.5 diff -C2 -d -r1.10.4.4 -r1.10.4.5 *** EditUserFormAction.java 29 Oct 2005 18:10:24 -0000 1.10.4.4 --- EditUserFormAction.java 1 Nov 2005 12:51:02 -0000 1.10.4.5 *************** *** 33,37 **** import org.apache.struts.action.ActionMapping; - import cowsultants.itracker.ejb.beans.session.UserHandlerBean; import cowsultants.itracker.ejb.client.interfaces.UserHandler; import cowsultants.itracker.ejb.client.models.PermissionModel; --- 33,36 ---- Index: InitializeLanguagesAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/InitializeLanguagesAction.java,v retrieving revision 1.6.4.4 retrieving revision 1.6.4.5 diff -C2 -d -r1.6.4.4 -r1.6.4.5 *** InitializeLanguagesAction.java 30 Oct 2005 16:38:23 -0000 1.6.4.4 --- InitializeLanguagesAction.java 1 Nov 2005 12:51:01 -0000 1.6.4.5 *************** *** 31,35 **** import org.apache.struts.action.ActionMapping; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.util.Logger; --- 31,34 ---- Index: EditWorkflowScriptAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditWorkflowScriptAction.java,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** EditWorkflowScriptAction.java 29 Oct 2005 18:10:24 -0000 1.5.4.4 --- EditWorkflowScriptAction.java 1 Nov 2005 12:51:02 -0000 1.5.4.5 *************** *** 36,40 **** import bsh.ParseException; import bsh.Parser; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; import cowsultants.itracker.ejb.client.models.WorkflowScriptModel; --- 36,39 ---- Index: OrderConfigurationItemAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/OrderConfigurationItemAction.java,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -C2 -d -r1.7.4.4 -r1.7.4.5 *** OrderConfigurationItemAction.java 30 Oct 2005 16:35:45 -0000 1.7.4.4 --- OrderConfigurationItemAction.java 1 Nov 2005 12:51:02 -0000 1.7.4.5 *************** *** 32,36 **** 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; --- 32,35 ---- Index: EditWorkflowScriptFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditWorkflowScriptFormAction.java,v retrieving revision 1.6.4.6 retrieving revision 1.6.4.7 diff -C2 -d -r1.6.4.6 -r1.6.4.7 *** EditWorkflowScriptFormAction.java 30 Oct 2005 18:34:50 -0000 1.6.4.6 --- EditWorkflowScriptFormAction.java 1 Nov 2005 12:51:02 -0000 1.6.4.7 *************** *** 34,38 **** import org.apache.struts.validator.DynaValidatorForm; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.exceptions.SystemConfigurationException; import cowsultants.itracker.ejb.client.interfaces.SystemConfiguration; --- 34,37 ---- Index: RemoveCustomFieldValueAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/RemoveCustomFieldValueAction.java,v retrieving revision 1.5.4.4 retrieving revision 1.5.4.5 diff -C2 -d -r1.5.4.4 -r1.5.4.5 *** RemoveCustomFieldValueAction.java 30 Oct 2005 16:35:45 -0000 1.5.4.4 --- RemoveCustomFieldValueAction.java 1 Nov 2005 12:51:02 -0000 1.5.4.5 *************** *** 33,37 **** 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; --- 33,36 ---- |
|
From: Marky G. <mar...@us...> - 2005-11-01 12:51:11
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19314/web/themes/standardtheme Modified Files: Tag: itrackerhibernate relate_issue.jsp Log Message: removing unused imports Index: relate_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/relate_issue.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** relate_issue.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- relate_issue.jsp 1 Nov 2005 12:51:02 -0000 1.1.2.2 *************** *** 11,18 **** <%@ page import="cowsultants.itracker.ejb.client.util.IssueUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.util.UserUtilities" %> - <%@ page import="cowsultants.itracker.ejb.client.interfaces.IssueHandlerHome" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.IssueHandler" %> - <it:checkLogin/> <%@ include file="/themes/standardtheme/includes/page_init.jsp" %> --- 11,16 ---- |
|
From: Marky G. <mar...@us...> - 2005-11-01 12:40:01
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16858/src/cowsultants/itracker/core Modified Files: Tag: itrackerhibernate ApplicationInitialization.java Log Message: remove unused import Index: ApplicationInitialization.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/core/Attic/ApplicationInitialization.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ApplicationInitialization.java 29 Oct 2005 16:47:04 -0000 1.1.2.2 --- ApplicationInitialization.java 1 Nov 2005 12:39:50 -0000 1.1.2.3 *************** *** 37,41 **** import cowsultants.itracker.ejb.beans.session.NoSuchEntityException; import cowsultants.itracker.ejb.beans.session.ReportHandlerBean; - import cowsultants.itracker.ejb.beans.session.SystemConfigurationBean; import cowsultants.itracker.ejb.client.exceptions.PasswordException; import cowsultants.itracker.ejb.client.exceptions.UserException; --- 37,40 ---- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 00:52:09
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16793/src/cowsultants/itracker/web/forms Modified Files: Tag: itrackerhibernate UserForm.java Log Message: had changed to wrong superclass by mistake. reverted Index: UserForm.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/forms/UserForm.java,v retrieving revision 1.15.4.4 retrieving revision 1.15.4.5 diff -C2 -d -r1.15.4.4 -r1.15.4.5 *** UserForm.java 30 Oct 2005 16:09:18 -0000 1.15.4.4 --- UserForm.java 1 Nov 2005 00:52:01 -0000 1.15.4.5 *************** *** 26,31 **** import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; ! public class UserForm extends ITrackerForm { /** --- 26,32 ---- import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionMapping; + import org.apache.struts.validator.ValidatorForm; ! public class UserForm extends ValidatorForm { /** |
|
From: Ricardo T. <rj...@us...> - 2005-10-31 10:55:47
|
Update of /cvsroot/itracker/itracker/conf/jboss/merge In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14409 Removed Files: Tag: itrackerhibernate jbosscmp-jdbc-defaults.xml Log Message: no longer used, because of CMP removal --- jbosscmp-jdbc-defaults.xml DELETED --- |
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11129/standardtheme/admin Modified Files: Tag: itrackerhibernate create_language_key.jsp edit_configuration.jsp edit_customfield.jsp edit_customfieldvalue.jsp edit_project.jsp edit_user.jsp index.jsp list_attachments.jsp list_configuration.jsp list_languages.jsp list_projects.jsp list_users.jsp list_workflow.jsp Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring formatting removed unused imports Index: list_projects.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_projects.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_projects.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_projects.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,15 **** <%@ page import="java.util.Arrays" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <it:checkLogin permission="<%= UserUtilities.PERMISSION_PRODUCT_ADMIN %>"/> --- 6,12 ---- *************** *** 41,45 **** <% ! ProjectHandler ph = new ProjectHandlerBean(); ProjectModel[] projects = ph.getAllProjects(); --- 38,42 ---- <% ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ProjectModel[] projects = ph.getAllProjects(); Index: list_users.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_users.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_users.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_users.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,11 **** <%@ page import="java.util.*" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.web.util.SessionManager" %> <%@ page import="cowsultants.itracker.ejb.client.util.UserUtilities" %> --- 6,9 ---- *************** *** 33,37 **** <% ! UserHandler uh = new UserHandlerBean(); %> --- 31,35 ---- <% ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); %> Index: edit_project.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_project.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** edit_project.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- edit_project.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,11 **** <%@ page import="java.util.*" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.beans.session.ProjectHandlerBean" %> <%@ page import="cowsultants.itracker.ejb.beans.session.UserHandlerBean" %> --- 6,9 ---- *************** *** 19,25 **** <% ! ProjectHandler ph = new ProjectHandlerBean(); ! UserHandler uh = new UserHandlerBean(); ! boolean allowPermissionUpdate = uh.allowPermissionUpdates(null, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); --- 17,23 ---- <% ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); ! boolean allowPermissionUpdate = uh.allowPermissionUpdates(null, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); Index: edit_customfieldvalue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_customfieldvalue.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** edit_customfieldvalue.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- edit_customfieldvalue.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,10 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> --- 5,8 ---- *************** *** 51,55 **** <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); --- 49,53 ---- <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); HashMap languages = sc.getAvailableLanguages(); Index: edit_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_configuration.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** edit_configuration.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- edit_configuration.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 49,53 **** <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); --- 49,53 ---- <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); HashMap languages = sc.getAvailableLanguages(); Index: edit_customfield.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_customfield.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** edit_customfield.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- edit_customfield.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,11 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> - <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> --- 5,8 ---- *************** *** 54,58 **** <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); --- 51,55 ---- <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); HashMap languages = sc.getAvailableLanguages(); Index: list_configuration.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_configuration.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_configuration.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_configuration.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,19 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ 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.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <it:checkLogin permission="<%= UserUtilities.PERMISSION_USER_ADMIN %>"/> <% ! SystemConfiguration sc = new SystemConfigurationBean(); ConfigurationModel[] resolutions = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION); --- 5,16 ---- <%@ taglib uri="/struts-logic.tld" prefix="logic" %> <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> <it:checkLogin permission="<%= UserUtilities.PERMISSION_USER_ADMIN %>"/> <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); ConfigurationModel[] resolutions = sc.getConfigurationItemsByType(SystemConfigurationUtilities.TYPE_RESOLUTION); Index: list_workflow.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_workflow.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_workflow.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_workflow.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,10 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> --- 5,8 ---- *************** *** 50,54 **** <% ! SystemConfiguration sc = new SystemConfigurationBean(); WorkflowScriptModel[] workflowScripts = sc.getWorkflowScripts(); --- 48,52 ---- <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); WorkflowScriptModel[] workflowScripts = sc.getWorkflowScripts(); Index: list_languages.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_languages.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_languages.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_languages.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,10 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> --- 5,8 ---- *************** *** 22,26 **** <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); --- 20,24 ---- <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); HashMap languages = sc.getAvailableLanguages(); Index: list_attachments.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/list_attachments.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_attachments.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_attachments.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,15 **** <%@ page import="java.util.Arrays" %> - <%@ 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.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <it:checkLogin permission="<%= UserUtilities.PERMISSION_USER_ADMIN %>"/> --- 6,11 ---- *************** *** 37,41 **** <% ! IssueHandler ih = new IssueHandlerBean(); IssueAttachmentModel[] attachments = ih.getAllIssueAttachments(); --- 33,37 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); IssueAttachmentModel[] attachments = ih.getAllIssueAttachments(); Index: create_language_key.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/create_language_key.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** create_language_key.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- create_language_key.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,10 **** <%@ taglib uri="/struts-logic.tld" prefix="logic" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.beans.session.SystemConfigurationBean" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> --- 5,8 ---- *************** *** 24,28 **** <table border="0" cellspacing="0" cellspacing="1" width="100%"align="left"> <% ! SystemConfiguration sc = new SystemConfigurationBean(); HashMap languages = sc.getAvailableLanguages(); --- 22,26 ---- <table border="0" cellspacing="0" cellspacing="1" width="100%"align="left"> <% ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); HashMap languages = sc.getAvailableLanguages(); Index: edit_user.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_user.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** edit_user.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- edit_user.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,11 **** <%@ page import="java.util.Arrays" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.UserUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> --- 6,9 ---- *************** *** 23,28 **** <% } else { ! UserHandler uh = new UserHandlerBean(); ! ProjectHandler ph = new ProjectHandlerBean(); boolean isUpdate = false; --- 21,26 ---- <% } else { ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); boolean isUpdate = false; Index: index.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/index.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** index.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- index.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 6,13 **** <%@ 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.resources.*" %> <%@ page import="cowsultants.itracker.web.scheduler.*" %> <%@ page import="cowsultants.itracker.web.util.SessionManager" %> --- 6,10 ---- *************** *** 16,41 **** <% ! //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(); ! ! //Object rhRef = ic.lookup("java:comp/env/" + ReportHandler.JNDI_NAME); ! //ReportHandlerHome rhHome = (ReportHandlerHome) PortableRemoteObject.narrow(rhRef, ReportHandlerHome.class); ReportHandler rh = new ReportHandlerBean(); ! ! //Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! //SystemConfigurationHome scHome = (SystemConfigurationHome) PortableRemoteObject.narrow(scRef, SystemConfigurationHome.class); ! SystemConfiguration sc = new SystemConfigurationBean(); ! ! //Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); ! //UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); ! UserHandler uh = new UserHandlerBean(); ! %> --- 13,21 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ReportHandler rh = new ReportHandlerBean(); ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); %> |
|
From: Ricardo T. <rj...@us...> - 2005-10-31 10:35:09
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11129/standardtheme/help Modified Files: Tag: itrackerhibernate help_about.jsp Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring formatting removed unused imports Index: help_about.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/help/Attic/help_about.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** help_about.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- help_about.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 5,20 **** <%@ 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.*" %> --- 5,11 ---- *************** *** 26,30 **** ! SystemConfiguration sc = new SystemConfigurationBean(); versionNumber = sc.getProperty("version", "Unknown"); --- 17,21 ---- ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); versionNumber = sc.getProperty("version", "Unknown"); |
|
From: Ricardo T. <rj...@us...> - 2005-10-31 10:35:09
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11129/standardtheme/includes Modified Files: Tag: itrackerhibernate header.jsp Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring formatting removed unused imports Index: header.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/includes/Attic/header.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** header.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- header.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 *************** *** 20,24 **** ! SystemConfiguration headerSC = new SystemConfigurationBean(); allowForgotPassword = headerSC.getBooleanProperty("allow_forgot_password", true); --- 20,24 ---- ! SystemConfiguration headerSC = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); allowForgotPassword = headerSC.getBooleanProperty("allow_forgot_password", true); |
|
From: Ricardo T. <rj...@us...> - 2005-10-31 10:21:51
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8299/standardtheme Modified Files: Tag: itrackerhibernate view_issue_activity.jsp Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring formatting small changes resulting from removal of IssueActivityModel Index: view_issue_activity.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/view_issue_activity.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** view_issue_activity.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- view_issue_activity.jsp 31 Oct 2005 10:21:40 -0000 1.1.2.2 *************** *** 6,17 **** <%@ page import="java.util.Arrays" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.IssueUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.util.UserUtilities" %> - <%@ page import="cowsultants.itracker.ejb.client.interfaces.IssueHandlerHome" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.IssueHandler" %> ! <it:checkLogin/> --- 6,14 ---- <%@ page import="java.util.Arrays" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.IssueUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.util.UserUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.IssueHandler" %> ! <%@ page import="cowsultants.itracker.ejb.beans.entity.*" %> <it:checkLogin/> *************** *** 19,30 **** <% ! InitialContext ic = new InitialContext(); ! ! IssueHandler ih = new IssueHandlerBean(); Integer issueId = new Integer((request.getParameter("id") == null ? "-1" : (request.getParameter("id")))); Integer currUserId = currUser.getId(); ! IssueActivityModel[] activity = ih.getIssueActivity(issueId); ProjectModel project = ih.getIssueProject(issueId); --- 16,25 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); Integer issueId = new Integer((request.getParameter("id") == null ? "-1" : (request.getParameter("id")))); Integer currUserId = currUser.getId(); ! IssueActivityBean[] activity = ih.getIssueActivity(issueId); ProjectModel project = ih.getIssueProject(issueId); *************** *** 76,80 **** <td valign="top"><%= activity[i].getDescription() %></td> <td></td> ! <td valign="top"><%= activity[i].getUserFirstName() + " " + activity[i].getUserLastName() %></td> </tr> <% } %> --- 71,75 ---- <td valign="top"><%= activity[i].getDescription() %></td> <td></td> ! <td valign="top"><%= activity[i].getUser().getFirstName() + " " + activity[i].getUser().getLastName() %></td> </tr> <% } %> |
|
From: Ricardo T. <rj...@us...> - 2005-10-31 10:21:10
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8031/standardtheme Modified Files: Tag: itrackerhibernate create_issue.jsp edit_preferences.jsp list_issues.jsp list_projects.jsp list_reports.jsp search_issues.jsp view_issue.jsp Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring formatting Index: list_reports.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/list_reports.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_reports.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_reports.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 7,15 **** <%@ page import="java.util.Arrays" %> <%@ page import="java.util.Date" %> - <%@ page import="javax.naming.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <%@ page import="cowsultants.itracker.ejb.beans.session.*" %> --- 7,13 ---- *************** *** 53,60 **** <% ! InitialContext ic = new InitialContext(); ! ! IssueHandler ih = new IssueHandlerBean(); ! ProjectHandler ph = new ProjectHandlerBean(); ReportHandler rh = new ReportHandlerBean(); --- 51,56 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ReportHandler rh = new ReportHandlerBean(); Index: edit_preferences.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/edit_preferences.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** edit_preferences.jsp 29 Oct 2005 14:04:27 -0000 1.1.2.2 --- edit_preferences.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.3 *************** *** 21,31 **** <% } else { ! //InitialContext ic = new InitialContext(); ! //Object scRef = ic.lookup("java:comp/env/" + SystemConfiguration.JNDI_NAME); ! SystemConfiguration sc = new SystemConfigurationBean(); ! ! //Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); ! //UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); ! UserHandler uh = new UserHandlerBean(); boolean allowProfileUpdate = uh.allowProfileUpdates(user, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); --- 21,26 ---- <% } else { ! SystemConfiguration sc = ServletContextUtils.getItrackerServices(getServletContext()).getSystemConfiguration(); ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); boolean allowProfileUpdate = uh.allowProfileUpdates(user, null, UserUtilities.AUTH_TYPE_UNKNOWN, UserUtilities.REQ_SOURCE_WEB); Index: list_projects.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/list_projects.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_projects.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_projects.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 7,16 **** <%@ page import="java.util.Arrays" %> <%@ page import="java.util.Date" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <it:checkLogin/> --- 7,13 ---- *************** *** 47,51 **** <% ! ProjectHandler ph = new ProjectHandlerBean(); ProjectModel[] projects = ph.getAllAvailableProjects(); Arrays.sort(projects, new ProjectModel()); --- 44,48 ---- <% ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ProjectModel[] projects = ph.getAllAvailableProjects(); Arrays.sort(projects, new ProjectModel()); Index: search_issues.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/search_issues.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** search_issues.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- search_issues.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 6,11 **** <%@ page import="java.util.*" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> --- 6,9 ---- *************** *** 21,41 **** <% ! //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(); ! ! //Object rhRef = ic.lookup("java:comp/env/" + ReportHandler.JNDI_NAME); ! //ReportHandlerHome rhHome = (ReportHandlerHome) PortableRemoteObject.narrow(rhRef, ReportHandlerHome.class); ReportHandler rh = new ReportHandlerBean(); ! ! //Object uhRef = ic.lookup("java:comp/env/" + UserHandler.JNDI_NAME); ! //UserHandlerHome uhHome = (UserHandlerHome) PortableRemoteObject.narrow(uhRef, UserHandlerHome.class); ! UserHandler uh = new UserHandlerBean(); Integer currUserId = currUser.getId(); --- 19,26 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); ReportHandler rh = new ReportHandlerBean(); ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); Integer currUserId = currUser.getId(); Index: view_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/view_issue.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** view_issue.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- view_issue.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 6,11 **** <%@ page import="java.util.Arrays" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.*" %> --- 6,9 ---- *************** *** 19,23 **** <% ! IssueHandler ih = new IssueHandlerBean(); Integer issueId = null; --- 17,21 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); Integer issueId = null; Index: list_issues.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/list_issues.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** list_issues.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- list_issues.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 6,16 **** <%@ page import="java.util.Arrays" %> - <%@ page import="javax.naming.*" %> - <%@ page import="javax.rmi.*" %> <%@ page import="cowsultants.itracker.ejb.client.models.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.IssueUtilities" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.*" %> <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> - <%@ page import="cowsultants.itracker.ejb.beans.session.SpringFactories" %> <it:checkLogin/> --- 6,13 ---- *************** *** 18,23 **** <% ! IssueHandler ih = new IssueHandlerBean(); ! ProjectHandler ph = new ProjectHandlerBean(); Integer currUserId = currUser.getId(); --- 15,20 ---- <% ! IssueHandler ih = ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandler(); ! ProjectHandler ph = ServletContextUtils.getItrackerServices(getServletContext()).getProjectHandler(); Integer currUserId = currUser.getId(); Index: create_issue.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/Attic/create_issue.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** create_issue.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- create_issue.jsp 31 Oct 2005 10:21:02 -0000 1.1.2.2 *************** *** 6,15 **** <%@ 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.util.*" %> - <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> <%@ page import="cowsultants.itracker.ejb.client.interfaces.UserHandler" %> --- 6,12 ---- *************** *** 19,23 **** <% ! UserHandler uh = new UserHandlerBean(); ProjectModel project = (ProjectModel) session.getAttribute(Constants.PROJECT_KEY); --- 16,20 ---- <% ! UserHandler uh = ServletContextUtils.getItrackerServices(getServletContext()).getUserHandler(); ProjectModel project = (ProjectModel) session.getAttribute(Constants.PROJECT_KEY); |