itracker-commits Mailing List for itracker (Page 127)

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin added to the repository
--> Using per-directory sticky tag `itrackerhibernate'

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/workflow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin/workflow

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/workflow added to the repository

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/attachment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin/attachment

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/attachment added to the repository

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/project
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin/project

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/project added to the repository

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin/report

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/report added to the repository

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/configuration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2703/src/cowsultants/itracker/web/actions/admin/configuration

Log Message:
Directory /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/admin/configuration added to the repository

Update of /cvsroot/itracker/itracker/docs/testingdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5305

Modified Files:
      Tag: itrackerhibernate
	UsecasesImplementationStatus.ods 
Log Message:
added some usecases and data for first full testrun i did. Feel free to add your testrundata or usecases from other areas of the application

Index: UsecasesImplementationStatus.ods
===================================================================
RCS file: /cvsroot/itracker/itracker/docs/testingdocs/Attic/UsecasesImplementationStatus.ods,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
Binary files /tmp/cvs7FGC2K and /tmp/cvsYGJIWA differ

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv871

Modified Files:
      Tag: itrackerhibernate
	ITrackerServicesImpl.java 
Log Message:
add setter for issueSearch

Index: ITrackerServicesImpl.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ITrackerServicesImpl.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** ITrackerServicesImpl.java	1 Nov 2005 17:18:25 -0000	1.1.2.6
--- ITrackerServicesImpl.java	26 Nov 2005 01:10:06 -0000	1.1.2.7
***************
*** 210,212 ****
--- 210,216 ----
          return issueSearch;
      }    
+ 
+     public void setIssueSearch( IssueSearch issueSearch ) {        
+         this.issueSearch = issueSearch;
+     }    
  }

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv773

Modified Files:
      Tag: itrackerhibernate
	IssueSearchBean.java 
Log Message:
- remove unused field dataSource
- adjust names of member  variables to fit naming convention in applicationContext.xml
- do not close connection as it is taken from the hibernate session
- remove unused getter/setter for systemConfiguration attribute which is passed as parameter of the constuctor now

Index: IssueSearchBean.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/IssueSearchBean.java,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -C2 -d -r1.25.2.5 -r1.25.2.6
*** IssueSearchBean.java	30 Oct 2005 16:52:11 -0000	1.25.2.5
--- IssueSearchBean.java	26 Nov 2005 01:09:05 -0000	1.25.2.6
***************
*** 26,31 ****
  import java.util.Vector;
  
- import javax.sql.DataSource;
- 
  import cowsultants.itracker.ejb.client.exceptions.IssueSearchException;
  import cowsultants.itracker.ejb.client.interfaces.IssueHandler;
--- 26,29 ----
***************
*** 55,66 ****
      private static String versionbeanRelTableName;
  
!     private static DataSource ds;
! 
!     private IssueHandler ihHome;
  
      private IssueFactory issueFactory;
-     SystemConfiguration systemConfiguration;
  
!     public IssueSearchBean() {        
          componentbeanTableName = systemConfiguration.getProperty("componentbean_table_name",
                  SystemConfigurationUtilities.DEFAULT_COMPONENTBEAN_TABLE_NAME);
--- 53,61 ----
      private static String versionbeanRelTableName;
  
!     private IssueHandler issueHandler;
  
      private IssueFactory issueFactory;
  
!     public IssueSearchBean( SystemConfiguration systemConfiguration) {        
          componentbeanTableName = systemConfiguration.getProperty("componentbean_table_name",
                  SystemConfigurationUtilities.DEFAULT_COMPONENTBEAN_TABLE_NAME);
***************
*** 188,198 ****
              rs.close();
              pstmt.close();
!             if (conn != null) {
                  conn.close();
!             }
  
              Vector issuesAvailable = new Vector();
              for (int i = 0; i < issuesFound.size(); i++) {
!                 IssueModel issue = ihHome.getIssue((Integer) issuesFound.elementAt(i));
  
                  if (IssueUtilities.canViewIssue(issue, user, permissions)) {
--- 183,193 ----
              rs.close();
              pstmt.close();
!             /*if (conn != null) {
                  conn.close();
!             }*/
  
              Vector issuesAvailable = new Vector();
              for (int i = 0; i < issuesFound.size(); i++) {
!                 IssueModel issue = issueHandler.getIssue((Integer) issuesFound.elementAt(i));
  
                  if (IssueUtilities.canViewIssue(issue, user, permissions)) {
***************
*** 211,214 ****
--- 206,210 ----
              return issues;
          } catch (SQLException sqle) {
+             sqle.printStackTrace();
              if (Logger.isLoggingDebug()) {
                  Logger.logDebug("SQLException while searching for issue ids. " + sqle.getMessage());
***************
*** 216,221 ****
              throw new IssueSearchException("SQL Exception caught while performing search.",
                      IssueSearchException.ERROR_SQL_EXCEPTION);
!         } finally {
!             try {
                  if (conn != null) {
                      conn.close();
--- 212,219 ----
              throw new IssueSearchException("SQL Exception caught while performing search.",
                      IssueSearchException.ERROR_SQL_EXCEPTION);
!         } /**finally {
!             
!              * do not close as we get it from the session
!              try {
                  if (conn != null) {
                      conn.close();
***************
*** 223,235 ****
              } catch (SQLException sqle) {
              }
!         }
      }
  
!     public IssueHandler getIhHome() {
!         return ihHome;
      }
  
!     public void setIhHome(IssueHandler ihHome) {
!         this.ihHome = ihHome;
      }
      
--- 221,233 ----
              } catch (SQLException sqle) {
              }
!         }*/
      }
  
!     public IssueHandler getIssueHandler() {
!         return issueHandler;
      }
  
!     public void setIssueHandler(IssueHandler issueHandler) {
!         this.issueHandler = issueHandler;
      }
      
***************
*** 238,251 ****
      }
  
!     public void setIssueFactory(IssueFactory ifHome) {
!         this.issueFactory = ifHome;
!     }
! 
!     public SystemConfiguration getSystemConfiguration() {
!         return systemConfiguration;
!     }
! 
!     public void setSystemConfiguration(SystemConfiguration sc) {
!         this.systemConfiguration = sc;
      }
  }
--- 236,241 ----
      }
  
!     public void setIssueFactory(IssueFactory issueFactory) {
!         this.issueFactory = issueFactory;
      }
  }

Update of /cvsroot/itracker/itracker/web/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31289

Modified Files:
      Tag: itrackerhibernate
	applicationContext.xml 
Log Message:
add issueSearch

Index: applicationContext.xml
===================================================================
RCS file: /cvsroot/itracker/itracker/web/WEB-INF/Attic/applicationContext.xml,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** applicationContext.xml	19 Nov 2005 14:06:39 -0000	1.1.2.13
--- applicationContext.xml	26 Nov 2005 01:04:19 -0000	1.1.2.14
***************
*** 596,599 ****
--- 596,603 ----
  	</bean>
  	
+ 	<bean id="issueSearch" class="cowsultants.itracker.ejb.beans.session.IssueSearchBean" autowire="byName">
+ 		<constructor-arg ref="systemConfiguration"/>
+ 	</bean>	
+         
  	<bean id="itrackerServices" class="cowsultants.itracker.ejb.beans.session.ITrackerServicesImpl" autowire="byName">
  	</bean>	

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30580

Modified Files:
      Tag: itrackerhibernate
	BaseHibernateFactoryImpl.java 
Log Message:
avoid invinite loop on getConnection

Index: BaseHibernateFactoryImpl.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/BaseHibernateFactoryImpl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** BaseHibernateFactoryImpl.java	24 Oct 2005 23:25:50 -0000	1.1.2.3
--- BaseHibernateFactoryImpl.java	26 Nov 2005 01:02:19 -0000	1.1.2.4
***************
*** 41,46 ****
      }
  
      public Connection getConnection() {
!         return(getConnection());
      }
  
--- 41,59 ----
      }
  
+     /**
+      * return the a <code>Connection</code>
+      *
+      * @return a database <code>Connection</code> 
+      */
      public Connection getConnection() {
!         try {
!             return(getSession().connection());
!         } catch (DataAccessResourceFailureException ex) {
!             throw new DataException(ex);
!         } catch (HibernateException ex) {
!             throw new DataException(ex);
!         } catch (IllegalStateException ex) {
!             throw new DataException(ex);
!         }
      }
  

Hi Ricardo,

Sorry for coming back to these issues regarding the JSP
refactoring so late.

"   1) removing most of the Java code from list=5Fissues.jsp was easy. I=20
moved it to an action. This has cause the reduction of the JSP size to=20
half, and I think was a very good thing. "

Where did you do this?

I must first have a look in these topics.

I guess a JSP should not invoke or create or instantiate Handlers as=20
shown in this example...
 IssueHandler ih =3D=20
ServletContextUtils.getItrackerServices(getServletContext()).getIssueHandle=
r();
    ProjectHandler ph =3D=20
ServletContextUtils.getItrackerServices(getServletContext()).getProjectHand=
ler();
This should be done by the StrutsAction.

For the technologies to go with I would give my vote for
1) Using JSTL and EL and JSP where-ever possible.
2) Using custom tags not so much anymore, if JSTL alternatives are available
3) Using Java scriptlets only if really needed.
4) Investigating JSF as a View Technology for future usage as well
 (I am currently investigating this in some other smaller projects, as
testings, and I guess we better wait until Struts makes some moves;=20
currently the
framework is progressing again; even the WebWork Guys want to merge into
the movement).
5) I would give my vote not to use Velocity or Freemarker, because I don't
kow it.

Understanding the code in the JSPs will take some time for me.

I also had discussions with Marc about how we currently programm
here. And I guess we should put more power into the Actions, that
code against the Interfaces (Handlers) that we get from the Factories. I=20
guess
Factories are here to create Interfaces Handler Instances. (I hope I=20
find the right
words here). It seems like we have some wording & design pattern
issues here, between Beans, DAOs, Factories, Handlers, etc. and we should
further enforce a proper design. Anyway, this should be part of an own
thread on the mailing list.

Thanks,
Best regards,
Marky


Ricardo Trindade wrote:

> Hi,
>
>    Regarding the JSP refactoring issue we've been discussing, about=20
> removing java code from JSP :
>
>    1) removing most of the Java code from list=5Fissues.jsp was easy. I=20
> moved it to an action. This has cause the reduction of the JSP size to=20
> half, and I think was a very good thing.
>
>    2) I'm unsure how to proceed. What's left is stuff like this :
>
>            <% if(project.getStatus() =3D=3D ProjectUtilities.STATUS=5FACT=
IVE=20
> && UserUtilities.hasPermission(currPermissions, project.getId(),=20
> UserUtilities.PERMISSION=5FEDIT)) { %>
>                  <it:formatImageAction forward=3D"createissue"=20
> paramName=3D"pid" paramValue=3D"<%=3D project.getId() %>"=20
> src=3D"/themes/standardtheme/images/create.gif"=20
> altKey=3D"itracker.web.image.create.issue.alt" arg0=3D"<%=3D=20
> project.getName() %>" textActionKey=3D"itracker.web.image.create.texttag"=
/>
>            <% } %>
>
>    Some of the issues here will go away by themselves in the future.=20
> Changes like turning project.getStatus() =3D=3D=20
> ProjectUtilities.STATUS=5FACTIVE into project.isActive() will make code=20
> like this more readable. (this is just a simple example, I don't want=20
> to have hard coded project statuses, like the example implies)
>
>    But still, if we want to do full templating, we'll need to go a=20
> step further. We need to remove java code associated with view. That=20
> means conditionals, iterations, formatting, etc... How best can I=20
> remove this java code ? I've examined some options :
>
>    1) Using JSTL (standard tag libraries). Latest version of JSP seems=20
> to have something called EL, that gives decent syntax inside JSPs.    =20
> 2) Using a templating language like velocity, or freeemarker
>    3) Using java inside JSP, to code view logic
>    4) Using something else ?
>
>    What should I do in prototype refactoring I'm doing ? I've worked=20
> with the all the technologies above (velocity, freemarker, JSPs,=20
> etc..), but I don't consider myself and expert in them, because there=20
> has been a while since I've been on or managed the front end layer of=20
> a web project. So I don't think I'm equipped to do the best choice.
>
>    What I can tell is that having the power of a real programming=20
> language inside templates is good, but we have to take care to don't=20
> put business logic in. Unfortunately java is very verbose, so I'm not=20
> sure. My past experience and current small tests lead me to believe=20
> actually all of these aproaches, if well applied, are good.
>
>    So my personal favorite at this point for pass one of the=20
> refactoring is 3). I'm sure it's not the best approach. If any of you=20
> have experience in this area, please help this discussion.
>
> Ricardo
>
>
>
> -------------------------------------------------------
> SF.Net email is sponsored by:
> Tame your development challenges with Apache's Geronimo App Server.=20
> Download
> it for free - -and be entered to win a 42" plasma tv or your very own
> Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
> =5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=
=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F
> Itracker-commits mailing list
> Itr...@li...
> https://lists.sourceforge.net/lists/listinfo/itracker-commits



--=20
R.=D8.S.A.
Identity: Marky Goldstein
E-Mail: re...@ro...
Task: Managing Director, Product & Strategy

R.=D8.S.A. Creation. Technology. Intelligence. AG
Seefeldstrasse 231, 8008 Zurich, Switzerland
Phone: +41 1 389 63 33
Fax: +41 1 389 63 30
URL: http://www.rosa.com/=20

Update of /cvsroot/itracker/itracker/web/WEB-INF/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4145/web/WEB-INF/config

Modified Files:
      Tag: itrackerhibernate
	struts-config.xml 
Log Message:
    changed this to validate = false and removed input, as I guess this is not needed, is it? 

<action path="/removeworkflowscript" type="cowsultants.itracker.web.actions.RemoveWorkflowScriptAction"
            name="workflowScriptForm" scope="request" validate="false"/>

Index: struts-config.xml
===================================================================
RCS file: /cvsroot/itracker/itracker/web/WEB-INF/config/Attic/struts-config.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** struts-config.xml	14 Nov 2005 22:07:55 -0000	1.1.2.3
--- struts-config.xml	25 Nov 2005 20:27:41 -0000	1.1.2.4
***************
*** 76,80 ****
--- 76,82 ----
        <form-property name="versions" type="java.lang.Integer[]"/>
      </form-bean>
+    
      <form-bean name="selfRegistrationForm" type="cowsultants.itracker.web.forms.UserForm"/>
+    
      <form-bean name="watchIssueForm" type="org.apache.struts.validator.DynaValidatorForm">
        <form-property name="issueId" type="java.lang.String"/>
***************
*** 337,341 ****
              name="workflowScriptForm" scope="request" input="/themes/standardtheme/admin/edit_workflowscript.jsp" validate="false"/>
      <action path="/removeworkflowscript" type="cowsultants.itracker.web.actions.RemoveWorkflowScriptAction"
!             name="workflowScriptForm" scope="request" input="/themes/standardtheme/admin/list_workflowscript.jsp"/>
      <action path="/exportattachments" type="cowsultants.itracker.web.actions.ExportAttachmentsAction"
              name="adminActionForm" scope="request" input="/themes/standardtheme/admin/list_attachments.jsp"/>
--- 339,343 ----
              name="workflowScriptForm" scope="request" input="/themes/standardtheme/admin/edit_workflowscript.jsp" validate="false"/>
      <action path="/removeworkflowscript" type="cowsultants.itracker.web.actions.RemoveWorkflowScriptAction"
!             name="workflowScriptForm" scope="request" validate="false"/>
      <action path="/exportattachments" type="cowsultants.itracker.web.actions.ExportAttachmentsAction"
              name="adminActionForm" scope="request" input="/themes/standardtheme/admin/list_attachments.jsp"/>
***************
*** 385,390 ****
      <set-property property="inputForward" value="false"/>
    </controller>
! 
!   <message-resources factory="cowsultants.itracker.web.resources.ITrackerMessageResourcesFactory" parameter="UNUSED" null="false" />
  
    <plug-in className="org.apache.struts.plugins.ModuleConfigVerifier"/>
--- 387,394 ----
      <set-property property="inputForward" value="false"/>
    </controller>
! <!-- 
! <message-resources factory="cowsultants.itracker.web.resources.ITrackerMessageResourcesFactory" parameter="UNUSED" null="false" />
! -->
!   <message-resources factory="cowsultants.itracker.web.resources.ITrackerMessageResourcesFactory" parameter="cowsultants.itracker.ejb.client.resources.ITracker" null="false" />
  
    <plug-in className="org.apache.struts.plugins.ModuleConfigVerifier"/>

Update of /cvsroot/itracker/itracker/docs/testingdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11361/docs/testingdocs

Added Files:
      Tag: itrackerhibernate
	UsecasesImplementationStatus.ods 
Log Message:
Nice Implementation Progress & Testing Sheet for ALL Releases 3.X, made by Marc. We manage in under svn/docs/testingdocs/.

Please people, everybody help us testing. Thanks. 

--- NEW FILE: UsecasesImplementationStatus.ods ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/itracker/itracker/docs/testingdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11315/docs/testingdocs

Log Message:
Directory /cvsroot/itracker/itracker/docs/testingdocs added to the repository
--> Using per-directory sticky tag `itrackerhibernate'

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4674

