join-cvs Mailing List for Join Integration Management System (Page 3)
Brought to you by:
lbroudoux
Menu
▾
▴
join-cvs — CVS commits for JOIN
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(68) |
Aug
(146) |
Sep
(35) |
Oct
(30) |
Nov
(56) |
Dec
(45) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
(48) |
Mar
(56) |
Apr
(13) |
May
(15) |
Jun
(37) |
Jul
(113) |
Aug
(41) |
Sep
(24) |
Oct
(44) |
Nov
(52) |
Dec
|
| 2005 |
Jan
(73) |
Feb
(14) |
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(90) |
Sep
(51) |
Oct
(5) |
Nov
(24) |
Dec
(1) |
| 2006 |
Jan
(26) |
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(165) |
Aug
(4) |
Sep
(5) |
Oct
(48) |
Nov
(3) |
Dec
(10) |
| 2007 |
Jan
(38) |
Feb
(48) |
Mar
(3) |
Apr
(31) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(9) |
Dec
|
| 2008 |
Jan
(21) |
Feb
(41) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(12) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:36:35
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/security/persistence In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32602/businessobjects/security/persistence Modified Files: JdbcUserDao.java Log Message: Update according to new ObjectDao interface Index: JdbcUserDao.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/security/persistence/JdbcUserDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JdbcUserDao.java 6 Feb 2007 22:14:30 -0000 1.1 --- JdbcUserDao.java 3 Feb 2008 22:36:31 -0000 1.2 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 282,290 **** */ public void initialize(EntityObject entityobject){ ! // User do not have lazy loaded fields so jst refresh its state. refresh(entityobject); } /** * Persist the object state throughout the cluster. * @param obj The object to replicate --- 282,309 ---- */ public void initialize(EntityObject entityobject){ ! // User do not have lazy loaded fields so just refresh its state. refresh(entityobject); } /** + * Force initialization of the given entity association from underlying datastore + * @param entityobject EntityObject whose association shoud be initialized + * @param proxy A proxy object representing entoty association (this may be a collection) + */ + public void initializeAssociation(EntityObject entityobject, Object proxy){ + // User do not have lazy loaded fields so just refresh its state. + refresh(entityobject); + } + + /** + * Check if an object (EntityObject or association proxy) is initialized from datastore + * @param object The object to check initialization for + * @return true if object has been loaded from datastore, false otherwise + */ + public boolean isInitialized(Object object){ + return (object instanceof User); + } + + /** * Persist the object state throughout the cluster. * @param obj The object to replicate |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:35:14
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/reporting In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32200/businessobjects/reporting Modified Files: Subscription.java Log Message: Fix hibernate association problem Index: Subscription.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/reporting/Subscription.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Subscription.java 6 Feb 2007 21:32:18 -0000 1.2 --- Subscription.java 3 Feb 2008 22:35:08 -0000 1.3 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 56,59 **** --- 56,62 ---- this.mailingList = mailingList; this.creationDate = new Date(); + /* TODO: why this statement makes Hibernate fails with a ClassCastException when + reassociating mailing lists subscriptions proxy with session ? */ + // mailingList.addSubscription(this); } *************** *** 89,93 **** /** ! * @hibernate.many-to-one column="s_mailinglist_fk" not-null="true" * @return The mailing list that is subscribed to */ --- 92,96 ---- /** ! * @hibernate.many-to-one column="n_mailinglist_fk" not-null="true" * @return The mailing list that is subscribed to */ |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:34:11
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/reporting In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31498/businessobjects/reporting Modified Files: MailingList.java Log Message: Fix hibernate association problem Index: MailingList.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/reporting/MailingList.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MailingList.java 6 Feb 2007 21:32:18 -0000 1.2 --- MailingList.java 3 Feb 2008 22:34:05 -0000 1.3 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 117,121 **** * @hibernate.bag lazy="true" cascade="all-delete-orphan" inverse="true" * @hibernate.collection-key column="n_mailinglist_fk" ! * @hibernate.collection-many-to-many class="org.figure8.join.businessobjects.reporting.Subscription" * @return A set of {@code Subscription} objects for this mailing list */ --- 117,121 ---- * @hibernate.bag lazy="true" cascade="all-delete-orphan" inverse="true" * @hibernate.collection-key column="n_mailinglist_fk" ! * @hibernate.collection-one-to-many class="org.figure8.join.businessobjects.reporting.Subscription" * @return A set of {@code Subscription} objects for this mailing list */ |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:29:55
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/commons/persistence In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29850/businessobjects/commons/persistence Modified Files: HibernateStatusDao.java Log Message: Fix checstyle issues Index: HibernateStatusDao.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/commons/persistence/HibernateStatusDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HibernateStatusDao.java 19 Jul 2006 23:12:28 -0000 1.1 --- HibernateStatusDao.java 3 Feb 2008 22:29:51 -0000 1.2 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 17,21 **** import org.figure8.join.core.persistence.HibernateObjectDao; import org.figure8.join.businessobjects.commons.Status; - import org.figure8.join.services.cache.CacheManager; import org.figure8.join.util.LogUtil; --- 17,20 ---- |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:28:26
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/security In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29451/businessfacades/security Modified Files: UserManager.java Log Message: Fix checstyle issues Index: UserManager.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/security/UserManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UserManager.java 20 Jul 2006 12:23:55 -0000 1.1 --- UserManager.java 3 Feb 2008 22:28:19 -0000 1.2 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 86,89 **** --- 86,90 ---- * The getUsers method must be used when you want to list users using lastname * criterion. Users have their lastname "LIKE" given arguments. + * @param lastname The lastname to use as search criteria * @return List of <code>org.figure8.join.businessobjects.security.User</code>. */ |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:27:06
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28696/businessfacades/environment Modified Files: DefaultResourceManager.java Log Message: Add feature for remote interaction with resources and their versions Index: DefaultResourceManager.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/environment/DefaultResourceManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DefaultResourceManager.java 6 Apr 2007 21:02:35 -0000 1.5 --- DefaultResourceManager.java 3 Feb 2008 22:26:57 -0000 1.6 *************** *** 1,4 **** /** ! * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 28,33 **** import org.figure8.join.businessobjects.environment.VersionedResourceType; import org.figure8.join.businessobjects.environment.VersionedResourceUpdate; - import org.figure8.join.businessobjects.environment.EISMapping; import org.figure8.join.businessobjects.environment.EIS; import org.figure8.join.businessobjects.environment.persistence.MachineDao; import org.figure8.join.businessobjects.environment.persistence.ResourceDao; --- 28,33 ---- import org.figure8.join.businessobjects.environment.VersionedResourceType; import org.figure8.join.businessobjects.environment.VersionedResourceUpdate; import org.figure8.join.businessobjects.environment.EIS; + import org.figure8.join.businessobjects.environment.EISMapping; import org.figure8.join.businessobjects.environment.persistence.MachineDao; import org.figure8.join.businessobjects.environment.persistence.ResourceDao; *************** *** 373,376 **** --- 373,385 ---- log.info("Updating " + resource.getName() + " resource using " + version.getName() + " resource version"); + + // Initialize active update for this resource because they are lazy loaded and + // it may have no SessionInView filter active ... + // TODO : added for remote access purpose (ResourceService), check for wmogin this block somewhere else... + if (!resourceDao.isInitialized(resource.getActiveVersionUpdates())){ + log.info("Initializing activeVersionUpdates for resource " + resource.getName()); + resourceDao.initializeAssociation(resource, resource.getActiveVersionUpdates()); + } + // Create a new update and update the resource. VersionedResourceUpdate update = new VersionedResourceUpdate(version, resource); |
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:26:05
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28309/businessfacades/environment Modified Files: DefaultParameterManager.java Log Message: Fix checstyle issues Index: DefaultParameterManager.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessfacades/environment/DefaultParameterManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DefaultParameterManager.java 6 Apr 2007 21:02:35 -0000 1.3 --- DefaultParameterManager.java 3 Feb 2008 22:25:59 -0000 1.4 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 107,111 **** */ public Parameter getParameter(String name){ ! return parameterDao.getParameter(name); } --- 107,111 ---- */ public Parameter getParameter(String name){ ! return parameterDao.getParameter(name); } *************** *** 118,122 **** if (log.isDebugEnabled()) log.debug("Found " + result.size() + " different deployment parameters"); ! return result; } --- 118,122 ---- if (log.isDebugEnabled()) log.debug("Found " + result.size() + " different deployment parameters"); ! return result; } *************** *** 126,130 **** */ public void removeParameter(Parameter parameter){ ! parameterDao.remove(parameter); log.info("Parameter called '" + parameter.getName() + "' has been removed."); } --- 126,130 ---- */ public void removeParameter(Parameter parameter){ ! parameterDao.remove(parameter); log.info("Parameter called '" + parameter.getName() + "' has been removed."); } |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 22:35:59
|
Update of /cvsroot/join/join1/src/web/styles In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17189/styles Modified Files: join.css Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: join.css =================================================================== RCS file: /cvsroot/join/join1/src/web/styles/join.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** join.css 9 Oct 2006 20:58:29 -0000 1.2 --- join.css 28 Jan 2008 22:35:53 -0000 1.3 *************** *** 113,117 **** } ! .h3, .h4, .h5{ background-image: url(../images/nw-min.gif); background-repeat: no-repeat; --- 113,117 ---- } ! .h4, .h5{ background-image: url(../images/nw-min.gif); background-repeat: no-repeat; *************** *** 122,126 **** background-color: #a2b7c5; } - .h4{ color: #1f354d; --- 122,125 ---- *************** *** 173,176 **** --- 172,184 ---- } + .disptab th{ + background-color: #dddddd; + background-image: url(../images/nw-min.gif); + background-repeat: no-repeat; + } + .disptab th.empty{ + background-color: #f2f5f7; + } + #doctab th{ background-color: #dddddd; *************** *** 211,215 **** } ! #leftcol a, #doctab a{ text-decoration: none; } --- 219,223 ---- } ! #leftcol a, .disptab a, #doctab a{ text-decoration: none; } *************** *** 272,276 **** margin-top: 0em; } - .h4 h4{ font-size: 0.9em; --- 280,283 ---- *************** *** 302,305 **** --- 309,321 ---- } + .disptab td{ + font-size: 0.7em; + color: #686868; + } + .disptab th{ + font-size: 0.7em; + color: #686868; + } + #doctab td{ font-size: 0.7em; *************** *** 348,351 **** --- 364,380 ---- } + table.disptab td{ + margin: 2px; + padding-left: 12px; + padding-right: 12px; + } + table.disptab th{ + margin: 2px; + padding-right: 10px; + padding-left: 10px; + padding-top: 3px; + padding-bottom: 3px; + } + table#doctab td{ margin: 2px; *************** *** 382,384 **** td#leftcol div{ padding-left: 5px; ! } --- 411,413 ---- td#leftcol div{ padding-left: 5px; ! } \ No newline at end of file |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 22:34:20
|
Update of /cvsroot/join/join1/src/web/jsp In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16768/jsp Modified Files: mailinglists.jsp subscriptions.jsp Log Message: Fix for issue #1880908 : complete subscriptions rendering Index: mailinglists.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/mailinglists.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mailinglists.jsp 30 Jul 2006 19:16:26 -0000 1.1 --- mailinglists.jsp 28 Jan 2008 22:34:16 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 7,10 **** --- 8,15 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <script language="javascript"> var events = new Array(); *************** *** 54,57 **** --- 59,69 ---- } </script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/editor/tiny_mce.js"></script> + <script language="javascript" type="text/javascript"> + tinyMCE.init({ + theme : "complete", + mode : "textareas" + }); + </script> <div class="h3"> *************** *** 68,95 **** <h4><bean:message bundle="gui" key="title.mailinglist.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="requestScope.mailingLists" export="true" ! requestURI="/action/mailingList" excludedParams="*"> ! <display:column titleKey="label.mailinglist.name" property="name" sortable="true"/> ! <display:column titleKey="label.mailinglist.event" property="event.label" sortable="true"/> ! <display:column titleKey="label.mailinglist.eventResource"> ! <logic:notEmpty name="row" property="event.resourceResolver"> ! <logic:notEmpty name="row" property="resourceId"> ! <bean:define id="resourceId" name="row" property="resourceId" toScope="page"/> ! <bean:define id="resolver" name="row" property="event.resourceResolver" toScope="page"/> ! <join:getResult name="resolver" scope="page" method="getResource" ! paramName="resourceId" paramScope="page" resultName="resource" resultScope="page"/> ! <bean:write name="resource" property="label"/> </logic:notEmpty> ! </logic:notEmpty> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/mailingList?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit mailing list properties"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/mailingList?op=subscriptions" paramId="name" paramProperty="name"> ! <html:img page="/images/16x16/users.gif" alt="Users subscriptions"/> ! </display:column> ! </display:table> </div> <br/> <bean:define id="param" value="true"/> <html:img page="/images/22x22/add.gif" align="absmiddle"/> --- 80,109 ---- <h4><bean:message bundle="gui" key="title.mailinglist.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.mailingLists" export="true" ! requestURI="/action/mailingList?rd=none" excludedParams="*"> ! <display:column titleKey="label.mailinglist.name" property="name" sortable="true"/> ! <display:column titleKey="label.mailinglist.event" property="event.label" sortable="true"/> ! <display:column titleKey="label.mailinglist.eventResource"> ! <logic:notEmpty name="row" property="event.resourceResolver"> ! <logic:notEmpty name="row" property="resourceId"> ! <bean:define id="resourceId" name="row" property="resourceId" toScope="page"/> ! <bean:define id="resolver" name="row" property="event.resourceResolver" toScope="page"/> ! <join:getResult name="resolver" scope="page" method="getResource" ! paramName="resourceId" paramScope="page" resultName="resource" resultScope="page"/> ! <bean:write name="resource" property="label"/> ! </logic:notEmpty> </logic:notEmpty> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/mailingList?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit mailing list properties"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/mailingList?op=subscriptions" paramId="name" paramProperty="name"> ! <html:img page="/images/16x16/users.gif" alt="Users subscriptions"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> <br/> <bean:define id="param" value="true"/> <html:img page="/images/22x22/add.gif" align="absmiddle"/> Index: subscriptions.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/subscriptions.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** subscriptions.jsp 6 Feb 2007 21:48:49 -0000 1.1 --- subscriptions.jsp 28 Jan 2008 22:34:16 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 9,12 **** --- 10,14 ---- <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/prototype.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/ajaxtags.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/effects.js"></script> <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/hide.js"></script> *************** *** 52,53 **** --- 54,82 ---- </div> </logic:present> + <logic:notPresent parameter="userId"> + <div class="h3"> + <h3> + <html:img page="/images/22x22/users.gif" align="absmiddle"/> <bean:message bundle="gui" key="title.subscriptions"/> + </h3> + </div> + <br/> + <div class="h4"> + <h4><bean:message bundle="gui" key="title.subscriptions.list"/> '<bean:write name="mailingList" property="name"/>'</h4> + <div align="center"> + <ajax:displayTag id="adtFrame" tableClass="disptab"> + <display:table id="row" styleClass="disptab" name="requestScope.subscriptions" + requestURI="/action/mailingList?rd=none" export="true"> + <display:column titleKey="label.subscription.user" sortable="true"> + <join:resolveUser name="row" property="userId"/> + </display:column> + <display:column titleKey="label.subscription.date" sortable="true" width="130"> + <bean:write name="row" property="creationDate" formatKey="pattern.date.datetostring"/> + </display:column> + </display:table> + </ajax:displayTag> + </div> + <br/> + <html:img page="/images/22x22/message.gif" align="absmiddle"/> + <html:link action="/mailingList"><bean:message bundle="gui" key="title.mailinglist"/> ...</html:link> + </div> + </logic:notPresent> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:49:12
|
Update of /cvsroot/join/join1/src/web/styles In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25567/styles Added Files: niftycorners.css Log Message: --- NEW FILE: niftycorners.css --- /*Nifty Corners Cube CSS by Alessandro Fulciniti The following classes are added dinamically by javascript, and their use should be avoided in the markup */ b.niftycorners,b.niftyfill{display:block} b.niftycorners *{display:block;height: 1px;line-height:1px;font-size: 1px; overflow:hidden;border-style:solid;border-width: 0 1px} /*normal*/ b.r1{margin: 0 3px;border-width: 0 2px} b.r2{margin: 0 2px} b.r3{margin: 0 1px} b.r4{height: 2px} b.rb1{margin: 0 8px;border-width:0 2px} b.rb2{margin: 0 6px;border-width:0 2px} b.rb3{margin: 0 5px} b.rb4{margin: 0 4px} b.rb5{margin: 0 3px} b.rb6{margin: 0 2px} b.rb7{margin: 0 1px;height:2px} b.rb8{margin: 0;height:2px} b.rs1{margin: 0 1px} /*transparent inside*/ b.t1{border-width: 0 5px} b.t2{border-width: 0 3px} b.t3{border-width: 0 2px} b.t4{height: 2px} b.tb1{border-width: 0 10px} b.tb2{border-width: 0 8px} b.tb3{border-width: 0 6px} b.tb4{border-width: 0 5px} b.tb5{border-width: 0 4px} b.tb6{border-width: 0 3px} b.tb7{border-width: 0 2px;height:2px} b.tb8{border-width: 0 1px;height:2px} b.ts1{border-width: 0 2px} |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:47:30
|
Update of /cvsroot/join/join1/src/web/layouts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24822/layouts Modified Files: main.jsp popup.jsp Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: popup.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/layouts/popup.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** popup.jsp 30 Jul 2006 19:45:34 -0000 1.1 --- popup.jsp 28 Jan 2008 00:47:27 -0000 1.2 *************** *** 9,13 **** --- 9,26 ---- <title><tiles:getAsString name="title" ignore="true"/></title> <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/menu.js"></script> + <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/niftycube.js"></script> <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/styles/join.css" media="screen"/> + <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/styles/niftycorners.css" media="screen"/> + + <script language="javascript" type="text/javascript"> + function loadNifty(){ + Nifty("div.h3","tl br"); + Nifty("div.h4","tl bottom"); + } + window.onload=function(){ + loadNifty(); + } + </script> </head> Index: main.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/layouts/main.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main.jsp 30 Jul 2006 19:45:34 -0000 1.1 --- main.jsp 28 Jan 2008 00:47:27 -0000 1.2 *************** *** 9,13 **** --- 9,26 ---- <title><tiles:getAsString name="title" ignore="true"/></title> <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/menu.js"></script> + <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%= request.getContextPath() %>/scripts/niftycube.js"></script> <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/styles/join.css" media="screen"/> + <link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/styles/niftycorners.css" media="screen"/> + + <script language="Javascript" type="text/javascript"> + function loadNifty(){ + Nifty("div.h3","tl br"); + Nifty("div.h4","tl bottom"); + } + window.onload=function(){ + loadNifty(); + } + </script> </head> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:42:44
|
Update of /cvsroot/join/join1/src/web/jsp In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22938/jsp Modified Files: releases.jsp status.jsp steps.jsp targets.jsp Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: status.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/status.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** status.jsp 14 Jan 2007 18:16:30 -0000 1.2 --- status.jsp 28 Jan 2008 00:42:41 -0000 1.3 *************** *** 2,7 **** <%@ page import="org.figure8.join.businessobjects.commons.Status "%> - <%@ page import="org.apache.commons.beanutils.BasicDynaBean" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 2,7 ---- <%@ page import="org.figure8.join.businessobjects.commons.Status "%> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 9,12 **** --- 9,16 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 22,37 **** <h4><bean:message bundle="gui" key="title.status.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="requestScope.statusList" export="true" ! requestURI="/action/status" excludedParams="*"> ! <display:column titleKey="label.status.key" property="key" sortable="true" width="80"/> ! <display:column titleKey="label.status.label" property="label"/> ! <display:column titleKey="label.status.type" property="type"/> ! <display:column titleKey="label.status.terminal" property="terminal"/> ! <display:column titleKey="label.status.cancelled" property="cancelled"/> ! <display:column headerClass="empty" media="html" ! url="/action/status?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit status properties"/> ! </display:column> ! </display:table> </div> </div> --- 26,43 ---- <h4><bean:message bundle="gui" key="title.status.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.statusList" export="true" ! requestURI="/action/status?rd=none" excludedParams="*"> ! <display:column titleKey="label.status.key" property="key" sortable="true" width="80"/> ! <display:column titleKey="label.status.label" property="label"/> ! <display:column titleKey="label.status.type" property="type"/> ! <display:column titleKey="label.status.terminal" property="terminal"/> ! <display:column titleKey="label.status.cancelled" property="cancelled"/> ! <display:column headerClass="empty" media="html" ! url="/action/status?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit status properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> </div> Index: targets.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/targets.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** targets.jsp 30 Jul 2006 19:16:27 -0000 1.1 --- targets.jsp 28 Jan 2008 00:42:41 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 19,31 **** <h4><bean:message bundle="gui" key="title.target.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="requestScope.targets" export="true" ! requestURI="/action/target" excludedParams="*"> ! <display:column titleKey="label.target.name" property="name" sortable="true" width="80"/> ! <display:column titleKey="label.target.description" property="description" width="240"/> ! <display:column headerClass="empty" media="html" ! url="/action/target?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit target properties"/> ! </display:column> ! </display:table> </div> </div> --- 24,38 ---- <h4><bean:message bundle="gui" key="title.target.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.targets" export="true" ! requestURI="/action/target?rd=none" excludedParams="*"> ! <display:column titleKey="label.target.name" property="name" sortable="true" width="80"/> ! <display:column titleKey="label.target.description" property="description" width="240"/> ! <display:column headerClass="empty" media="html" ! url="/action/target?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit target properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> </div> Index: steps.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/steps.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** steps.jsp 30 Jul 2006 19:16:26 -0000 1.1 --- steps.jsp 28 Jan 2008 00:42:41 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 19,31 **** <h4><bean:message bundle="gui" key="title.step.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="applicationScope.cacheAccessor.cachedSteps" export="true" ! requestURI="/action/step" excludedParams="*"> ! <display:column titleKey="label.step.position" property="position" sortable="true" width="60"/> ! <display:column titleKey="label.step.label" property="label" sortable="true"/> ! <display:column headerClass="empty" media="html" ! url="/action/step?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit step properties"/> ! </display:column> ! </display:table> </div> </div> --- 24,38 ---- <h4><bean:message bundle="gui" key="title.step.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="applicationScope.cacheAccessor.cachedSteps" export="true" ! requestURI="/action/step?rd=none" excludedParams="*"> ! <display:column titleKey="label.step.position" property="position" sortable="true" width="80"/> ! <display:column titleKey="label.step.label" property="label" sortable="true"/> ! <display:column headerClass="empty" media="html" ! url="/action/step?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit step properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> </div> Index: releases.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/releases.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** releases.jsp 30 Jul 2006 19:16:26 -0000 1.1 --- releases.jsp 28 Jan 2008 00:42:41 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,13 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/calendar.js"></script> *************** *** 21,37 **** <h4><bean:message bundle="gui" key="title.release.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="applicationScope.cacheAccessor.cachedReleases" export="true" ! requestURI="/action/release" excludedParams="*"> ! <display:column titleKey="label.release.major" property="major" sortable="true" width="60"/> ! <display:column titleKey="label.release.minor" property="minor"/> ! <display:column titleKey="label.release.name" property="name" sortable="true"/> ! <display:column titleKey="label.release.shipdate" sortable="true"> ! <bean:write name="row" property="shippingDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/release?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit release properties"/> ! </display:column> ! </display:table> </div> </div> --- 25,43 ---- <h4><bean:message bundle="gui" key="title.release.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="applicationScope.cacheAccessor.cachedReleases" export="true" ! requestURI="/action/release?rd=none" excludedParams="*"> ! <display:column titleKey="label.release.major" property="major" sortable="true" width="70"/> ! <display:column titleKey="label.release.minor" property="minor"/> ! <display:column titleKey="label.release.name" property="name" sortable="true" width="60"/> ! <display:column titleKey="label.release.shipdate" sortable="true" width="100"> ! <bean:write name="row" property="shippingDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/release?op=load" paramId="name" paramProperty="name"> ! <html:img page="/images/redo.gif" alt="Edit release properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> </div> *************** *** 89,91 **** </html:form> </div> ! <jsp:include page="/includes/formfooter.jsp"/> --- 95,97 ---- </html:form> </div> ! <jsp:include page="/includes/formfooter.jsp"/> \ No newline at end of file |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:40:55
|
Update of /cvsroot/join/join1/src/web/jsp/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22183/jsp/environment Modified Files: environmentmappings.jsp environmentview.jsp environmentviews.jsp Added Files: deploymentshistory.jsp Log Message: Fix for issue #1821986 : display deployments history Index: environmentmappings.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentmappings.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** environmentmappings.jsp 30 Jul 2006 19:39:16 -0000 1.1 --- environmentmappings.jsp 28 Jan 2008 00:40:52 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 18,26 **** <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "logicalEnvKey=" + key %>" /> </logic:match> <logic:match name="criterion" value="physicalenv"> ! <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "physicalEnvKey=" + key %>" /> </logic:match> </span> --- 23,31 ---- <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "logicalEnvKey=" + key %>" /><br/> </logic:match> <logic:match name="criterion" value="physicalenv"> ! <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="name" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "physicalEnvKey=" + key %>" /><br/> </logic:match> </span> *************** *** 28,49 **** <div align="center"> <bean:define id="param" toScope="page" name="param"/> ! <display:table id="row" htmlId="doctab" name="requestScope.messages" export="true" ! requestURI="<%= "/action/environmentMapping?op=view&" + param %>" pagesize="20"> ! <display:column titleKey="label.envmapping.startdate" sortable="true"> ! <bean:write name="row" property="startDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <logic:match name="criterion" value="logicalenv"> ! <display:column titleKey="label.envmapping.physicalenv" property="physicalEnvironment.label"/> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <display:column titleKey="label.envmapping.logicalenv" property="logicalEnvironment.label"/> ! </logic:match> ! <display:column titleKey="label.envmapping.enddate"> ! <bean:write name="row" property="endDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! </display:table> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> ! <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </div> --- 33,62 ---- <div align="center"> <bean:define id="param" toScope="page" name="param"/> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.mappings" export="true" ! requestURI="/action/environmentMapping?rd=none" pagesize="20"> ! <display:column titleKey="label.envmapping.startdate" width="120" sortable="true"> ! <bean:write name="row" property="startDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <logic:match name="criterion" value="logicalenv"> ! <display:column titleKey="label.envmapping.physicalenv" property="physicalEnvironment.name"/> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <display:column titleKey="label.envmapping.logicalenv" property="logicalEnvironment.label"/> ! </logic:match> ! <display:column titleKey="label.envmapping.enddate"> ! <bean:write name="row" property="endDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> ! <logic:match name="criterion" value="logicalenv"> ! <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <html:link action="/physicalEnvironment?op=details" paramId="idStr" paramName="environment" paramProperty="id"> ! <bean:message bundle="gui" key="menu.environments"/> ...</html:link> ! </logic:match> </div> Index: environmentviews.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentviews.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** environmentviews.jsp 8 Apr 2007 22:30:13 -0000 1.3 --- environmentviews.jsp 28 Jan 2008 00:40:52 -0000 1.4 *************** *** 97,103 **** <legend><html:img page="/images/16x16/history.gif" alt="History" align="absmiddle"/> <bean:message bundle="gui" key="label.logicalenv.history"/></legend> <br/> ! <html:link action="/deployment?op="><bean:message bundle="gui" key="label.logicalenv.history.currents"/></html:link><br/> <join:authorize role="manager" resourceName="element"> ! <html:link action="/deployment?op="><bean:message bundle="gui" key="label.logicalenv.history.logicalenv"/></html:link><br/> </join:authorize> <join:authorize role="joiner"> --- 97,107 ---- <legend><html:img page="/images/16x16/history.gif" alt="History" align="absmiddle"/> <bean:message bundle="gui" key="label.logicalenv.history"/></legend> <br/> ! <logic:present name="element" property="logicalEnvironment.activeEnvironmentMapping"> ! <html:link action="/deployments?op=getByEnvMapping" paramId="idStr" paramName="element" paramProperty="logicalEnvironment.activeEnvironmentMapping.id"> ! <bean:message bundle="gui" key="label.logicalenv.history.currents"/></html:link><br/> ! </logic:present> <join:authorize role="manager" resourceName="element"> ! <html:link action="/deployments?op=getByLogical" paramId="logicalEnvKey" paramName="element" paramProperty="logicalEnvironment.key"> ! <bean:message bundle="gui" key="label.logicalenv.history.logicalenv"/></html:link><br/> </join:authorize> <join:authorize role="joiner"> --- NEW FILE: deploymentshistory.jsp --- <% // $Revision: 1.1 $ %> <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> <div class="h3"> <h3> <html:img page="/images/22x22/history.gif" align="absmiddle"/> <bean:message bundle="gui" name="title"/> </h3> </div> <br/> <div class="h4"> <h4><bean:message bundle="gui" key="title.deployments.searched"/></h4> <span class="text" id="doctab"> <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/><br/> </logic:match> <logic:match name="criterion" value="physicalenv"> <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="name" scope="request"/><br/> </logic:match> <logic:match name="criterion" value="envmapping"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="mapping" property="logicalEnvironment.label" scope="request"/><br/> <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="mapping" property="physicalEnvironment.name" scope="request"/><br/> <bean:message bundle="gui" key="label.envmapping.startdate"/> : <bean:write name="mapping" property="startDate" formatKey="pattern.date.datetostring"/><br/> <bean:message bundle="gui" key="label.envmapping.enddate"/> : <bean:write name="mapping" property="endDate" formatKey="pattern.date.datetostring"/><br/> </logic:match> </span> <br/> <div align="center"> <ajax:displayTag id="adtFrame" tableClass="disptab"> <display:table id="row" styleClass="disptab" name="requestScope.deployments" export="true" requestURI="/action/deployments?rd=none" pagesize="20"> <bean:define id="cancelled" name="row" property="status.cancelled"/> <display:column titleKey="label.deployment.realizationdate" width="120" sortable="true"> <logic:equal value="true" name="cancelled"><span class="canceled"></logic:equal> <bean:write name="row" property="realizationDate" formatKey="pattern.date.datetostring"/> <logic:equal value="true" name="cancelled"></span></logic:equal> </display:column> <display:column titleKey="label.deployment.assembly"> <logic:equal value="true" name="cancelled"><span class="canceled"></logic:equal> <html:link action="/assembly?op=details" paramId="key" paramName="row" paramProperty="assembly.key"> <bean:write name="row" property="assembly.key"/></html:link> <logic:equal value="true" name="cancelled"></span></logic:equal> </display:column> <display:column titleKey="label.deployment.target" property="target.name"/> <display:column titleKey="label.deployment.applicant"> <join:resolveUser name="row" property="applicantId" link="true"/> </display:column> </display:table> </ajax:displayTag> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> <logic:match name="criterion" value="logicalenv"> <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> <logic:match name="criterion" value="physicalenv"> <html:link action="/physicalEnvironment?op=details" paramId="idStr" paramName="environment" paramProperty="id"> <bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> <logic:match name="criterion" value="envmapping"> <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> </div> Index: environmentview.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentview.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** environmentview.jsp 8 Apr 2007 22:30:13 -0000 1.4 --- environmentview.jsp 28 Jan 2008 00:40:52 -0000 1.5 *************** *** 246,250 **** <br/> <logic:notEqual parameter="fromLogical" value="true"> ! <html:link action="/deployment?op=getByPhysical" paramId="environmentKey" paramName="environment" paramProperty="key"> <bean:message bundle="gui" key="label.physicalenv.history.updates"/></html:link> <br/><br/> --- 246,250 ---- <br/> <logic:notEqual parameter="fromLogical" value="true"> ! <html:link action="/deployments?op=getByPhysical" paramId="physicalEnvKey" paramName="environment" paramProperty="key"> <bean:message bundle="gui" key="label.physicalenv.history.updates"/></html:link> <br/><br/> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:39:00
|
Update of /cvsroot/join/join1/src/web/includes In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21376/includes Modified Files: footer.jsp menu.jsp Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: menu.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/includes/menu.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** menu.jsp 8 Apr 2007 22:24:48 -0000 1.6 --- menu.jsp 28 Jan 2008 00:38:51 -0000 1.7 *************** *** 2,13 **** <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <div id="navcolumn"> <!-- Preload and hide the menu to avoid clipping --> <script language="Javascript" type="text/javascript">preLoading();</script> ! <!-- User menu item --> <span id="menu1" class="menu" onmouseover="showMenu('smenu1');" onmouseout="stopTimeout();"> --- 2,52 ---- <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/calendar.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/effects.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/hide.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/controls.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + + <script language="Javascript" type="text/javascript"> + function showLoading(){ + var objOverlay = document.getElementById('overlay'); + if (objOverlay == null){ + // create overlay div and hardcode some functional styles (aesthetic styles are in CSS file) + var objHead = document.getElementsByTagName("body").item(0); + var objOverlay = document.createElement("div"); + objOverlay.setAttribute('id','overlay'); + objOverlay.style.display = 'none'; + objOverlay.style.position = 'absolute'; + objOverlay.style.left = 235; + objOverlay.style.top = 95; + objOverlay.style.zIndex = '90'; + objOverlay.style.width = '100%'; + objHead.insertBefore(objOverlay, objHead.firstChild); + + var objLoadingImage = document.createElement("img"); + objLoadingImage.src = '<%=request.getContextPath()%>/images/ajax-loader.gif'; + objLoadingImage.setAttribute('id','loadingImage'); + objLoadingImage.style.position = 'absolute'; + objLoadingImage.style.zIndex = '150'; + objOverlay.appendChild(objLoadingImage); + } + objOverlay.style.display = 'block'; + } + function hideLoading(){ + var objOverlay = document.getElementById('overlay'); + objOverlay.style.display = 'none'; + } + </script> + <div id="navcolumn"> <!-- Preload and hide the menu to avoid clipping --> <script language="Javascript" type="text/javascript">preLoading();</script> ! <!-- User menu item --> <span id="menu1" class="menu" onmouseover="showMenu('smenu1');" onmouseout="stopTimeout();"> *************** *** 27,30 **** --- 66,71 ---- </span> + <join:ajaxA target="bodycol" ajaxFlag="xhr" preFunction="showLoading()" options="onComplete:function(request){hideLoading();loadNifty()}"> + <!-- Artifacts menu item --> <span id="menu2" class="menu" onmouseover="showMenu('smenu2');" onmouseout="stopTimeout();"> *************** *** 236,241 **** </small> </span> </div> <!-- Once navcolumn is filled, load entire menu properties --> ! <script language="Javascript" type="text/javascript">loading();</script> --- 277,284 ---- </small> </span> + + </join:ajaxA> </div> <!-- Once navcolumn is filled, load entire menu properties --> ! <script language="Javascript" type="text/javascript">loading();</script> \ No newline at end of file Index: footer.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/includes/footer.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** footer.jsp 27 Jul 2006 13:00:23 -0000 1.1 --- footer.jsp 28 Jan 2008 00:38:51 -0000 1.2 *************** *** 6,10 **** <table border="0" cellspacing="0" cellpadding="4" width="99%"> <tr> ! <td align="left" valign="top">© 2006, Join Team</td> <td align="right"> <a href="http://www.sourceforge.net/projects/join"> --- 6,10 ---- <table border="0" cellspacing="0" cellpadding="4" width="99%"> <tr> ! <td align="left" valign="top">© 2008, Join Team</td> <td align="right"> <a href="http://www.sourceforge.net/projects/join"> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:37:19
|
Update of /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20987/businessobjects/environment/persistence Modified Files: spring.xml Log Message: Fix for issue #1821986 : display deployments history Index: spring.xml =================================================================== RCS file: /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence/spring.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** spring.xml 9 Oct 2006 20:44:31 -0000 1.3 --- spring.xml 28 Jan 2008 00:37:15 -0000 1.4 *************** *** 81,84 **** --- 81,90 ---- </bean> + <bean id="assemblyDao" class="org.figure8.join.businessobjects.artifact.persistence.HibernateAssemblyDao"> + <property name="sessionFactory"> + <ref local="sessionFactory"/> + </property> + </bean> + <bean id="machineDao" class="org.figure8.join.businessobjects.environment.persistence.HibernateMachineDao"> <property name="sessionFactory"> *************** *** 140,142 **** --- 146,154 ---- </property> </bean> + + <bean id="deploymentDao" class="org.figure8.join.businessobjects.environment.persistence.HibernateDeploymentDao"> + <property name="sessionFactory"> + <ref local="sessionFactory"/> + </property> + </bean> </beans> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:36:02
|
Update of /cvsroot/join/join1/src/test/org/figure8/join/businessobjects/environment/persistence In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20248/businessobjects/environment/persistence Added Files: DeploymentDaoTest.java Log Message: Fix for issue #1821986 : display deployments history --- NEW FILE: DeploymentDaoTest.java --- /** * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the * "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.opensource.org/licenses/gpl-license.php * * 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 org.figure8.join.businessobjects.environment.persistence; import org.figure8.join.util.SpringTestCase; import org.figure8.join.businessobjects.environment.Deployment; import org.figure8.join.businessobjects.environment.LogicalEnvironment; import org.figure8.join.businessobjects.environment.PhysicalEnvironment; import org.figure8.join.businessobjects.environment.EnvironmentMapping; import org.figure8.join.businessobjects.commons.Step; import org.figure8.join.businessobjects.commons.Release; import org.figure8.join.businessobjects.commons.Target; import org.figure8.join.businessobjects.commons.persistence.StepDao; import org.figure8.join.businessobjects.commons.persistence.TargetDao; import org.figure8.join.businessobjects.commons.persistence.ReleaseDao; import org.figure8.join.businessobjects.artifact.Assembly; import org.figure8.join.businessobjects.artifact.persistence.AssemblyDao; import java.util.Date; import java.util.List; /** * JUnit test case for testing DeploymentDao implementation. * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a> * @version $Revision: 1.1 $ */ public class DeploymentDaoTest extends SpringTestCase{ // Static ------------------------------------------------------------------- /** Spring configuration files */ private String[] configLocations = new String[]{ "classpath:/org/figure8/join/businessobjects/environment/persistence/spring.xml"}; // Attributes --------------------------------------------------------------- /** The needed StepDao impl */ protected StepDao stepDao = null; /** The needed TargetDao impl. */ protected TargetDao targetDao = null; /** The needed ReleaseDao impl */ protected ReleaseDao releaseDao = null; /** The needed AssemblyDao impl. */ protected AssemblyDao assemblyDao = null; /** The needed logical environment dao impl. */ protected LogicalEnvironmentDao logicalEnvDao = null; /** The needed physical environment dao impl. */ protected PhysicalEnvironmentDao physicalEnvDao = null; /** The needed environment mapping dao impl. */ protected EnvironmentMappingDao envMappingDao = null; /** The DeploymentDao implementation instance to test. */ protected DeploymentDao dao = null; // Override of SpringTestCase ----------------------------------------------- /** Retrieve the daos we neef after having initialized context */ public void setUp(){ super.setUp(); // Get required daos. stepDao = (StepDao)context.getBean("stepDao"); targetDao = (TargetDao)context.getBean("targetDao"); releaseDao = (ReleaseDao)context.getBean("releaseDao"); assemblyDao = (AssemblyDao)context.getBean("assemblyDao"); logicalEnvDao = (LogicalEnvironmentDao)context.getBean("logicalEnvironmentDao"); physicalEnvDao = (PhysicalEnvironmentDao)context.getBean("physicalEnvironmentDao"); envMappingDao = (EnvironmentMappingDao)context.getBean("environmentMappingDao"); // Get the dao implementation to test. dao = (DeploymentDao)context.getBean("deploymentDao"); } // Public ------------------------------------------------------------------- /** Test the creation of a Deployment */ public void testDeploymentCreation(){ // Save a deployment and required items. Step step = new Step("deploymentCreation", 1); Target target = new Target("full", "description"); Release release = new Release("99.0", 99, 0, new Date()); Assembly assembly = new Assembly("01", "comments", "composerId", release); LogicalEnvironment logical = new LogicalEnvironment("depCreation", "label", "description", "managerId", step, release); PhysicalEnvironment physical = new PhysicalEnvironment("depCreation", "name"); EnvironmentMapping envMapping = new EnvironmentMapping(logical, physical); Deployment deployment = new Deployment("applicantId", "comments", envMapping, assembly, target); int size = getDeploymentListSize(); stepDao.save(step); targetDao.save(target); releaseDao.save(release); assemblyDao.save(assembly); logicalEnvDao.save(logical); physicalEnvDao.save(physical); envMappingDao.save(envMapping); dao.save(deployment); // Assert there's one deployment created. assertEquals("Deployment is successfully created", size + 1, getDeploymentListSize()); } /** Test the retrieval of Deployments using the environment criterion */ public void testFindByEnvironments(){ // Save a deployment and required items. Step step = new Step("depFindByEnv", 1); Target target = new Target("fullByEnv", "description"); Release release = new Release("99.1", 99, 1, new Date()); Assembly assembly = new Assembly("01", "comments", "composerId", release); LogicalEnvironment logical = new LogicalEnvironment("depFindByEnv", "labelByEnv", "description", "managerId", step, release); PhysicalEnvironment physical = new PhysicalEnvironment("depFindByEnv1", "nameByEnv1"); PhysicalEnvironment physical2 = new PhysicalEnvironment("depFindByEnv2", "nameByEnv2"); EnvironmentMapping envMapping = new EnvironmentMapping(logical, physical); Deployment deployment = new Deployment("applicantId", "comments", envMapping, assembly, target); stepDao.save(step); targetDao.save(target); releaseDao.save(release); assemblyDao.save(assembly); logicalEnvDao.save(logical); physicalEnvDao.save(physical); physicalEnvDao.save(physical2); envMappingDao.save(envMapping); dao.save(deployment); // Find by environments and assert. List deployments = dao.getDeploymentsByLogicalEnvironment(logical); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 1, deployments.size()); deployments = dao.getDeploymentsByPhysicalEnvironment(physical); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 1, deployments.size()); deployments = dao.getDeploymentsByPhysicalEnvironment(physical2); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 0, deployments.size()); // Close existing mapping, create another one and associated deployment. envMapping.close(); // TODO: solve why next call to save() makes the test crash (lazy intialization exception) // envMappingDao.save(envMapping); EnvironmentMapping envMapping2 = new EnvironmentMapping(logical, physical2); Deployment deployment2 = new Deployment("applicantId", "comments", envMapping2, assembly, target); envMappingDao.save(envMapping2); dao.save(deployment2); // Find by environments and assert. deployments = dao.getDeploymentsByLogicalEnvironment(logical); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 2, deployments.size()); deployments = dao.getDeploymentsByPhysicalEnvironment(physical); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 1, deployments.size()); deployments = dao.getDeploymentsByPhysicalEnvironment(physical2); assertNotNull("Deployments list is not null", deployments); assertEquals("Deployments list has correct size", 1, deployments.size()); } // Protected ---------------------------------------------------------------- /** Test the findAll on Deployment */ protected int getDeploymentListSize(){ return dao.findAll().size(); } // Implementation of SpringTestCase ----------------------------------------- /** @return configLocations inner field */ public String[] getConfigLocations(){ return configLocations; } } |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:34:15
|
Update of /cvsroot/join/join1/src/resources/spring In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19839 Modified Files: action-servlet.xml Log Message: Fix for issue #1821986 : display deployments history Index: action-servlet.xml =================================================================== RCS file: /cvsroot/join/join1/src/resources/spring/action-servlet.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** action-servlet.xml 28 Feb 2007 23:57:38 -0000 1.6 --- action-servlet.xml 28 Jan 2008 00:34:11 -0000 1.7 *************** *** 176,179 **** --- 176,185 ---- </bean> + <bean name="/deployments" class="org.figure8.join.control.action.DeploymentsActions"> + <property name="environmentManager"> + <ref bean="environmentManager"/> + </property> + </bean> + <bean name="/parameter" class="org.figure8.join.control.action.ParameterActions"> <property name="parameterManager"> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:33:47
|
Update of /cvsroot/join/join1/src/resources/struts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19457 Modified Files: struts-controller.xml Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: struts-controller.xml =================================================================== RCS file: /cvsroot/join/join1/src/resources/struts/struts-controller.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** struts-controller.xml 14 Jan 2007 17:54:16 -0000 1.2 --- struts-controller.xml 28 Jan 2008 00:33:44 -0000 1.3 *************** *** 1,4 **** <controller ! contentType="text/html" locale="true" nocache="false" --- 1,4 ---- <controller ! contentType="text/html;charset=UTF-8" locale="true" nocache="false" |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:32:51
|
Update of /cvsroot/join/join1/src/resources/properties In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19052 Modified Files: gui_fr_FR.properties Log Message: Index: gui_fr_FR.properties =================================================================== RCS file: /cvsroot/join/join1/src/resources/properties/gui_fr_FR.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gui_fr_FR.properties 27 Nov 2007 22:00:26 -0000 1.6 --- gui_fr_FR.properties 28 Jan 2008 00:32:37 -0000 1.7 *************** *** 141,145 **** title.deployments.bylogicalenv=Mises à jour par Environnement title.deployments.byphysicalenv=Mises à jour par Environnement Physique ! title.deployments.byenvmapping=Mises à jour par Lien title.components=Composants --- 141,145 ---- title.deployments.bylogicalenv=Mises à jour par Environnement title.deployments.byphysicalenv=Mises à jour par Environnement Physique ! title.deployments.byenvmapping=Mises à jour par Lien d'environnements title.components=Composants |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:30:42
|
Update of /cvsroot/join/join1/lib/tlds In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18297/join1/lib/tlds Added Files: ajaxtags.tld Log Message: Add ajax support and nifty cubes for nice rounded corners ! --- NEW FILE: ajaxtags.tld --- <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> <taglib xmlns="http://java.sun.com/JSP/TagLibraryDescriptor"> <tlib-version>1.1</tlib-version> <jsp-version>1.2</jsp-version> <short-name>Ajax Tag Library</short-name> <uri>http://ajaxtags.org/tags/ajax</uri> <description>Ajax Tag Library</description> <tag> <name>select</name> <tag-class>org.ajaxtags.tags.AjaxSelectTag</tag-class> <description> Builds the JavaScript required to populate a select box based on some event </description> [...1150 lines suppressed...] <name>target</name> <required>true</required> <rtexprvalue>true</rtexprvalue> <description> The target region on the page where the AJAX response will be written, often a DIV tag </description> </attribute> <attribute> <name>ajaxFlag</name> <required>false</required> <rtexprvalue>true</rtexprvalue> <description> A true/false flag to indicate whether the rest of the page should be ignored in an AJAX call [default=false] </description> </attribute> </tag> </taglib> |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:26:38
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/control In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16732/control Modified Files: JoinAction.java Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: JoinAction.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/JoinAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JoinAction.java 8 Apr 2007 18:46:51 -0000 1.5 --- JoinAction.java 28 Jan 2008 00:26:26 -0000 1.6 *************** *** 50,53 **** --- 50,55 ---- /** The request parameter which contains graphical rendering operation. */ public static final String REND_PARAMETER = "rd"; + /** The request parameter which tells that request has been made using XmlHttpRequest (Ajax) */ + public static final String XHR_PARAMETER = "xhr"; /** The request attribute which will contain the path of the page body. */ *************** *** 142,145 **** --- 144,159 ---- } + /** + * Tells wether a request has been submitted using XmlHttpRequest + * @param request The servlet container request wrapper + * @return Wether request has been submitted using XmlHttpRequest + */ + protected boolean isXhrRequest(HttpServletRequest request){ + String xhrAttribute = request.getParameter(XHR_PARAMETER); + if (Boolean.valueOf(xhrAttribute).booleanValue()) + return true; + return false; + } + // Private ------------------------------------------------------------------ *************** *** 206,210 **** // Care about rendering info. String rendering = request.getParameter(REND_PARAMETER); ! if (REND_NONE.equals(rendering)) return forward; else if (REND_POPUP.equals(rendering)) --- 220,224 ---- // Care about rendering info. String rendering = request.getParameter(REND_PARAMETER); ! if (REND_NONE.equals(rendering) || (isXhrRequest(request) && rendering == null)) return forward; else if (REND_POPUP.equals(rendering)) |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:25:16
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/control/form In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16342/control/form Added Files: DeploymentsForm.java Log Message: Fix for issue #1821986 : display deployments history --- NEW FILE: DeploymentsForm.java --- /** * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the * "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.opensource.org/licenses/gpl-license.php * * 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 org.figure8.join.control.form; import org.figure8.join.control.JoinForm; import org.figure8.join.control.action.DeploymentsActions; import org.apache.struts.action.ActionMapping; import javax.servlet.http.HttpServletRequest; /** * This is a Struts for used when retrieving deployments using different criteria. * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a> * @version $Revision: 1.1 $ * @struts.form name="DeploymentsForm" */ public class DeploymentsForm extends JoinForm{ // Attributes --------------------------------------------------------------- /** The key of logical environment to get deployments for. */ private String logicalEnvKey; /** The unique key of physical environment to get deployments for. */ private String physicalEnvKey; // Constructors ------------------------------------------------------------- /** Creates a new instance of DeploymentsForm */ public DeploymentsForm(){ } // Public ------------------------------------------------------------------- /** @return The unique key of logical environment to get deployements for */ public String getLogicalEnvKey(){ return logicalEnvKey; } /** @param logicalEnvKey The unique key of logical environment to get deployements for */ public void setLogicalEnvKey(String logicalEnvKey){ this.logicalEnvKey = logicalEnvKey; } /** @return The unique key of physical environment to get deployements for */ public String getPhysicalEnvKey(){ return physicalEnvKey; } /** @param physicalEnvKey The unique key of physical to get deployements for */ public void setPhysicalEnvKey(String physicalEnvKey){ this.physicalEnvKey = physicalEnvKey; } // Implementation of JoinForm ----------------------------------------------- /** * Validation of the form attributes. * @param operation String representing the operation to invoke on Action * @param mapping Mapping between forwards name and path for this action * @param request The servlet container request wrapper */ public void doValidate(String operation, ActionMapping mapping, HttpServletRequest request){ if (DeploymentsActions.LOGICALENV_OP.equals(operation)){ // Check if logical environment key is missing. if (logicalEnvKey == null || logicalEnvKey.length() == 0) addActionError("errors.required", getGuiMessageResources().getMessage("label.deployment.environment")); } else if (DeploymentsActions.PHYSICALENV_OP.equals(operation)){ // Check if physical environment key is missing. if (physicalEnvKey == null || physicalEnvKey.length() == 0) addActionError("errors.required", getGuiMessageResources().getMessage("label.deployment.environment")); } else if (DeploymentsActions.ENVMAPPING_OP.equals(operation)){ // Use generic identifier in this case. validateEntityObjectId(); } } // Override of ActionForm --------------------------------------------------- /** * Reset form attributes. * @param mapping Mapping between forwards name and path for this action * @param request The servlet container request wrapper */ public void reset(ActionMapping mapping, HttpServletRequest request){ super.reset(mapping, request); logicalEnvKey = null; physicalEnvKey = null; } } |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:23:49
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/control/action In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15573/control/action Modified Files: EnvironmentMappingActions.java Added Files: DeploymentsActions.java Log Message: Fix for issue #1821986 : display deployments history Index: EnvironmentMappingActions.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/EnvironmentMappingActions.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EnvironmentMappingActions.java 19 Jul 2006 22:42:26 -0000 1.1 --- EnvironmentMappingActions.java 28 Jan 2008 00:23:44 -0000 1.2 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 108,112 **** * @throws Exception such as InfraStructureExceptions ... */ ! public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ // Trace operation to execute. log.debug("doExecute() called for '" + operation + "' operation"); --- 108,114 ---- * @throws Exception such as InfraStructureExceptions ... */ ! public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) ! throws Exception{ // Trace operation to execute. log.debug("doExecute() called for '" + operation + "' operation"); *************** *** 138,142 **** * @return A forward to the next view to render and display */ ! protected ActionForward showMappingForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ --- 140,145 ---- * @return A forward to the next view to render and display */ ! protected ActionForward showMappingForm(ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) throws Exception{ *************** *** 173,177 **** * @return A forward to the next view to render and display */ ! protected ActionForward loadMapping(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ --- 176,181 ---- * @return A forward to the next view to render and display */ ! protected ActionForward loadMapping(ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) throws Exception{ *************** *** 194,198 **** * @return A forward to the next view to render and display */ ! protected ActionForward createMapping(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ --- 198,203 ---- * @return A forward to the next view to render and display */ ! protected ActionForward createMapping(ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) throws Exception{ *************** *** 220,224 **** * @return A forward to the next view to render and display */ ! protected ActionForward closeMapping(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ --- 225,230 ---- * @return A forward to the next view to render and display */ ! protected ActionForward closeMapping(ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) throws Exception{ *************** *** 245,249 **** * @return A forward to the next view to render and display */ ! protected ActionForward loadEnvironmentMappings(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ --- 251,256 ---- * @return A forward to the next view to render and display */ ! protected ActionForward loadEnvironmentMappings(ActionMapping mapping, ActionForm form, ! HttpServletRequest request, HttpServletResponse response) throws Exception{ *************** *** 265,269 **** else if (mForm.getPhysicalEnvKey() != null){ // Log and get appropriate list. ! log.info("Retrieving the EnvironmentMapping history for physical environment: " + mForm.getPhysicalEnvKey()); PhysicalEnvironment physicalEnv = environmentManager.getPhysicalEnvironment(mForm.getPhysicalEnvKey()); mappings = environmentManager.getEnvironmentMappings(physicalEnv); --- 272,277 ---- else if (mForm.getPhysicalEnvKey() != null){ // Log and get appropriate list. ! log.info("Retrieving the EnvironmentMapping history for physical environment: " ! + mForm.getPhysicalEnvKey()); PhysicalEnvironment physicalEnv = environmentManager.getPhysicalEnvironment(mForm.getPhysicalEnvKey()); mappings = environmentManager.getEnvironmentMappings(physicalEnv); --- NEW FILE: DeploymentsActions.java --- /** * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the * "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.opensource.org/licenses/gpl-license.php * * 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 org.figure8.join.control.action; import org.figure8.join.control.JoinAction; import org.figure8.join.control.form.DeploymentsForm; import org.figure8.join.businessfacades.environment.EnvironmentManager; import org.figure8.join.businessobjects.environment.EnvironmentMapping; import org.figure8.join.businessobjects.environment.LogicalEnvironment; import org.figure8.join.businessobjects.environment.PhysicalEnvironment; import org.figure8.join.util.LogUtil; import org.apache.commons.logging.Log; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; /** * This is a Struts action controller for managing Deployments retrieval related operations. * @author <a href="mailto:lau...@fr...">Laurent Broudoux</a> * @version $Revision: 1.1 $ * @struts.action path="/deployments" name="DeploymentsForm" * scope="request" parameter="op" validate="true" * input="/pages/mainpage.jsp?body=/jsp/environment/deploymentshistory.jsp" * @struts.action-forward name="History" path="/jsp/environment/deploymentshistory.jsp" */ public class DeploymentsActions extends JoinAction{ // Static ------------------------------------------------------------------- /** Get a commons logger */ private static final Log log = LogUtil.getLog(DeploymentsActions.class); /** Operation code for retrieving deployments for a logical environment. */ public static final String LOGICALENV_OP = "getByLogical"; /** Operation code for retrieving deployments for a physical environment. */ public static final String PHYSICALENV_OP = "getByPhysical"; /** Operation code for retrieving deployments for an environment mapping. */ public static final String ENVMAPPING_OP = "getByEnvMapping"; /** The request scope for specifying the title of the screen (used by view) */ public static final String TITLE_KEY = "title"; /** * The request scope attribute under which the retrivied deployments * list is stored. */ public static final String DEPLOYMENTS_KEY = "deployments"; // Attributes --------------------------------------------------------------- /** The EnvironmentManager implementation to use */ protected EnvironmentManager environmentManager = null; // Constructors ------------------------------------------------------------- /** Creates a new instance of DeploymentsActions. */ public DeploymentsActions(){ } // Public ------------------------------------------------------------------- /** @param environmentManager The EnvironmentManager implementation to use */ public void setEnvironmentManager(EnvironmentManager environmentManager){ this.environmentManager = environmentManager; } // Implementation of JoinAction --------------------------------------------- /** * @param operation String representing the operation to invoke on Action * @param mapping Mapping between forwards name and path for this action * @param form The form object containing request parameters * @param request The servlet container request wrapper * @param response The servlet container response wrapper * @return A forward to the next view to render and display * @throws Exception such as InfraStructureExceptions ... */ public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ // Trace operation to execute. log.debug("doExecute() called for '" + operation + "' operation"); if (form instanceof DeploymentsForm){ // Get deployments form for operations. DeploymentsForm dForm = (DeploymentsForm)form; if (LOGICALENV_OP.equals(operation)){ return getDeploymentsForLogicalEnvironment(mapping, dForm, request, response); } else if (PHYSICALENV_OP.equals(operation)){ return getDeploymentsForPhysicalEnvironment(mapping, dForm, request, response); } else if (ENVMAPPING_OP.equals(operation)){ return getDeploymentsForEnvironmentMapping(mapping, dForm, request, response); } } // This should not happen... return null; } // Protected ---------------------------------------------------------------- /** * Retrieve deployments for a specified logical environment. * @return A forward to the next view to render and display */ protected ActionForward getDeploymentsForLogicalEnvironment(ActionMapping mapping, DeploymentsForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ // Retrieve deployments from manager. LogicalEnvironment environment = environmentManager.getLogicalEnvironment(form.getLogicalEnvKey()); List deployments = environmentManager.getDeployments(environment); // Store into request attributes before forwarding. request.setAttribute(LogicalEnvironmentActions.ENVIRONMENT_KEY, environment); request.setAttribute(DEPLOYMENTS_KEY, deployments); request.setAttribute(TITLE_KEY, "title.deployments.bylogicalenv"); request.setAttribute("criterion", "logicalenv"); return mapping.findForward("History"); } /** * Retrieve deployments for a specified physical environment. * @return A forward to the next view to render and display */ protected ActionForward getDeploymentsForPhysicalEnvironment(ActionMapping mapping, DeploymentsForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ // Retrieve deployments from manager. PhysicalEnvironment environment = environmentManager.getPhysicalEnvironment(form.getPhysicalEnvKey()); List deployments = environmentManager.getDeployments(environment); // Store into request attributes before forwarding. request.setAttribute(PhysicalEnvironmentActions.ENVIRONMENT_KEY, environment); request.setAttribute(DEPLOYMENTS_KEY, deployments); request.setAttribute(TITLE_KEY, "title.deployments.byphysicalenv"); request.setAttribute("criterion", "physicalenv"); return mapping.findForward("History"); } /** * Retrieve deployments for a specified environment mapping. * @return A forward to the next view to render and display */ protected ActionForward getDeploymentsForEnvironmentMapping(ActionMapping mapping, DeploymentsForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{ // Retrieve environment mapping from manager. EnvironmentMapping envMapping = environmentManager.getEnvironmentMapping(form.getId()); // Store into request attributes before forwarding. request.setAttribute(EnvironmentMappingActions.MAPPING_KEY, envMapping); request.setAttribute(DEPLOYMENTS_KEY, envMapping.getDeployments()); request.setAttribute(TITLE_KEY, "title.deployments.byenvmapping"); request.setAttribute("criterion", "envmapping"); return mapping.findForward("History"); } } |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:21:56
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14803/businessobjects/environment Modified Files: EnvironmentMapping.java LogicalEnvironment.java Log Message: Fix for issue #1821986 : display deployments history Index: EnvironmentMapping.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/EnvironmentMapping.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EnvironmentMapping.java 6 Apr 2007 21:12:38 -0000 1.3 --- EnvironmentMapping.java 28 Jan 2008 00:21:53 -0000 1.4 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 113,117 **** /** ! * @hibernate.bag cascade="save-update" lazy="true" order-by="creationDate desc" inverse="true" * @hibernate.collection-key column="n_envmapping_fk" * @hibernate.collection-one-to-many class="org.figure8.join.businessobjects.environment.Deployment" --- 113,117 ---- /** ! * @hibernate.bag cascade="save-update" lazy="true" order-by="d_creation desc" inverse="true" * @hibernate.collection-key column="n_envmapping_fk" * @hibernate.collection-one-to-many class="org.figure8.join.businessobjects.environment.Deployment" Index: LogicalEnvironment.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/LogicalEnvironment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LogicalEnvironment.java 22 Jul 2006 13:04:45 -0000 1.1 --- LogicalEnvironment.java 28 Jan 2008 00:21:53 -0000 1.2 *************** *** 72,79 **** /** * Creates a new LogicalEnvironment with mandatory attribute * @param label This environment label * @param description This environment description */ ! public LogicalEnvironment(String key, String label, String description, String managerId, Step step, Release release){ this.key = key; this.label = label; --- 72,84 ---- /** * Creates a new LogicalEnvironment with mandatory attribute + * @param key This environment unique key * @param label This environment label * @param description This environment description + * @param managerId The unique identifier environment manager + * @param step The integration cycle step this environment is dedicated to + * @param release The project release this environment is dedicated to */ ! public LogicalEnvironment(String key, String label, String description, ! String managerId, Step step, Release release){ this.key = key; this.label = label; |
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:20:38
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14376/businessobjects/environment Modified Files: Deployment.java Log Message: Fix for issue #1821986 : display deployments history Index: Deployment.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/businessobjects/environment/Deployment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Deployment.java 6 Apr 2007 21:12:38 -0000 1.3 --- Deployment.java 28 Jan 2008 00:20:33 -0000 1.4 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2007 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 50,54 **** * @hibernate.query name="join.deployment_findByLogicalEnvironment" * query="from Deployment dep left join fetch dep.assembly ! * where dep.environemntMapping.logicalEnvironment = :logicalEnv order by dep.creationDate desc" * @hibernate.query name="join.deployment_findByPhysicalEnvironment" * query="from Deployment dep left join fetch dep.assembly --- 50,54 ---- * @hibernate.query name="join.deployment_findByLogicalEnvironment" * query="from Deployment dep left join fetch dep.assembly ! * where dep.environmentMapping.logicalEnvironment = :logicalEnv order by dep.creationDate desc" * @hibernate.query name="join.deployment_findByPhysicalEnvironment" * query="from Deployment dep left join fetch dep.assembly |
