Menu
▾
▴
itracker-commits — itracker CVS commits are distributed through this mailinglist. Join to develop.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(217) |
Nov
(180) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(58) |
Feb
(370) |
Mar
(105) |
Apr
(165) |
May
(93) |
Jun
(37) |
Jul
|
Aug
(21) |
Sep
(131) |
Oct
(40) |
Nov
(113) |
Dec
(401) |
| 2007 |
Jan
(180) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2008 |
Jan
(163) |
Feb
(78) |
Mar
|
Apr
(4) |
May
(28) |
Jun
(2) |
Jul
|
Aug
|
Sep
(96) |
Oct
(189) |
Nov
(413) |
Dec
(121) |
| 2009 |
Jan
(34) |
Feb
(18) |
Mar
(24) |
Apr
(16) |
May
(3) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(16) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
(35) |
Jun
|
Jul
(17) |
Aug
(7) |
Sep
|
Oct
(9) |
Nov
|
Dec
|
|
From: Marky G. <mar...@us...> - 2005-11-03 07:43:55
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler/tasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/src/cowsultants/itracker/web/scheduler/tasks Modified Files: Tag: itrackerhibernate MailNotification.java Log Message: remove unused import Index: MailNotification.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler/tasks/Attic/MailNotification.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 *** MailNotification.java 3 Nov 2005 07:43:10 -0000 1.1.2.5 --- MailNotification.java 3 Nov 2005 07:43:46 -0000 1.1.2.6 *************** *** 24,28 **** import cowsultants.itracker.ejb.client.interfaces.IssueHandler; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; - import cowsultants.itracker.ejb.client.interfaces.UserHandler; import cowsultants.itracker.ejb.client.models.IssueHistoryModel; import cowsultants.itracker.ejb.client.models.IssueModel; --- 24,27 ---- |
|
From: Marky G. <mar...@us...> - 2005-11-03 07:43:22
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler/tasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24890/src/cowsultants/itracker/web/scheduler/tasks Modified Files: Tag: itrackerhibernate MailNotification.java Log Message: removed unused import Index: MailNotification.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/scheduler/tasks/Attic/MailNotification.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 *** MailNotification.java 30 Oct 2005 18:41:46 -0000 1.1.2.4 --- MailNotification.java 3 Nov 2005 07:43:10 -0000 1.1.2.5 *************** *** 3,7 **** import cowsultants.itracker.ejb.beans.session.IssueHandlerBean; import cowsultants.itracker.ejb.beans.session.ProjectHandlerBean; - import cowsultants.itracker.ejb.beans.session.UserHandlerBean; import java.sql.Connection; import java.sql.ResultSet; --- 3,6 ---- |
|
From: Marc B. <mb...@us...> - 2005-11-02 23:37:15
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15211 Modified Files: Tag: itrackerhibernate ProjectHandlerBean.java Log Message: set project to version Index: ProjectHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/ProjectHandlerBean.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 *** ProjectHandlerBean.java 2 Nov 2005 00:35:11 -0000 1.16.4.5 --- ProjectHandlerBean.java 2 Nov 2005 23:37:03 -0000 1.16.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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { private ComponentFactory componentFactory; private CustomFieldFactory customFieldFactory; private ProjectFactory projectFactory; private ProjectScriptFactory projectScriptFactory; private UserFactory userFactory; private VersionFactory versionFactory; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setCreateDate( new Timestamp( System.currentTimeMillis() ) ); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = versionFactory.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = versionFactory.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = versionFactory.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = userFactory.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = customFieldFactory.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project != null ? project.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version != null ? version.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component != null ? component.getTotalNumberIssues() : 0; } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } public CustomFieldFactory getCustomFieldFactory() { return this.customFieldFactory; } public void setCustomFieldFactory(CustomFieldFactory customFieldFactory) { this.customFieldFactory = customFieldFactory; } public ProjectScriptFactory getProjectScriptFactory() { return this.projectScriptFactory; } public void setProjectScriptFactory(ProjectScriptFactory projectScriptFactory) { this.projectScriptFactory = projectScriptFactory; } public VersionFactory getVersionFactory() { return this.versionFactory; } public void setVersionFactory(VersionFactory versionFactory) { this.versionFactory = versionFactory; } public UserFactory getUserFactory() { return this.userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } } \ 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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { private ComponentFactory componentFactory; private CustomFieldFactory customFieldFactory; private ProjectFactory projectFactory; private ProjectScriptFactory projectScriptFactory; private UserFactory userFactory; private VersionFactory versionFactory; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setCreateDate( new Timestamp( System.currentTimeMillis() ) ); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); version.setProject( project ); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = versionFactory.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = versionFactory.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = versionFactory.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = userFactory.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = customFieldFactory.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project != null ? project.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version != null ? version.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component != null ? component.getTotalNumberIssues() : 0; } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } public CustomFieldFactory getCustomFieldFactory() { return this.customFieldFactory; } public void setCustomFieldFactory(CustomFieldFactory customFieldFactory) { this.customFieldFactory = customFieldFactory; } public ProjectScriptFactory getProjectScriptFactory() { return this.projectScriptFactory; } public void setProjectScriptFactory(ProjectScriptFactory projectScriptFactory) { this.projectScriptFactory = projectScriptFactory; } public VersionFactory getVersionFactory() { return this.versionFactory; } public void setVersionFactory(VersionFactory versionFactory) { this.versionFactory = versionFactory; } public UserFactory getUserFactory() { return this.userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } } \ No newline at end of file |
|
From: Marc B. <mb...@us...> - 2005-11-02 20:53:54
|
Update of /cvsroot/itracker/itracker/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10810/web/WEB-INF Modified Files: Tag: itrackerhibernate applicationContext.xml Log Message: added componentFactorytarget and componentFactory bean Index: applicationContext.xml =================================================================== RCS file: /cvsroot/itracker/itracker/web/WEB-INF/Attic/applicationContext.xml,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** applicationContext.xml 1 Nov 2005 22:13:28 -0000 1.1.2.9 --- applicationContext.xml 2 Nov 2005 20:53:46 -0000 1.1.2.10 *************** *** 57,60 **** --- 57,67 ---- </property> </bean> + + <!-- The component factory --> + <bean id="componentFactoryTarget" class="cowsultants.itracker.ejb.beans.session.ComponentFactoryImpl"> + <property name="sessionFactory"> + <ref bean="sessionFactory"/> + </property> + </bean> <!-- The userpreferences factory --> *************** *** 259,262 **** --- 266,289 ---- <!-- A proxy to the entity factory, after the Hibernate interceptor is applied --> <!-- Application code uses this object --> + <bean id="componentFactory" 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="componentFactoryTarget"/> + <property name="proxyInterfaces"> + <value>cowsultants.itracker.ejb.beans.session.ComponentFactory</value> + </property> + <property name="postInterceptors"> + <list> + <ref bean="myHibernateInterceptor"/> + </list> + </property> + </bean> + + <!-- A proxy to the entity factory, after the Hibernate interceptor is applied --> + <!-- Application code uses this object --> <bean id="userPreferencesFactory" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> <property name="transactionManager" ref="transactionManager"/> |
|
From: Marc B. <mb...@us...> - 2005-11-02 20:50:40
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10147 Modified Files: Tag: itrackerhibernate EditVersionAction.java Log Message: set projectId to version Index: EditVersionAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditVersionAction.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 *** EditVersionAction.java 29 Oct 2005 18:10:24 -0000 1.10.4.4 --- EditVersionAction.java 2 Nov 2005 20:50:31 -0000 1.10.4.5 *************** *** 75,78 **** --- 75,79 ---- } else { project = ph.getProject(projectId); + version.setProjectId(projectId); if(project == null) { errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("itracker.web.error.invalidproject")); *************** *** 103,105 **** } ! \ No newline at end of file --- 104,106 ---- } ! |
|
From: Marc B. <mb...@us...> - 2005-11-02 20:49:09
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686 Modified Files: Tag: itrackerhibernate ComponentFactory.java Log Message: extending BaseFactory interface Index: ComponentFactory.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ComponentFactory.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 *** ComponentFactory.java 11 Oct 2005 01:36:08 -0000 1.1.2.1 --- ComponentFactory.java 2 Nov 2005 20:48:58 -0000 1.1.2.2 *************** *** 5,9 **** import cowsultants.itracker.ejb.beans.entity.ComponentBean; ! public interface ComponentFactory { public ComponentBean findByPrimaryKey(Integer componentId); --- 5,9 ---- import cowsultants.itracker.ejb.beans.entity.ComponentBean; ! public interface ComponentFactory extends BaseFactory { public ComponentBean findByPrimaryKey(Integer componentId); |
|
From: Marc B. <mb...@us...> - 2005-11-02 20:48:31
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9531 Modified Files: Tag: itrackerhibernate ComponentFactoryImpl.java Log Message: hibernate implementation Index: ComponentFactoryImpl.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ComponentFactoryImpl.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 *** ComponentFactoryImpl.java 11 Oct 2005 01:36:08 -0000 1.1.2.1 --- ComponentFactoryImpl.java 2 Nov 2005 20:48:21 -0000 1.1.2.2 *************** *** 4,18 **** import cowsultants.itracker.ejb.beans.entity.ComponentBean; ! public class ComponentFactoryImpl implements ComponentFactory { public ComponentBean findByPrimaryKey(Integer componentId) { ! // TODO Auto-generated method stub ! return null; } public Collection findByProjectId(Integer projectId) { ! // TODO Auto-generated method stub ! return null; } --- 4,29 ---- import cowsultants.itracker.ejb.beans.entity.ComponentBean; + import cowsultants.itracker.ejb.beans.entity.ProjectBean; + import net.sf.hibernate.HibernateException; + import net.sf.hibernate.expression.Expression; ! public class ComponentFactoryImpl extends BaseHibernateFactoryImpl implements ComponentFactory { public ComponentBean findByPrimaryKey(Integer componentId) { ! try { ! return (ComponentBean) (getSession().load(ComponentBean.class, componentId)); ! } catch (HibernateException e) { ! throw new DataException(e); ! } } public Collection findByProjectId(Integer projectId) { ! try { ! ProjectBean project = (ProjectBean) getSession().load(ProjectBean.class,projectId); ! return (getSession().createCriteria(ComponentBean.class). ! add(Expression.eq("project", project)).list()); ! } catch (HibernateException e) { ! throw new DataException(e); ! } } |
|
From: Marc B. <mb...@us...> - 2005-11-02 20:46:24
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9158 Modified Files: Tag: itrackerhibernate ComponentBean.java Log Message: initialize issues Collection to avoid NullPointer Index: ComponentBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/ComponentBean.java,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** ComponentBean.java 11 Oct 2005 01:21:04 -0000 1.6.4.1 --- ComponentBean.java 2 Nov 2005 20:46:16 -0000 1.6.4.2 *************** *** 29,33 **** private String name; private String description; ! private Collection issues; public String getDescription() { --- 29,33 ---- private String name; private String description; ! private Collection issues = new ArrayList(); public String getDescription() { |
|
From: Marky G. <mar...@us...> - 2005-11-02 15:16:04
|
Update of /cvsroot/itracker/itracker/web/WEB-INF/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24990/web/WEB-INF/config Modified Files: Tag: itrackerhibernate struts-config.xml Log Message: update config Index: struts-config.xml =================================================================== RCS file: /cvsroot/itracker/itracker/web/WEB-INF/config/Attic/struts-config.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** struts-config.xml 29 Oct 2005 11:41:23 -0000 1.1.2.1 --- struts-config.xml 2 Nov 2005 15:15:54 -0000 1.1.2.2 *************** *** 210,214 **** <forward name="watchissue" path="/watchissue.do"/> ! <forward name="report_issueseverity" path="/reports/issue_severity.jsp"/> <forward name="adminindex" path="/themes/standardtheme/admin/index.jsp"/> --- 210,214 ---- <forward name="watchissue" path="/watchissue.do"/> ! <forward name="report_issueseverity" path="/themes/standardtheme/reports/issue_severity.jsp"/> <forward name="adminindex" path="/themes/standardtheme/admin/index.jsp"/> |
|
From: Marky G. <mar...@us...> - 2005-11-02 15:15:50
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24941/web/themes/standardtheme/help Modified Files: Tag: itrackerhibernate show_help.jsp Log Message: fixed help Index: show_help.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/help/Attic/show_help.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 *** show_help.jsp 29 Oct 2005 11:39:26 -0000 1.1.2.1 --- show_help.jsp 2 Nov 2005 15:15:37 -0000 1.1.2.2 *************** *** 7,10 **** --- 7,12 ---- <%@ page import="java.io.*" %> <%@ page import="cowsultants.itracker.ejb.client.util.Logger" %> + <%@ page import="cowsultants.itracker.ejb.client.resources.ITrackerResources" %> + <it:checkLogin/> |
|
From: Marky G. <mar...@us...> - 2005-11-02 15:15:35
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24864/web/themes/standardtheme/admin Modified Files: Tag: itrackerhibernate edit_customfield.jsp Removed Files: Tag: itrackerhibernate list_groups.jsp edit_group.jsp Log Message: fixed customfield, removed group code. --- list_groups.jsp DELETED --- Index: edit_customfield.jsp =================================================================== RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_customfield.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_customfield.jsp 31 Oct 2005 10:35:00 -0000 1.1.2.2 --- edit_customfield.jsp 2 Nov 2005 15:15:22 -0000 1.1.2.3 *************** *** 172,179 **** <tr class="listHeading"><td colspan="3"><html:img page="/themes/standardtheme/images/blank.gif" height="2" width="1"/></td></tr> <tr><td colspan="3"><html:img page="/themes/standardtheme/images/blank.gif" width="1" height="4"/></td></tr> ! <% ! CustomFieldValueModel[] fieldOptions = field.getOptions(); ! for(int i = 0; i < fieldOptions.length; i++) { ! %> <tr> <td class="listRowUnshaded" style="white-space: nowrap;" nowrap> --- 172,180 ---- <tr class="listHeading"><td colspan="3"><html:img page="/themes/standardtheme/images/blank.gif" height="2" width="1"/></td></tr> <tr><td colspan="3"><html:img page="/themes/standardtheme/images/blank.gif" width="1" height="4"/></td></tr> ! ! <% ! CustomFieldValueModel[] fieldOptions = field.getOptions(); ! for(int i = 0; i < fieldOptions.length; i++) { ! %> <tr> <td class="listRowUnshaded" style="white-space: nowrap;" nowrap> *************** *** 193,197 **** </table> </td> ! <% } %> <tr><td colspan="5"><html:img page="/themes/standardtheme/images/blank.gif" width="1" height="12"/></td></tr> --- 194,199 ---- </table> </td> ! ! <% } %> <tr><td colspan="5"><html:img page="/themes/standardtheme/images/blank.gif" width="1" height="12"/></td></tr> *************** *** 205,207 **** <%@ include file="/themes/standardtheme/includes/footer.jsp" %> - <% } %> \ No newline at end of file --- 207,208 ---- --- edit_group.jsp DELETED --- |
|
From: Marky G. <mar...@us...> - 2005-11-02 15:15:10
|
Update of /cvsroot/itracker/itracker/web/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24784/web/reports Removed Files: Tag: itrackerhibernate issue_severity.jsp Log Message: fixed. --- issue_severity.jsp DELETED --- |
|
From: Marky G. <mar...@us...> - 2005-11-02 15:00:06
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21934/web/themes/standardtheme/reports Added Files: Tag: itrackerhibernate issue_severity.jsp Log Message: get handlers from servletcontextutils. fixed error. --- NEW FILE: issue_severity.jsp --- <%@ page language="java" contentType="text/html;charset=UTF-8" %> <%@ taglib uri="/itracker.tld" prefix="it" %> <%@ taglib uri="/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/struts-html.tld" prefix="html" %> <%@ taglib uri="/struts-logic.tld" prefix="logic" %> <%@ page import="java.util.*" %> <%@ page import="javax.naming.*" %> <%@ page import="javax.rmi.*" %> <%@ page import="org.apache.commons.beanutils.*" %> <%@ page import="org.apache.struts.action.*" %> <%@ page import="org.apache.struts.util.*" %> <%@ 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/> <%@ 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"> <tr> <td class="editColumnTitle" colspan="7"><it:message key="itracker.web.attr.projects"/>:</td> </tr> <tr align="left" class="listHeading"> <td valign="bottom"><it:message key="itracker.web.attr.name"/></td> <% int numSeverities = IssueUtilities.getNumberSeverities(); for(int i = 1; i <= numSeverities; i++) { %> <td valign="top"> <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <tr align="left" class="listHeading"> <td align="left" valign="top" colspan="2"><%= IssueUtilities.getSeverityName(i, currLocale) %></td> </tr> <tr align="left" class="listSubHeading"> <td align="left" valign="bottom" width="50%"><it:message key="itracker.web.reports.issuesev.open"/></td> <td align="left" valign="bottom" width="50%"><it:message key="itracker.web.reports.issuesev.resolved"/></td> </tr> </table> </td> <% } %> <td align="left" valign="bottom"><it:message key="itracker.web.attr.total"/></td> </tr> <% GregorianCalendar cal = new GregorianCalendar(); cal.add(Calendar.DAY_OF_MONTH, -30); Date oldDate = cal.getTime(); boolean hasProjects = false; DynaActionForm form = (DynaActionForm) request.getAttribute("reportForm"); Integer[] projects = (Integer[]) PropertyUtils.getSimpleProperty(form, "projectIds"); if(projects != null) { ProjectHandler ph = ServletContextUtils.getItrackerServices(this.getServletContext()).getProjectHandler(); IssueHandler ih = ServletContextUtils.getItrackerServices(this.getServletContext()).getIssueHandler(); Vector visableProjects = new Vector(); int vpc = 0; for(int i = 0; i < projects.length; i++) { if(UserUtilities.hasPermission(currPermissions, projects[i], UserUtilities.PERMISSION_VIEW_ALL)) { visableProjects.add(projects[i]); } } String[] chartProjectNames = new String[visableProjects.size()]; double[][] chartDataOpen = new double[visableProjects.size()][numSeverities]; double[][] chartDataResolved = new double[visableProjects.size()][numSeverities]; for(int i = 0; i < visableProjects.size(); i++) { Integer projectId = (Integer) visableProjects.elementAt(i); int[] numOpen = new int[numSeverities + 1]; int[] numOld = new int[numSeverities + 1]; int[] numResolved = new int[numSeverities + 1]; hasProjects = true; ProjectModel project = ph.getProject(projectId); chartProjectNames[vpc] = project.getName(); IssueModel[] issues = ih.getIssuesByProjectId(projectId); for(int j = 0; j < issues.length; j++) { if(issues[j].getStatus() < IssueUtilities.STATUS_RESOLVED) { numOpen[issues[j].getSeverity()]++; if(issues[j].getLastModifiedDate().before(oldDate)) { numOld[issues[j].getSeverity()] = 1; } } else { numResolved[issues[j].getSeverity()]++; } } %> <tr align="right" class="<%= (i % 2 == 1 ? "listRowShaded" : "listRowUnshaded" ) %>"> <td><a href="<html:rewrite forward="listissues"/>?pid=<%= project.getId() %>" class="listRow"><%= project.getName() %></a></td> <% for(int j = 1; j <= numSeverities; j++) { chartDataOpen[vpc][j - 1] = (double) numOpen[j]; chartDataResolved[vpc][j - 1] = (double) numResolved[j]; %> <td> <table border="0" cellspacing="0" cellspacing="1" width="100%" align="left"> <tr class="<%= (i % 2 == 1 ? "listRowShaded" : "listRowUnshaded" ) %>"> <td align="left" width="50%"><span <%= (numOld[j] == 1 ? "style=\"color: red;\"" : "") %>><%= numOpen[j] %></span></td> <td align="left" width="50%"><%= numResolved[j] %></td> </tr> </table> </td> <% } %> <td align="left"><%= issues.length %></td> </tr> <% vpc++; } session.setAttribute("chartprojectnames", chartProjectNames); session.setAttribute("chartdataopen", chartDataOpen); session.setAttribute("chartdataresolved", chartDataResolved); } if(! hasProjects) { %> <tr><td colspan="7" class="listRowUnshaded" align="left"><it:message key="itracker.web.error.noprojects"/></td></tr> <% } else { %> <tr><td><html:img page="/images/blank.gif" height="8" width="1"/></td></tr> <tr><td colspan="99" class="tableNote"><it:message key="itracker.web.reports.issuesev.datenote"/></td></tr> <tr><td><html:img page="/images/blank.gif" height="15" width="1"/></td></tr> <tr><td colspan="99" align="left"> <img src="<html:rewrite page="/servlets/ReportChartController"/>?chartType=severityOpen&locale=<%= currLocale.toString() %>"> <img src="<html:rewrite page="/servlets/ReportChartController"/>?chartType=severityResolved&locale=<%= currLocale.toString() %>"> </td></tr> <% } %> </table> <%@ include file="/themes/standardtheme/includes/footer.jsp" %> |
|
From: Marky G. <mar...@us...> - 2005-11-02 14:59:58
|
Update of /cvsroot/itracker/itracker/web/themes/standardtheme/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21920/web/themes/standardtheme/reports Log Message: Directory /cvsroot/itracker/itracker/web/themes/standardtheme/reports added to the repository --> Using per-directory sticky tag `itrackerhibernate' |
|
From: Marc B. <mb...@us...> - 2005-11-02 00:35:24
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17090 Modified Files: Tag: itrackerhibernate ProjectHandlerBean.java Log Message: check against null to avoid nullPointer Index: ProjectHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/ProjectHandlerBean.java,v retrieving revision 1.16.4.4 retrieving revision 1.16.4.5 diff -C2 -d -r1.16.4.4 -r1.16.4.5 *** ProjectHandlerBean.java 1 Nov 2005 23:51:32 -0000 1.16.4.4 --- ProjectHandlerBean.java 2 Nov 2005 00:35:11 -0000 1.16.4.5 *************** *** 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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { private ComponentFactory componentFactory; private CustomFieldFactory customFieldFactory; private ProjectFactory projectFactory; private ProjectScriptFactory projectScriptFactory; private UserFactory userFactory; private VersionFactory versionFactory; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setCreateDate( new Timestamp( System.currentTimeMillis() ) ); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = versionFactory.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = versionFactory.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = versionFactory.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = userFactory.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = customFieldFactory.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getTotalNumberIssues(); } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getTotalNumberIssues(); } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getTotalNumberIssues(); } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } public CustomFieldFactory getCustomFieldFactory() { return this.customFieldFactory; } public void setCustomFieldFactory(CustomFieldFactory customFieldFactory) { this.customFieldFactory = customFieldFactory; } public ProjectScriptFactory getProjectScriptFactory() { return this.projectScriptFactory; } public void setProjectScriptFactory(ProjectScriptFactory projectScriptFactory) { this.projectScriptFactory = projectScriptFactory; } public VersionFactory getVersionFactory() { return this.versionFactory; } public void setVersionFactory(VersionFactory versionFactory) { this.versionFactory = versionFactory; } public UserFactory getUserFactory() { return this.userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } } \ 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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { private ComponentFactory componentFactory; private CustomFieldFactory customFieldFactory; private ProjectFactory projectFactory; private ProjectScriptFactory projectScriptFactory; private UserFactory userFactory; private VersionFactory versionFactory; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setCreateDate( new Timestamp( System.currentTimeMillis() ) ); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = versionFactory.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = versionFactory.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = versionFactory.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = userFactory.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = customFieldFactory.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project != null ? project.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version != null ? version.getTotalNumberIssues() : 0; } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component != null ? component.getTotalNumberIssues() : 0; } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } public CustomFieldFactory getCustomFieldFactory() { return this.customFieldFactory; } public void setCustomFieldFactory(CustomFieldFactory customFieldFactory) { this.customFieldFactory = customFieldFactory; } public ProjectScriptFactory getProjectScriptFactory() { return this.projectScriptFactory; } public void setProjectScriptFactory(ProjectScriptFactory projectScriptFactory) { this.projectScriptFactory = projectScriptFactory; } public VersionFactory getVersionFactory() { return this.versionFactory; } public void setVersionFactory(VersionFactory versionFactory) { this.versionFactory = versionFactory; } public UserFactory getUserFactory() { return this.userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } } \ No newline at end of file |
|
From: Marc B. <mb...@us...> - 2005-11-02 00:01:57
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4862 Modified Files: Tag: itrackerhibernate PermissionFactoryImpl.java Log Message: corrected fieldname in criteria expression from type to permissionType (thanks jesse) Index: PermissionFactoryImpl.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/PermissionFactoryImpl.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 *** PermissionFactoryImpl.java 30 Oct 2005 16:52:11 -0000 1.1.2.2 --- PermissionFactoryImpl.java 2 Nov 2005 00:01:49 -0000 1.1.2.3 *************** *** 18,22 **** ProjectBean project = projectFactory.findByPrimaryKey(projectId); Criteria criteria = getSession().createCriteria(PermissionBean.class); ! criteria.add(Expression.eq("type", new Integer(permissionType))); criteria.add(Expression.eq("project", project)); try { --- 18,22 ---- ProjectBean project = projectFactory.findByPrimaryKey(projectId); Criteria criteria = getSession().createCriteria(PermissionBean.class); ! criteria.add(Expression.eq("permissionType", new Integer(permissionType))); criteria.add(Expression.eq("project", project)); try { |
|
From: Marc B. <mb...@us...> - 2005-11-01 23:51:46
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2079 Modified Files: Tag: itrackerhibernate ProjectHandlerBean.java Log Message: - renamed member variables of factories to prepare for autowiring by name (fixes nullPointer) - set mandatory createDate while creation a new VersionBean instance Index: ProjectHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/ProjectHandlerBean.java,v retrieving revision 1.16.4.3 retrieving revision 1.16.4.4 diff -C2 -d -r1.16.4.3 -r1.16.4.4 *** ProjectHandlerBean.java 30 Oct 2005 16:52:11 -0000 1.16.4.3 --- ProjectHandlerBean.java 1 Nov 2005 23:51:32 -0000 1.16.4.4 *************** *** 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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { ComponentFactory componentFactory; CustomFieldFactoryImpl cfHome = null; ProjectFactory projectFactory; ProjectScriptFactory psHome = null; UserFactoryImpl uHome = null; VersionFactory vHome = null; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = vHome.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = vHome.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = vHome.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = vHome.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = uHome.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = cfHome.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = psHome.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = psHome.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getTotalNumberIssues(); } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = vHome.findByPrimaryKey(versionId); return version.getTotalNumberIssues(); } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getTotalNumberIssues(); } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } } \ 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.HashSet; import java.util.Iterator; import java.util.Locale; import cowsultants.itracker.ejb.beans.entity.ComponentBean; import cowsultants.itracker.ejb.beans.entity.CustomFieldBean; import cowsultants.itracker.ejb.beans.entity.ProjectBean; import cowsultants.itracker.ejb.beans.entity.ProjectScriptBean; import cowsultants.itracker.ejb.beans.entity.UserBean; import cowsultants.itracker.ejb.beans.entity.VersionBean; import cowsultants.itracker.ejb.client.interfaces.ProjectHandler; import cowsultants.itracker.ejb.client.models.ComponentModel; import cowsultants.itracker.ejb.client.models.CustomFieldModel; import cowsultants.itracker.ejb.client.models.ProjectModel; import cowsultants.itracker.ejb.client.models.ProjectScriptModel; import cowsultants.itracker.ejb.client.models.UserModel; import cowsultants.itracker.ejb.client.models.VersionModel; public class ProjectHandlerBean implements ProjectHandler { private ComponentFactory componentFactory; private CustomFieldFactory customFieldFactory; private ProjectFactory projectFactory; private ProjectScriptFactory projectScriptFactory; private UserFactory userFactory; private VersionFactory versionFactory; private IssueFactory issueFactory; public ProjectHandlerBean() { } public ProjectModel getProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getModel(); } public ProjectModel[] getAllProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAll(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public int getNumberProjects() throws DataException { Collection projects = projectFactory.findAll(); return projects.size(); } public ProjectModel[] getAllAvailableProjects() throws DataException { int i = 0; ProjectModel[] projectArray = new ProjectModel[0]; Collection projects = projectFactory.findAllAvailable(); projectArray = new ProjectModel[projects.size()]; for (Iterator iterator = projects.iterator(); iterator.hasNext(); i++) { projectArray[i] = ((ProjectBean) iterator.next()).getModel(); } return projectArray; } public ProjectModel createProject(ProjectModel model) { ProjectBean project = new ProjectBean(); project.setModel(model); project.setCreateDate(new Timestamp(System.currentTimeMillis())); this.projectFactory.save(project); return project.getModel(); } public ProjectModel updateProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); project.setModel(model); return project.getModel(); } public boolean deleteProject(ProjectModel model) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); // project.remove(); return true; } public ComponentModel updateProjectComponent(ComponentModel model) { ComponentBean component = componentFactory.findByPrimaryKey(model.getId()); component.setModel(model); return component.getModel(); } public ComponentModel addProjectComponent(Integer projectId, ComponentModel model) throws DataException { ComponentBean component = new ComponentBean(); component.setCreateDate(new Timestamp(new Date().getTime())); component.setProject( projectFactory.findByPrimaryKey(projectId)); component.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection components = project.getComponents(); components.add(component); model.setId(component.getId()); model.setProjectId(projectId); projectFactory.save(project); return component.getModel(); } public boolean removeProjectComponent(Integer projectId, Integer componentId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ComponentBean component = componentFactory.findByPrimaryKey(componentId); Collection components = project.getComponents(); components.remove(component); // component.remove(); return true; } public ComponentModel getProjectComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getModel(); } public ComponentModel[] getProjectComponents(Integer projectId) { int i = 0; ComponentModel[] componentArray = new ComponentModel[0]; Collection components = componentFactory.findByProjectId(projectId); componentArray = new ComponentModel[components.size()]; for (Iterator iterator = components.iterator(); iterator.hasNext(); i++) { componentArray[i] = ((ComponentBean) iterator.next()).getModel(); } return componentArray; } public VersionModel addProjectVersion(Integer projectId, VersionModel model) throws DataException { VersionBean version = new VersionBean(); version.setCreateDate( new Timestamp( System.currentTimeMillis() ) ); version.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection versions = project.getVersions(); versions.add(version); model.setId(version.getId()); model.setProjectId(projectId); // return version.getModel(); return model; } public boolean removeProjectVersion(Integer projectId, Integer versionId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); VersionBean version = versionFactory.findByPrimaryKey(versionId); Collection versions = project.getVersions(); versions.remove(version); // version.remove(); return true; } public VersionModel updateProjectVersion(VersionModel model) { VersionBean version = versionFactory.findByPrimaryKey(model.getId()); version.setModel(model); return version.getModel(); } public VersionModel getProjectVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getModel(); } public VersionModel[] getProjectVersions(Integer projectId) { int i = 0; VersionModel[] versionArray = new VersionModel[0]; Collection versions = versionFactory.findByProjectId(projectId); versionArray = new VersionModel[versions.size()]; for (Iterator iterator = versions.iterator(); iterator.hasNext(); i++) { versionArray[i] = ((VersionBean) iterator.next()).getModel(); } return versionArray; } public UserModel[] getProjectOwners(Integer projectId) throws DataException { int i = 0; UserModel[] userArray = new UserModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection users = project.getOwners(); userArray = new UserModel[users.size()]; for (Iterator iterator = users.iterator(); iterator.hasNext(); i++) { userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; } public boolean setProjectOwners(ProjectModel model, HashSet newOwners) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection owners = project.getOwners(); owners.clear(); if (newOwners != null && !newOwners.isEmpty()) { for (Iterator iterator = newOwners.iterator(); iterator.hasNext();) { Integer ownerId = (Integer) iterator.next(); UserBean owner = userFactory.findByPrimaryKey(ownerId); owners.add(owner); } } return true; } public CustomFieldModel[] getProjectFields(Integer projectId) throws DataException { int i = 0; CustomFieldModel[] fieldArray = new CustomFieldModel[0]; ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection fields = project.getCustomFields(); fieldArray = new CustomFieldModel[fields.size()]; for (Iterator iterator = fields.iterator(); iterator.hasNext(); i++) { fieldArray[i] = ((CustomFieldBean) iterator.next()).getModel(); } return fieldArray; } public CustomFieldModel[] getProjectFields(Integer projectId, Locale locale) throws DataException { CustomFieldModel[] fieldArray = getProjectFields(projectId); for (int i = 0; i < fieldArray.length; i++) { fieldArray[i].setLabels(locale); } return fieldArray; } public boolean setProjectFields(ProjectModel model, HashSet newFields) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(model.getId()); Collection fields = project.getCustomFields(); fields.clear(); if (newFields != null && !newFields.isEmpty()) { for (Iterator iterator = newFields.iterator(); iterator.hasNext();) { Integer fieldId = (Integer) iterator.next(); CustomFieldBean field = customFieldFactory.findByPrimaryKey(fieldId); fields.add(field); } } return true; } public ProjectScriptModel addProjectScript(Integer projectId, ProjectScriptModel model) throws DataException { ProjectScriptBean projectScript = new ProjectScriptBean(); projectScript.setModel(model); ProjectBean project = projectFactory.findByPrimaryKey(projectId); Collection scripts = project.getScripts(); scripts.add(projectScript); model.setId(projectScript.getId()); model.setProjectId(projectId); return model; } public boolean removeProjectScript(Integer projectId, Integer scriptId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(scriptId); Collection scripts = project.getScripts(); scripts.remove(script); // script.remove(); return true; } public ProjectScriptModel updateProjectScript(ProjectScriptModel model) { ProjectScriptBean script = projectScriptFactory.findByPrimaryKey(model.getId()); script.setModel(model); return script.getModel(); } public int getTotalNumberIssuesByProject(Integer projectId) throws DataException { ProjectBean project = projectFactory.findByPrimaryKey(projectId); return project.getTotalNumberIssues(); } public int getTotalNumberIssuesByVersion(Integer versionId) { VersionBean version = versionFactory.findByPrimaryKey(versionId); return version.getTotalNumberIssues(); } public int getTotalNumberIssuesByComponent(Integer componentId) { ComponentBean component = componentFactory.findByPrimaryKey(componentId); return component.getTotalNumberIssues(); } public Object[] getProjectStats(Integer projectId) { return issueFactory.getIssueStats(projectId); } public IssueFactory getIssueFactory() { return issueFactory; } public void setIssueFactory(IssueFactory ifHome) { this.issueFactory = ifHome; } public ProjectFactory getProjectFactory() { return projectFactory; } public void setProjectFactory(ProjectFactory projectFactory) { this.projectFactory = projectFactory; } public ComponentFactory getComponentFactory() { return componentFactory; } public void setComponentFactory(ComponentFactory componentFactory) { this.componentFactory = componentFactory; } public CustomFieldFactory getCustomFieldFactory() { return this.customFieldFactory; } public void setCustomFieldFactory(CustomFieldFactory customFieldFactory) { this.customFieldFactory = customFieldFactory; } public ProjectScriptFactory getProjectScriptFactory() { return this.projectScriptFactory; } public void setProjectScriptFactory(ProjectScriptFactory projectScriptFactory) { this.projectScriptFactory = projectScriptFactory; } public VersionFactory getVersionFactory() { return this.versionFactory; } public void setVersionFactory(VersionFactory versionFactory) { this.versionFactory = versionFactory; } public UserFactory getUserFactory() { return this.userFactory; } public void setUserFactory(UserFactory userFactory) { this.userFactory = userFactory; } } \ No newline at end of file |
|
From: Marc B. <mb...@us...> - 2005-11-01 22:59:21
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21355 Modified Files: Tag: itrackerhibernate UserHandlerBean.java Log Message: set mandatory createdDate after creating a PermissionBean instance in addUserPermissions() Index: UserHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/UserHandlerBean.java,v retrieving revision 1.44.4.5 retrieving revision 1.44.4.6 diff -C2 -d -r1.44.4.5 -r1.44.4.6 *** UserHandlerBean.java 1 Nov 2005 22:11:01 -0000 1.44.4.5 --- UserHandlerBean.java 1 Nov 2005 22:59:12 -0000 1.44.4.6 *************** *** 481,484 **** --- 481,485 ---- PermissionBean permission = new PermissionBean(); + permission.setCreateDate( new Timestamp(System.currentTimeMillis())); permission.setModel(newPermissions[i]); permission.setProject(project); |
|
From: Marc B. <mb...@us...> - 2005-11-01 22:13:42
|
Update of /cvsroot/itracker/itracker/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12735 Modified Files: Tag: itrackerhibernate applicationContext.xml Log Message: adding constructor argument of UserHandlerBean Index: applicationContext.xml =================================================================== RCS file: /cvsroot/itracker/itracker/web/WEB-INF/Attic/applicationContext.xml,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** applicationContext.xml 1 Nov 2005 14:45:40 -0000 1.1.2.8 --- applicationContext.xml 1 Nov 2005 22:13:28 -0000 1.1.2.9 *************** *** 508,511 **** --- 508,514 ---- <bean id="userHandler" class="cowsultants.itracker.ejb.beans.session.UserHandlerBean" autowire="autodetect"> <constructor-arg ref="userFactory"/> + <constructor-arg ref="projectFactory"/> + <constructor-arg ref="permissionFactory"/> + <constructor-arg ref="userPreferencesFactory"/> </bean> |
|
From: Marc B. <mb...@us...> - 2005-11-01 22:11:10
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12216 Modified Files: Tag: itrackerhibernate UserHandlerBean.java Log Message: - renamed private member variables permissionHome, projectHome, upHome to XyzFactory - added parameters to consturctor for dependency inj. in analogy to userFactory - removed usage of deprecated SpringFactories methods - checked superUsers agains null to avoid nullPointer - set mandatory createdDate while creating PermissionBean Index: UserHandlerBean.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/UserHandlerBean.java,v retrieving revision 1.44.4.4 retrieving revision 1.44.4.5 diff -C2 -d -r1.44.4.4 -r1.44.4.5 *** UserHandlerBean.java 30 Oct 2005 16:52:11 -0000 1.44.4.4 --- UserHandlerBean.java 1 Nov 2005 22:11:01 -0000 1.44.4.5 *************** *** 85,95 **** NotificationFactoryImpl nHome = null; ! PermissionFactory permissionHome = null; ! ProjectFactory projectHome = null; UserFactory userFactory; ! UserPreferencesFactory upHome = null; private ProjectHandler projectHandler; --- 85,95 ---- NotificationFactoryImpl nHome = null; ! PermissionFactory permissionFactory = null; ! ProjectFactory projectFactory = null; UserFactory userFactory; ! UserPreferencesFactory userPreferencesFactory = null; private ProjectHandler projectHandler; *************** *** 97,108 **** private SystemConfiguration systemConfiguration; ! public UserHandlerBean(SystemConfiguration systemConfiguration, ProjectHandler projectHandler, UserFactory userFactory) { this.systemConfiguration = systemConfiguration; this.projectHandler = projectHandler; this.userFactory = userFactory; try { ic = new InitialContext(); - upHome = SpringFactories.getUserPreferencesFactory(); - permissionHome = SpringFactories.getPermissionFactory(); allowSelfRegister = systemConfiguration.getBooleanProperty("allow_self_register", false); --- 97,111 ---- private SystemConfiguration systemConfiguration; ! public UserHandlerBean(SystemConfiguration systemConfiguration, ProjectHandler projectHandler, UserFactory userFactory, ! ProjectFactory projectFactory, PermissionFactory permissionFactory, UserPreferencesFactory userPreferencesFactory) { this.systemConfiguration = systemConfiguration; this.projectHandler = projectHandler; this.userFactory = userFactory; + this.projectFactory = projectFactory; + this.userPreferencesFactory = userPreferencesFactory; + this.permissionFactory = permissionFactory; + try { ic = new InitialContext(); allowSelfRegister = systemConfiguration.getBooleanProperty("allow_self_register", false); *************** *** 117,121 **** } } ! public UserModel getUser(Integer userId) throws DataException { UserBean user = userFactory.findByPrimaryKey(userId); --- 120,124 ---- } } ! public UserModel getUser(Integer userId) throws DataException { UserBean user = userFactory.findByPrimaryKey(userId); *************** *** 169,175 **** Collection superUsers = userFactory.findSuperUsers(); ! userArray = new UserModel[superUsers.size()]; ! for (Iterator iterator = superUsers.iterator(); iterator.hasNext(); i++) { ! userArray[i] = ((UserBean) iterator.next()).getModel(); } return userArray; --- 172,180 ---- Collection superUsers = userFactory.findSuperUsers(); ! if ( superUsers != null ) { ! userArray = new UserModel[superUsers.size()]; ! for (Iterator iterator = superUsers.iterator(); iterator.hasNext(); i++) { ! userArray[i] = ((UserBean) iterator.next()).getModel(); ! } } return userArray; *************** *** 178,182 **** public UserPreferencesModel getUserPreferencesByUserId(Integer userId) throws DataException { ! UserPreferencesBean userPrefs = upHome.findByUserId(userId); if (userPrefs == null) return new UserPreferencesModel(); --- 183,187 ---- public UserPreferencesModel getUserPreferencesByUserId(Integer userId) throws DataException { ! UserPreferencesBean userPrefs = userPreferencesFactory.findByUserId(userId); if (userPrefs == null) return new UserPreferencesModel(); *************** *** 322,326 **** // try { ! userPrefs = upHome.findByUserId(model.getUserId()); /* * } catch (ObjectNotFoundException onfe) { if (userPrefs == null || --- 327,331 ---- // try { ! userPrefs = userPreferencesFactory.findByUserId(model.getUserId()); /* * } catch (ObjectNotFoundException onfe) { if (userPrefs == null || *************** *** 366,370 **** if (permission != null && permission.getProjectId() != null) { ! Collection permissions = permissionHome.findByProjectIdAndPermission(permission.getProjectId(), permission .getPermissionType()); userArray = new UserModel[permissions.size()]; --- 371,375 ---- if (permission != null && permission.getProjectId() != null) { ! Collection permissions = permissionFactory.findByProjectIdAndPermission(permission.getProjectId(), permission .getPermissionType()); userArray = new UserModel[permissions.size()]; *************** *** 381,385 **** if (user != null && user.getId() != null) { ! Collection permissions = permissionHome.findByUserId(user.getId()); permissionArray = new PermissionModel[permissions.size()]; for (Iterator iterator = permissions.iterator(); iterator.hasNext(); i++) { --- 386,390 ---- if (user != null && user.getId() != null) { ! Collection permissions = permissionFactory.findByUserId(user.getId()); permissionArray = new PermissionModel[permissions.size()]; for (Iterator iterator = permissions.iterator(); iterator.hasNext(); i++) { *************** *** 461,465 **** } ! Collection permissions = permissionHome.findByUserId(userId); Integer projectId = null; --- 466,470 ---- } ! Collection permissions = permissionFactory.findByUserId(userId); Integer projectId = null; *************** *** 472,476 **** if (projectId == null || projectId.intValue() != newPermissions[i].getProjectId().intValue()) { projectId = newPermissions[i].getProjectId(); ! project = projectHome.findByPrimaryKey(projectId); } --- 477,481 ---- if (projectId == null || projectId.intValue() != newPermissions[i].getProjectId().intValue()) { projectId = newPermissions[i].getProjectId(); ! project = projectFactory.findByPrimaryKey(projectId); } *************** *** 526,535 **** } ! Collection permissions = permissionHome.findByUserId(userId); if (newPermissions == null || newPermissions.length == 0) { for (Iterator iterator = permissions.iterator(); iterator.hasNext();) { PermissionBean permission = (PermissionBean) iterator.next(); ! permissionHome.delete(permission); } } else { --- 531,540 ---- } ! Collection permissions = permissionFactory.findByUserId(userId); if (newPermissions == null || newPermissions.length == 0) { for (Iterator iterator = permissions.iterator(); iterator.hasNext();) { PermissionBean permission = (PermissionBean) iterator.next(); ! permissionFactory.delete(permission); } } else { *************** *** 564,570 **** if (model.getProjectId() != null) { // try { ! ProjectBean project = projectHome.findByPrimaryKey(model.getProjectId()); PermissionBean permission = new PermissionBean(); permission.setModel(model); permission.setProject(project); --- 569,576 ---- if (model.getProjectId() != null) { // try { ! ProjectBean project = projectFactory.findByPrimaryKey(model.getProjectId()); PermissionBean permission = new PermissionBean(); + permission.setCreateDate( new Timestamp(System.currentTimeMillis())); permission.setModel(model); permission.setProject(project); |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:58:11
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9679/src/cowsultants/itracker/web/actions Modified Files: Tag: itrackerhibernate EditReportFormAction.java Log Message: no longer instantiating service objects, but using the only instance of the service layer and data access objects created by spring unused imports Index: EditReportFormAction.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditReportFormAction.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 *** EditReportFormAction.java 29 Oct 2005 01:47:04 -0000 1.8.4.3 --- EditReportFormAction.java 1 Nov 2005 17:58:00 -0000 1.8.4.4 *************** *** 19,25 **** package cowsultants.itracker.web.actions; - import cowsultants.itracker.ejb.beans.session.ReportHandlerBean; import java.io.IOException; import java.util.HashMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; --- 19,25 ---- package cowsultants.itracker.web.actions; import java.io.IOException; import java.util.HashMap; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; *************** *** 55,59 **** try { ! ReportHandler rh = new ReportHandlerBean(); HttpSession session = request.getSession(true); --- 55,59 ---- try { ! ReportHandler rh = getITrackerServices().getReportHandler(); HttpSession session = request.getSession(true); |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:51:42
|
Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8161/src/cowsultants/itracker/web/servlets Modified Files: Tag: itrackerhibernate ReportDownloadController.java Log Message: unused imports Index: ReportDownloadController.java =================================================================== RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/ReportDownloadController.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 *** ReportDownloadController.java 1 Nov 2005 17:14:00 -0000 1.6.4.4 --- ReportDownloadController.java 1 Nov 2005 17:51:34 -0000 1.6.4.5 *************** *** 21,26 **** import java.io.IOException; - import javax.naming.InitialContext; - import javax.naming.NamingException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; --- 21,24 ---- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:27:43
|
Update of /cvsroot/itracker/itracker/conf/jrun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2744/conf/jrun Removed Files: Tag: itrackerhibernate jrun-ejb-jar.xml Log Message: no longer used --- jrun-ejb-jar.xml DELETED --- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:26:07
|
Update of /cvsroot/itracker/itracker/conf/weblogic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2472/conf/weblogic Removed Files: Tag: itrackerhibernate weblogic-cmp-rdbms-jar.xml Log Message: no longer used, CMP config --- weblogic-cmp-rdbms-jar.xml DELETED --- |
|
From: Ricardo T. <rj...@us...> - 2005-11-01 17:25:40
|
Update of /cvsroot/itracker/itracker/conf/jboss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2411/conf/jboss Removed Files: Tag: itrackerhibernate jbosscmp-jdbc.xml Log Message: no longer used, CMP config --- jbosscmp-jdbc.xml DELETED --- |