Modified Files:
      Tag: itrackerhibernate
	issueattachmentbean.hbm.xml 
Log Message:
add field fileData. Remove table IssueAttachmentBean to let hibernate create the new table structure while startup

Index: issueattachmentbean.hbm.xml
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/entity/Attic/issueattachmentbean.hbm.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** issueattachmentbean.hbm.xml	11 Oct 2005 01:36:07 -0000	1.1.2.1
--- issueattachmentbean.hbm.xml	20 Nov 2005 02:21:55 -0000	1.1.2.2
***************
*** 14,19 ****
  		<property name="description" not-null="true" unique="false"/>		
  		<property name="originalFileName" column="orig_file_name" not-null="true" unique="false"/>				
! 		<property name="type" column="attachment_type" not-null="true" unique="false"/>		
! 		<property name="fileName" column="file_name" not-null="true" unique="false"/>				
  		<property name="size" column="file_size" not-null="true" unique="false"/>						
  		<many-to-one name="issue" column="issue_id" class="cowsultants.itracker.ejb.beans.entity.IssueBean"/>		
--- 14,20 ----
  		<property name="description" not-null="true" unique="false"/>		
  		<property name="originalFileName" column="orig_file_name" not-null="true" unique="false"/>				
! 		<property name="type" column="attachment_type" not-null="true" unique="false"/>	
!                 <property name="fileData" column="file_data" not-null="true" length="1000000" unique="false" type="binary"/>
! 		<property name="fileName" column="file_name" not-null="true" unique="false"/>		
  		<property name="size" column="file_size" not-null="true" unique="false"/>						
  		<many-to-one name="issue" column="issue_id" class="cowsultants.itracker.ejb.beans.entity.IssueBean"/>		

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4399

Modified Files:
      Tag: itrackerhibernate
	UserFactoryImpl.java 
Log Message:
implemented getUserPermissions(UserModel user, int req_source_web) // what is this req_source_web about?

Index: UserFactoryImpl.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/UserFactoryImpl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** UserFactoryImpl.java	21 Oct 2005 11:14:29 -0000	1.1.2.3
--- UserFactoryImpl.java	20 Nov 2005 02:20:20 -0000	1.1.2.4
***************
*** 3,10 ****
--- 3,15 ----
  import java.util.Collection;
  import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.List;
  
  import net.sf.hibernate.Criteria;
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.expression.Expression;
+ import net.sf.hibernate.expression.Order;
+ 
+ import cowsultants.itracker.ejb.beans.entity.PermissionBean;
  import cowsultants.itracker.ejb.beans.entity.UserBean;
  import cowsultants.itracker.ejb.client.models.UserModel;
***************
*** 20,26 ****
      }
  
      public HashMap getUserPermissions(UserModel user, int req_source_web) {
!         // TODO Auto-generated method stub
!         return null;
      }
  
--- 25,72 ----
      }
  
+     /**
+      * Searches all permissions for the given user and sorts it by project. The
+      * <code>HashMap</code> returned has the project ids as key (<code>Integer</code>)
+      * and a <code>HashSet</code> as values. The <code>HashSet</code> holds a set of 
+      * string representation of the permission
+      *
+      * @param user The user of interest
+      * @param req_source_web requested by?
+      * @return HashMap of permission keyed by project ids
+      */
      public HashMap getUserPermissions(UserModel user, int req_source_web) {
!         
!         // create hashMap to hold permission by project id as key
!         HashMap mapByProject = new HashMap();
!         try {
!             // load user bean
!             UserBean userBean = (UserBean) getSession().load(UserBean.class, user.getId());
!             // create criteria
!             Criteria criteria = getSession().createCriteria(PermissionBean.class);
!             criteria.add( Expression.eq ("user" , userBean) );
!             criteria.addOrder( Order.asc( "project" ));
!             // perform search
!             List perms = criteria.list();
!             for ( int i = 0; i < perms.size(); i++ ) {
!                 // get current permission
!                 PermissionBean perm = (PermissionBean)perms.get(i);
!                 // hashset with permissions for a given project
!                 HashSet projectSet = null;
!                 if ( mapByProject.containsKey( perm.getProject().getId() ) ) {
!                     // get hashSet for project if it exists
!                     projectSet = (HashSet)mapByProject.get( perm.getProject().getId() );
!                 } else {
!                     // create if not available yet
!                     projectSet = new HashSet();
!                     // put into container
!                     mapByProject.put( perm.getProject().getId(), projectSet );
!                 }
!                 // add permission of permission for a given project as a String
!                 projectSet.add(perm.getPermissionType() + "");
!             }
!         } catch (HibernateException ex) {
!             throw new DataException( ex );
!         }
!         return mapByProject;
      }
  

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4178

Modified Files:
      Tag: itrackerhibernate
	AttachmentDownloadController.java 
Log Message:
- pass servletContext to getITrackerServices as the method interface changed
- adjust paths of jsps to new directory structure (themes/...)

Index: AttachmentDownloadController.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/AttachmentDownloadController.java,v
retrieving revision 1.13.4.5
retrieving revision 1.13.4.6
diff -C2 -d -r1.13.4.5 -r1.13.4.6
*** AttachmentDownloadController.java	30 Oct 2005 16:30:56 -0000	1.13.4.5
--- AttachmentDownloadController.java	20 Nov 2005 02:19:24 -0000	1.13.4.6
***************
*** 55,59 ****
          UserModel user = (UserModel) session.getAttribute("user");
          try {
!             IssueHandler ih = getITrackerServices().getIssueHandler();
  
              Integer attachmentId = null;
--- 55,59 ----
          UserModel user = (UserModel) session.getAttribute("user");
          try {
!             IssueHandler ih = getITrackerServices(request.getSession().getServletContext() ).getIssueHandler();
  
              Integer attachmentId = null;
***************
*** 73,82 ****
                  errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("itracker.web.error.invalidattachment"));
                  saveErrors(request, errors);
!                 forward("/error.jsp", request, response);
                  return;
              }
  
              if(! ih.canViewIssue(attachment.getIssueId(), user)) {
!                 forward("/unauthorized.jsp", request, response);
                  return;
              }
--- 73,82 ----
                  errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("itracker.web.error.invalidattachment"));
                  saveErrors(request, errors);
!                 forward("/themes/standardtheme//error.jsp", request, response);
                  return;
              }
  
              if(! ih.canViewIssue(attachment.getIssueId(), user)) {
!                 forward("/themes/standardtheme/unauthorized.jsp", request, response);
                  return;
              }
***************
*** 87,91 ****
                  errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("itracker.web.error.missingattachmentdata"));
                  saveErrors(request, errors);
!                 forward("/error.jsp", request, response);
                  return;
              }
--- 87,91 ----
                  errors.add(ActionErrors.GLOBAL_ERROR, new ActionError("itracker.web.error.missingattachmentdata"));
                  saveErrors(request, errors);
!                 forward("/themes/standardtheme//error.jsp", request, response);
                  return;
              }

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3963

Modified Files:
      Tag: itrackerhibernate
	ReportDownloadController.java 
Log Message:
pass servletContext to getITrackerServices as the method interface changed

Index: ReportDownloadController.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/ReportDownloadController.java,v
retrieving revision 1.6.4.5
retrieving revision 1.6.4.6
diff -C2 -d -r1.6.4.5 -r1.6.4.6
*** ReportDownloadController.java	1 Nov 2005 17:51:34 -0000	1.6.4.5
--- ReportDownloadController.java	20 Nov 2005 02:17:53 -0000	1.6.4.6
***************
*** 50,54 ****
          UserModel user = (UserModel) session.getAttribute("user");
          try {
!             ReportHandler rh = this.getITrackerServices().getReportHandler();
  
              Integer reportId = null;
--- 50,54 ----
          UserModel user = (UserModel) session.getAttribute("user");
          try {
!             ReportHandler rh = this.getITrackerServices(request.getSession().getServletContext()).getReportHandler();
  
              Integer reportId = null;

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3825

Modified Files:
      Tag: itrackerhibernate
	GenericController.java 
Log Message:
servletContext must be passed as parameter to avoid NullPointerException

Index: GenericController.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/servlets/GenericController.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** GenericController.java	30 Oct 2005 16:12:06 -0000	1.4.4.1
--- GenericController.java	20 Nov 2005 02:17:05 -0000	1.4.4.2
***************
*** 23,26 ****
--- 23,27 ----
  
  import javax.servlet.RequestDispatcher;
+ import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServlet;
***************
*** 117,122 ****
      
  
!     protected ITrackerServices getITrackerServices() {
!         return ServletContextUtils.getItrackerServices(getServletContext());
      }
  
--- 118,123 ----
      
  
!     protected ITrackerServices getITrackerServices(ServletContext context) {
!         return ServletContextUtils.getItrackerServices(context);
      }
  

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2717

Modified Files:
      Tag: itrackerhibernate
	EditTaskAction.java 
Log Message:
validate availability of chosen class

Index: EditTaskAction.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/web/actions/EditTaskAction.java,v
retrieving revision 1.9.4.4
retrieving revision 1.9.4.5
diff -C2 -d -r1.9.4.4 -r1.9.4.5
*** EditTaskAction.java	29 Oct 2005 18:10:24 -0000	1.9.4.4
--- EditTaskAction.java	19 Nov 2005 21:33:15 -0000	1.9.4.5
***************
*** 80,86 ****
              String className = (String) PropertyUtils.getSimpleProperty(form, "className");
              if(className != null && ! className.equals("")) {
!                 task.setClassName(className);
              } else {
!                 task.setClassName((String) PropertyUtils.getSimpleProperty(form, "classNameText"));
              }
              task.setArgs((String) PropertyUtils.getSimpleProperty(form, "args"));
--- 80,103 ----
              String className = (String) PropertyUtils.getSimpleProperty(form, "className");
              if(className != null && ! className.equals("")) {
!                 try {
!                     Class.forName( className );
!                     task.setClassName(className);
!                 } catch ( ClassNotFoundException e ) {
!                     errors.add(ActionErrors.GLOBAL_ERROR, new ActionError( "itracker.web.error.save" ) );
!                     saveErrors(request, errors);
!                     saveToken(request);
!                     return mapping.getInputForward();
!                 }
              } else {
!                 String classNameText = (String) PropertyUtils.getSimpleProperty(form, "classNameText");
!                 try {
!                     Class.forName( classNameText );
!                     task.setClassName( classNameText );
!                 } catch ( ClassNotFoundException e ) {
!                     errors.add(ActionErrors.GLOBAL_ERROR, new ActionError( "itracker.web.error.save" ) );
!                     saveErrors(request, errors);
!                     saveToken(request);
!                     return mapping.getInputForward();
!                 }
              }
              task.setArgs((String) PropertyUtils.getSimpleProperty(form, "args"));

Update of /cvsroot/itracker/itracker/web/themes/standardtheme/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2636

Modified Files:
      Tag: itrackerhibernate
	edit_task.jsp 
Log Message:
display message if any

Index: edit_task.jsp
===================================================================
RCS file: /cvsroot/itracker/itracker/web/themes/standardtheme/admin/Attic/edit_task.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** edit_task.jsp	29 Oct 2005 11:39:26 -0000	1.1.2.1
--- edit_task.jsp	19 Nov 2005 21:32:15 -0000	1.1.2.2
***************
*** 43,46 ****
--- 43,56 ----
        <%@ include file="/themes/standardtheme/includes/header.jsp" %>
  
+ <logic:messagesPresent>
+   <center>
+     <span class="formError">
+      <html:messages id="error">
+         <bean:write name="error"/><br/>
+      </html:messages>
+     </span>
+   </center>
+   <br>
+ </logic:messagesPresent>
        <html:form action="/edittask">
          <html:hidden property="action"/>

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32681

Modified Files:
      Tag: itrackerhibernate
	SchedulerHandlerBean.java 
Log Message:
make create, update and delete of scheduled tasks work

Index: SchedulerHandlerBean.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/SchedulerHandlerBean.java,v
retrieving revision 1.8.4.5
retrieving revision 1.8.4.6
diff -C2 -d -r1.8.4.5 -r1.8.4.6
*** SchedulerHandlerBean.java	30 Oct 2005 16:52:11 -0000	1.8.4.5
--- SchedulerHandlerBean.java	19 Nov 2005 16:31:09 -0000	1.8.4.6
***************
*** 19,22 ****
--- 19,24 ----
  package cowsultants.itracker.ejb.beans.session;
  
+ import cowsultants.itracker.ejb.client.util.Logger;
+ import java.sql.Timestamp;
  import java.util.Collection;
  import java.util.Iterator;
***************
*** 51,70 ****
      }
  
      public ScheduledTaskModel createTask(ScheduledTaskModel model) {
              ScheduledTaskBean task = new ScheduledTaskBean();
              task.setModel(model);
              return task.getModel();
-             //Logger.logDebug("Could not create task.", ce);
      }
  
      public ScheduledTaskModel updateTask(ScheduledTaskModel model) {
              ScheduledTaskBean task = scheduledTaskFactory.findByPrimaryKey(model.getId());
              task.setModel(model);
              return task.getModel();
      }
  
      public boolean removeTask(Integer taskId) {
!             //stHome.remove(taskId);
!             return true;
      }
  
--- 53,100 ----
      }
  
+     /**
+      * Creates a scheduled task
+      *
+      * @param model The <code>ScheduledTaskModel</code> carrying the data
+      * @return The <code>ScheduledTaskModel</code> after saving
+      */
      public ScheduledTaskModel createTask(ScheduledTaskModel model) {
              ScheduledTaskBean task = new ScheduledTaskBean();
              task.setModel(model);
+             task.setCreateDate( new Timestamp(System.currentTimeMillis()));
+             
+             this.scheduledTaskFactory.saveOrUpdate( task );
              return task.getModel();
      }
  
+ 
+     /**
+      * updates a scheduled task
+      *
+      * @param model The <code>ScheduledTaskModel</code> carrying the data
+      * @return The <code>ScheduledTaskModel</code> after updating
+      */    
      public ScheduledTaskModel updateTask(ScheduledTaskModel model) {
              ScheduledTaskBean task = scheduledTaskFactory.findByPrimaryKey(model.getId());
              task.setModel(model);
+             
+             this.scheduledTaskFactory.saveOrUpdate(task);
              return task.getModel();
      }
  
+     /**
+      * removes a scheduled task
+      *
+      * @param taskId The id of the task
+      * @return true if removed
+      */
      public boolean removeTask(Integer taskId) {
!         try {
!             ScheduledTaskBean task = this.scheduledTaskFactory.findByPrimaryKey(taskId);
!             this.scheduledTaskFactory.delete(task);
!         } catch ( DataException e ) {
!             Logger.logError( e.getMessage(), e );
!         }
!         return false;
      }
  

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32577

Modified Files:
      Tag: itrackerhibernate
	ScheduledTaskFactoryImpl.java 
Log Message:
extend BaseHibernateFactoryImpl and implement findByPrimaryKey in hibernate style

Index: ScheduledTaskFactoryImpl.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ScheduledTaskFactoryImpl.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
*** ScheduledTaskFactoryImpl.java	19 Nov 2005 15:39:23 -0000	1.1.2.2
--- ScheduledTaskFactoryImpl.java	19 Nov 2005 16:30:27 -0000	1.1.2.3
***************
*** 11,15 ****
  import cowsultants.itracker.ejb.beans.entity.ScheduledTaskBean;
  
! public class ScheduledTaskFactoryImpl extends HibernateDaoSupport implements ScheduledTaskFactory {
  
      /** 
--- 11,15 ----
  import cowsultants.itracker.ejb.beans.entity.ScheduledTaskBean;
  
! public class ScheduledTaskFactoryImpl extends BaseHibernateFactoryImpl implements ScheduledTaskFactory {
  
      /** 

Update of /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32236

Modified Files:
      Tag: itrackerhibernate
	ScheduledTaskFactory.java 
Log Message:
extend BaseFactory

Index: ScheduledTaskFactory.java
===================================================================
RCS file: /cvsroot/itracker/itracker/src/cowsultants/itracker/ejb/beans/session/Attic/ScheduledTaskFactory.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
*** ScheduledTaskFactory.java	11 Oct 2005 01:36:08 -0000	1.1.2.1
--- ScheduledTaskFactory.java	19 Nov 2005 16:29:32 -0000	1.1.2.2
***************
*** 5,9 ****
  import cowsultants.itracker.ejb.beans.entity.ScheduledTaskBean;
  
! public interface ScheduledTaskFactory {
      
      public ScheduledTaskBean findByPrimaryKey(Integer id);
--- 5,9 ----
  import cowsultants.itracker.ejb.beans.entity.ScheduledTaskBean;
  
! public interface ScheduledTaskFactory extends BaseFactory {
      
      public ScheduledTaskBean findByPrimaryKey(Integer id);